Merge branch 'youxilong_2.26_院后第一增量' of http://192.168.16.64:3000/jihan/PostDischargePatientManage into youxilong_2.26_院后第一增量

postdischarge-admin/src/main/java/com/xinelu/web/controller/system/SysUserController.java

@@ -141,6 +141,22 @@ public class SysUserController extends BaseController {
         return toAjax(userService.updateUser(user));
     }
 
+    /**
+     * 修改用户机构科室
+     */
+    @PostMapping("/editAgency")
+    public AjaxResult editAgency(@RequestBody SysUser user) {
+        return toAjax(userService.editAgency(user));
+    }
+
+    /**
+     * 修改用户机构科室
+     */
+    @PostMapping("/editDepartment")
+    public AjaxResult editDepartment(@RequestBody SysUser user) {
+        return toAjax(userService.editDepartment(user));
+    }
+
     /**
      * 删除用户
      */

postdischarge-admin/src/main/resources/application.yml

@@ -12,6 +12,12 @@ xinelu:
   profile: D:/postdischarge/uploadPath
   # 签约知情书上传
   sign-informed-file-url: /signInformed
+  # 素材库封面上传
+  propaganda-cover-url: /propagandaCover
+  # 宣教库封面上传
+  materials-cover-url: /materialsCover
+  # 素材库封面上传
+  materials-video-url: /materialsVideo
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

postdischarge-common/src/main/java/com/xinelu/common/config/SystemBusinessConfig.java

@@ -51,6 +51,21 @@ public class SystemBusinessConfig {
      */
     private String signInformedFileUrl;
 
+	/**
+	 * 宣教库封面
+	 */
+	private String propagandaCoverUrl;
+
+	/**
+	 * 素材库封面
+	 */
+	private String materialsCoverUrl;
+
+	/**
+	 * 素材库视频地址
+	 */
+	private String materialsVideoUrl;
+
     /**
      * 话术图片地址
      */
@@ -155,4 +170,27 @@ public class SystemBusinessConfig {
     public void setScriptFileUrl(String scriptFileUrl) {
         this.scriptFileUrl = scriptFileUrl;
     }
+	public String getPropagandaCoverUrl() {
+		return propagandaCoverUrl;
+	}
+
+	public void setPropagandaCoverUrl(String propagandaCoverUrl) {
+		this.propagandaCoverUrl = propagandaCoverUrl;
+	}
+
+	public String getMaterialsCoverUrl() {
+		return materialsCoverUrl;
+	}
+
+	public void setMaterialsCoverUrl(String materialsCoverUrl) {
+		this.materialsCoverUrl = materialsCoverUrl;
+	}
+
+	public String getMaterialsVideoUrl() {
+		return materialsVideoUrl;
+	}
+
+	public void setMaterialsVideoUrl(String materialsVideoUrl) {
+		this.materialsVideoUrl = materialsVideoUrl;
+	}
 }

postdischarge-common/src/main/java/com/xinelu/common/constant/FileUploadPathConstants.java

@@ -0,0 +1,29 @@
+package com.xinelu.common.constant;
+
+/**
+ * @description: 文件上传路径常量
+ * @author: haown
+ * @create: 2024-03-01 10:39
+ **/
+public class FileUploadPathConstants {
+
+	/**
+	 * 签约知情书上传路径
+	 */
+	public static final String SIGN_INFORMED_TYPE = "signInformedFileUrl";
+
+	/**
+	 * 宣教封面上传路径
+	 */
+	public static final String PROPAGANDA_COVER_TYPE = "propagandaCoverUrl";
+
+	/**
+	 * 素材封面上传路径
+	 */
+	public static final String MATERIALS_COVER_TYPE = "materialsCoverUrl";
+
+	/**
+	 * 素材库视频上传路径
+	 */
+	public static final String MATERIALS_VIDEO_TYPE = "materialsVideoUrl";
+}

postdischarge-common/src/main/java/com/xinelu/common/constant/SignRecordServiceStatusConstants.java

@@ -21,6 +21,11 @@ public class SignRecordServiceStatusConstants {
 	 */
 	public static final String SERVICE_END = "SERVICE_END";
 
+	/**
+	 * 待续约
+	 */
+	public static final String WAIT_CONTINUOUS_SIGN = "WAIT_CONTINUOUS_SIGN";
+
 	/**
 	 * 在签
 	 */
@@ -37,8 +42,8 @@ public class SignRecordServiceStatusConstants {
 	public static final String SEPARATE_SIGN = "SEPARATE_SIGN";
 
 	/**
-	 * 续约
+	 * 服务到期
 	 */
-	public static final String CONTINUOUS_SIGN = "CONTINUOUS_SIGN";
+	public static final String EXPIRE_SIGN = "EXPIRE_SIGN";
 
 }

postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java

@@ -89,7 +89,7 @@ public class AgencyController extends BaseController {
     @Log(title = "机构信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody Agency agency) {
-        return toAjax(agencyService.insertAgency(agency));
+        return agencyService.insertAgency(agency);
     }
 
     /**

postdischarge-manage/src/main/java/com/xinelu/manage/controller/crowdinfo/CrowdInfoController.java

@@ -0,0 +1,112 @@
+package com.xinelu.manage.controller.crowdinfo;
+
+import com.xinelu.common.annotation.Log;
+import com.xinelu.common.core.controller.BaseController;
+import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.common.core.domain.R;
+import com.xinelu.common.core.page.TableDataInfo;
+import com.xinelu.common.enums.BusinessType;
+import com.xinelu.common.utils.poi.ExcelUtil;
+import com.xinelu.manage.domain.crowdinfo.CrowdInfo;
+import com.xinelu.manage.service.crowdinfo.ICrowdInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 人群信息Controller
+ *
+ * @author xinelu
+ * @date 2024-03-04
+ */
+@Api(tags = "人群信息控制器")
+@RestController
+@RequestMapping("/manage/crowdInfo")
+public class CrowdInfoController extends BaseController {
+    @Resource
+    private ICrowdInfoService crowdInfoService;
+
+	/**
+	 * 分页查询人群信息列表
+	 */
+	@PreAuthorize("@ss.hasPermi('manage:crowdInfo:list')")
+	@GetMapping("/list")
+    public TableDataInfo list(CrowdInfo crowdInfo) {
+        startPage();
+        List<CrowdInfo> list = crowdInfoService.selectCrowdInfoList(crowdInfo);
+        return getDataTable(list);
+    }
+
+	/**
+	 * 查询人群信息列表
+	 */
+	@ApiOperation("查询人群信息列表")
+	@PreAuthorize("@ss.hasPermi('manage:crowdInfo:list')")
+	@GetMapping("/getList")
+	public R<List<CrowdInfo>> getList(CrowdInfo crowdInfo) {
+		List<CrowdInfo> list = crowdInfoService.selectCrowdInfoList(crowdInfo);
+		return R.ok(list);
+	}
+
+    /**
+     * 导出人群信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:crowdInfo:export')")
+    @Log(title = "人群信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CrowdInfo crowdInfo) {
+        List<CrowdInfo> list = crowdInfoService.selectCrowdInfoList(crowdInfo);
+        ExcelUtil<CrowdInfo> util = new ExcelUtil<CrowdInfo>(CrowdInfo. class);
+        util.exportExcel(response, list, "人群信息数据");
+    }
+
+    /**
+     * 获取人群信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:crowdInfo:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(crowdInfoService.selectCrowdInfoById(id));
+    }
+
+    /**
+     * 新增人群信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:crowdInfo:add')")
+    @Log(title = "人群信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CrowdInfo crowdInfo) {
+        return toAjax(crowdInfoService.insertCrowdInfo(crowdInfo));
+    }
+
+    /**
+     * 修改人群信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:crowdInfo:edit')")
+    @Log(title = "人群信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CrowdInfo crowdInfo) {
+        return toAjax(crowdInfoService.updateCrowdInfo(crowdInfo));
+    }
+
+    /**
+     * 删除人群信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:crowdInfo:remove')")
+    @Log(title = "人群信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(crowdInfoService.deleteCrowdInfoByIds(ids));
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java

@@ -108,7 +108,7 @@ public class DepartmentController extends BaseController {
     @Log(title = "科室信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(departmentService.deleteDepartmentByIds(ids));
+        return departmentService.deleteDepartmentByIds(ids);
     }
 
     /**

postdischarge-manage/src/main/java/com/xinelu/manage/controller/departmentdiseasetype/DepartmentDiseaseTypeController.java

@@ -88,4 +88,12 @@ public class DepartmentDiseaseTypeController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(departmentDiseaseTypeService.deleteDepartmentDiseaseTypeByIds(ids));
     }
+
+    /**
+     * 科室病种数量
+     */
+    @GetMapping("/selectDiseaseCount")
+    public AjaxResult selectDiseaseTypeCount(String departmentName) {
+        return departmentDiseaseTypeService.selectDiseaseTypeCount(departmentName);
+    }
 }

postdischarge-manage/src/main/java/com/xinelu/manage/controller/materialsinfo/MaterialsInfoController.java

@@ -7,8 +7,10 @@ import com.xinelu.common.core.page.TableDataInfo;
 import com.xinelu.common.enums.BusinessType;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.manage.domain.materialsinfo.MaterialsInfo;
+import com.xinelu.manage.dto.materialsinfo.MaterialsInfoDto;
 import com.xinelu.manage.service.materialsinfo.IMaterialsInfoService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -35,12 +37,13 @@ public class MaterialsInfoController extends BaseController {
     @Resource
     private IMaterialsInfoService materialsInfoService;
 
-/**
+	/**
- * 查询素材信息列表
+	 * 查询素材信息列表
- */
+	 */
-@PreAuthorize("@ss.hasPermi('manage:materials:list')")
+	@ApiOperation("查询素材信息列表")
-@GetMapping("/list")
+	@PreAuthorize("@ss.hasPermi('manage:materials:list')")
-    public TableDataInfo list(MaterialsInfo materialsInfo) {
+	@GetMapping("/list")
+    public TableDataInfo list(MaterialsInfoDto materialsInfo) {
         startPage();
         List<MaterialsInfo> list = materialsInfoService.selectMaterialsInfoList(materialsInfo);
         return getDataTable(list);
@@ -52,7 +55,7 @@ public class MaterialsInfoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('manage:materials:export')")
     @Log(title = "素材信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, MaterialsInfo materialsInfo) {
+    public void export(HttpServletResponse response, MaterialsInfoDto materialsInfo) {
         List<MaterialsInfo> list = materialsInfoService.selectMaterialsInfoList(materialsInfo);
         ExcelUtil<MaterialsInfo> util = new ExcelUtil<MaterialsInfo>(MaterialsInfo. class);
         util.exportExcel(response, list, "素材信息数据");
@@ -61,6 +64,7 @@ public class MaterialsInfoController extends BaseController {
     /**
      * 获取素材信息详细信息
      */
+    @ApiOperation("根据主键id获取素材信息详细信息")
     @PreAuthorize("@ss.hasPermi('manage:materials:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
@@ -70,6 +74,7 @@ public class MaterialsInfoController extends BaseController {
     /**
      * 新增素材信息
      */
+    @ApiOperation("新增素材信息")
     @PreAuthorize("@ss.hasPermi('manage:materials:add')")
     @Log(title = "素材信息", businessType = BusinessType.INSERT)
     @PostMapping
@@ -80,6 +85,7 @@ public class MaterialsInfoController extends BaseController {
     /**
      * 修改素材信息
      */
+    @ApiOperation("修改素材信息")
     @PreAuthorize("@ss.hasPermi('manage:materials:edit')")
     @Log(title = "素材信息", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -90,6 +96,7 @@ public class MaterialsInfoController extends BaseController {
     /**
      * 删除素材信息
      */
+    @ApiOperation("批量删除素材信息")
     @PreAuthorize("@ss.hasPermi('manage:materials:remove')")
     @Log(title = "素材信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")

postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklist/PatientBlacklistController.java

@@ -8,8 +8,10 @@ import com.xinelu.common.enums.BusinessType;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.manage.domain.patientblacklist.PatientBlacklist;
 import com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto;
+import com.xinelu.manage.dto.patientblacklist.PatientBlacklistSaveDto;
 import com.xinelu.manage.service.patientblacklist.IPatientBlacklistService;
 import com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo;
+import io.swagger.annotations.Api;
 import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -29,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author haown
  * @date 2024-02-27
  */
+@Api(tags = "患者-黑明单关系控制器")
 @RestController
 @RequestMapping("/manage/blacklist")
 public class PatientBlacklistController extends BaseController {
@@ -73,7 +76,7 @@ public class PatientBlacklistController extends BaseController {
     @PreAuthorize("@ss.hasPermi('manage:blacklist:add')")
     @Log(title = "患者-黑明单关系", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody PatientBlacklist patientBlacklist) {
+    public AjaxResult add(@RequestBody PatientBlacklistSaveDto patientBlacklist) {
         return toAjax(patientBlacklistService.insertPatientBlacklist(patientBlacklist));
     }
 

postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseController.java

@@ -0,0 +1,113 @@
+package com.xinelu.manage.controller.patientblacklistabnormalcause;
+
+import com.xinelu.common.annotation.Log;
+import com.xinelu.common.core.controller.BaseController;
+import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.common.core.domain.R;
+import com.xinelu.common.core.page.TableDataInfo;
+import com.xinelu.common.enums.BusinessType;
+import com.xinelu.common.utils.poi.ExcelUtil;
+import com.xinelu.manage.domain.patientblacklistabnormalcause.PatientBlacklistAbnormalCause;
+import com.xinelu.manage.service.patientblacklistabnormalcause.IPatientBlacklistAbnormalCauseService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 患者黑名单异常原因Controller
+ *
+ * @author haown
+ * @date 2024-03-01
+ */
+@Api(tags = "患者黑名单异常原因控制器")
+@RestController
+@RequestMapping("/manage/cause")
+public class PatientBlacklistAbnormalCauseController extends BaseController {
+    @Resource
+    private IPatientBlacklistAbnormalCauseService patientBlacklistAbnormalCauseService;
+
+	/**
+	 * 分页查询患者黑名单异常原因列表
+	 */
+	@ApiOperation("分页查询患者黑名单异常原因列表")
+	@PreAuthorize("@ss.hasPermi('manage:cause:list')")
+	@GetMapping("/list")
+    public TableDataInfo list(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) {
+        startPage();
+        List<PatientBlacklistAbnormalCause> list = patientBlacklistAbnormalCauseService.selectPatientBlacklistAbnormalCauseList(patientBlacklistAbnormalCause);
+        return getDataTable(list);
+    }
+
+	/**
+	 * 查询患者黑名单异常原因列表
+	 */
+	@ApiOperation("查询患者黑名单异常原因列表")
+	@PreAuthorize("@ss.hasPermi('manage:cause:list')")
+	@GetMapping("/getList")
+	public R<List<PatientBlacklistAbnormalCause>> getList(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) {
+		List<PatientBlacklistAbnormalCause> list = patientBlacklistAbnormalCauseService.selectPatientBlacklistAbnormalCauseList(patientBlacklistAbnormalCause);
+		return R.ok(list);
+	}
+
+    /**
+     * 导出患者黑名单异常原因列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:cause:export')")
+    @Log(title = "患者黑名单异常原因", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) {
+        List<PatientBlacklistAbnormalCause> list = patientBlacklistAbnormalCauseService.selectPatientBlacklistAbnormalCauseList(patientBlacklistAbnormalCause);
+        ExcelUtil<PatientBlacklistAbnormalCause> util = new ExcelUtil<PatientBlacklistAbnormalCause>(PatientBlacklistAbnormalCause. class);
+        util.exportExcel(response, list, "患者黑名单异常原因数据");
+    }
+
+    /**
+     * 获取患者黑名单异常原因详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:cause:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(patientBlacklistAbnormalCauseService.selectPatientBlacklistAbnormalCauseById(id));
+    }
+
+    /**
+     * 新增患者黑名单异常原因
+     */
+    @PreAuthorize("@ss.hasPermi('manage:cause:add')")
+    @Log(title = "患者黑名单异常原因", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) {
+        return toAjax(patientBlacklistAbnormalCauseService.insertPatientBlacklistAbnormalCause(patientBlacklistAbnormalCause));
+    }
+
+    /**
+     * 修改患者黑名单异常原因
+     */
+    @PreAuthorize("@ss.hasPermi('manage:cause:edit')")
+    @Log(title = "患者黑名单异常原因", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) {
+        return toAjax(patientBlacklistAbnormalCauseService.updatePatientBlacklistAbnormalCause(patientBlacklistAbnormalCause));
+    }
+
+    /**
+     * 删除患者黑名单异常原因
+     */
+    @PreAuthorize("@ss.hasPermi('manage:cause:remove')")
+    @Log(title = "患者黑名单异常原因", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(patientBlacklistAbnormalCauseService.deletePatientBlacklistAbnormalCauseByIds(ids));
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectrecord/ProjectRecordController.java

@@ -0,0 +1,19 @@
+package com.xinelu.manage.controller.projectrecord;
+
+import com.xinelu.common.core.controller.BaseController;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description: 检测项目数据记录控制器
+ * @author: haown
+ * @create: 2024-02-29 15:45
+ **/
+@Api(tags = "检测项目数据记录控制器")
+@RestController
+@RequestMapping("/manage/projectRecord")
+public class ProjectRecordController extends BaseController {
+
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java

@@ -1,28 +1,32 @@
 package com.xinelu.manage.controller.propagandainfo;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.access.prepost.PreAuthorize;
-import javax.annotation.Resource;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.xinelu.common.annotation.Log;
 import com.xinelu.common.core.controller.BaseController;
 import com.xinelu.common.core.domain.AjaxResult;
-import com.xinelu.common.enums.BusinessType;
+import com.xinelu.common.core.domain.R;
-import com.xinelu.manage.domain.propagandainfo.PropagandaInfo;
-import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService;
-import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.common.core.page.TableDataInfo;
+import com.xinelu.common.enums.BusinessType;
+import com.xinelu.common.utils.poi.ExcelUtil;
+import com.xinelu.manage.domain.propagandainfo.PropagandaInfo;
+import com.xinelu.manage.dto.department.DepartmentDTO;
+import com.xinelu.manage.dto.propagandainfo.PropagandaInfoDto;
+import com.xinelu.manage.dto.propagandainfo.PropagandaUpdateDto;
+import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService;
+import com.xinelu.manage.vo.department.DepartmentVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 宣教库管理Controller
@@ -43,7 +47,7 @@ public class PropagandaInfoController extends BaseController {
 	@ApiOperation("分页查询宣教库管理列表")
 	@PreAuthorize("@ss.hasPermi('manage:propaganda:list')")
 	@GetMapping("/list")
-    public TableDataInfo list(PropagandaInfo propagandaInfo) {
+    public TableDataInfo list(PropagandaInfoDto propagandaInfo) {
         startPage();
         List<PropagandaInfo> list = propagandaInfoService.selectPropagandaInfoList(propagandaInfo);
         return getDataTable(list);
@@ -55,7 +59,7 @@ public class PropagandaInfoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('manage:propaganda:export')")
     @Log(title = "宣教库管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, PropagandaInfo propagandaInfo) {
+    public void export(HttpServletResponse response, PropagandaInfoDto propagandaInfo) {
         List<PropagandaInfo> list = propagandaInfoService.selectPropagandaInfoList(propagandaInfo);
         ExcelUtil<PropagandaInfo> util = new ExcelUtil<PropagandaInfo>(PropagandaInfo. class);
         util.exportExcel(response, list, "宣教库管理数据");
@@ -93,6 +97,29 @@ public class PropagandaInfoController extends BaseController {
         return toAjax(propagandaInfoService.updatePropagandaInfo(propagandaInfo));
     }
 
+	/**
+	 * 复制宣教内容
+	 */
+	@ApiOperation("复制宣教内容")
+	@PreAuthorize("@ss.hasPermi('manage:propaganda:add')")
+	@GetMapping("/copy/{id}")
+	public R<String> copy(@PathVariable Long id) {
+		int flag = propagandaInfoService.copyPropagandaInfo(id);
+		return flag > 0 ? R.ok() : R.fail();
+	}
+
+	/**
+	 * 修改宣教信息状态
+	 */
+	@ApiOperation("修改宣教库信息")
+	@PreAuthorize("@ss.hasPermi('manage:propaganda:edit')")
+	@Log(title = "宣教库管理", businessType = BusinessType.UPDATE)
+	@PostMapping("/updateStatus")
+	public R<String> updateStatus(@RequestBody PropagandaUpdateDto propagandaInfo) {
+		int flag = propagandaInfoService.updateStatus(propagandaInfo);
+		return flag < 0 ? R.fail() : R.ok();
+	}
+
     /**
      * 删除宣教库管理
      */
@@ -103,4 +130,14 @@ public class PropagandaInfoController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(propagandaInfoService.deletePropagandaInfoByIds(ids));
     }
+
+	/**
+	 * 查询科室信息列表及包含宣教库数量
+	 */
+	@ApiOperation("查询科室信息列表及包含宣教库数量")
+	@GetMapping("/selectNumByDept")
+	public R<List<DepartmentVO>> selectNumByDept(DepartmentDTO departmentDto) {
+		List<DepartmentVO> list = propagandaInfoService.selectNumByDept(departmentDto);
+		return R.ok(list);
+	}
 }

postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientinformed/FileUploadController.java

@@ -0,0 +1,48 @@
+package com.xinelu.manage.controller.signpatientinformed;
+
+import com.xinelu.common.constant.Constants;
+import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.manage.service.signpatientinformed.IFileUploadService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import java.util.Objects;
+import javax.annotation.Resource;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @description: 文件上传控制器
+ * @author: haown
+ * @create: 2024-03-01 10:30
+ **/
+@Api(tags = "文件上传控制器")
+@RestController
+@RequestMapping("/manage/file")
+public class FileUploadController {
+
+	@Resource
+	private IFileUploadService fileUploadService;
+	/**
+	 * 文件上传
+	 */
+	@ApiOperation(value = "文件上传", notes = "type:signInformedFileUrl:签约知情书上传,propagandaCoverUrl:宣教库封面上传,"
+		+ "materialsCoverUrl:宣教库封面上传,materialsVideoUrl:宣教库视频上传")
+	@PostMapping("/uploadFile")
+	public AjaxResult uploadFile(@RequestParam("file") MultipartFile multipartFile, @RequestParam(value = "type") String type) throws Exception {
+		if (Objects.isNull(multipartFile) || StringUtils.isBlank(multipartFile.getOriginalFilename())) {
+			return AjaxResult.error("当前文件不存在，无法上传！");
+		}
+		if (multipartFile.getOriginalFilename().contains(Constants.EMPTY)) {
+			return AjaxResult.error("当前文件名含有空格，请先去除空格在上传！");
+		}
+		if (StringUtils.isBlank(type)) {
+			return AjaxResult.error("请选择所要上传的路径类型！");
+		}
+		return fileUploadService.uploadFile(multipartFile, type);
+	}
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientinformed/SignPatientInformedController.java

@@ -1,7 +1,6 @@
 package com.xinelu.manage.controller.signpatientinformed;
 
 import com.xinelu.common.annotation.Log;
-import com.xinelu.common.constant.Constants;
 import com.xinelu.common.core.controller.BaseController;
 import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.core.page.TableDataInfo;
@@ -9,11 +8,10 @@ import com.xinelu.common.enums.BusinessType;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed;
 import com.xinelu.manage.service.signpatientinformed.ISignPatientInformedService;
+import io.swagger.annotations.Api;
 import java.util.List;
-import java.util.Objects;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,9 +20,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 签约知情同意书信息Controller
@@ -32,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author xinelu
  * @date 2024-02-27
  */
+@Api(tags = "签约知情同意书控制器")
 @RestController
 @RequestMapping("/manage/signInformed")
 public class SignPatientInformedController extends BaseController {
@@ -100,17 +97,4 @@ public class SignPatientInformedController extends BaseController {
         return toAjax(signPatientInformedService.deleteSignPatientInformedByIds(ids));
     }
 
-	/**
-	 * 问诊聊天上传文件接口
-	 */
-	@PostMapping("/uploadFile")
-	public AjaxResult uploadFile(@RequestParam("file") MultipartFile multipartFile) throws Exception {
-		if (Objects.isNull(multipartFile) || StringUtils.isBlank(multipartFile.getOriginalFilename())) {
-			return AjaxResult.error("当前文件不存在，无法上传！");
-		}
-		if (multipartFile.getOriginalFilename().contains(Constants.EMPTY)) {
-			return AjaxResult.error("当前文件名含有空格，请先去除空格在上传！");
-		}
-		return signPatientInformedService.uploadFile(multipartFile);
-	}
 }

postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java

@@ -1,15 +1,16 @@
 package com.xinelu.manage.controller.signpatientrecord;
 
 import com.xinelu.common.core.controller.BaseController;
-import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.common.core.domain.R;
 import com.xinelu.common.core.page.TableDataInfo;
-import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto;
 import com.xinelu.manage.dto.signpatientrecord.SignPatientAddDto;
 import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto;
+import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto;
 import com.xinelu.manage.service.signpatientrecord.ISignPatientRecordService;
 import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo;
-import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo;
 import com.xinelu.manage.vo.signpatientrecord.SignPatientListVo;
+import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import javax.annotation.Resource;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author: haown
  * @create: 2024-02-28 16:03
  **/
+@Api(tags = "患者签约记录控制器")
 @RestController
 @RequestMapping("/manage/signRecord")
 public class SignPatientRecordController extends BaseController {
@@ -48,11 +50,12 @@ public class SignPatientRecordController extends BaseController {
 	/**
 	 * 签约
 	 */
-	@ApiOperation("签约")
+	@ApiOperation("签约/续约")
 	@PreAuthorize("@ss.hasPermi('manage:signRecord:add')")
 	@PostMapping("/sign")
-	public AjaxResult sign(@RequestBody SignPatientAddDto body) {
+	public R<String> sign(@RequestBody SignPatientAddDto body) {
-		return toAjax(signPatientRecordService.add(body));
+		int flag = signPatientRecordService.add(body);
+		return flag > 0 ? R.ok() : R.fail();
 	}
 
 	/**
@@ -61,9 +64,9 @@ public class SignPatientRecordController extends BaseController {
 	@ApiOperation("根据患者主键查询签约记录")
 	@PreAuthorize("@ss.hasPermi('manage:signRecord:list')")
 	@GetMapping("/getByPatient/{patientId}")
-	public AjaxResult getByPatient(@PathVariable("patientId") Long patientId) {
+	public R<List<SignPatientRecordVo>> getByPatient(@PathVariable("patientId") Long patientId) {
 		List<SignPatientRecordVo> list = signPatientRecordService.getByPatient(patientId);
-		return AjaxResult.success(list);
+		return R.ok(list);
 	}
 
 	/**
@@ -71,10 +74,10 @@ public class SignPatientRecordController extends BaseController {
 	 */
 	@ApiOperation("根据签约记录表主键查询签约详情")
 	@PreAuthorize("@ss.hasPermi('manage:signRecord:list')")
-	@GetMapping("/getByRecordId/{patientSignRecordId}")
+	@GetMapping("/getByRecordId/{id}")
-	public AjaxResult getByRecordId(@PathVariable("patientSignRecordId") Long patientSignRecordId) {
+	public R<SignPatientInfoVo> getByRecordId(@PathVariable("id") Long id) {
-		SignPatientInfoVo signInfo = signPatientRecordService.getByRecordId(patientSignRecordId);
+		SignPatientInfoVo signInfo = signPatientRecordService.getByRecordId(id);
-		return AjaxResult.success(signInfo);
+		return R.ok(signInfo);
 	}
 
 	/**
@@ -83,8 +86,8 @@ public class SignPatientRecordController extends BaseController {
 	@ApiOperation("解约")
 	@PreAuthorize("@ss.hasPermi('manage:signRecord:edit')")
 	@PostMapping("/updateSignStatus")
-	public AjaxResult updateSignStatus(@RequestBody SignPatientStatusDto updateSignStatus) {
+	public R<String> updateSignStatus(@RequestBody SignPatientStatusDto updateSignStatus) {
 		int flag = signPatientRecordService.updateSignStatus(updateSignStatus);
-		return flag < 0 ? AjaxResult.error() : AjaxResult.success();
+		return flag < 0 ? R.fail() : R.ok();
 	}
 }

postdischarge-manage/src/main/java/com/xinelu/manage/domain/crowdinfo/CrowdInfo.java

@@ -0,0 +1,76 @@
+package com.xinelu.manage.domain.crowdinfo;
+
+import com.xinelu.common.annotation.Excel;
+import com.xinelu.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 人群信息对象 crowd_info
+ *
+ * @author xinelu
+ * @date 2024-03-04
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "人群信息对象", description = "crowd_info")
+public class CrowdInfo extends BaseEntity {
+
+	private static final long serialVersionUID=1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 人群名称 */
+    @ApiModelProperty(value = "人群名称")
+    @Excel(name = "人群名称")
+    private String crowdName;
+
+    /** 最小适合年龄 */
+    @ApiModelProperty(value = "最小适合年龄")
+    @Excel(name = "最小适合年龄")
+    private Long minSuitableAge;
+
+    /** 最大适合年龄 */
+    @ApiModelProperty(value = "最大适合年龄")
+    @Excel(name = "最大适合年龄")
+    private Long maxSuitableAge;
+
+    /** 适合性别，全部：ALL，男：MALE，女：FEMALE，未知：UNKNOWN */
+    @ApiModelProperty(value = "适合性别，全部：ALL，男：MALE，女：FEMALE，未知：UNKNOWN")
+    @Excel(name = "适合性别，全部：ALL，男：MALE，女：FEMALE，未知：UNKNOWN")
+    private String suitableGender;
+
+    /** 人群类型，默认：DEFAULT，慢病：CHRONIC_DISEASE，特殊人群：SPECIAL_POPULATIONS，重点人群：KEY_GROUPS */
+    @ApiModelProperty(value = "人群类型，默认：DEFAULT，慢病：CHRONIC_DISEASE，特殊人群：SPECIAL_POPULATIONS，重点人群：KEY_GROUPS")
+    @Excel(name = "人群类型，默认：DEFAULT，慢病：CHRONIC_DISEASE，特殊人群：SPECIAL_POPULATIONS，重点人群：KEY_GROUPS")
+    private String crowdType;
+
+    /** 特殊人群（1：65岁及以上老年人 2：60-64岁老年人 3：0-6岁儿童 4：孕产妇 5：残疾人 6：优抚对象；
+慢病人群（20：高血压 21：二型糖尿病 22：高血压合并糖尿病 23：冠心病 24：脑卒中康复期）；
+其他重点人群（40：严重精神障碍 41：结核病 42：肿瘤病 43：贫困人口 44：计划生育特殊家庭） */
+    @ApiModelProperty(value = "特殊人群")
+    @Excel(name = "特殊人群", readConverterExp = "1=：65岁及以上老年人,2=：60-64岁老年人,3=：0-6岁儿童,4=：孕产妇,5=：残疾人,6=：优抚对象；慢病人群（20：高血压,2=1：二型糖尿病,2=2：高血压合并糖尿病,2=3：冠心病,2=4：脑卒中康复期")
+    private String specialType;
+
+    /** 是否禁用，0：否，1：是 */
+    @ApiModelProperty(value = "是否禁用，0：否，1：是")
+    @Excel(name = "是否禁用，0：否，1：是")
+    private Integer whetherDisable;
+
+    /** 排序 */
+    @ApiModelProperty(value = "排序")
+    @Excel(name = "排序")
+    private Long sort;
+
+    /** 删除标识，0：正常，1：已删除 */
+    private Integer delFlag;
+
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/materialsinfo/MaterialsInfo.java

@@ -22,9 +22,10 @@ import lombok.NoArgsConstructor;
 @ApiModel(value = "素材信息对象", description = "materials_info")
 public class MaterialsInfo extends BaseEntity {
 
-private static final long serialVersionUID=1L;
+	private static final long serialVersionUID=1L;
 
     /** 主键id */
+    @ApiModelProperty(value = "主键id")
     private Long id;
 
     /** 素材名称 */
@@ -104,7 +105,7 @@ private static final long serialVersionUID=1L;
 
     /** 素材状态，全部：ALL，已上架：LISTED，未上架：NOT_LISTED */
     @ApiModelProperty(value = "素材状态，全部：ALL，已上架：LISTED，未上架：NOT_LISTED")
-    @Excel(name = "素材状态，全部：ALL，已上架：LISTED，未上架：NOT_LISTED")
+    @Excel(name = "素材状态，已上架：LISTED，未上架：NOT_LISTED")
     private String materialsStatus;
 
     /** 素材备注 */

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientblacklist/PatientBlacklist.java

@@ -5,6 +5,7 @@ import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -16,6 +17,7 @@ import lombok.NoArgsConstructor;
  * @date 2024-02-27
  */
 @Data
+@Builder
 @AllArgsConstructor
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
@@ -30,6 +32,31 @@ public class PatientBlacklist extends BaseEntity {
     /** 患者id */
     private Long patientId;
 
+	/** 所属医院id */
+	@ApiModelProperty(value = "所属医院id")
+	private Long hospitalAgencyId;
+
+	/** 所属医院名称 */
+	@ApiModelProperty(value = "所属医院名称")
+	private String hospitalAgencyName;
+
+	/** 所属院区id */
+	@ApiModelProperty(value = "所属院区id")
+	private Long campusAgencyId;
+
+	/** 所属院区名称 */
+	@ApiModelProperty(value = "所属院区名称")
+	@Excel(name = "所属院区名称")
+	private String campusAgencyName;
+
+	/** 所属科室id */
+	@ApiModelProperty(value = "所属科室id")
+	private Long departmentId;
+
+	/** 所属科室名称 */
+	@ApiModelProperty(value = "所属科室名称")
+	private String departmentName;
+
     /** 异常原因字典表id */
     @ApiModelProperty(value = "异常原因字典表id")
     @Excel(name = "异常原因字典表id")

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientblacklistabnormalcause/PatientBlacklistAbnormalCause.java

@@ -0,0 +1,57 @@
+package com.xinelu.manage.domain.patientblacklistabnormalcause;
+
+import com.xinelu.common.annotation.Excel;
+import com.xinelu.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 患者黑名单异常原因对象 patient_blacklist_abnormal_cause
+ *
+ * @author haown
+ * @date 2024-03-01
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "患者黑名单异常原因对象", description = "patient_blacklist_abnormal_cause")
+public class PatientBlacklistAbnormalCause extends BaseEntity {
+	private static final long serialVersionUID=1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 上级id */
+    @ApiModelProperty(value = "上级id")
+    @Excel(name = "上级id")
+    private Long parentId;
+
+    /** 异常原因代码 */
+    @ApiModelProperty(value = "异常原因代码")
+    @Excel(name = "异常原因代码")
+    private String abnormalCauseCode;
+
+    /** 异常原因描述 */
+    @ApiModelProperty(value = "异常原因描述")
+    @Excel(name = "异常原因描述")
+    private String abnormalCauseValue;
+
+    /** 异常原因级别（异常原因：ABNORMAL_CAUSE，补充说明：SUPPLEMENT） */
+    @ApiModelProperty(value = "异常原因级别,（异常原因：ABNORMAL_CAUSE，补充说明：SUPPLEMENT）")
+    @Excel(name = "异常原因级别", readConverterExp = "异=常原因：ABNORMAL_CAUSE，补充说明：SUPPLEMENT")
+    private String abnormalCauseLevel;
+
+    /** 状态（0正常 1停用） */
+    @ApiModelProperty(value = "状态")
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 删除标志（0代表存在 1代表删除） */
+    private String delFlag;
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java

@@ -67,10 +67,20 @@ public class PatientInfo extends BaseEntity {
     @ApiModelProperty(value = "患者类型，预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT")
     private String patientType;
 
-    /** 签约状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN */
+	/**
-    @ApiModelProperty(value = "签约状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN")
+	 * 签约状态，未签约：UN_SIGN,在签：IN_SIGN,解约：SEPARATE_SIGN, 服务到期：EXPIRE_SIGN
-    @Excel(name = "签约状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN")
+	 */
-    private String signStatus;
+	@ApiModelProperty(value = "签约状态，未签约：UN_SIGN,在签：IN_SIGN,解约：SEPARATE_SIGN, 过期：EXPIRE_SIGN")
+	private String signStatus;
+
+	@ApiModelProperty(value = "签约记录表id")
+	private Long signPatientRecordId;
+
+	/**
+	 * 服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END
+	 */
+	@ApiModelProperty(value = "服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END")
+	private String serviceStatus;
 
     /** 签约时间，格式：yyyy-MM-dd HH:mm:ss */
     @ApiModelProperty(value = "签约时间，格式：yyyy-MM-dd HH:mm:ss")

postdischarge-manage/src/main/java/com/xinelu/manage/domain/project/Project.java

@@ -0,0 +1,107 @@
+package com.xinelu.manage.domain.project;
+
+import com.xinelu.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 检测项目表
+ * @TableName project
+ */
+@ApiModel("检测项目表")
+@Data
+public class Project extends BaseEntity {
+    /**
+     * 主键id
+     */
+	@ApiModelProperty("主键id")
+    private Long id;
+
+    /**
+     * 所属分组id
+     */
+    @ApiModelProperty("所属分组id")
+    private Long groupId;
+
+    /**
+     * 分组名称
+     */
+    @ApiModelProperty("分组名称")
+    private String groupName;
+
+    /**
+     * 项目名称
+     */
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
+    /**
+     * 项目编码
+     */
+    @ApiModelProperty("项目编码")
+    private String projectCode;
+
+    /**
+     * 项目别名
+     */
+    @ApiModelProperty("项目别名")
+    private String projectAlias;
+
+    /**
+     * 是否启用，0：是，1：否
+     */
+    @ApiModelProperty("是否启用，0：是，1：否")
+    private Integer enableStatus;
+
+    /**
+     * 判断模式，定量：QUANTIFY，定性：QUALITATIVE
+     */
+    @ApiModelProperty("判断模式，定量：QUANTIFY，定性：QUALITATIVE")
+    private String judgeMode;
+
+    /**
+     * 项目指标最大值
+     */
+    @ApiModelProperty("项目指标最大值")
+    private Integer maxValue;
+
+    /**
+     * 项目指标最小值
+     */
+    @ApiModelProperty("项目指标最小值")
+    private Integer minValue;
+
+    /**
+     * 项目指标默认值
+     */
+    @ApiModelProperty("项目指标默认值")
+    private String defaultValue;
+
+    /**
+     * LIS对照
+     */
+    @ApiModelProperty("LIS对照")
+    private String lisCompare;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    private Integer projectSort;
+
+    /**
+     * 备注信息
+     */
+    @ApiModelProperty("备注信息")
+    private String projectRemark;
+
+    /**
+     * 删除标识，0：未删除，1：已删除
+     */
+    @ApiModelProperty("删除标识，0：未删除，1：已删除")
+    private Integer delFlag;
+
+    private static final long serialVersionUID = 1L;
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectdevice/ProjectDevice.java

@@ -0,0 +1,82 @@
+package com.xinelu.manage.domain.projectdevice;
+
+import com.xinelu.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 检测项目设备表
+ * @TableName project_device
+ */
+@ApiModel("检测项目设备表")
+@Data
+public class ProjectDevice extends BaseEntity {
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 患者id
+     */
+    private Long patientId;
+
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+
+    /**
+     * 身份证号
+     */
+    private String cardNo;
+
+    /**
+     * 设备类型，血糖仪：GLUCOSE_METER，血压计：BLOOD_PRESSURE_DEVICE
+     */
+    private String deviceType;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * 设备状态
+     */
+    private String deviceStatus;
+
+    /**
+     * 备注信息
+     */
+    private String deviceRemark;
+
+    /**
+     * 设备绑定时间
+     */
+    private Date deviceBindTime;
+
+    /**
+     * 设备解绑时间
+     */
+    private Date deviceUnbindTime;
+
+    /**
+     * 设备IP地址
+     */
+    private String deviceIp;
+
+    /**
+     * 设备端口
+     */
+    private Integer devicePort;
+
+    private static final long serialVersionUID = 1L;
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectgroup/ProjectGroup.java

@@ -0,0 +1,56 @@
+package com.xinelu.manage.domain.projectgroup;
+
+import com.xinelu.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * 检测项目分组表
+ * @TableName project_group
+ */
+@ApiModel("检测项目分组表")
+@Data
+public class ProjectGroup extends BaseEntity {
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 上级分组id
+     */
+    private Long parentId;
+
+    /**
+     * 分组名称
+     */
+    private String groupName;
+
+    /**
+     * 分组编码
+     */
+    private String groupCode;
+
+    /**
+     * 是否启用，0：是，1：否
+     */
+    private Integer enableStatus;
+
+    /**
+     * 排序
+     */
+    private Integer groupSort;
+
+    /**
+     * 备注信息
+     */
+    private String groupRemark;
+
+    /**
+     * 删除标识，0：未删除，1：已删除
+     */
+    private Integer delFlag;
+
+    private static final long serialVersionUID = 1L;
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastrecord/ProjectLastRecord.java

@@ -0,0 +1,122 @@
+package com.xinelu.manage.domain.projectlastrecord;
+
+import com.xinelu.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 最近一次检测项目数据记录表
+ * @TableName project_last_record
+ */
+@ApiModel("最近一次检测项目数据记录表")
+@Data
+public class ProjectLastRecord extends BaseEntity {
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 患者id
+     */
+    private Long patientId;
+
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+
+    /**
+     * 患者身份证号
+     */
+    private String cardNo;
+
+    /**
+     * 分组id
+     */
+    private Long groupId;
+
+    /**
+     * 分组名称
+     */
+    private String groupName;
+
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 检测设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 检测设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 项目别名
+     */
+    private String projectAlias;
+
+    /**
+     * 判断模式，定量：QUANTIFY，定性：QUALITATIVE
+     */
+    private String judgeMode;
+
+    /**
+     * 检测结果，数字或文字描述
+     */
+    private String measureResult;
+
+    /**
+     * 项目指标最大值
+     */
+    private Integer maxValue;
+
+    /**
+     * 项目指标最小值
+     */
+    private Integer minValue;
+
+    /**
+     * 项目指标默认值
+     */
+    private String defaultValue;
+
+    /**
+     * LIS对照
+     */
+    private String lisCompare;
+
+    /**
+     * 检测时间
+     */
+    private Date measureTime;
+
+    /**
+     * 检测人姓名，自动上传时为空，手动上传为上传人姓名
+     */
+    private String measureName;
+
+    /**
+     * 备注信息
+     */
+    private String recordRemark;
+
+    /**
+     * 合格标识，合格：QUALIFIED，不合格：NOT_QUALIFIED
+     */
+    private String qualifiedSign;
+
+    private static final long serialVersionUID = 1L;
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecord/ProjectRecord.java

@@ -0,0 +1,122 @@
+package com.xinelu.manage.domain.projectrecord;
+
+import com.xinelu.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 检测项目数据记录表
+ * @TableName project_record
+ */
+@ApiModel("检测项目数据记录表")
+@Data
+public class ProjectRecord extends BaseEntity {
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 患者id
+     */
+    private Long patientId;
+
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+
+    /**
+     * 患者身份证号
+     */
+    private String cardNo;
+
+    /**
+     * 分组id
+     */
+    private Long groupId;
+
+    /**
+     * 分组名称
+     */
+    private String groupName;
+
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 检测设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 检测设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 项目别名
+     */
+    private String projectAlias;
+
+    /**
+     * 判断模式，定量：QUANTIFY，定性：QUALITATIVE
+     */
+    private String judgeMode;
+
+    /**
+     * 检测结果，数字或文字描述
+     */
+    private String measureResult;
+
+    /**
+     * 项目指标最大值
+     */
+    private Integer maxValue;
+
+    /**
+     * 项目指标最小值
+     */
+    private Integer minValue;
+
+    /**
+     * 项目指标默认值
+     */
+    private String defaultValue;
+
+    /**
+     * LIS对照
+     */
+    private String lisCompare;
+
+    /**
+     * 检测时间
+     */
+    private Date measureTime;
+
+    /**
+     * 检测人姓名，自动上传时为空，手动上传为上传人姓名
+     */
+    private String measureName;
+
+    /**
+     * 备注信息
+     */
+    private String recordRemark;
+
+    /**
+     * 合格标识，合格：QUALIFIED，不合格：NOT_QUALIFIED
+     */
+    private String qualifiedSign;
+
+    private static final long serialVersionUID = 1L;
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecordfile/ProjectRecordFile.java

@@ -0,0 +1,111 @@
+package com.xinelu.manage.domain.projectrecordfile;
+
+import com.xinelu.common.core.domain.BaseEntity;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 检测项目数据记录附件表（存储检测结果既含有报告又含有指标数据的检测项）
+ * @TableName project_record_file
+ */
+@Data
+public class ProjectRecordFile extends BaseEntity {
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 患者id
+     */
+    private Long patientId;
+
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+
+    /**
+     * 患者身份证号
+     */
+    private String cardNo;
+
+    /**
+     * 分组id
+     */
+    private Long groupId;
+
+    /**
+     * 分组名称
+     */
+    private String groupName;
+
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 检测设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 检测设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 项目别名
+     */
+    private String projectAlias;
+
+    /**
+     * 检测结果附件路径
+     */
+    private String filePath;
+
+    /**
+     * 检测时间
+     */
+    private Date measureTime;
+
+    /**
+     * 检测人姓名，自动上传时为空，手动上传为上传人姓名
+     */
+    private String measureName;
+
+    /**
+     * 项目指标最大值
+     */
+    private Integer maxValue;
+
+    /**
+     * 项目指标最小值
+     */
+    private Integer minValue;
+
+    /**
+     * 项目指标默认值
+     */
+    private String defaultValue;
+
+    /**
+     * 合格标识，合格：QUALIFIED，不合格：NOT_QUALIFIED
+     */
+    private String qualifiedSign;
+
+
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandainfo/PropagandaInfo.java

@@ -20,14 +20,15 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "宣教库管理对象", description = "propaganda_info")
-public class PropagandaInfo extends BaseEntity
+public class PropagandaInfo extends BaseEntity  {
-        {
+
-private static final long serialVersionUID=1L;
+	private static final long serialVersionUID=1L;
 
     /** 主键id */
     private Long id;
 
     /** 所属医院id */
+    @ApiModelProperty(value = "所属医院id")
     private Long hospitalAgencyId;
 
     /** 所属医院名称 */
@@ -36,6 +37,7 @@ private static final long serialVersionUID=1L;
     private String hospitalAgencyName;
 
     /** 所属科室id */
+    @ApiModelProperty(value = "所属科室id")
     private Long departmentId;
 
     /** 所属科室名称 */
@@ -55,6 +57,7 @@ private static final long serialVersionUID=1L;
     private String propagandaType;
 
     /** 宣教ID */
+    @ApiModelProperty(value = "宣教ID")
     private String propagandaCode;
 
     /** 宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED */
@@ -63,28 +66,38 @@ private static final long serialVersionUID=1L;
     private String propagandaStatus;
 
     /** 宣教正文内容 */
+    @ApiModelProperty(value = "宣教正文内容")
     private String propagandaContent;
 
     /** 宣教封面文件存放地址 */
+    @ApiModelProperty(value = "宣教封面文件存放地址")
     private String propagandaCoverPath;
 
     /** 宣教文章摘要 */
+    @ApiModelProperty(value = "宣教文章摘要")
     private String articleSummary;
 
     /** 语音播报 */
+    @ApiModelProperty(value = "语音播报")
     private String voicebroadcast;
 
     /** 所属病种id */
+    @ApiModelProperty(value = "所属病种id")
     private Long diseaseTypeId;
 
     /** 所属病种名称 */
-        @ApiModelProperty(value = "所属病种名称")
+    @ApiModelProperty(value = "所属病种名称")
-            @Excel(name = "所属病种名称")
+    @Excel(name = "所属病种名称")
     private String diseaseTypeName;
 
     /** 宣教链接 */
+    @ApiModelProperty(value = "宣教链接")
     private String propagandaLink;
 
     /** 宣教二维码图片存放地址 */
+    @ApiModelProperty(value = "宣教二维码图片存放地址")
     private String propagandaBarcodePath;
+
+	/** 删除标识，0：未删除，1：已删除 */
+	private Integer delFlag;
 }

postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java

@@ -1,5 +1,6 @@
 package com.xinelu.manage.domain.signpatientrecord;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -50,10 +51,20 @@ public class SignPatientRecord extends BaseEntity {
 	@ApiModelProperty(value = "身份证号")
 	private String cardNo;
 
+	/** 性别 */
+	@ApiModelProperty(value = "性别")
+	private String sex;
+
+	/** 出生日期，格式：yyyy-MM-dd */
+	@ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date birthDate;
+
     /**
      * 签约时间，格式：yyyy-MM-dd HH:mm:ss
      */
     @ApiModelProperty(value = "签约时间，格式：yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date signTime;
 
     /**
@@ -116,6 +127,9 @@ public class SignPatientRecord extends BaseEntity {
     @ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
     private String visitMethod;
 
+	@ApiModelProperty(value = "住院/门诊号")
+	private String inHospitalNumber;
+
     /**
      * 签约时诊断
      */
@@ -135,15 +149,15 @@ public class SignPatientRecord extends BaseEntity {
     private String serviceStatus;
 
     /**
-     * 签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN
+     * 签约状态，未签约：UN_SIGN,在签：IN_SIGN,解约：SEPARATE_SIGN, 服务过期：EXPIRE_SIGN
      */
-    @ApiModelProperty(value = "签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN")
+    @ApiModelProperty(value = "签约状态，未签约：UN_SIGN,在签：IN_SIGN,解约：SEPARATE_SIGN, 过期：EXPIRE_SIGN")
     private String signStatus;
 
     /**
      * 意向来源（意向签约，字典枚举）
      */
-    @ApiModelProperty(value = "意向来源（意向签约，字典枚举）")
+    @ApiModelProperty(value = "意向来源（意向签约，字典枚举）,DOCTOR_BILLING:医生开单")
     private String intentionalSource;
 
     /**
@@ -164,6 +178,11 @@ public class SignPatientRecord extends BaseEntity {
     @ApiModelProperty(value = "开单医生姓名（意向签约）")
     private String billingDoctorName;
 
+	/**
+	 * 提交时间（待续签）
+	 */
+	@ApiModelProperty(value = "提交时间（待续签）")
+	private Date submissionTime;
     /**
      * 金额
      */
@@ -176,6 +195,12 @@ public class SignPatientRecord extends BaseEntity {
     @ApiModelProperty(value = "缴费状态，已缴费：PAID，未交费：UNPAID_FEES")
     private String paymentStatus;
 
+	/**
+	 * 解约原因
+	 */
+	@ApiModelProperty(value = "解约原因")
+	private String separateReason;
+
     /**
      * 删除标识，0：未删除，1：已删除
      */

postdischarge-manage/src/main/java/com/xinelu/manage/dto/materialsinfo/MaterialsInfoDto.java

@@ -0,0 +1,39 @@
+package com.xinelu.manage.dto.materialsinfo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xinelu.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * @description: 素材库查询传输对象
+ * @author: haown
+ * @create: 2024-03-04 14:02
+ **/
+@ApiModel
+@Data
+public class MaterialsInfoDto {
+
+	@ApiModelProperty(value = "创建时间开始，yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date createTimeStart;
+
+	@ApiModelProperty(value = "创建时间结束，yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date createTimeEnd;
+
+	/** 素材状态，已上架：LISTED，未上架：NOT_LISTED */
+	@ApiModelProperty(value = "素材状态,已上架：LISTED，未上架：NOT_LISTED")
+	private String materialsStatus;
+
+	/** 素材名称 */
+	@ApiModelProperty(value = "素材名称")
+	private String materialsName;
+
+	/** 素材类型，图文：IMAGE_TEXT，视频：VIDEO */
+	@ApiModelProperty(value = "素材类型，图文：IMAGE_TEXT，视频：VIDEO")
+	@Excel(name = "素材类型，图文：IMAGE_TEXT，视频：VIDEO")
+	private String materialsType;
+}

postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientblacklist/PatientBlacklistSaveDto.java

@@ -0,0 +1,81 @@
+package com.xinelu.manage.dto.patientblacklist;
+
+import com.xinelu.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 患者黑名单保存传输对象
+ * @author: haown
+ * @create: 2024-03-01 15:19
+ **/
+@Data
+@ApiModel("患者黑名单保存传输对象")
+public class PatientBlacklistSaveDto {
+
+	/** 患者姓名 */
+	@ApiModelProperty(value = "患者姓名")
+	@Excel(name = "患者姓名")
+	private String patientName;
+
+	/** 患者电话 */
+	@ApiModelProperty(value = "患者电话")
+	@Excel(name = "患者电话")
+	private String patientPhone;
+
+	/** 身份证号 */
+	@ApiModelProperty(value = "身份证号")
+	private String cardNo;
+
+	/** 所属医院id */
+	@ApiModelProperty(value = "所属医院id")
+	private Long hospitalAgencyId;
+
+	/** 所属医院名称 */
+	@ApiModelProperty(value = "所属医院名称")
+	private String hospitalAgencyName;
+
+	/** 所属科室id */
+	@ApiModelProperty(value = "所属科室id")
+	private Long departmentId;
+
+	/** 所属院区id */
+	@ApiModelProperty(value = "所属院区id")
+	private Long campusAgencyId;
+
+	/** 所属院区名称 */
+	@ApiModelProperty(value = "所属院区名称")
+	@Excel(name = "所属院区名称")
+	private String campusAgencyName;
+
+	/** 所属科室名称 */
+	@ApiModelProperty(value = "所属科室名称")
+	private String departmentName;
+
+	/** 异常原因字典表id */
+	@ApiModelProperty(value = "异常原因字典表id")
+	@Excel(name = "异常原因字典表id")
+	private Long abnormalCauseId;
+
+	/** 异常原因字典表值 */
+	@ApiModelProperty(value = "异常原因字典表值")
+	@Excel(name = "异常原因字典表值")
+	private String abnormalCauseValue;
+
+	/** 补充说明字典表id */
+	private Long supplementIllustrateId;
+
+	/** 补充说明字典表值 */
+	private String supplementIllustrateValue;
+
+	/** 功能限制（具体来源未知？） */
+	private String functionLimitation;
+
+	/**
+	 * 来源(CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑, MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接)
+	 */
+	@ApiModelProperty(value = "来源(CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑,MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接)")
+	@Excel(name = "来源(CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑,MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接)")
+	private String blacklistSource;
+}

postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientblacklist/PatientBlacklistUpdateDto.java

@@ -0,0 +1,45 @@
+package com.xinelu.manage.dto.patientblacklist;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 黑名单列表修改传输对象
+ * @author: haown
+ * @create: 2024-03-01 17:03
+ **/
+@ApiModel("黑名单列表修改传输对象")
+@Data
+public class PatientBlacklistUpdateDto {
+
+	/** 主键id */
+	@ApiModelProperty(value = "患者电话")
+	private Long id;
+
+	/** 异常原因字典表id */
+	@ApiModelProperty(value = "异常原因字典表id")
+	private Long abnormalCauseId;
+
+	/** 异常原因字典表值 */
+	@ApiModelProperty(value = "异常原因字典表值")
+	private String abnormalCauseValue;
+
+	/** 补充说明字典表id */
+	@ApiModelProperty(value = "补充说明字典表id")
+	private Long supplementIllustrateId;
+
+	/** 补充说明字典表值 */
+	@ApiModelProperty(value = "补充说明字典表值")
+	private String supplementIllustrateValue;
+
+	/** 功能限制（具体来源未知？） */
+	@ApiModelProperty(value = "功能限制")
+	private String functionLimitation;
+
+	/**
+	 * 来源(CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑, MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接)
+	 */
+	@ApiModelProperty(value = "来源(CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑,MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接)")
+	private String blacklistSource;
+}

postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java

@@ -21,6 +21,10 @@ public class PatientInfoDto {
 	@ApiModelProperty(value = "患者电话")
 	private String patientPhone;
 
+	/** 身份证号 */
+	@ApiModelProperty(value = "身份证号")
+	private String cardNo;
+
 	/** 主要诊断 */
 	@ApiModelProperty(value = "主要诊断")
 	private String mainDiagnosis;

postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectrecord/ProjectRecordDto.java

@@ -0,0 +1,40 @@
+package com.xinelu.manage.dto.projectrecord;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * @description: 测量记录查询传输对象
+ * @author: haown
+ * @create: 2024-03-01 08:52
+ **/
+@ApiModel("测量记录查询传输对象")
+@Data
+public class ProjectRecordDto {
+
+	/**
+	 * 项目编码
+	 */
+	@ApiModelProperty("项目编码")
+	private String projectCode;
+
+	/**
+	 * 患者id
+	 */
+	@ApiModelProperty("患者id")
+	private Long patientId;
+
+	/**
+	 * 检测时间
+	 */
+	@ApiModelProperty("检测时间开始")
+	private Date measureTimeStart;
+
+	/**
+	 * 检测时间
+	 */
+	@ApiModelProperty("检测时间结束")
+	private Date measureTimeEnd;
+}

postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java

@@ -0,0 +1,67 @@
+package com.xinelu.manage.dto.propagandainfo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xinelu.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * @description: 宣教库查询传输对象
+ * @author: haown
+ * @create: 2024-03-01 09:29
+ **/
+@ApiModel("宣教库查询传输对象")
+@Data
+public class PropagandaInfoDto {
+
+	/** 所属医院id */
+	@ApiModelProperty(value = "所属医院id")
+	private Long hospitalAgencyId;
+
+	/** 所属科室id */
+	@ApiModelProperty(value = "所属科室id")
+	private Long departmentId;
+
+	/** 宣教标题（宣教名称） */
+	@ApiModelProperty(value = "宣教标题")
+	@Excel(name = "宣教标题", readConverterExp = "宣=教名称")
+	private String propagandaTitle;
+
+	/** 宣教类型，用药知识：MEDICATION_KNOWLEDGE，疾病科普：DISEASE_POPULARIZATION，运动营养：SPORT_NUTRITION，其他知识：OTHER_KNOWLEDGE，
+	 定制内容：CUSTOMIZED_CONTENT */
+	@ApiModelProperty(value = "宣教类型，用药知识：MEDICATION_KNOWLEDGE，疾病科普：DISEASE_POPULARIZATION，运动营养：SPORT_NUTRITION，其他知识：OTHER_KNOWLEDGE，定制内容：CUSTOMIZED_CONTENT")
+	@Excel(name = "宣教类型，用药知识：MEDICATION_KNOWLEDGE，疾病科普：DISEASE_POPULARIZATION，运动营养：SPORT_NUTRITION，其他知识：OTHER_KNOWLEDGE，定制内容：CUSTOMIZED_CONTENT")
+	private String propagandaType;
+
+
+	/** 宣教ID */
+	@ApiModelProperty(value = "宣教ID")
+	private String propagandaCode;
+
+	/** 宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED */
+	@ApiModelProperty(value = "宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED")
+	@Excel(name = "宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED")
+	private String propagandaStatus;
+
+	/**
+	 * 创建者
+	 */
+	@ApiModelProperty(value = "创建者")
+	private String createBy;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间开始")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date createTimeStart;
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间结束")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date createTimeEnd;
+}

postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaUpdateDto.java

@@ -0,0 +1,26 @@
+package com.xinelu.manage.dto.propagandainfo;
+
+import com.xinelu.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 宣教库修改传输对象
+ * @author: haown
+ * @create: 2024-03-01 11:11
+ **/
+@ApiModel("宣教库修改传输对象")
+@Data
+public class PropagandaUpdateDto {
+
+	/** 主键id */
+	@ApiModelProperty("主键id")
+	private Long id;
+
+	/** 宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED */
+	@ApiModelProperty(value = "宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED")
+	@Excel(name = "宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED")
+	private String propagandaStatus;
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java

@@ -23,6 +23,6 @@ public class SignPatientAddDto {
 
 	private List<SignPatientPackageHardware> devices;
 
-	private SignPatientInformed signPatientInformed;
+	private List<SignPatientInformed> informeds;
 
 }

postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java

@@ -1,5 +1,6 @@
 package com.xinelu.manage.dto.signpatientrecord;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
@@ -88,14 +89,23 @@ public class SignPatientListDto {
 	private Long wardId;
 
 	/**
-	 * 签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN
+	 * 签约状态，在签：IN_SIGN,解约：SEPARATE_SIGN, 过期：EXPIRE_SIGN
 	 */
-	@ApiModelProperty(value = "签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN")
+	@ApiModelProperty(value = "签约状态，在签：IN_SIGN,解约：SEPARATE_SIGN, 过期：EXPIRE_SIGN")
 	private String signStatus;
 
 	/**
-	 * 服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END
+	 * 服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END，待续签：WAIT_CONTINUOUS_SIGN
 	 */
-	@ApiModelProperty(value = "服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END")
+	@ApiModelProperty(value = "服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END，待续签：WAIT_CONTINUOUS_SIGN")
 	private String serviceStatus;
+
+	@ApiModelProperty(value = "服务结束时间开始")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date serviceEndTimeStart;
+
+	@ApiModelProperty(value = "服务结束时间结束")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date serviceEndTimeEnd;
+
 }

postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientStatusDto.java

@@ -13,6 +13,9 @@ public class SignPatientStatusDto {
 
 	private Long id;
 
+	@ApiModelProperty(value = "患者表主键")
+	private Long patientId;
+
 	/**
 	 * 服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END
 	 */
@@ -20,8 +23,14 @@ public class SignPatientStatusDto {
 	private String serviceStatus;
 
 	/**
-	 * 签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN
+	 * 签约状态，在签：IN_SIGN,解约：SEPARATE_SIGN, 过期：EXPIRE_SIGN
 	 */
-	@ApiModelProperty(value = "签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN")
+	@ApiModelProperty(value = "签约状态，在签：IN_SIGN,解约：SEPARATE_SIGN, 过期：EXPIRE_SIGN")
 	private String signStatus;
+
+	/**
+	 * 解约原因
+	 */
+	@ApiModelProperty(value = "解约原因")
+	private String separateReason;
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/agency/AgencyMapper.java

@@ -70,6 +70,14 @@ public interface AgencyMapper {
      */
     int updateAgency(Agency agency);
 
+    /**
+     * 修改机构信息
+     *
+     * @param agency 机构信息
+     * @return 结果
+     */
+    int updateAgencyById(Agency agency);
+
     /**
      * 删除机构信息
      *
@@ -101,4 +109,7 @@ public interface AgencyMapper {
      * @return int
      **/
     int insertAgencyImportList(List<Agency> agencyList);
+
+
+    int selectAgencyNameByAgencyNameInt(String agencyName);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/crowdinfo/CrowdInfoMapper.java

@@ -0,0 +1,61 @@
+package com.xinelu.manage.mapper.crowdinfo;
+
+import com.xinelu.manage.domain.crowdinfo.CrowdInfo;
+import java.util.List;
+
+
+/**
+ * 人群信息Mapper接口
+ *
+ * @author xinelu
+ * @date 2024-03-04
+ */
+public interface CrowdInfoMapper {
+    /**
+     * 查询人群信息
+     *
+     * @param id 人群信息主键
+     * @return 人群信息
+     */
+    public CrowdInfo selectCrowdInfoById(Long id);
+
+    /**
+     * 查询人群信息列表
+     *
+     * @param crowdInfo 人群信息
+     * @return 人群信息集合
+     */
+    public List<CrowdInfo> selectCrowdInfoList(CrowdInfo crowdInfo);
+
+    /**
+     * 新增人群信息
+     *
+     * @param crowdInfo 人群信息
+     * @return 结果
+     */
+    public int insertCrowdInfo(CrowdInfo crowdInfo);
+
+    /**
+     * 修改人群信息
+     *
+     * @param crowdInfo 人群信息
+     * @return 结果
+     */
+    public int updateCrowdInfo(CrowdInfo crowdInfo);
+
+    /**
+     * 删除人群信息
+     *
+     * @param id 人群信息主键
+     * @return 结果
+     */
+    public int deleteCrowdInfoById(Long id);
+
+    /**
+     * 批量删除人群信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCrowdInfoByIds(Long[] ids);
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java

@@ -56,6 +56,15 @@ public interface DepartmentMapper {
      */
     int updateDepartment(Department department);
 
+
+    /**
+     * 修改科室信息
+     *
+     * @param department 科室信息
+     * @return 结果
+     */
+    int updateDepartmentById(Department department);
+
     /**
      * 删除科室信息
      *
@@ -123,8 +132,17 @@ public interface DepartmentMapper {
 
     /**
      * 查询科室信息列表及包含服务包数量
+     *
      * @param departmentDto
      * @return
      */
     List<DepartmentVO> selectListServicePackageNum(DepartmentDTO departmentDto);
+
+    /**
+     * 查询下级机构信息
+     *
+     * @param id 机构信息主键
+     * @return 机构信息
+     */
+    List<Department> selectDepartmentByParentId(Long[] id);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/departmentdiseasetype/DepartmentDiseaseTypeMapper.java

@@ -1,6 +1,7 @@
 package com.xinelu.manage.mapper.departmentdiseasetype;
 
 import com.xinelu.manage.domain.departmentdiseasetype.DepartmentDiseaseType;
+import com.xinelu.manage.vo.department.DepartmentVO;
 
 import java.util.List;
 
@@ -59,4 +60,12 @@ public interface DepartmentDiseaseTypeMapper {
      * @return 结果
      */
     int deleteDepartmentDiseaseTypeByIds(Long[] ids);
+
+    /**
+     * 科室病种数量
+     *
+     * @param departmentName 科室名称
+     * @return DepartmentVO
+     */
+    List<DepartmentVO> selectDiseaseTypeCount(String departmentName);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/materialsinfo/MaterialsInfoMapper.java

@@ -1,8 +1,8 @@
 package com.xinelu.manage.mapper.materialsinfo;
 
-import java.util.List;
-
 import com.xinelu.manage.domain.materialsinfo.MaterialsInfo;
+import com.xinelu.manage.dto.materialsinfo.MaterialsInfoDto;
+import java.util.List;
 
 /**
  * 素材信息Mapper接口
@@ -25,7 +25,7 @@ public interface MaterialsInfoMapper {
      * @param materialsInfo 素材信息
      * @return 素材信息集合
      */
-    public List<MaterialsInfo> selectMaterialsInfoList(MaterialsInfo materialsInfo);
+    public List<MaterialsInfo> selectMaterialsInfoList(MaterialsInfoDto materialsInfo);
 
     /**
      * 新增素材信息

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklist/PatientBlacklistMapper.java

@@ -18,7 +18,7 @@ public interface PatientBlacklistMapper {
      * @param id 患者-黑明单关系主键
      * @return 患者-黑明单关系
      */
-    public PatientBlacklist selectPatientBlacklistById(Long id);
+    public PatientBlacklistVo selectPatientBlacklistById(Long id);
 
     /**
      * 查询患者-黑明单关系列表

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseMapper.java

@@ -0,0 +1,61 @@
+package com.xinelu.manage.mapper.patientblacklistabnormalcause;
+
+import com.xinelu.manage.domain.patientblacklistabnormalcause.PatientBlacklistAbnormalCause;
+import java.util.List;
+
+
+/**
+ * 患者黑名单异常原因Mapper接口
+ *
+ * @author haown
+ * @date 2024-03-01
+ */
+public interface PatientBlacklistAbnormalCauseMapper {
+    /**
+     * 查询患者黑名单异常原因
+     *
+     * @param id 患者黑名单异常原因主键
+     * @return 患者黑名单异常原因
+     */
+    public PatientBlacklistAbnormalCause selectPatientBlacklistAbnormalCauseById(Long id);
+
+    /**
+     * 查询患者黑名单异常原因列表
+     *
+     * @param patientBlacklistAbnormalCause 患者黑名单异常原因
+     * @return 患者黑名单异常原因集合
+     */
+    public List<PatientBlacklistAbnormalCause> selectPatientBlacklistAbnormalCauseList(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause);
+
+    /**
+     * 新增患者黑名单异常原因
+     *
+     * @param patientBlacklistAbnormalCause 患者黑名单异常原因
+     * @return 结果
+     */
+    public int insertPatientBlacklistAbnormalCause(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause);
+
+    /**
+     * 修改患者黑名单异常原因
+     *
+     * @param patientBlacklistAbnormalCause 患者黑名单异常原因
+     * @return 结果
+     */
+    public int updatePatientBlacklistAbnormalCause(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause);
+
+    /**
+     * 删除患者黑名单异常原因
+     *
+     * @param id 患者黑名单异常原因主键
+     * @return 结果
+     */
+    public int deletePatientBlacklistAbnormalCauseById(Long id);
+
+    /**
+     * 批量删除患者黑名单异常原因
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deletePatientBlacklistAbnormalCauseByIds(Long[] ids);
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/project/ProjectMapper.java

@@ -0,0 +1,25 @@
+package com.xinelu.manage.mapper.project;
+
+import com.xinelu.manage.domain.project.Project;
+
+/**
+* @author haown
+* @description 针对表【project(检测项目表)】的数据库操作Mapper
+* @createDate 2024-03-05 16:33:33
+* @Entity com.xinelu.manage.domain.project.Project
+*/
+public interface ProjectMapper {
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(Project record);
+
+    int insertSelective(Project record);
+
+    Project selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(Project record);
+
+    int updateByPrimaryKey(Project record);
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectdevice/ProjectDeviceMapper.java

@@ -0,0 +1,25 @@
+package com.xinelu.manage.mapper.projectdevice;
+
+import com.xinelu.manage.domain.projectdevice.ProjectDevice;
+
+/**
+* @author haown
+* @description 针对表【project_device(检测项目设备表)】的数据库操作Mapper
+* @createDate 2024-03-05 17:14:06
+* @Entity com.xinelu.manage.domain.projectdevice.ProjectDevice
+*/
+public interface ProjectDeviceMapper {
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(ProjectDevice record);
+
+    int insertSelective(ProjectDevice record);
+
+    ProjectDevice selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(ProjectDevice record);
+
+    int updateByPrimaryKey(ProjectDevice record);
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectgroup/ProjectGroupMapper.java

@@ -0,0 +1,25 @@
+package com.xinelu.manage.mapper.projectgroup;
+
+import com.xinelu.manage.domain.projectgroup.ProjectGroup;
+
+/**
+* @author haown
+* @description 针对表【project_group(检测项目分组表)】的数据库操作Mapper
+* @createDate 2024-03-05 16:34:58
+* @Entity com.xinelu.manage.domain.projectgroup.ProjectGroup
+*/
+public interface ProjectGroupMapper {
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(ProjectGroup record);
+
+    int insertSelective(ProjectGroup record);
+
+    ProjectGroup selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(ProjectGroup record);
+
+    int updateByPrimaryKey(ProjectGroup record);
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectlastrecord/ProjectLastRecordMapper.java

@@ -0,0 +1,25 @@
+package com.xinelu.manage.mapper.projectlastrecord;
+
+import com.xinelu.manage.domain.projectlastrecord.ProjectLastRecord;
+
+/**
+* @author haown
+* @description 针对表【project_last_record(最近一次检测项目数据记录表)】的数据库操作Mapper
+* @createDate 2024-03-05 17:09:28
+* @Entity com.xinelu.manage.domain.projectlastrecord.ProjectLastRecord
+*/
+public interface ProjectLastRecordMapper {
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(ProjectLastRecord record);
+
+    int insertSelective(ProjectLastRecord record);
+
+    ProjectLastRecord selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(ProjectLastRecord record);
+
+    int updateByPrimaryKey(ProjectLastRecord record);
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecord/ProjectRecordMapper.java

@@ -0,0 +1,25 @@
+package com.xinelu.manage.mapper.projectrecord;
+
+import com.xinelu.manage.domain.projectrecord.ProjectRecord;
+
+/**
+* @author haown
+* @description 针对表【project_record(检测项目数据记录表)】的数据库操作Mapper
+* @createDate 2024-03-05 17:09:04
+* @Entity com.xinelu.manage.domain.projectrecord.ProjectRecord
+*/
+public interface ProjectRecordMapper {
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(ProjectRecord record);
+
+    int insertSelective(ProjectRecord record);
+
+    ProjectRecord selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(ProjectRecord record);
+
+    int updateByPrimaryKey(ProjectRecord record);
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecordfile/ProjectRecordFileMapper.java

@@ -0,0 +1,25 @@
+package com.xinelu.manage.mapper.projectrecordfile;
+
+import com.xinelu.manage.domain.projectrecordfile.ProjectRecordFile;
+
+/**
+* @author haown
+* @description 针对表【project_record_file(检测项目数据记录附件表（存储检测结果既含有报告又含有指标数据的检测项）)】的数据库操作Mapper
+* @createDate 2024-03-05 16:36:32
+* @Entity com.xinelu.manage.domain.projectrecordfile.ProjectRecordFile
+*/
+public interface ProjectRecordFileMapper {
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(ProjectRecordFile record);
+
+    int insertSelective(ProjectRecordFile record);
+
+    ProjectRecordFile selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(ProjectRecordFile record);
+
+    int updateByPrimaryKey(ProjectRecordFile record);
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandainfo/PropagandaInfoMapper.java

@@ -1,8 +1,10 @@
 package com.xinelu.manage.mapper.propagandainfo;
 
-import java.util.List;
-
 import com.xinelu.manage.domain.propagandainfo.PropagandaInfo;
+import com.xinelu.manage.dto.department.DepartmentDTO;
+import com.xinelu.manage.dto.propagandainfo.PropagandaInfoDto;
+import com.xinelu.manage.vo.department.DepartmentVO;
+import java.util.List;
 
 /**
  * 宣教库管理Mapper接口
@@ -25,7 +27,7 @@ public interface PropagandaInfoMapper {
      * @param propagandaInfo 宣教库管理
      * @return 宣教库管理集合
      */
-    public List<PropagandaInfo> selectPropagandaInfoList(PropagandaInfo propagandaInfo);
+    public List<PropagandaInfo> selectPropagandaInfoList(PropagandaInfoDto propagandaInfo);
 
     /**
      * 新增宣教库管理
@@ -58,4 +60,13 @@ public interface PropagandaInfoMapper {
      * @return 结果
      */
     public int deletePropagandaInfoByIds(Long[] ids);
+
+	/**
+	 * 查询科室信息列表及包含宣教库数量
+	 *
+	 * @param departmentDto
+	 * @return
+	 */
+	List<DepartmentVO> selectNumByDept(DepartmentDTO departmentDto);
+
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientrecord/SignPatientRecordMapper.java

@@ -29,7 +29,7 @@ public interface SignPatientRecordMapper {
 
 	List<SignPatientListVo> selectList(SignPatientListDto signPatientRecord);
 
-	SignPatientInfoVo getByRecordId(Long patientSignRecordId);
+	SignPatientInfoVo getByRecordId(Long id);
 
 	List<SignPatientRecordVo> getByPatient(Long patientId);
 

postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/IAgencyService.java

@@ -53,7 +53,7 @@ public interface IAgencyService {
      * @param agency 机构信息
      * @return 结果
      */
-    int insertAgency(Agency agency);
+    AjaxResult insertAgency(Agency agency);
 
     /**
      * 修改机构信息

postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java

@@ -109,10 +109,14 @@ public class AgencyServiceImpl implements IAgencyService {
      * @return 结果
      */
     @Override
-    public int insertAgency(Agency agency) {
+    public AjaxResult insertAgency(Agency agency) {
+        int i = agencyMapper.selectAgencyNameByAgencyNameInt(agency.getAgencyName());
+        if (i > 0) {
+            return AjaxResult.error("该名称" + agency.getAgencyName() + "以重复！");
+        }
         agency.setCreateTime(DateUtils.getNowDate());
         agency.setCreateBy(SecurityUtils.getUsername());
-        return agencyMapper.insertAgency(agency);
+        return AjaxResult.success(agencyMapper.insertAgency(agency));
     }
 
     /**
@@ -125,7 +129,7 @@ public class AgencyServiceImpl implements IAgencyService {
     public int updateAgency(Agency agency) {
         agency.setUpdateTime(DateUtils.getNowDate());
         agency.setUpdateBy(SecurityUtils.getUsername());
-        return agencyMapper.updateAgency(agency);
+        return agencyMapper.updateAgencyById(agency);
     }
 
     /**

postdischarge-manage/src/main/java/com/xinelu/manage/service/crowdinfo/ICrowdInfoService.java

@@ -0,0 +1,60 @@
+package com.xinelu.manage.service.crowdinfo;
+
+import com.xinelu.manage.domain.crowdinfo.CrowdInfo;
+import java.util.List;
+
+/**
+ * 人群信息Service接口
+ *
+ * @author xinelu
+ * @date 2024-03-04
+ */
+public interface ICrowdInfoService {
+    /**
+     * 查询人群信息
+     *
+     * @param id 人群信息主键
+     * @return 人群信息
+     */
+    public CrowdInfo selectCrowdInfoById(Long id);
+
+    /**
+     * 查询人群信息列表
+     *
+     * @param crowdInfo 人群信息
+     * @return 人群信息集合
+     */
+    public List<CrowdInfo> selectCrowdInfoList(CrowdInfo crowdInfo);
+
+    /**
+     * 新增人群信息
+     *
+     * @param crowdInfo 人群信息
+     * @return 结果
+     */
+    public int insertCrowdInfo(CrowdInfo crowdInfo);
+
+    /**
+     * 修改人群信息
+     *
+     * @param crowdInfo 人群信息
+     * @return 结果
+     */
+    public int updateCrowdInfo(CrowdInfo crowdInfo);
+
+    /**
+     * 批量删除人群信息
+     *
+     * @param ids 需要删除的人群信息主键集合
+     * @return 结果
+     */
+    public int deleteCrowdInfoByIds(Long[] ids);
+
+    /**
+     * 删除人群信息信息
+     *
+     * @param id 人群信息主键
+     * @return 结果
+     */
+    public int deleteCrowdInfoById(Long id);
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/crowdinfo/impl/CrowdInfoServiceImpl.java

@@ -0,0 +1,92 @@
+package com.xinelu.manage.service.crowdinfo.impl;
+
+import com.xinelu.common.utils.DateUtils;
+import com.xinelu.common.utils.SecurityUtils;
+import com.xinelu.manage.domain.crowdinfo.CrowdInfo;
+import com.xinelu.manage.mapper.crowdinfo.CrowdInfoMapper;
+import com.xinelu.manage.service.crowdinfo.ICrowdInfoService;
+import java.util.List;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 人群信息Service业务层处理
+ *
+ * @author xinelu
+ * @date 2024-03-04
+ */
+@Service
+public class CrowdInfoServiceImpl implements ICrowdInfoService {
+    @Resource
+    private CrowdInfoMapper crowdInfoMapper;
+
+    /**
+     * 查询人群信息
+     *
+     * @param id 人群信息主键
+     * @return 人群信息
+     */
+    @Override
+    public CrowdInfo selectCrowdInfoById(Long id) {
+        return crowdInfoMapper.selectCrowdInfoById(id);
+    }
+
+    /**
+     * 查询人群信息列表
+     *
+     * @param crowdInfo 人群信息
+     * @return 人群信息
+     */
+    @Override
+    public List<CrowdInfo> selectCrowdInfoList(CrowdInfo crowdInfo) {
+        return crowdInfoMapper.selectCrowdInfoList(crowdInfo);
+    }
+
+    /**
+     * 新增人群信息
+     *
+     * @param crowdInfo 人群信息
+     * @return 结果
+     */
+    @Override
+    public int insertCrowdInfo(CrowdInfo crowdInfo) {
+	    crowdInfo.setCreateTime(DateUtils.getNowDate());
+	    crowdInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
+        return crowdInfoMapper.insertCrowdInfo(crowdInfo);
+    }
+
+    /**
+     * 修改人群信息
+     *
+     * @param crowdInfo 人群信息
+     * @return 结果
+     */
+    @Override
+    public int updateCrowdInfo(CrowdInfo crowdInfo) {
+	    crowdInfo.setUpdateTime(DateUtils.getNowDate());
+	    crowdInfo.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName());
+        return crowdInfoMapper.updateCrowdInfo(crowdInfo);
+    }
+
+    /**
+     * 批量删除人群信息
+     *
+     * @param ids 需要删除的人群信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCrowdInfoByIds(Long[] ids) {
+        return crowdInfoMapper.deleteCrowdInfoByIds(ids);
+    }
+
+    /**
+     * 删除人群信息信息
+     *
+     * @param id 人群信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCrowdInfoById(Long id) {
+        return crowdInfoMapper.deleteCrowdInfoById(id);
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java

@@ -62,7 +62,7 @@ public interface IDepartmentService {
      * @param ids 需要删除的科室信息主键集合
      * @return 结果
      */
-    int deleteDepartmentByIds(Long[] ids);
+    AjaxResult deleteDepartmentByIds(Long[] ids);
 
     /**
      * 删除科室信息信息

postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java

@@ -99,8 +99,9 @@ public class DepartmentServiceImpl implements IDepartmentService {
      */
     @Override
     public int updateDepartment(Department department) {
+        department.setUpdateBy(SecurityUtils.getUsername());
         department.setUpdateTime(DateUtils.getNowDate());
-        return departmentMapper.updateDepartment(department);
+        return departmentMapper.updateDepartmentById(department);
     }
 
     /**
@@ -110,8 +111,12 @@ public class DepartmentServiceImpl implements IDepartmentService {
      * @return 结果
      */
     @Override
-    public int deleteDepartmentByIds(Long[] ids) {
+    public AjaxResult deleteDepartmentByIds(Long[] ids) {
-        return departmentMapper.deleteDepartmentByIds(ids);
+        int size = departmentMapper.selectDepartmentByParentId(ids).size();
+        if (size > 0) {
+            return AjaxResult.error("该科室存在下级科室，请先删除其下级科室！");
+        }
+        return AjaxResult.success(departmentMapper.deleteDepartmentByIds(ids));
     }
 
     /**

postdischarge-manage/src/main/java/com/xinelu/manage/service/departmentdiseasetype/IDepartmentDiseaseTypeService.java

@@ -1,5 +1,6 @@
 package com.xinelu.manage.service.departmentdiseasetype;
 
+import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.manage.domain.departmentdiseasetype.DepartmentDiseaseType;
 
 import java.util.List;
@@ -59,4 +60,12 @@ public interface IDepartmentDiseaseTypeService {
      * @return 结果
      */
     int deleteDepartmentDiseaseTypeById(Long id);
+
+    /**
+     * 科室病种信息信息
+     *
+     * @param departmentName 科室信息
+     * @return 结果
+     */
+    AjaxResult selectDiseaseTypeCount(String departmentName);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/departmentdiseasetype/impl/DepartmentDiseaseTypeServiceImpl.java

@@ -1,12 +1,16 @@
 package com.xinelu.manage.service.departmentdiseasetype.impl;
 
+import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.utils.DateUtils;
 import com.xinelu.manage.domain.departmentdiseasetype.DepartmentDiseaseType;
 import com.xinelu.manage.mapper.departmentdiseasetype.DepartmentDiseaseTypeMapper;
 import com.xinelu.manage.service.departmentdiseasetype.IDepartmentDiseaseTypeService;
+import com.xinelu.manage.vo.department.DepartmentVO;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -88,4 +92,26 @@ public class DepartmentDiseaseTypeServiceImpl implements IDepartmentDiseaseTypeS
     public int deleteDepartmentDiseaseTypeById(Long id) {
         return departmentDiseaseTypeMapper.deleteDepartmentDiseaseTypeById(id);
     }
+
+    /**
+     * 科室病种数量
+     *
+     * @param departmentName 科室名称
+     * @return DepartmentVO
+     */
+    @Override
+    public AjaxResult selectDiseaseTypeCount(String departmentName) {
+        DepartmentVO departmentVO = new DepartmentVO();
+        List<DepartmentVO> department = new ArrayList<>();
+        departmentVO.setDepartmentName("全部");
+        departmentVO.setCountNum(0);
+        List<DepartmentVO> departmentVOS = departmentDiseaseTypeMapper.selectDiseaseTypeCount(departmentName);
+        if (CollectionUtils.isNotEmpty(departmentVOS)) {
+            Integer result = departmentVOS.stream().mapToInt(DepartmentVO::getCountNum).sum();
+            departmentVO.setCountNum(result);
+            department.add(departmentVO);
+            department.addAll(departmentVOS);
+        }
+        return AjaxResult.success(department);
+    }
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/IMaterialsInfoService.java

@@ -1,8 +1,8 @@
 package com.xinelu.manage.service.materialsinfo;
 
-import java.util.List;
-
 import com.xinelu.manage.domain.materialsinfo.MaterialsInfo;
+import com.xinelu.manage.dto.materialsinfo.MaterialsInfoDto;
+import java.util.List;
 
 /**
  * 素材信息Service接口
@@ -25,7 +25,7 @@ public interface IMaterialsInfoService {
      * @param materialsInfo 素材信息
      * @return 素材信息集合
      */
-    public List<MaterialsInfo> selectMaterialsInfoList(MaterialsInfo materialsInfo);
+    public List<MaterialsInfo> selectMaterialsInfoList(MaterialsInfoDto materialsInfo);
 
     /**
      * 新增素材信息

postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/impl/MaterialsInfoServiceImpl.java

@@ -1,12 +1,13 @@
 package com.xinelu.manage.service.materialsinfo.impl;
 
+import com.xinelu.common.utils.DateUtils;
+import com.xinelu.manage.domain.materialsinfo.MaterialsInfo;
+import com.xinelu.manage.dto.materialsinfo.MaterialsInfoDto;
+import com.xinelu.manage.mapper.materialsinfo.MaterialsInfoMapper;
+import com.xinelu.manage.service.materialsinfo.IMaterialsInfoService;
 import java.util.List;
-        import com.xinelu.common.utils.DateUtils;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
-import com.xinelu.manage.mapper.materialsinfo.MaterialsInfoMapper;
-import com.xinelu.manage.domain.materialsinfo.MaterialsInfo;
-import com.xinelu.manage.service.materialsinfo.IMaterialsInfoService;
 
 /**
  * 素材信息Service业务层处理
@@ -37,7 +38,7 @@ public class MaterialsInfoServiceImpl implements IMaterialsInfoService {
      * @return 素材信息
      */
     @Override
-    public List<MaterialsInfo> selectMaterialsInfoList(MaterialsInfo materialsInfo) {
+    public List<MaterialsInfo> selectMaterialsInfoList(MaterialsInfoDto materialsInfo) {
         return materialsInfoMapper.selectMaterialsInfoList(materialsInfo);
     }
 

postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/IPatientBlacklistService.java

@@ -2,6 +2,7 @@ package com.xinelu.manage.service.patientblacklist;
 
 import com.xinelu.manage.domain.patientblacklist.PatientBlacklist;
 import com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto;
+import com.xinelu.manage.dto.patientblacklist.PatientBlacklistSaveDto;
 import com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo;
 import java.util.List;
 
@@ -18,7 +19,7 @@ public interface IPatientBlacklistService {
      * @param id 患者-黑明单关系主键
      * @return 患者-黑明单关系
      */
-    public PatientBlacklist selectPatientBlacklistById(Long id);
+    public PatientBlacklistVo selectPatientBlacklistById(Long id);
 
     /**
      * 查询患者-黑明单关系列表
@@ -31,10 +32,10 @@ public interface IPatientBlacklistService {
     /**
      * 新增患者-黑明单关系
      *
-     * @param patientBlacklist 患者-黑明单关系
+     * @param blacklistSaveDto 患者-黑明单关系
      * @return 结果
      */
-    public int insertPatientBlacklist(PatientBlacklist patientBlacklist);
+    public int insertPatientBlacklist(PatientBlacklistSaveDto blacklistSaveDto);
 
     /**
      * 修改患者-黑明单关系

postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java

@@ -1,15 +1,22 @@
 package com.xinelu.manage.service.patientblacklist.impl;
 
+import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.DateUtils;
+import com.xinelu.common.utils.bean.BeanUtils;
 import com.xinelu.manage.domain.patientblacklist.PatientBlacklist;
+import com.xinelu.manage.domain.patientinfo.PatientInfo;
 import com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto;
+import com.xinelu.manage.dto.patientblacklist.PatientBlacklistSaveDto;
+import com.xinelu.manage.dto.patientinfo.PatientInfoDto;
 import com.xinelu.manage.mapper.patientblacklist.PatientBlacklistMapper;
+import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper;
 import com.xinelu.manage.service.patientblacklist.IPatientBlacklistService;
 import com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo;
 import java.util.Date;
 import java.util.List;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 患者-黑明单关系Service业务层处理
@@ -22,6 +29,9 @@ public class PatientBlacklistServiceImpl implements IPatientBlacklistService {
     @Resource
     private PatientBlacklistMapper patientBlacklistMapper;
 
+	@Resource
+	private PatientInfoMapper patientInfoMapper;
+
     /**
      * 查询患者-黑明单关系
      *
@@ -29,7 +39,7 @@ public class PatientBlacklistServiceImpl implements IPatientBlacklistService {
      * @return 患者-黑明单关系
      */
     @Override
-    public PatientBlacklist selectPatientBlacklistById(Long id) {
+    public PatientBlacklistVo selectPatientBlacklistById(Long id) {
         return patientBlacklistMapper.selectPatientBlacklistById(id);
     }
 
@@ -47,11 +57,26 @@ public class PatientBlacklistServiceImpl implements IPatientBlacklistService {
     /**
      * 新增患者-黑明单关系
      *
-     * @param patientBlacklist 患者-黑明单关系
+     * @param blacklistSaveDto 患者-黑明单关系
      * @return 结果
      */
     @Override
-    public int insertPatientBlacklist(PatientBlacklist patientBlacklist) {
+    public int insertPatientBlacklist(PatientBlacklistSaveDto blacklistSaveDto) {
+		// 根据患者姓名、身份证号查询患者
+	    PatientInfoDto patientInfoDto = new PatientInfoDto();
+	    patientInfoDto.setPatientName(blacklistSaveDto.getPatientName());
+	    patientInfoDto.setPatientPhone(blacklistSaveDto.getPatientPhone());
+	    patientInfoDto.setCardNo(blacklistSaveDto.getCardNo());
+	    List<PatientInfo> patientList = patientInfoMapper.selectPatientInfoList(patientInfoDto);
+		if (CollectionUtils.isEmpty(patientList)) {
+			throw new ServiceException("未找到该患者，请确认姓名身份证号手机号是否正确");
+		}
+		if (patientList.size() > 1) {
+			throw new ServiceException("找到多名患者信息，请确认姓名身份证号手机号是否正确");
+		}
+		PatientBlacklist patientBlacklist = new PatientBlacklist();
+	    BeanUtils.copyBeanProp(patientBlacklist, blacklistSaveDto);
+	    patientBlacklist.setPatientId(patientList.get(0).getId());
 	    patientBlacklist.setDelFlag(0);
         patientBlacklist.setCreateTime(DateUtils.getNowDate());
         return patientBlacklistMapper.insertPatientBlacklist(patientBlacklist);

postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklistabnormalcause/IPatientBlacklistAbnormalCauseService.java

@@ -0,0 +1,61 @@
+package com.xinelu.manage.service.patientblacklistabnormalcause;
+
+import com.xinelu.manage.domain.patientblacklistabnormalcause.PatientBlacklistAbnormalCause;
+import java.util.List;
+
+
+/**
+ * 患者黑名单异常原因Service接口
+ *
+ * @author haown
+ * @date 2024-03-01
+ */
+public interface IPatientBlacklistAbnormalCauseService {
+    /**
+     * 查询患者黑名单异常原因
+     *
+     * @param id 患者黑名单异常原因主键
+     * @return 患者黑名单异常原因
+     */
+    public PatientBlacklistAbnormalCause selectPatientBlacklistAbnormalCauseById(Long id);
+
+    /**
+     * 查询患者黑名单异常原因列表
+     *
+     * @param patientBlacklistAbnormalCause 患者黑名单异常原因
+     * @return 患者黑名单异常原因集合
+     */
+    public List<PatientBlacklistAbnormalCause> selectPatientBlacklistAbnormalCauseList(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause);
+
+    /**
+     * 新增患者黑名单异常原因
+     *
+     * @param patientBlacklistAbnormalCause 患者黑名单异常原因
+     * @return 结果
+     */
+    public int insertPatientBlacklistAbnormalCause(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause);
+
+    /**
+     * 修改患者黑名单异常原因
+     *
+     * @param patientBlacklistAbnormalCause 患者黑名单异常原因
+     * @return 结果
+     */
+    public int updatePatientBlacklistAbnormalCause(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause);
+
+    /**
+     * 批量删除患者黑名单异常原因
+     *
+     * @param ids 需要删除的患者黑名单异常原因主键集合
+     * @return 结果
+     */
+    public int deletePatientBlacklistAbnormalCauseByIds(Long[] ids);
+
+    /**
+     * 删除患者黑名单异常原因信息
+     *
+     * @param id 患者黑名单异常原因主键
+     * @return 结果
+     */
+    public int deletePatientBlacklistAbnormalCauseById(Long id);
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklistabnormalcause/impl/PatientBlacklistAbnormalCauseServiceImpl.java

@@ -0,0 +1,89 @@
+package com.xinelu.manage.service.patientblacklistabnormalcause.impl;
+
+import com.xinelu.common.utils.DateUtils;
+import com.xinelu.manage.domain.patientblacklistabnormalcause.PatientBlacklistAbnormalCause;
+import com.xinelu.manage.mapper.patientblacklistabnormalcause.PatientBlacklistAbnormalCauseMapper;
+import com.xinelu.manage.service.patientblacklistabnormalcause.IPatientBlacklistAbnormalCauseService;
+import java.util.List;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 患者黑名单异常原因Service业务层处理
+ *
+ * @author haown
+ * @date 2024-03-01
+ */
+@Service
+public class PatientBlacklistAbnormalCauseServiceImpl implements IPatientBlacklistAbnormalCauseService {
+    @Resource
+    private PatientBlacklistAbnormalCauseMapper patientBlacklistAbnormalCauseMapper;
+
+    /**
+     * 查询患者黑名单异常原因
+     *
+     * @param id 患者黑名单异常原因主键
+     * @return 患者黑名单异常原因
+     */
+    @Override
+    public PatientBlacklistAbnormalCause selectPatientBlacklistAbnormalCauseById(Long id) {
+        return patientBlacklistAbnormalCauseMapper.selectPatientBlacklistAbnormalCauseById(id);
+    }
+
+    /**
+     * 查询患者黑名单异常原因列表
+     *
+     * @param patientBlacklistAbnormalCause 患者黑名单异常原因
+     * @return 患者黑名单异常原因
+     */
+    @Override
+    public List<PatientBlacklistAbnormalCause> selectPatientBlacklistAbnormalCauseList(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) {
+        return patientBlacklistAbnormalCauseMapper.selectPatientBlacklistAbnormalCauseList(patientBlacklistAbnormalCause);
+    }
+
+    /**
+     * 新增患者黑名单异常原因
+     *
+     * @param patientBlacklistAbnormalCause 患者黑名单异常原因
+     * @return 结果
+     */
+    @Override
+    public int insertPatientBlacklistAbnormalCause(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) {
+                patientBlacklistAbnormalCause.setCreateTime(DateUtils.getNowDate());
+            return patientBlacklistAbnormalCauseMapper.insertPatientBlacklistAbnormalCause(patientBlacklistAbnormalCause);
+    }
+
+    /**
+     * 修改患者黑名单异常原因
+     *
+     * @param patientBlacklistAbnormalCause 患者黑名单异常原因
+     * @return 结果
+     */
+    @Override
+    public int updatePatientBlacklistAbnormalCause(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) {
+                patientBlacklistAbnormalCause.setUpdateTime(DateUtils.getNowDate());
+        return patientBlacklistAbnormalCauseMapper.updatePatientBlacklistAbnormalCause(patientBlacklistAbnormalCause);
+    }
+
+    /**
+     * 批量删除患者黑名单异常原因
+     *
+     * @param ids 需要删除的患者黑名单异常原因主键
+     * @return 结果
+     */
+    @Override
+    public int deletePatientBlacklistAbnormalCauseByIds(Long[] ids) {
+        return patientBlacklistAbnormalCauseMapper.deletePatientBlacklistAbnormalCauseByIds(ids);
+    }
+
+    /**
+     * 删除患者黑名单异常原因信息
+     *
+     * @param id 患者黑名单异常原因主键
+     * @return 结果
+     */
+    @Override
+    public int deletePatientBlacklistAbnormalCauseById(Long id) {
+        return patientBlacklistAbnormalCauseMapper.deletePatientBlacklistAbnormalCauseById(id);
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/project/IProjectService.java

@@ -0,0 +1,10 @@
+package com.xinelu.manage.service.project;
+
+/**
+* @author haown
+* @description 针对表【project(检测项目表)】的数据库操作Service
+* @createDate 2024-02-29 15:10:38
+*/
+public interface IProjectService {
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/project/impl/ProjectServiceImpl.java

@@ -0,0 +1,14 @@
+package com.xinelu.manage.service.project.impl;
+
+import com.xinelu.manage.service.project.IProjectService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author haown
+* @description 针对表【project(检测项目表)】的数据库操作Service实现
+* @createDate 2024-02-29 15:10:38
+*/
+@Service
+public class ProjectServiceImpl implements IProjectService {
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/IProjectDeviceService.java

@@ -0,0 +1,10 @@
+package com.xinelu.manage.service.projectdevice;
+
+/**
+* @author haown
+* @description 针对表【project_device(检测项目设备表)】的数据库操作Service
+* @createDate 2024-02-29 15:15:14
+*/
+public interface IProjectDeviceService {
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/impl/ProjectDeviceServiceImpl.java

@@ -0,0 +1,14 @@
+package com.xinelu.manage.service.projectdevice.impl;
+
+import com.xinelu.manage.service.projectdevice.IProjectDeviceService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【project_device(检测项目设备表)】的数据库操作Service实现
+* @createDate 2024-02-29 15:15:14
+*/
+@Service
+public class ProjectDeviceServiceImpl implements IProjectDeviceService {
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/IProjectGroupService.java

@@ -0,0 +1,10 @@
+package com.xinelu.manage.service.projectgroup;
+
+/**
+* @author haown
+* @description 针对表【project_group(检测项目分组表)】的数据库操作Service
+* @createDate 2024-02-29 15:19:16
+*/
+public interface IProjectGroupService {
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/impl/ProjectGroupServiceImpl.java

@@ -0,0 +1,14 @@
+package com.xinelu.manage.service.projectgroup.impl;
+
+import com.xinelu.manage.service.projectgroup.IProjectGroupService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author haown
+* @description 针对表【project_group(检测项目分组表)】的数据库操作Service实现
+* @createDate 2024-02-29 15:19:16
+*/
+@Service
+public class ProjectGroupServiceImpl implements IProjectGroupService {
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/IProjectLastRecordService.java

@@ -0,0 +1,10 @@
+package com.xinelu.manage.service.projectlastrecord;
+
+/**
+* @author haown
+* @description 针对表【project_last_record(最近一次检测项目数据记录表)】的数据库操作Service
+* @createDate 2024-02-29 15:20:41
+*/
+public interface IProjectLastRecordService {
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/impl/ProjectLastRecordServiceImpl.java

@@ -0,0 +1,14 @@
+package com.xinelu.manage.service.projectlastrecord.impl;
+
+import com.xinelu.manage.service.projectlastrecord.IProjectLastRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author haown
+* @description 针对表【project_last_record(最近一次检测项目数据记录表)】的数据库操作Service实现
+* @createDate 2024-02-29 15:20:41
+*/
+@Service
+public class ProjectLastRecordServiceImpl implements IProjectLastRecordService {
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/IProjectRecordService.java

@@ -0,0 +1,10 @@
+package com.xinelu.manage.service.projectrecord;
+
+/**
+* @author haown
+* @description 针对表【project_record(检测项目数据记录表)】的数据库操作Service
+* @createDate 2024-02-29 15:22:15
+*/
+public interface IProjectRecordService {
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/impl/ProjectRecordServiceImpl.java

@@ -0,0 +1,14 @@
+package com.xinelu.manage.service.projectrecord.impl;
+
+import com.xinelu.manage.service.projectrecord.IProjectRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author haown
+* @description 针对表【project_record(检测项目数据记录表)】的数据库操作Service实现
+* @createDate 2024-02-29 15:22:15
+*/
+@Service
+public class ProjectRecordServiceImpl implements IProjectRecordService {
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/IProjectRecordFileService.java

@@ -0,0 +1,10 @@
+package com.xinelu.manage.service.projectrecordfile;
+
+/**
+* @author haown
+* @description 针对表【project_record_file(检测项目数据记录附件表（扩展）)】的数据库操作Service
+* @createDate 2024-02-29 15:23:25
+*/
+public interface IProjectRecordFileService {
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/impl/ProjectRecordFileServiceImpl.java

@@ -0,0 +1,14 @@
+package com.xinelu.manage.service.projectrecordfile.impl;
+
+import com.xinelu.manage.service.projectrecordfile.IProjectRecordFileService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author haown
+* @description 针对表【project_record_file(检测项目数据记录附件表（扩展）)】的数据库操作Service实现
+* @createDate 2024-02-29 15:23:25
+*/
+@Service
+public class ProjectRecordFileServiceImpl implements IProjectRecordFileService {
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java

@@ -1,8 +1,11 @@
 package com.xinelu.manage.service.propagandainfo;
 
-import java.util.List;
-
 import com.xinelu.manage.domain.propagandainfo.PropagandaInfo;
+import com.xinelu.manage.dto.department.DepartmentDTO;
+import com.xinelu.manage.dto.propagandainfo.PropagandaInfoDto;
+import com.xinelu.manage.dto.propagandainfo.PropagandaUpdateDto;
+import com.xinelu.manage.vo.department.DepartmentVO;
+import java.util.List;
 
 /**
  * 宣教库管理Service接口
@@ -25,7 +28,7 @@ public interface IPropagandaInfoService {
      * @param propagandaInfo 宣教库管理
      * @return 宣教库管理集合
      */
-    public List<PropagandaInfo> selectPropagandaInfoList(PropagandaInfo propagandaInfo);
+    public List<PropagandaInfo> selectPropagandaInfoList(PropagandaInfoDto propagandaInfo);
 
     /**
      * 新增宣教库管理
@@ -43,6 +46,22 @@ public interface IPropagandaInfoService {
      */
     public int updatePropagandaInfo(PropagandaInfo propagandaInfo);
 
+	/**
+	 * 复制宣教库管理
+	 *
+	 * @param id 宣教库id
+	 * @return 结果
+	 */
+	public int copyPropagandaInfo(Long id);
+
+	/**
+	 * 修改宣教库管理
+	 *
+	 * @param propagandaInfo 宣教库管理
+	 * @return 结果
+	 */
+	public int updateStatus(PropagandaUpdateDto propagandaInfo);
+
     /**
      * 批量删除宣教库管理
      *
@@ -58,4 +77,12 @@ public interface IPropagandaInfoService {
      * @return 结果
      */
     public int deletePropagandaInfoById(Long id);
+
+	/**
+	 * 查询科室信息列表及包含宣教信息数量
+	 *
+	 * @param departmentDto
+	 * @return
+	 */
+	List<DepartmentVO> selectNumByDept(DepartmentDTO departmentDto);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java

@@ -1,12 +1,17 @@
 package com.xinelu.manage.service.propagandainfo.impl;
 
+import com.xinelu.common.utils.DateUtils;
+import com.xinelu.common.utils.SecurityUtils;
+import com.xinelu.manage.domain.propagandainfo.PropagandaInfo;
+import com.xinelu.manage.dto.department.DepartmentDTO;
+import com.xinelu.manage.dto.propagandainfo.PropagandaInfoDto;
+import com.xinelu.manage.dto.propagandainfo.PropagandaUpdateDto;
+import com.xinelu.manage.mapper.propagandainfo.PropagandaInfoMapper;
+import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService;
+import com.xinelu.manage.vo.department.DepartmentVO;
 import java.util.List;
-        import com.xinelu.common.utils.DateUtils;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
-import com.xinelu.manage.mapper.propagandainfo.PropagandaInfoMapper;
-import com.xinelu.manage.domain.propagandainfo.PropagandaInfo;
-import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService;
 
 /**
  * 宣教库管理Service业务层处理
@@ -37,7 +42,7 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService {
      * @return 宣教库管理
      */
     @Override
-    public List<PropagandaInfo> selectPropagandaInfoList(PropagandaInfo propagandaInfo) {
+    public List<PropagandaInfo> selectPropagandaInfoList(PropagandaInfoDto propagandaInfo) {
         return propagandaInfoMapper.selectPropagandaInfoList(propagandaInfo);
     }
 
@@ -61,11 +66,30 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService {
      */
     @Override
     public int updatePropagandaInfo(PropagandaInfo propagandaInfo) {
-                propagandaInfo.setUpdateTime(DateUtils.getNowDate());
+        propagandaInfo.setUpdateTime(DateUtils.getNowDate());
         return propagandaInfoMapper.updatePropagandaInfo(propagandaInfo);
     }
 
-    /**
+	@Override public int copyPropagandaInfo(Long id) {
+		PropagandaInfo propagandaInfo = propagandaInfoMapper.selectPropagandaInfoById(id);
+		propagandaInfo.setId(null);
+		propagandaInfo.setCreateTime(DateUtils.getNowDate());
+		propagandaInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
+		propagandaInfo.setUpdateTime(null);
+		propagandaInfo.setUpdateBy(null);
+		propagandaInfo.setPropagandaCode(propagandaInfo.getPropagandaCode() + "-COPY");
+		propagandaInfo.setPropagandaStatus("CREATE_COMPLETE");
+		return propagandaInfoMapper.insertPropagandaInfo(propagandaInfo);
+	}
+
+	@Override public int updateStatus(PropagandaUpdateDto propagandaInfo) {
+		PropagandaInfo body = new PropagandaInfo();
+		body.setId(propagandaInfo.getId());
+		body.setPropagandaStatus(propagandaInfo.getPropagandaStatus());
+		return propagandaInfoMapper.updatePropagandaInfo(body);
+	}
+
+	/**
      * 批量删除宣教库管理
      *
      * @param ids 需要删除的宣教库管理主键
@@ -86,4 +110,8 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService {
     public int deletePropagandaInfoById(Long id) {
         return propagandaInfoMapper.deletePropagandaInfoById(id);
     }
+
+	@Override public List<DepartmentVO> selectNumByDept(DepartmentDTO departmentDto) {
+		return propagandaInfoMapper.selectNumByDept(departmentDto);
+	}
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/IFileUploadService.java

@@ -0,0 +1,20 @@
+package com.xinelu.manage.service.signpatientinformed;
+
+import com.xinelu.common.core.domain.AjaxResult;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 文件上传Service接口
+ *
+ * @author xinelu
+ * @date 2024-02-27
+ */
+public interface IFileUploadService {
+	/**
+	 * 文件上传接口
+	 *
+	 * @param multipartFile 文件
+	 * @return
+	 **/
+	AjaxResult uploadFile(MultipartFile multipartFile, String type) throws Exception;
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/ISignPatientInformedService.java

@@ -1,11 +1,7 @@
 package com.xinelu.manage.service.signpatientinformed;
 
-import com.xinelu.common.core.domain.AjaxResult;
-import com.xinelu.common.exception.file.InvalidExtensionException;
 import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed;
-import java.io.IOException;
 import java.util.List;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 签约知情同意书信息Service接口
@@ -62,6 +58,5 @@ public interface ISignPatientInformedService {
      */
     public int deleteSignPatientInformedById(Long id);
 
-	AjaxResult uploadFile(MultipartFile multipartFile) throws IOException, InvalidExtensionException;
 
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/impl/FileUplooadServiceImpl.java

@@ -0,0 +1,66 @@
+package com.xinelu.manage.service.signpatientinformed.impl;
+
+import com.xinelu.common.config.SystemBusinessConfig;
+import com.xinelu.common.constant.FileUploadPathConstants;
+import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.common.exception.ServiceException;
+import com.xinelu.common.utils.file.FileUploadUtils;
+import com.xinelu.common.utils.file.MimeTypeUtils;
+import com.xinelu.manage.service.signpatientinformed.IFileUploadService;
+import javax.annotation.Resource;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @description: 文件上传Service业务层处理
+ * @author: haown
+ * @create: 2024-03-01 10:36
+ **/
+@Service
+public class FileUplooadServiceImpl implements IFileUploadService {
+
+	@Resource
+	private SystemBusinessConfig systemBusinessConfig;
+
+	@Override public AjaxResult uploadFile(MultipartFile multipartFile, String type) throws Exception {
+		//获取不同的文件路径
+		String uploadPathUrl = "";
+		switch (type) {
+			// 签约知情书
+			case FileUploadPathConstants.SIGN_INFORMED_TYPE:
+				uploadPathUrl = SystemBusinessConfig.getProfile() + systemBusinessConfig.getSignInformedFileUrl();
+				break;
+			//护理宣教库封面路径上传
+			case FileUploadPathConstants.PROPAGANDA_COVER_TYPE:
+				uploadPathUrl = SystemBusinessConfig.getProfile() + systemBusinessConfig.getPropagandaCoverUrl();
+				break;
+			//素材库封面图片路径上传
+			case FileUploadPathConstants.MATERIALS_COVER_TYPE:
+				uploadPathUrl = SystemBusinessConfig.getProfile() + systemBusinessConfig.getMaterialsCoverUrl();
+				break;
+			//素材库视频路径上传
+			case FileUploadPathConstants.MATERIALS_VIDEO_TYPE:
+				uploadPathUrl = SystemBusinessConfig.getProfile() + systemBusinessConfig.getMaterialsVideoUrl();
+				break;
+			default:
+				break;
+		}
+		if (StringUtils.isBlank(uploadPathUrl)) {
+			return AjaxResult.success();
+		}
+		//上传
+		String pictureName = "";
+		if (StringUtils.equals(type, FileUploadPathConstants.MATERIALS_VIDEO_TYPE)) {
+			pictureName = FileUploadUtils.upload(uploadPathUrl, multipartFile, MimeTypeUtils.VIDEO_EXTENSION);
+		} else {
+			pictureName = FileUploadUtils.upload(uploadPathUrl, multipartFile, MimeTypeUtils.IMAGE_EXTENSION);
+		}
+		if (StringUtils.isBlank(pictureName)) {
+			throw new ServiceException("图片上传失败，请联系管理员！");
+		}
+		AjaxResult ajax = AjaxResult.success("上传成功！");
+		ajax.put("imgUrl", pictureName);
+		return ajax;
+	}
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/impl/SignPatientInformedServiceImpl.java

@@ -1,21 +1,12 @@
 package com.xinelu.manage.service.signpatientinformed.impl;
 
-import com.xinelu.common.config.SystemBusinessConfig;
-import com.xinelu.common.core.domain.AjaxResult;
-import com.xinelu.common.exception.ServiceException;
-import com.xinelu.common.exception.file.InvalidExtensionException;
 import com.xinelu.common.utils.DateUtils;
-import com.xinelu.common.utils.file.FileUploadUtils;
-import com.xinelu.common.utils.file.MimeTypeUtils;
 import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed;
 import com.xinelu.manage.mapper.signpatientinformed.SignPatientInformedMapper;
 import com.xinelu.manage.service.signpatientinformed.ISignPatientInformedService;
-import java.io.IOException;
 import java.util.List;
 import javax.annotation.Resource;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 签约知情同意书信息Service业务层处理
@@ -27,8 +18,6 @@ import org.springframework.web.multipart.MultipartFile;
 public class SignPatientInformedServiceImpl implements ISignPatientInformedService {
     @Resource
     private SignPatientInformedMapper signPatientInformedMapper;
-	@Resource
-	private SystemBusinessConfig systemBusinessConfig;
 
     /**
      * 查询签约知情同意书信息
@@ -98,19 +87,4 @@ public class SignPatientInformedServiceImpl implements ISignPatientInformedServi
         return signPatientInformedMapper.deleteSignPatientInformedById(id);
     }
 
-	@Override public AjaxResult uploadFile(MultipartFile multipartFile) throws IOException, InvalidExtensionException {
-		//获取不同的文件路径
-		String uploadPathUrl = SystemBusinessConfig.getProfile() + systemBusinessConfig.getSignInformedFileUrl();
-		if (StringUtils.isBlank(uploadPathUrl)) {
-			return AjaxResult.success();
-		}
-		//上传
-		String pictureName = FileUploadUtils.uploadSystemBusinessPath(uploadPathUrl, multipartFile, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
-		if (StringUtils.isBlank(pictureName)) {
-			throw new ServiceException("文件上传失败，请联系管理员！");
-		}
-		AjaxResult ajax = AjaxResult.success("上传成功！");
-		ajax.put("fileUrl", pictureName);
-		return ajax;
-	}
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/ISignPatientRecordService.java

@@ -19,10 +19,10 @@ public interface ISignPatientRecordService {
 
 	/**
 	 * 根据签约编号查询居民签约信息
-	 * @param patientSignRecordId
+	 * @param id
 	 * @return
 	 */
-	SignPatientInfoVo getByRecordId(Long patientSignRecordId);
+	SignPatientInfoVo getByRecordId(Long id);
 
 	/**
 	 * 根据患者主键查询患者签约记录列表

postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java

@@ -4,25 +4,32 @@ import com.xinelu.common.constant.PaymentStatusConstants;
 import com.xinelu.common.constant.SignRecordServiceStatusConstants;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.DateUtils;
+import com.xinelu.common.utils.SecurityUtils;
+import com.xinelu.common.utils.StringUtils;
+import com.xinelu.manage.domain.patientinfo.PatientInfo;
 import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed;
 import com.xinelu.manage.domain.signpatientpackage.SignPatientPackage;
 import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware;
 import com.xinelu.manage.domain.signpatientrecord.SignPatientRecord;
-import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto;
 import com.xinelu.manage.dto.signpatientrecord.SignPatientAddDto;
 import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto;
+import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto;
+import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper;
 import com.xinelu.manage.mapper.signpatientinformed.SignPatientInformedMapper;
-import com.xinelu.manage.mapper.signpatientpackagehardware.SignPatientPackageHardwareMapper;
 import com.xinelu.manage.mapper.signpatientpackage.SignPatientPackageMapper;
+import com.xinelu.manage.mapper.signpatientpackagehardware.SignPatientPackageHardwareMapper;
 import com.xinelu.manage.mapper.signpatientrecord.SignPatientRecordMapper;
 import com.xinelu.manage.service.signpatientrecord.ISignPatientRecordService;
 import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo;
-import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo;
 import com.xinelu.manage.vo.signpatientrecord.SignPatientListVo;
+import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo;
+import java.util.Calendar;
 import java.util.List;
 import javax.annotation.Resource;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 /**
@@ -42,29 +49,54 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
 	private SignPatientPackageHardwareMapper hardwareMapper;
 	@Resource
 	private SignPatientInformedMapper informedMapper;
+	@Resource
+	private PatientInfoMapper patientInfoMapper;
+	@Resource
+	private SignPatientPackageHardwareMapper signPatientPackageHardwareMapper;
+	@Resource
+	private SignPatientInformedMapper signPatientInformedMapper;
 
 	@Override public List<SignPatientListVo> selectList(SignPatientListDto signPatientRecord) {
 		return signPatientRecordMapper.selectList(signPatientRecord);
 	}
 
-	@Override public SignPatientInfoVo getByRecordId(Long patientSignRecordId) {
+	@Override public SignPatientInfoVo getByRecordId(Long id) {
-		return signPatientRecordMapper.getByRecordId(patientSignRecordId);
+		SignPatientInfoVo signPatientInfoVo = signPatientRecordMapper.getByRecordId(id);
+		// 根据签约记录主键查询设备列表
+		SignPatientPackageHardware queryDevice = new SignPatientPackageHardware();
+		queryDevice.setSignPatientRecordId(id);
+		List<SignPatientPackageHardware> devices = signPatientPackageHardwareMapper.selectSignPatientPackageHardwareList(queryDevice);
+		signPatientInfoVo.setSignDevices(devices);
+
+		SignPatientInformed signPatientInformed = new SignPatientInformed();
+		signPatientInformed.setSignPatientRecordId(id);
+		List<SignPatientInformed> informeds = signPatientInformedMapper.selectSignPatientInformedList(signPatientInformed);
+		signPatientInfoVo.setSignPatientInformeds(informeds);
+		return signPatientInfoVo;
 	}
 
 	@Override public List<SignPatientRecordVo> getByPatient(Long patientId) {
 		return signPatientRecordMapper.getByPatient(patientId);
 	}
 
-	@Override public int add(SignPatientAddDto body) {
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int add(SignPatientAddDto body) {
 		SignPatientPackage signPatientPackage = body.getSignPackage();
 		if (ObjectUtils.isNotEmpty(body.getRecord())) {
 			SignPatientRecord signPatientRecord = body.getRecord();
+			signPatientRecord.setId(null);
 			if (signPatientRecord.getPatientId() == null) {
 				throw new ServiceException("数据错误");
 			}
+			PatientInfo patient = patientInfoMapper.selectPatientInfoById(signPatientRecord.getPatientId());
+			if (ObjectUtils.isEmpty(patient)) {
+				throw new ServiceException("请选择签约居民");
+			}
 			signPatientRecord.setServiceStatus(SignRecordServiceStatusConstants.SERVICE_CENTER);
 			signPatientRecord.setDelFlag(0);
 			signPatientRecord.setPaymentStatus(PaymentStatusConstants.UNPAID_FEES);
+			signPatientRecord.setSignTime(DateUtils.getNowDate());
 			signPatientRecord.setSignStatus(SignRecordServiceStatusConstants.IN_SIGN);
 
 			if (signPatientPackage != null) {
@@ -72,7 +104,12 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
 			} else {
 				throw new ServiceException("请选择服务包");
 			}
-
+			// 签约信息保存到患者表
+			patient.setSignPatientRecordId(signPatientRecord.getId());
+			patient.setSignStatus(SignRecordServiceStatusConstants.IN_SIGN);
+			patient.setServiceStatus(SignRecordServiceStatusConstants.SERVICE_CENTER);
+			patient.setSignTime(DateUtils.getNowDate());
+			patientInfoMapper.updatePatientInfo(patient);
 			// 保存签约记录
 			int flag = signPatientRecordMapper.insert(signPatientRecord);
 			if (flag > 0) {
@@ -81,22 +118,48 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
 					signPatientPackage.setSignPatientRecordId(signPatientRecord.getId());
 					signPatientPackage.setPatientId(signPatientRecord.getPatientId());
 					signPatientPackage.setPackagePaymentStatus(PaymentStatusConstants.UNPAID_FEES);
-					signPatientPackageMapper.insertSignPatientPackage(signPatientPackage);
+					if (signPatientPackage.getServiceStartTime() == null) {
-					// 保存硬件
+						signPatientPackage.setServiceStartTime(DateUtils.parseDate(DateFormatUtils.format(DateUtils.getNowDate(), "yyyy-MM-dd") + " 00:00:00"));
-					if (!CollectionUtils.isEmpty(body.getDevices())) {
+						Calendar calendar = Calendar.getInstance();
-						for(SignPatientPackageHardware hardware : body.getDevices()) {
+						// 将日期设置为1号（每次计算都从第一天开始）
-							hardware.setSignPatientRecordId(signPatientRecord.getId());
+						calendar.setTime(DateUtils.getNowDate());
-							hardwareMapper.insertSignPatientPackageHardware(hardware);
+						// 添加一个月
+						calendar.add(Calendar.MONTH, signPatientPackage.getServiceCycle());
+						// 再减去一天
+						calendar.add(Calendar.DATE, -1);
+						signPatientPackage.setServiceEndTime(DateUtils.parseDate(DateFormatUtils.format(calendar.getTime(), "yyyy-MM-dd") + " 23:59:59"));
+					} else {
+						signPatientPackage.setServiceStartTime(DateUtils.parseDate(DateFormatUtils.format(signPatientPackage.getServiceStartTime(), "yyyy-MM-dd") + " 00:00:00"));
+						if (signPatientPackage.getServiceStartTime() == null) {
+							Calendar calendar = Calendar.getInstance();
+							// 将日期设置为1号（每次计算都从第一天开始）
+							calendar.setTime(signPatientPackage.getServiceStartTime());
+							// 添加一个月
+							calendar.add(Calendar.MONTH, signPatientPackage.getServiceCycle());
+							// 再减去一天
+							calendar.add(Calendar.DATE, -1);
+							signPatientPackage.setServiceEndTime(DateUtils.parseDate(DateFormatUtils.format(calendar.getTime(), "yyyy-MM-dd") + " 23:59:59"));
+						} else {
+							signPatientPackage.setServiceEndTime(DateUtils.parseDate(DateFormatUtils.format(signPatientPackage.getServiceEndTime(), "yyyy-MM-dd") + " 23:59:59"));
 						}
 					}
+					signPatientPackageMapper.insertSignPatientPackage(signPatientPackage);
+				}
+				// 保存硬件
+				if (!CollectionUtils.isEmpty(body.getDevices())) {
+					for(SignPatientPackageHardware hardware : body.getDevices()) {
+						hardware.setSignPatientRecordId(signPatientRecord.getId());
+						hardwareMapper.insertSignPatientPackageHardware(hardware);
+					}
 				}
 
 				// 保存告知书
-				if (body.getSignPatientInformed() != null) {
+				if (!CollectionUtils.isEmpty(body.getInformeds())) {
-					SignPatientInformed informed = new SignPatientInformed();
+					for (SignPatientInformed informed : body.getInformeds()) {
-					informed.setSignPatientRecordId(signPatientRecord.getId());
+						informed.setSignPatientRecordId(signPatientRecord.getId());
-					informed.setPatientId(signPatientRecord.getPatientId());
+						informed.setPatientId(signPatientRecord.getPatientId());
-					informedMapper.insertSignPatientInformed(informed);
+						informedMapper.insertSignPatientInformed(informed);
+					}
 				}
 			}
 			return flag;
@@ -104,14 +167,30 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
 		return 0;
 	}
 
-	@Override public int updateSignStatus(SignPatientStatusDto patientCancelSignDto) {
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public int updateSignStatus(SignPatientStatusDto patientCancelSignDto) {
+		if (patientCancelSignDto.getPatientId() == null) {
+			throw new ServiceException("居民主键不能为空");
+		}
 		// 修改签约记录状态
 		SignPatientRecord signRecord = new SignPatientRecord();
 		signRecord.setId(patientCancelSignDto.getId());
 		signRecord.setSignStatus(patientCancelSignDto.getSignStatus());
 		signRecord.setServiceStatus(patientCancelSignDto.getServiceStatus());
+		signRecord.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName());
 		signRecord.setUpdateTime(DateUtils.getNowDate());
+		signRecord.setSeparateReason(patientCancelSignDto.getSeparateReason());
+		if (StringUtils.equals(SignRecordServiceStatusConstants.SEPARATE_SIGN, patientCancelSignDto.getSignStatus())) {
+
+			PatientInfo patient = patientInfoMapper.selectPatientInfoById(patientCancelSignDto.getPatientId());
+			// 签约信息保存到患者表
+			patient.setSignStatus(patientCancelSignDto.getSignStatus());
+			patient.setServiceStatus(patientCancelSignDto.getServiceStatus());
+			patientInfoMapper.updatePatientInfo(patient);
+		}
 		int flag = signPatientRecordMapper.updateByPrimaryKeySelective(signRecord);
 		return flag;
 	}
+
 }

postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientblacklist/PatientBlacklistVo.java

@@ -67,12 +67,21 @@ public class PatientBlacklistVo {
 	@ApiModelProperty(value = "异常原因字典表值")
 	private String abnormalCauseValue;
 
+	/** 补充说明字典表id */
+	private Long supplementIllustrateId;
+
+	/** 补充说明字典表值 */
+	private String supplementIllustrateValue;
+
 	/**
 	 * 来源(CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑, MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接)
 	 */
 	@ApiModelProperty(value = "来源(CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑,MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接)")
 	private String blacklistSource;
 
+	/** 功能限制（具体来源未知？） */
+	private String functionLimitation;
+
 	/**
 	 * 创建时间
 	 */

postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java

@@ -2,6 +2,7 @@ package com.xinelu.manage.vo.signpatientrecord;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xinelu.common.annotation.Excel;
+import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed;
 import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -46,10 +47,20 @@ public class SignPatientInfoVo {
 	@ApiModelProperty(value = "身份证号")
 	private String cardNo;
 
+	/** 性别 */
+	@ApiModelProperty(value = "性别")
+	private String sex;
+
+	/** 出生日期，格式：yyyy-MM-dd */
+	@ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date birthDate;
+
 	/**
 	 * 签约时间，格式：yyyy-MM-dd HH:mm:ss
 	 */
 	@ApiModelProperty(value = "签约时间，格式：yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date signTime;
 
 	/**
@@ -88,6 +99,9 @@ public class SignPatientInfoVo {
 	@ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
 	private String visitMethod;
 
+	@ApiModelProperty(value = "住院/门诊号")
+	private String inHospitalNumber;
+
 	/**
 	 * 签约时诊断
 	 */
@@ -107,7 +121,7 @@ public class SignPatientInfoVo {
 	private String serviceStatus;
 
 	/**
-	 * 签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN
+	 * 签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN，过期：EXPIRE_SIGN
 	 */
 	@ApiModelProperty(value = "签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN，过期：EXPIRE_SIGN")
 	private String signStatus;
@@ -149,4 +163,7 @@ public class SignPatientInfoVo {
 	@ApiModelProperty(value = "签约硬件设备列表")
 	private List<SignPatientPackageHardware> signDevices;
 
+	@ApiModelProperty(value = "签约知情书列表")
+	private List<SignPatientInformed> signPatientInformeds;
+
 }

postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java

@@ -1,5 +1,6 @@
 package com.xinelu.manage.vo.signpatientrecord;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
@@ -43,10 +44,20 @@ public class SignPatientListVo {
 	@ApiModelProperty(value = "身份证号")
 	private String cardNo;
 
+	/** 性别 */
+	@ApiModelProperty(value = "性别")
+	private String sex;
+
+	/** 出生日期，格式：yyyy-MM-dd */
+	@ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date birthDate;
+
 	/**
 	 * 签约时间，格式：yyyy-MM-dd HH:mm:ss
 	 */
 	@ApiModelProperty(value = "签约时间，格式：yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date signTime;
 
 	/**
@@ -85,6 +96,21 @@ public class SignPatientListVo {
 	@ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
 	private String visitMethod;
 
+	@ApiModelProperty(value = "住院/门诊号")
+	private String inHospitalNumber;
+
+	/**
+	 * 签约时诊断
+	 */
+	@ApiModelProperty(value = "签约时诊断")
+	private String signDiagnosis;
+
+	/**
+	 * 审核后诊断
+	 */
+	@ApiModelProperty(value = "审核后诊断")
+	private String reviewDiagnosis;
+
 	/**
 	 * 服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END
 	 */
@@ -92,9 +118,9 @@ public class SignPatientListVo {
 	private String serviceStatus;
 
 	/**
-	 * 签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN
+	 * 签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN，过期：EXPIRE_SIGN
 	 */
-	@ApiModelProperty(value = "签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN")
+	@ApiModelProperty(value = "签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN，过期：EXPIRE_SIGN")
 	private String signStatus;
 
 	/**
@@ -107,6 +133,7 @@ public class SignPatientListVo {
 	 * 加入意向时间（意向签约）
 	 */
 	@ApiModelProperty(value = "加入意向时间（意向签约）")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date intentionalTime;
 
 	/**

postdischarge-manage/src/main/resources/mapper/manage/agency/AgencyMapper.xml

@@ -317,6 +317,36 @@
         where id = #{id}
     </update>
 
+    <update id="updateAgencyById" parameterType="Agency">
+        update agency
+        <trim prefix="SET" suffixOverrides=",">
+            parent_id = #{parentId},
+            agency_category_id = #{agencyCategoryId},
+            agency_category_name = #{agencyCategoryName},
+            area_code = #{areaCode},
+            area_name = #{areaName},
+            <if test="agencyName != null">agency_name = #{agencyName},</if>
+            agency_code = #{agencyCode},
+            agency_abbreviation = #{agencyAbbreviation},
+            agency_status = #{agencyStatus},
+            node_type = #{nodeType},
+            org_agency_code = #{orgAgencyCode},
+            agency_category_manage_level = #{agencyCategoryManageLevel},
+            agency_contacts = #{agencyContacts},
+            agency_phone = #{agencyPhone},
+            agency_address = #{agencyAddress},
+            agency_remark = #{agencyRemark},
+            agency_sort = #{agencySort},
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
     <delete id="deleteAgencyById" parameterType="Long">
         delete
         from agency
@@ -410,4 +440,10 @@
             )
         </foreach>
     </insert>
+
+    <select id="selectAgencyNameByAgencyNameInt" resultType="java.lang.Integer">
+        select count(1)
+        from agency
+        where agency_name = #{agencyName}
+    </select>
 </mapper>

postdischarge-manage/src/main/resources/mapper/manage/crowdinfo/CrowdInfoMapper.xml

@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xinelu.manage.mapper.crowdinfo.CrowdInfoMapper">
+
+    <resultMap type="CrowdInfo" id="CrowdInfoResult">
+            <result property="id" column="id"/>
+            <result property="crowdName" column="crowd_name"/>
+            <result property="minSuitableAge" column="min_suitable_age"/>
+            <result property="maxSuitableAge" column="max_suitable_age"/>
+            <result property="suitableGender" column="suitable_gender"/>
+            <result property="crowdType" column="crowd_type"/>
+            <result property="specialType" column="special_type"/>
+            <result property="whetherDisable" column="whether_disable"/>
+            <result property="remark" column="remark"/>
+            <result property="sort" column="sort"/>
+            <result property="delFlag" column="del_flag"/>
+            <result property="createBy" column="create_by"/>
+            <result property="createTime" column="create_time"/>
+            <result property="updateBy" column="update_by"/>
+            <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectCrowdInfoVo">
+        select id, crowd_name, min_suitable_age, max_suitable_age, suitable_gender, crowd_type, special_type, whether_disable, remark, sort, del_flag, create_by, create_time, update_by, update_time from crowd_info
+    </sql>
+
+    <select id="selectCrowdInfoList" parameterType="CrowdInfo" resultMap="CrowdInfoResult">
+        <include refid="selectCrowdInfoVo"/>
+        <where>
+            <if test="crowdName != null  and crowdName != ''">
+                and crowd_name like concat('%', #{crowdName}, '%')
+            </if>
+            <if test="minSuitableAge != null ">
+                and min_suitable_age = #{minSuitableAge}
+            </if>
+            <if test="maxSuitableAge != null ">
+                and max_suitable_age = #{maxSuitableAge}
+            </if>
+            <if test="suitableGender != null  and suitableGender != ''">
+                and suitable_gender = #{suitableGender}
+            </if>
+            <if test="crowdType != null  and crowdType != ''">
+                and crowd_type = #{crowdType}
+            </if>
+            <if test="specialType != null  and specialType != ''">
+                and special_type = #{specialType}
+            </if>
+            <if test="whetherDisable != null ">
+                and whether_disable = #{whetherDisable}
+            </if>
+            <if test="sort != null ">
+                and sort = #{sort}
+            </if>
+            <if test="createTime != null ">
+                and create_time = #{createTime}
+            </if>
+            <if test="updateTime != null ">
+                and update_time = #{updateTime}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectCrowdInfoById" parameterType="Long"
+            resultMap="CrowdInfoResult">
+            <include refid="selectCrowdInfoVo"/>
+            where id = #{id}
+    </select>
+
+    <insert id="insertCrowdInfo" parameterType="CrowdInfo" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into crowd_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+        <if test="crowdName != null">crowd_name,
+        </if>
+        <if test="minSuitableAge != null">min_suitable_age,
+        </if>
+        <if test="maxSuitableAge != null">max_suitable_age,
+        </if>
+        <if test="suitableGender != null">suitable_gender,
+        </if>
+        <if test="crowdType != null">crowd_type,
+        </if>
+        <if test="specialType != null">special_type,
+        </if>
+        <if test="whetherDisable != null">whether_disable,
+        </if>
+        <if test="remark != null">remark,
+        </if>
+        <if test="sort != null">sort,
+        </if>
+        <if test="delFlag != null">del_flag,
+        </if>
+        <if test="createBy != null">create_by,
+        </if>
+        <if test="createTime != null">create_time,
+        </if>
+        <if test="updateBy != null">update_by,
+        </if>
+        <if test="updateTime != null">update_time,
+        </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="crowdName != null">#{crowdName},
+            </if>
+            <if test="minSuitableAge != null">#{minSuitableAge},
+            </if>
+            <if test="maxSuitableAge != null">#{maxSuitableAge},
+            </if>
+            <if test="suitableGender != null">#{suitableGender},
+            </if>
+            <if test="crowdType != null">#{crowdType},
+            </if>
+            <if test="specialType != null">#{specialType},
+            </if>
+            <if test="whetherDisable != null">#{whetherDisable},
+            </if>
+            <if test="remark != null">#{remark},
+            </if>
+            <if test="sort != null">#{sort},
+            </if>
+            <if test="delFlag != null">#{delFlag},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateCrowdInfo" parameterType="CrowdInfo">
+        update crowd_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="crowdName != null">crowd_name =
+                #{crowdName},
+            </if>
+            <if test="minSuitableAge != null">min_suitable_age =
+                #{minSuitableAge},
+            </if>
+            <if test="maxSuitableAge != null">max_suitable_age =
+                #{maxSuitableAge},
+            </if>
+            <if test="suitableGender != null">suitable_gender =
+                #{suitableGender},
+            </if>
+            <if test="crowdType != null">crowd_type =
+                #{crowdType},
+            </if>
+            <if test="specialType != null">special_type =
+                #{specialType},
+            </if>
+            <if test="whetherDisable != null">whether_disable =
+                #{whetherDisable},
+            </if>
+            <if test="remark != null">remark =
+                #{remark},
+            </if>
+            <if test="sort != null">sort =
+                #{sort},
+            </if>
+            <if test="delFlag != null">del_flag =
+                #{delFlag},
+            </if>
+            <if test="createBy != null">create_by =
+                #{createBy},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCrowdInfoById" parameterType="Long">
+        delete from crowd_info where id = #{id}
+    </delete>
+
+    <delete id="deleteCrowdInfoByIds" parameterType="String">
+        delete from crowd_info where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml

@@ -541,6 +541,43 @@
         where id = #{id}
     </update>
 
+    <update id="updateDepartmentById" parameterType="Department">
+        update department
+        <trim prefix="SET" suffixOverrides=",">
+            parent_department_id = #{parentDepartmentId},
+            agency_id = #{agencyId},
+            agency_name = #{agencyName},
+            <if test="departmentName != null">department_name = #{departmentName},</if>
+            department_code =#{departmentCode},
+            department_type =#{departmentType},
+            department_abbreviation =#{departmentAbbreviation},
+            department_person_id =#{departmentPersonId},
+            department_person_name =#{departmentPersonName},
+            node_type =#{nodeType},
+            provide_service_category =#{provideServiceCategory},
+            subdivision_category_id =#{subdivisionCategoryId},
+            subdivision_category_name =#{subdivisionCategoryName},
+            norm_department_compare_id =#{normDepartmentCompareId},
+            norm_department_compare_name =#{normDepartmentCompareName},
+            prepare_beds_count =#{prepareBedsCount},
+            department_phone = #{departmentPhone},
+            department_mail = #{departmentMail},
+            <if test="establishDate != null">establish_date =
+                #{establishDate},
+            </if>
+            <if test="revokeDate != null">revoke_date =
+                #{revokeDate},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
     <delete id="deleteDepartmentById" parameterType="Long">
         delete
         from department
@@ -553,4 +590,12 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectDepartmentByParentId" resultType="com.xinelu.manage.domain.department.Department">
+        <include refid="selectDepartmentVo"/>
+        where parent_department_id =
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 </mapper>

postdischarge-manage/src/main/resources/mapper/manage/departmentdiseasetype/DepartmentDiseaseTypeMapper.xml

@@ -5,141 +5,155 @@
 <mapper namespace="com.xinelu.manage.mapper.departmentdiseasetype.DepartmentDiseaseTypeMapper">
 
     <resultMap type="DepartmentDiseaseType" id="DepartmentDiseaseTypeResult">
-            <result property="id" column="id"/>
+        <result property="id" column="id"/>
-            <result property="departmentId" column="department_id"/>
+        <result property="departmentId" column="department_id"/>
-            <result property="departmentName" column="department_name"/>
+        <result property="departmentName" column="department_name"/>
-            <result property="diseaseTypeName" column="disease_type_name"/>
+        <result property="diseaseTypeName" column="disease_type_name"/>
-            <result property="diseaseTypeCode" column="disease_type_code"/>
+        <result property="diseaseTypeCode" column="disease_type_code"/>
-            <result property="diagnosisInfo" column="diagnosis_info"/>
+        <result property="diagnosisInfo" column="diagnosis_info"/>
-            <result property="diseaseTypeRemark" column="disease_type_remark"/>
+        <result property="diseaseTypeRemark" column="disease_type_remark"/>
-            <result property="createBy" column="create_by"/>
+        <result property="createBy" column="create_by"/>
-            <result property="createTime" column="create_time"/>
+        <result property="createTime" column="create_time"/>
-            <result property="updateBy" column="update_by"/>
+        <result property="updateBy" column="update_by"/>
-            <result property="updateTime" column="update_time"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectDepartmentDiseaseTypeVo">
-        select id, department_id, department_name, disease_type_name, disease_type_code, diagnosis_info, disease_type_remark, create_by, create_time, update_by, update_time from department_disease_type
+        select id,
+               department_id,
+               department_name,
+               disease_type_name,
+               disease_type_code,
+               diagnosis_info,
+               disease_type_remark,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from department_disease_type
     </sql>
 
-    <select id="selectDepartmentDiseaseTypeList" parameterType="DepartmentDiseaseType" resultMap="DepartmentDiseaseTypeResult">
+    <select id="selectDepartmentDiseaseTypeList" parameterType="DepartmentDiseaseType"
+            resultMap="DepartmentDiseaseTypeResult">
         <include refid="selectDepartmentDiseaseTypeVo"/>
         <where>
-                        <if test="departmentId != null ">
+            <if test="departmentId != null ">
-                            and department_id = #{departmentId}
+                and department_id = #{departmentId}
-                        </if>
+            </if>
-                        <if test="departmentName != null  and departmentName != ''">
+            <if test="departmentName != null  and departmentName != ''">
-                            and department_name like concat('%', #{departmentName}, '%')
+                and department_name like concat('%', #{departmentName}, '%')
-                        </if>
+            </if>
-                        <if test="diseaseTypeName != null  and diseaseTypeName != ''">
+            <if test="diseaseTypeName != null  and diseaseTypeName != ''">
-                            and disease_type_name like concat('%', #{diseaseTypeName}, '%')
+                and disease_type_name like concat('%', #{diseaseTypeName}, '%')
-                        </if>
+            </if>
-                        <if test="diseaseTypeCode != null  and diseaseTypeCode != ''">
+            <if test="diseaseTypeCode != null  and diseaseTypeCode != ''">
-                            and disease_type_code = #{diseaseTypeCode}
+                and disease_type_code = #{diseaseTypeCode}
-                        </if>
+            </if>
-                        <if test="diagnosisInfo != null  and diagnosisInfo != ''">
+            <if test="diagnosisInfo != null  and diagnosisInfo != ''">
-                            and diagnosis_info = #{diagnosisInfo}
+                and diagnosis_info = #{diagnosisInfo}
-                        </if>
+            </if>
-                        <if test="diseaseTypeRemark != null  and diseaseTypeRemark != ''">
+            <if test="diseaseTypeRemark != null  and diseaseTypeRemark != ''">
-                            and disease_type_remark = #{diseaseTypeRemark}
+                and disease_type_remark = #{diseaseTypeRemark}
-                        </if>
+            </if>
         </where>
     </select>
 
     <select id="selectDepartmentDiseaseTypeById" parameterType="Long"
             resultMap="DepartmentDiseaseTypeResult">
-            <include refid="selectDepartmentDiseaseTypeVo"/>
+        <include refid="selectDepartmentDiseaseTypeVo"/>
-            where id = #{id}
+        where id = #{id}
     </select>
 
     <insert id="insertDepartmentDiseaseType" parameterType="DepartmentDiseaseType" useGeneratedKeys="true"
             keyProperty="id">
         insert into department_disease_type
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="departmentId != null">department_id,
+            <if test="departmentId != null">department_id,
-                    </if>
+            </if>
-                    <if test="departmentName != null">department_name,
+            <if test="departmentName != null">department_name,
-                    </if>
+            </if>
-                    <if test="diseaseTypeName != null">disease_type_name,
+            <if test="diseaseTypeName != null">disease_type_name,
-                    </if>
+            </if>
-                    <if test="diseaseTypeCode != null">disease_type_code,
+            <if test="diseaseTypeCode != null">disease_type_code,
-                    </if>
+            </if>
-                    <if test="diagnosisInfo != null">diagnosis_info,
+            <if test="diagnosisInfo != null">diagnosis_info,
-                    </if>
+            </if>
-                    <if test="diseaseTypeRemark != null">disease_type_remark,
+            <if test="diseaseTypeRemark != null">disease_type_remark,
-                    </if>
+            </if>
-                    <if test="createBy != null">create_by,
+            <if test="createBy != null">create_by,
-                    </if>
+            </if>
-                    <if test="createTime != null">create_time,
+            <if test="createTime != null">create_time,
-                    </if>
+            </if>
-                    <if test="updateBy != null">update_by,
+            <if test="updateBy != null">update_by,
-                    </if>
+            </if>
-                    <if test="updateTime != null">update_time,
+            <if test="updateTime != null">update_time,
-                    </if>
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="departmentId != null">#{departmentId},
+            <if test="departmentId != null">#{departmentId},
-                    </if>
+            </if>
-                    <if test="departmentName != null">#{departmentName},
+            <if test="departmentName != null">#{departmentName},
-                    </if>
+            </if>
-                    <if test="diseaseTypeName != null">#{diseaseTypeName},
+            <if test="diseaseTypeName != null">#{diseaseTypeName},
-                    </if>
+            </if>
-                    <if test="diseaseTypeCode != null">#{diseaseTypeCode},
+            <if test="diseaseTypeCode != null">#{diseaseTypeCode},
-                    </if>
+            </if>
-                    <if test="diagnosisInfo != null">#{diagnosisInfo},
+            <if test="diagnosisInfo != null">#{diagnosisInfo},
-                    </if>
+            </if>
-                    <if test="diseaseTypeRemark != null">#{diseaseTypeRemark},
+            <if test="diseaseTypeRemark != null">#{diseaseTypeRemark},
-                    </if>
+            </if>
-                    <if test="createBy != null">#{createBy},
+            <if test="createBy != null">#{createBy},
-                    </if>
+            </if>
-                    <if test="createTime != null">#{createTime},
+            <if test="createTime != null">#{createTime},
-                    </if>
+            </if>
-                    <if test="updateBy != null">#{updateBy},
+            <if test="updateBy != null">#{updateBy},
-                    </if>
+            </if>
-                    <if test="updateTime != null">#{updateTime},
+            <if test="updateTime != null">#{updateTime},
-                    </if>
+            </if>
         </trim>
     </insert>
 
     <update id="updateDepartmentDiseaseType" parameterType="DepartmentDiseaseType">
         update department_disease_type
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="departmentId != null">department_id =
+            <if test="departmentId != null">department_id =
-                        #{departmentId},
+                #{departmentId},
-                    </if>
+            </if>
-                    <if test="departmentName != null">department_name =
+            <if test="departmentName != null">department_name =
-                        #{departmentName},
+                #{departmentName},
-                    </if>
+            </if>
-                    <if test="diseaseTypeName != null">disease_type_name =
+            <if test="diseaseTypeName != null">disease_type_name =
-                        #{diseaseTypeName},
+                #{diseaseTypeName},
-                    </if>
+            </if>
-                    <if test="diseaseTypeCode != null">disease_type_code =
+            <if test="diseaseTypeCode != null">disease_type_code =
-                        #{diseaseTypeCode},
+                #{diseaseTypeCode},
-                    </if>
+            </if>
-                    <if test="diagnosisInfo != null">diagnosis_info =
+            <if test="diagnosisInfo != null">diagnosis_info =
-                        #{diagnosisInfo},
+                #{diagnosisInfo},
-                    </if>
+            </if>
-                    <if test="diseaseTypeRemark != null">disease_type_remark =
+            <if test="diseaseTypeRemark != null">disease_type_remark =
-                        #{diseaseTypeRemark},
+                #{diseaseTypeRemark},
-                    </if>
+            </if>
-                    <if test="createBy != null">create_by =
+            <if test="createBy != null">create_by =
-                        #{createBy},
+                #{createBy},
-                    </if>
+            </if>
-                    <if test="createTime != null">create_time =
+            <if test="createTime != null">create_time =
-                        #{createTime},
+                #{createTime},
-                    </if>
+            </if>
-                    <if test="updateBy != null">update_by =
+            <if test="updateBy != null">update_by =
-                        #{updateBy},
+                #{updateBy},
-                    </if>
+            </if>
-                    <if test="updateTime != null">update_time =
+            <if test="updateTime != null">update_time =
-                        #{updateTime},
+                #{updateTime},
-                    </if>
+            </if>
         </trim>
         where id = #{id}
     </update>
 
     <delete id="deleteDepartmentDiseaseTypeById" parameterType="Long">
-        delete from department_disease_type where id = #{id}
+        delete
+        from department_disease_type
+        where id = #{id}
     </delete>
 
     <delete id="deleteDepartmentDiseaseTypeByIds" parameterType="String">
@@ -148,4 +162,18 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectDiseaseTypeCount" resultType="com.xinelu.manage.vo.department.DepartmentVO">
+        select dt.id,
+        dt.department_name,
+        dt.department_code,
+        count(ddt.id) AS countNum
+        from department dt left join department_disease_type ddt on dt.id = ddt.department_id
+        <where>
+            <if test="departmentName != null  and departmentName != ''">
+                dt.department_name like concat('%',#{departmentName},'%')
+            </if>
+        </where>
+        GROUP BY dt.id
+    </select>
 </mapper>

postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml

@@ -34,18 +34,24 @@
         select id, materials_name, materials_type, materials_option, materials_file_path, video_cover_type, video_cover_file_path, materials_abstract, indications, applicable_diseases, drug_name, surgical_name, check_items, inspection_items, crowd_id, crow_name, materials_status, materials_remark, materials_sort, create_by, create_time, update_by, update_time from materials_info
     </sql>
 
-    <select id="selectMaterialsInfoList" parameterType="MaterialsInfo" resultMap="MaterialsInfoResult">
+    <select id="selectMaterialsInfoList" parameterType="com.xinelu.manage.dto.materialsinfo.MaterialsInfoDto" resultMap="MaterialsInfoResult">
         <include refid="selectMaterialsInfoVo"/>
         <where>
-                        <if test="materialsName != null  and materialsName != ''">
+            <if test="materialsName != null  and materialsName != ''">
-                            and materials_name like concat('%', #{materialsName}, '%')
+                and materials_name like concat('%', #{materialsName}, '%')
-                        </if>
+            </if>
-                        <if test="materialsStatus != null  and materialsStatus != ''">
+            <if test="materialsStatus != null  and materialsStatus != ''">
-                            and materials_status = #{materialsStatus}
+                and materials_status = #{materialsStatus}
-                        </if>
+            </if>
-                        <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
+	        <if test="materialsType != null  and materialsType != ''">
-                            and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+		        and materials_type = #{materialsType}
-                        </if>
+	        </if>
+            <if test="createTimeStart != null">
+                and create_time >= #{createTimeStart}
+            </if>
+	        <if test="createTimeEnd != null">
+		        and create_time &lt;= #{createTimeEnd}
+	        </if>
         </where>
     </select>
 

postdischarge-manage/src/main/resources/mapper/manage/patientblacklist/PatientBlacklistMapper.xml

@@ -7,6 +7,12 @@
     <resultMap type="PatientBlacklist" id="PatientBlacklistResult">
             <result property="id" column="id"/>
             <result property="patientId" column="patient_id"/>
+		    <result property="hospitalAgencyId" column="hospital_agency_id" />
+		    <result property="hospitalAgencyName" column="hospital_agency_name" />
+		    <result property="campusAgencyId" column="campus_agency_id" />
+		    <result property="campusAgencyName" column="campus_agency_name" />
+		    <result property="departmentId" column="department_id" />
+		    <result property="departmentName" column="department_name" />
             <result property="abnormalCauseId" column="abnormal_cause_id"/>
             <result property="abnormalCauseValue" column="abnormal_cause_value"/>
             <result property="supplementIllustrateId" column="supplement_illustrate_id"/>
@@ -21,16 +27,18 @@
     </resultMap>
 
     <sql id="selectPatientBlacklistVo">
-        select id, patient_id, abnormal_cause_id, abnormal_cause_value, supplement_illustrate_id, supplement_illustrate_value,
+        select id, patient_id, hospital_agency_id,hospital_agency_name,campus_agency_id,campus_agency_name,department_id, department_name,
-               function_limitation, blacklist_source, del_flag, create_by, create_time, update_by, update_time from patient_blacklist
+	    abnormal_cause_id, abnormal_cause_value, supplement_illustrate_id, supplement_illustrate_value,
+        function_limitation, blacklist_source, del_flag, create_by, create_time, update_by, update_time from patient_blacklist
     </sql>
 
-    <select id="selectPatientBlacklistList" parameterType="com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto" resultMap="PatientBlacklistResult">
+    <select id="selectPatientBlacklistList" parameterType="com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto"
-	    select b.id, b.patient_id, b.abnormal_cause_id, b.abnormal_cause_value, b.supplement_illustrate_id,
+	    resultType="com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo">
+	    select b.id, b.patient_id,b.hospital_agency_id, b.hospital_agency_name,b.campus_agency_id,b.campus_agency_name,
+	    b.department_id, b.department_name, b.abnormal_cause_id, b.abnormal_cause_value, b.supplement_illustrate_id,
 	    b.supplement_illustrate_value, b.function_limitation, b.blacklist_source,
-	    b.create_time, p.patient_name,
+	    b.create_time, p.patient_name, p.patient_phone, p.card_no from patient_blacklist b
-	    p.patient_phone, p.card_no, p.hospital_agency_id, p.hospital_agency_name, p.campus_agency_id, p.campus_agency_name,
+        left join patient_info p on b.patient_id = p.id
-	    p.department_id, p.department_name from patient_blacklist b left join patient_info p on b.patient_id = p.id
         <where>
 	        b.del_flag = 0
 	        <if test="patientName != null  and patientName != ''">
@@ -55,109 +63,149 @@
     </select>
 
     <select id="selectPatientBlacklistById" parameterType="Long"
-            resultMap="PatientBlacklistResult">
+            resultType="com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo">
-            <include refid="selectPatientBlacklistVo"/>
+	    select b.id, b.patient_id,b.hospital_agency_id, b.hospital_agency_name,b.campus_agency_id,b.campus_agency_name,
-            where id = #{id}
+	       b.department_id, b.department_name, b.abnormal_cause_id, b.abnormal_cause_value, b.supplement_illustrate_id,
+	       b.supplement_illustrate_value, b.function_limitation, b.blacklist_source,
+	       b.create_time, p.patient_name, p.patient_phone, p.card_no from patient_blacklist b
+		 left join patient_info p on b.patient_id = p.id
+            where b.id = #{id}
     </select>
 
     <insert id="insertPatientBlacklist" parameterType="PatientBlacklist" useGeneratedKeys="true"
             keyProperty="id">
         insert into patient_blacklist
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="patientId != null">patient_id,
+            <if test="patientId != null">patient_id,
-                    </if>
+            </if>
-                    <if test="abnormalCauseId != null">abnormal_cause_id,
+	        <if test="hospitalAgencyId != null">hospital_agency_id,
-                    </if>
+	        </if>
-                    <if test="abnormalCauseValue != null">abnormal_cause_value,
+	        <if test="hospitalAgencyName != null">hospital_agency_name,
-                    </if>
+	        </if>
-                    <if test="supplementIllustrateId != null">supplement_illustrate_id,
+	        <if test="campusAgencyId != null">campus_agency_id,
-                    </if>
+	        </if>
-                    <if test="supplementIllustrateValue != null">supplement_illustrate_value,
+	        <if test="campusAgencyName != null">campus_agency_name,
-                    </if>
+	        </if>
-                    <if test="functionLimitation != null">function_limitation,
+	        <if test="departmentId != null">department_id,
-                    </if>
+	        </if>
-                    <if test="blacklistSource != null">blacklist_source,
+	        <if test="departmentName != null">department_name,
-                    </if>
+	        </if>
-			        <if test="delFlag != null">
+            <if test="abnormalCauseId != null">abnormal_cause_id,
-            			del_flag,
+            </if>
-			        </if>
+            <if test="abnormalCauseValue != null">abnormal_cause_value,
-                    <if test="createBy != null">create_by,
+            </if>
-                    </if>
+            <if test="supplementIllustrateId != null">supplement_illustrate_id,
-                    <if test="createTime != null">create_time,
+            </if>
-                    </if>
+            <if test="supplementIllustrateValue != null">supplement_illustrate_value,
-                    <if test="updateBy != null">update_by,
+            </if>
-                    </if>
+            <if test="functionLimitation != null">function_limitation,
-                    <if test="updateTime != null">update_time,
+            </if>
-                    </if>
+            <if test="blacklistSource != null">blacklist_source,
+            </if>
+	        <if test="delFlag != null">
+                del_flag,
+	        </if>
+            <if test="createBy != null">create_by,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="patientId != null">#{patientId},
+            <if test="patientId != null">#{patientId},
-                    </if>
+            </if>
-                    <if test="abnormalCauseId != null">#{abnormalCauseId},
+	        <if test="hospitalAgencyId != null">#{hospitalAgencyId},
-                    </if>
+	        </if>
-                    <if test="abnormalCauseValue != null">#{abnormalCauseValue},
+	        <if test="hospitalAgencyName != null">#{hospitalAgencyName},
-                    </if>
+	        </if>
-                    <if test="supplementIllustrateId != null">#{supplementIllustrateId},
+	        <if test="campusAgencyId != null">#{campusAgencyId},
-                    </if>
+	        </if>
-                    <if test="supplementIllustrateValue != null">#{supplementIllustrateValue},
+	        <if test="campusAgencyName != null">#{campusAgencyName},
-                    </if>
+	        </if>
-                    <if test="functionLimitation != null">#{functionLimitation},
+	        <if test="departmentId != null">#{departmentId},
-                    </if>
+	        </if>
-                    <if test="blacklistSource != null">#{blacklistSource},
+	        <if test="departmentName != null">#{departmentName},
-                    </if>
+	        </if>
-			        <if test="delFlag != null">
+            <if test="abnormalCauseId != null">#{abnormalCauseId},
-				        #{delFlag},
+            </if>
-			        </if>
+            <if test="abnormalCauseValue != null">#{abnormalCauseValue},
-                    <if test="createBy != null">#{createBy},
+            </if>
-                    </if>
+            <if test="supplementIllustrateId != null">#{supplementIllustrateId},
-                    <if test="createTime != null">#{createTime},
+            </if>
-                    </if>
+            <if test="supplementIllustrateValue != null">#{supplementIllustrateValue},
-                    <if test="updateBy != null">#{updateBy},
+            </if>
-                    </if>
+            <if test="functionLimitation != null">#{functionLimitation},
-                    <if test="updateTime != null">#{updateTime},
+            </if>
-                    </if>
+            <if test="blacklistSource != null">#{blacklistSource},
+            </if>
+	        <if test="delFlag != null">
+		        #{delFlag},
+	        </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
         </trim>
     </insert>
 
     <update id="updatePatientBlacklist" parameterType="PatientBlacklist">
         update patient_blacklist
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="patientId != null">patient_id =
+            <if test="patientId != null">patient_id =
-                        #{patientId},
+                #{patientId},
-                    </if>
+            </if>
-                    <if test="abnormalCauseId != null">abnormal_cause_id =
+	        <if test="hospitalAgencyId != null">hospital_agency_id = #{hospitalAgencyId},
-                        #{abnormalCauseId},
+	        </if>
-                    </if>
+	        <if test="hospitalAgencyName != null">hospital_agency_name = #{hospitalAgencyName},
-                    <if test="abnormalCauseValue != null">abnormal_cause_value =
+	        </if>
-                        #{abnormalCauseValue},
+	        <if test="campusAgencyId != null">campus_agency_id = #{campusAgencyId},
-                    </if>
+	        </if>
-                    <if test="supplementIllustrateId != null">supplement_illustrate_id =
+	        <if test="campusAgencyName != null">campus_agency_name = #{campusAgencyName},
-                        #{supplementIllustrateId},
+	        </if>
-                    </if>
+	        <if test="departmentId != null">department_id = #{departmentId},
-                    <if test="supplementIllustrateValue != null">supplement_illustrate_value =
+	        </if>
-                        #{supplementIllustrateValue},
+	        <if test="departmentName != null">department_name = #{departmentName},
-                    </if>
+	        </if>
-                    <if test="functionLimitation != null">function_limitation =
+	        <if test="abnormalCauseId != null">abnormal_cause_id =
-                        #{functionLimitation},
+	            #{abnormalCauseId},
-                    </if>
+	        </if>
-                    <if test="blacklistSource != null">blacklist_source =
+	        <if test="abnormalCauseValue != null">abnormal_cause_value =
-                        #{blacklistSource},
+	            #{abnormalCauseValue},
-                    </if>
+	        </if>
-			        <if test="delFlag != null">del_flag =
+	        <if test="supplementIllustrateId != null">supplement_illustrate_id =
-				        #{delFlag},
+	            #{supplementIllustrateId},
-			        </if>
+	        </if>
-                    <if test="createBy != null">create_by =
+	        <if test="supplementIllustrateValue != null">supplement_illustrate_value =
-                        #{createBy},
+	            #{supplementIllustrateValue},
-                    </if>
+	        </if>
-                    <if test="createTime != null">create_time =
+	        <if test="functionLimitation != null">function_limitation =
-                        #{createTime},
+	            #{functionLimitation},
-                    </if>
+	        </if>
-                    <if test="updateBy != null">update_by =
+	        <if test="blacklistSource != null">blacklist_source =
-                        #{updateBy},
+	            #{blacklistSource},
-                    </if>
+	        </if>
-                    <if test="updateTime != null">update_time =
+	        <if test="delFlag != null">del_flag =
-                        #{updateTime},
+		        #{delFlag},
-                    </if>
+	        </if>
+	        <if test="createBy != null">create_by =
+	            #{createBy},
+	        </if>
+	        <if test="createTime != null">create_time =
+	            #{createTime},
+	        </if>
+	        <if test="updateBy != null">update_by =
+	            #{updateBy},
+	        </if>
+	        <if test="updateTime != null">update_time =
+	            #{updateTime},
+	        </if>
         </trim>
         where id = #{id}
     </update>

postdischarge-manage/src/main/resources/mapper/manage/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseMapper.xml

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xinelu.manage.mapper.patientblacklistabnormalcause.PatientBlacklistAbnormalCauseMapper">
+
+    <resultMap type="PatientBlacklistAbnormalCause" id="PatientBlacklistAbnormalCauseResult">
+            <result property="id" column="id"/>
+            <result property="parentId" column="parent_id"/>
+            <result property="abnormalCauseCode" column="abnormal_cause_code"/>
+            <result property="abnormalCauseValue" column="abnormal_cause_value"/>
+            <result property="abnormalCauseLevel" column="abnormal_cause_level"/>
+            <result property="status" column="status"/>
+            <result property="delFlag" column="del_flag"/>
+            <result property="remark" column="remark"/>
+            <result property="createBy" column="create_by"/>
+            <result property="createTime" column="create_time"/>
+            <result property="updateBy" column="update_by"/>
+            <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectPatientBlacklistAbnormalCauseVo">
+        select id, parent_id, abnormal_cause_code, abnormal_cause_value, abnormal_cause_level, status, del_flag, remark, create_by, create_time, update_by, update_time from patient_blacklist_abnormal_cause
+    </sql>
+
+    <select id="selectPatientBlacklistAbnormalCauseList" parameterType="PatientBlacklistAbnormalCause" resultMap="PatientBlacklistAbnormalCauseResult">
+        <include refid="selectPatientBlacklistAbnormalCauseVo"/>
+        <where>
+			del_flag = 0
+            <if test="parentId != null ">
+                and parent_id = #{parentId}
+            </if>
+            <if test="abnormalCauseCode != null  and abnormalCauseCode != ''">
+                and abnormal_cause_code = #{abnormalCauseCode}
+            </if>
+            <if test="abnormalCauseValue != null  and abnormalCauseValue != ''">
+                and abnormal_cause_value = #{abnormalCauseValue}
+            </if>
+            <if test="abnormalCauseLevel != null  and abnormalCauseLevel != ''">
+                and abnormal_cause_level = #{abnormalCauseLevel}
+            </if>
+            <if test="status != null  and status != ''">
+                and status = #{status}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectPatientBlacklistAbnormalCauseById" parameterType="Long"
+            resultMap="PatientBlacklistAbnormalCauseResult">
+            <include refid="selectPatientBlacklistAbnormalCauseVo"/>
+            where id = #{id}
+    </select>
+
+    <insert id="insertPatientBlacklistAbnormalCause" parameterType="PatientBlacklistAbnormalCause" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into patient_blacklist_abnormal_cause
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test="parentId != null">parent_id,
+                    </if>
+                    <if test="abnormalCauseCode != null">abnormal_cause_code,
+                    </if>
+                    <if test="abnormalCauseValue != null">abnormal_cause_value,
+                    </if>
+                    <if test="abnormalCauseLevel != null">abnormal_cause_level,
+                    </if>
+                    <if test="status != null">status,
+                    </if>
+                    <if test="delFlag != null">del_flag,
+                    </if>
+                    <if test="remark != null">remark,
+                    </if>
+                    <if test="createBy != null">create_by,
+                    </if>
+                    <if test="createTime != null">create_time,
+                    </if>
+                    <if test="updateBy != null">update_by,
+                    </if>
+                    <if test="updateTime != null">update_time,
+                    </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                    <if test="parentId != null">#{parentId},
+                    </if>
+                    <if test="abnormalCauseCode != null">#{abnormalCauseCode},
+                    </if>
+                    <if test="abnormalCauseValue != null">#{abnormalCauseValue},
+                    </if>
+                    <if test="abnormalCauseLevel != null">#{abnormalCauseLevel},
+                    </if>
+                    <if test="status != null">#{status},
+                    </if>
+                    <if test="delFlag != null">#{delFlag},
+                    </if>
+                    <if test="remark != null">#{remark},
+                    </if>
+                    <if test="createBy != null">#{createBy},
+                    </if>
+                    <if test="createTime != null">#{createTime},
+                    </if>
+                    <if test="updateBy != null">#{updateBy},
+                    </if>
+                    <if test="updateTime != null">#{updateTime},
+                    </if>
+        </trim>
+    </insert>
+
+    <update id="updatePatientBlacklistAbnormalCause" parameterType="PatientBlacklistAbnormalCause">
+        update patient_blacklist_abnormal_cause
+        <trim prefix="SET" suffixOverrides=",">
+                    <if test="parentId != null">parent_id =
+                        #{parentId},
+                    </if>
+                    <if test="abnormalCauseCode != null">abnormal_cause_code =
+                        #{abnormalCauseCode},
+                    </if>
+                    <if test="abnormalCauseValue != null">abnormal_cause_value =
+                        #{abnormalCauseValue},
+                    </if>
+                    <if test="abnormalCauseLevel != null">abnormal_cause_level =
+                        #{abnormalCauseLevel},
+                    </if>
+                    <if test="status != null">status =
+                        #{status},
+                    </if>
+                    <if test="delFlag != null">del_flag =
+                        #{delFlag},
+                    </if>
+                    <if test="remark != null">remark =
+                        #{remark},
+                    </if>
+                    <if test="createBy != null">create_by =
+                        #{createBy},
+                    </if>
+                    <if test="createTime != null">create_time =
+                        #{createTime},
+                    </if>
+                    <if test="updateBy != null">update_by =
+                        #{updateBy},
+                    </if>
+                    <if test="updateTime != null">update_time =
+                        #{updateTime},
+                    </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deletePatientBlacklistAbnormalCauseById" parameterType="Long">
+        delete from patient_blacklist_abnormal_cause where id = #{id}
+    </delete>
+
+    <delete id="deletePatientBlacklistAbnormalCauseByIds" parameterType="String">
+        delete from patient_blacklist_abnormal_cause where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml

@@ -14,6 +14,8 @@
 		<result property="address" column="address" />
 		<result property="patientType" column="patient_type" />
 		<result property="signStatus" column="sign_status" />
+		<result property="signPatientRecordId" column="sign_patient_record_id" />
+		<result property="serviceStatus" column="service_status" />
 		<result property="signTime" column="sign_time" />
 		<result property="certificateIssuingDoctor" column="certificate_issuing_doctor" />
 		<result property="visitMethod" column="visit_method" />
@@ -77,11 +79,14 @@
 		<where>
 			del_flag = 0
 			<if test="patientName != null  and patientName != ''">
-				and patient_name like concat('%', #{patientName}, '%')
+				and patient_name = #{patientName}
 			</if>
 			<if test="patientPhone != null  and patientPhone != ''">
 				and patient_phone like concat('%', #{patientPhone}, '%')
 			</if>
+			<if test="cardNo != null  and cardNo != ''">
+				and card_no = #{cardNo}
+			</if>
 			<if test="patientType != null  and patientType != ''">
 			<choose>
 				<when test="patientType == 'OUTPATIENT_DISCHARGE'.toString()">
@@ -183,6 +188,10 @@
 			</if>
 			<if test="signStatus != null">sign_status,
 			</if>
+			<if test="signPatientRecordId != null">sign_patient_record_id,
+			</if>
+			<if test="serviceStatus != null">service_status,
+			</if>
 			<if test="signTime != null">sign_time,
 			</if>
 			<if test="certificateIssuingDoctor != null">certificate_issuing_doctor,
@@ -279,6 +288,10 @@
 			</if>
 			<if test="signStatus != null">#{signStatus},
 			</if>
+			<if test="signPatientRecordId != null">#{signPatientRecordId},
+			</if>
+			<if test="serviceStatus != null">#{serviceStatus},
+			</if>
 			<if test="signTime != null">#{signTime},
 			</if>
 			<if test="certificateIssuingDoctor != null">#{certificateIssuingDoctor},
@@ -382,6 +395,10 @@
 			<if test="signStatus != null">sign_status =
 				#{signStatus},
 			</if>
+			<if test="signPatientRecordId != null">sign_patient_record_id = #{signPatientRecordId},
+			</if>
+			<if test="serviceStatus != null">service_status = #{serviceStatus},
+			</if>
 			<if test="signTime != null">sign_time =
 				#{signTime},
 			</if>