Merge remote-tracking branch 'origin/3.11_院后第二增量' into dev

# Conflicts:
#	postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
#	postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java
#	postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml

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

@@ -4,6 +4,7 @@ import com.xinelu.common.annotation.Log;
 import com.xinelu.common.constant.UserConstants;
 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.domain.entity.SysRole;
 import com.xinelu.common.core.domain.entity.SysUser;
 import com.xinelu.common.core.page.TableDataInfo;
@@ -15,6 +16,8 @@ import com.xinelu.system.domain.vo.AgencyNameVO;
 import com.xinelu.system.service.ISysPostService;
 import com.xinelu.system.service.ISysRoleService;
 import com.xinelu.system.service.ISysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -31,6 +34,7 @@ import java.util.stream.Collectors;
  *
  * @author xinelu
  */
+@Api(tags = "用户信息控制器")
 @RestController
 @RequestMapping("/system/user")
 public class SysUserController extends BaseController {
@@ -54,6 +58,19 @@ public class SysUserController extends BaseController {
         return getDataTable(list);
     }
 
+	/**
+	 * 获取用户列表
+	 * @param user
+	 * @return
+	 */
+	@ApiOperation("获取用户列表")
+	@PreAuthorize("@ss.hasPermi('system:user:list')")
+	@GetMapping("/getList")
+	public R<List<SysUser>> getList(SysUser user) {
+		List<SysUser> list = userService.selectUserList(user);
+		return R.ok(list);
+	}
+
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")

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

@@ -180,15 +180,20 @@ public class Constants {
     public static final String SERVICE_MODE_ENCODING = "SME";
 
     /**
-     * 服务方式编码
+     * 任务类型编码
      */
     public static final String TASK_TYPE_CODE = "TTC";
 
     /**
-     * 服务方式编码
+     * 任务细分编码
      */
     public static final String TASK_PARTITION_CODE = "TPC";
 
+    /**
+     * 任务状态编码
+     */
+    public static final String TASK_STATUS_CODE = "TSC";
+
     /**
      * 门诊患者
      */
@@ -209,6 +214,16 @@ public class Constants {
      */
     public static final String DISCHARGED = "discharged";
 
+    /**
+     * 字段信息编码前缀
+     */
+    public static final String FIELD_ENCODING = "FE";
+
+    /**
+     * 字段内容编码前缀
+     */
+    public static final String CONTENT_ENCODING = "CE";
+
     /**
      * 院后微信小程序accessToken的redis的键前缀
      */

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

@@ -1,29 +0,0 @@
-package com.xinelu.common.constant;
-
-/**
- * 字段标签信息字段类型
- *
- * @author : youxilong
- * @date : 2024/3/11 10:19
- */
-public class LabelFieldInfoFieldTypeConstants {
-    /**
-     * 画像标签字段
-     */
-    public static final String PORTRAIT_LABEL_FIELD = "PORTRAIT_LABEL_FIELD";
-
-    /**
-     * 知识库字段
-     */
-    public static final String KNOWLEDGE_FIELD = "KNOWLEDGE_FIELD";
-
-    /**
-     * 字段信息编码前缀
-     */
-    public static final String FIELD_ENCODING = "FE";
-
-    /**
-     * 字段内容编码前缀
-     */
-    public static final String CONTENT_ENCODING = "CE";
-}

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

@@ -0,0 +1,19 @@
+package com.xinelu.common.constant;
+
+/**
+ * @description: 任务创建类型常量
+ * @author: haown
+ * @create: 2024-03-18 16:24
+ **/
+public class TaskCreateTypeConstant {
+
+	/**
+	 * 手动创建
+	 */
+	public static final String MANUAL_CREATE = "MANUAL_CREATE";
+
+	/**
+	 * 自动匹配
+	 */
+	public static final String MANUAL_MATCHE = "MANUAL_MATCHE";
+}

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

@@ -5,7 +5,7 @@ package com.xinelu.common.constant;
  * @author: haown
  * @create: 2024-03-07 15:45
  **/
-public class VisitTypeConstants {
+public class VisitMethodConstants {
 
 	/**
 	 * 门诊
@@ -15,5 +15,5 @@ public class VisitTypeConstants {
 	/**
 	 * 住院
 	 */
-	public static final String BE_HOSPITALIZED = "BE_HOSPITALIZED";
+	public static final String BE_IN_HOSPITAL = "BE_IN_HOSPITAL";
 }

postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyCategoryManageLevelEnum.java

@@ -0,0 +1,34 @@
+package com.xinelu.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Description 机构分类管理类别
+ * @Author zh
+ * @Date 2024-03-19
+ */
+@Getter
+public enum AgencyCategoryManageLevelEnum {
+
+    /**
+     * 非营利性医疗机构
+     */
+    NON_PROFIT_MEDICAL_AGENCY("NON_PROFIT_MEDICAL_AGENCY"),
+
+    /**
+     * 营利性医疗机构
+     */
+    FOR_PROFIT_MEDICAL_AGENCY("FOR_PROFIT_MEDICAL_AGENCY"),
+
+    /**
+     * 其他卫生机构
+     */
+    OTHER_HEALTH_AGENCY("OTHER_HEALTH_AGENCY"),
+    ;
+
+    final private String info;
+
+    AgencyCategoryManageLevelEnum(String info) {
+        this.info = info;
+    }
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyStatusEnum.java

@@ -0,0 +1,29 @@
+package com.xinelu.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Description 机构状态
+ * @Author zh
+ * @Date 2024-03-19
+ */
+@Getter
+public enum AgencyStatusEnum {
+
+    /**
+     * 启用
+     */
+    ON("ON"),
+
+    /**
+     * 禁用
+     */
+    OFF("OFF"),
+    ;
+
+    final private String info;
+
+    AgencyStatusEnum(String info) {
+        this.info = info;
+    }
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/HardWareTypeEnum.java

@@ -0,0 +1,25 @@
+package com.xinelu.common.enums;
+
+/**
+ * 硬件类型标识
+ *
+ * @author : youxilong
+ * @date : 2024/3/19 10:09
+ */
+public enum HardWareTypeEnum {
+
+    /**
+     * 硬件类型:血压仪
+     */
+    BLOOD_PRESSURE,
+
+    /**
+     * 硬件类型:血糖仪
+     */
+    GLUCOSE_METER,
+
+    /**
+     * 硬件类型:心电仪
+     */
+    ELECTROCARDIOGRA
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/LabelFieldTypeEnum.java

@@ -0,0 +1,20 @@
+package com.xinelu.common.enums;
+
+/**
+ * 字段类型标识
+ *
+ * @author : youxilong
+ * @date : 2024/3/19 10:22
+ */
+public enum LabelFieldTypeEnum {
+
+    /**
+     * 字段类型:画像标签字段
+     */
+    PORTRAIT_LABEL_FIELD,
+
+    /**
+     * 字段类型:知识库字段
+     */
+    KNOWLEDGE_FIELD
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/NodeTypeEnum.java

@@ -0,0 +1,64 @@
+package com.xinelu.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Description 节点类型
+ * @Author zh
+ * @Date 2024-03-19
+ */
+@Getter
+public enum NodeTypeEnum {
+
+    /**
+     * 卫健委
+     */
+    HEALTH_COMMISSION("HEALTH_COMMISSION"),
+
+    /**
+     * 医保局
+     */
+    MEDICAL_INSURANCE_BUREAU("MEDICAL_INSURANCE_BUREAU"),
+
+    /**
+     * 医院
+     */
+    HOSPITAL("HOSPITAL"),
+
+    /**
+     * 院区
+     */
+    CAMPUS("CAMPUS"),
+
+    /**
+     * 药店
+     */
+    PHARMACY("PHARMACY"),
+
+    /**
+     * 科室
+     */
+    DEPARTMENT("DEPARTMENT"),
+
+    /**
+     * 病区
+     */
+    WARD("WARD"),
+
+    /**
+     * 中国
+     */
+    CHINA("CHINA"),
+
+    /**
+     * 省份：
+     */
+    PROVINCE("PROVINCE"),
+    ;
+
+    final private String info;
+
+    NodeTypeEnum(String info) {
+        this.info = info;
+    }
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/PatientSourceEnum.java

@@ -0,0 +1,21 @@
+package com.xinelu.common.enums;
+
+/**
+ * @Description 患者来源枚举类
+ * @Author haown
+ * @Date 2024-03-21
+ */
+public enum PatientSourceEnum {
+	/**
+	 * 微信小程序
+	 */
+	WE_CHAT_APPLET,
+	/**
+	 * 微信公众号
+	 */
+	WE_CHAT_OFFICIAL_ACCOUNT,
+	/**
+	 * 管理端
+	 */
+	MANAGE_END
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/ScriptStatusEnum.java

@@ -0,0 +1,25 @@
+package com.xinelu.common.enums;
+
+/**
+ * 话术状态标识
+ *
+ * @author : youxilong
+ * @date : 2024/3/19 10:06
+ */
+public enum ScriptStatusEnum {
+
+    /**
+     * 话术状态，正常
+     */
+    NORMAL,
+
+    /**
+     * 话术状态:下架
+     */
+    OFF_SHELF,
+
+    /**
+     * 话术状态:暂停
+     */
+    SUSPEND
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/ServiceFrequencyTypeEnum.java

@@ -0,0 +1,20 @@
+package com.xinelu.common.enums;
+
+/**
+ * 服务频次标识
+ *
+ * @author : youxilong
+ * @date : 2024/3/19 10:12
+ */
+public enum ServiceFrequencyTypeEnum {
+
+    /**
+     * 服务频次类型：数字：DIGIT
+     */
+    DIGIT,
+
+    /**
+     * 服务频次类型：文本：TEXT
+     */
+    TEXT
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/ServiceTypeEnum.java

@@ -6,7 +6,7 @@ package com.xinelu.common.enums;
  * @author : youxilong
  * @date : 2024/2/29 20:08
  */
-public enum ServiceWayContentServiceType {
+public enum ServiceTypeEnum {
 
     /**
      * 服务方式
@@ -21,16 +21,6 @@ public enum ServiceWayContentServiceType {
     /**
      * 服务频次
      */
-    SERVICE_FREQUENCY,
-
-    /**
-     * 服务频次类型：数字：DIGIT
-     */
-    DIGIT,
-
-    /**
-     * 服务频次类型：文本：TEXT
-     */
-    TEXT
+    SERVICE_FREQUENCY
 
 }

postdischarge-common/src/main/java/com/xinelu/common/enums/TextMessageChannelEnum.java

@@ -0,0 +1,15 @@
+package com.xinelu.common.enums;
+
+/**
+ * 短信通道标识
+ *
+ * @author : youxilong
+ * @date : 2024/3/19 10:14
+ */
+public enum TextMessageChannelEnum {
+
+    /**
+     * 短信通道：水滴平台
+     */
+    WATER_DROPLET_PLATFORM
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/TextMessageStatusEnum.java

@@ -0,0 +1,20 @@
+package com.xinelu.common.enums;
+
+/**
+ * 短信状态标识
+ *
+ * @author : youxilong
+ * @date : 2024/3/19 10:15
+ */
+public enum TextMessageStatusEnum {
+
+    /**
+     * 短信状态:上架
+     */
+    GROUNDING,
+
+    /**
+     * 短信状态:下架：
+     */
+    OFF_SHELF
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/WeChatTemplateSourceEnum.java

@@ -0,0 +1,21 @@
+package com.xinelu.common.enums;
+
+/**
+ * 微信模板来源
+ *
+ * @author : youxilong
+ * @date : 2024/3/19 10:19
+ */
+public enum WeChatTemplateSourceEnum {
+
+    /**
+     * 模板来源:小程序
+     */
+    WE_CHAT_APPLET,
+
+    /**
+     * 模板来源:公众号
+     */
+    WE_CHAT_OFFICIAL_ACCOUNT
+
+}

postdischarge-common/src/main/java/com/xinelu/common/utils/AgeUtil.java

@@ -0,0 +1,67 @@
+package com.xinelu.common.utils;
+
+import com.xinelu.common.exception.ServiceException;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
+/**
+ * @author ljh
+ * @version 1.0
+ * Create by 2023/2/27 11:45
+ */
+public class AgeUtil {
+
+    /**
+     * 根据出生日期计算年龄数值
+     *
+     * @param date 出生日期
+     * @return 年龄数值
+     */
+    public static Long getAgeMonth(String date) {
+        if (StringUtils.isBlank(date)) {
+            throw new ServiceException("请输入正确的出生日期！");
+        }
+        String[] data = StringUtils.split(date, "-");
+        if (data.length < 3) {
+            throw new ServiceException("请输入正确的出生日期！");
+        }
+        Calendar birthday = new GregorianCalendar(Integer.parseInt(data[0]), Integer.parseInt(data[1]), Integer.parseInt(data[2]));
+        Calendar now = Calendar.getInstance();
+        int day = now.get(Calendar.DAY_OF_MONTH) - birthday.get(Calendar.DAY_OF_MONTH);
+        //月份从0开始计算，所以需要+1
+        int month = now.get(Calendar.MONTH) + 1 - birthday.get(Calendar.MONTH);
+        BigDecimal monthFraction;
+        int year = now.get(Calendar.YEAR) - birthday.get(Calendar.YEAR);
+        //按照减法原理，先day相减，不够向month借；然后month相减，不够向year借；最后year相减。
+        if (day < 0) {
+            month -= 1;
+            //得到上一个月，用来得到上个月的天数。
+            now.add(Calendar.MONTH, -1);
+        }
+        if (month < 0) {
+            //当前月份加12个月
+            monthFraction = BigDecimal.valueOf(month).add(BigDecimal.valueOf(12)).divide(BigDecimal.valueOf(12), 1, RoundingMode.HALF_UP);
+            year--;
+        } else {
+            //当前月份
+            monthFraction = BigDecimal.valueOf(month).divide(BigDecimal.valueOf(12), 1, RoundingMode.HALF_UP);
+        }
+        BigDecimal bigDecimal = BigDecimal.ZERO;
+        if (year >= 0) {
+            bigDecimal = bigDecimal.add(BigDecimal.valueOf(year));
+        }
+        if ((monthFraction.compareTo(BigDecimal.ZERO) > 0)) {
+            bigDecimal = bigDecimal.add(monthFraction);
+        }
+        //今天出生
+        if (year == 0 && month == 0 && day == 0) {
+            return BigDecimal.ZERO.longValue();
+        }
+        return Math.round(bigDecimal.doubleValue());
+    }
+
+}
+

postdischarge-common/src/main/java/com/xinelu/common/utils/poi/ExcelUtil.java

@@ -13,6 +13,7 @@ import com.xinelu.common.utils.file.FileTypeUtils;
 import com.xinelu.common.utils.file.FileUtils;
 import com.xinelu.common.utils.file.ImageUtils;
 import com.xinelu.common.utils.reflect.ReflectUtils;
+import java.time.ZoneId;
 import org.apache.commons.lang3.RegExUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ooxml.POIXMLDocumentPart;
@@ -269,6 +270,13 @@ public class ExcelUtil<T> {
                         } else if (val instanceof Double) {
                             val = DateUtil.getJavaDate((Double) val);
                         }
+                    } else if (LocalDate.class == fieldType) {
+	                    if (val instanceof String) {
+		                    val = DateUtils.parseDate(val);
+	                    } else if (val instanceof Double) {
+		                    val = DateUtil.getJavaDate((Double) val);
+	                    }
+	                    val = ((Date) val).toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
                     } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) {
                         val = Convert.toBool(val, false);
                     }

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

@@ -8,6 +8,7 @@ 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.agency.Agency;
+import com.xinelu.manage.dto.agency.HospitalDTO;
 import com.xinelu.manage.service.agency.IAgencyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -58,7 +59,7 @@ public class AgencyController extends BaseController {
         if (Objects.isNull(agency) || Objects.isNull(agency.getParentId())) {
             return AjaxResult.success();
         }
-        return agencyService.subordinateAgencyList(agency);
+        return agencyService.selectAgencyByIdList(agency);
     }
 
     /**
@@ -144,4 +145,9 @@ public class AgencyController extends BaseController {
         List<Agency> list = util.importExcel(file.getInputStream());
         return agencyService.insertAgencyImportList(list);
     }
+
+    @GetMapping("/getAgencyList")
+    public AjaxResult getAgencyList(HospitalDTO hospitalDTO) {
+        return agencyService.getAgencyList(hospitalDTO);
+    }
 }

postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java

@@ -43,6 +43,14 @@ public class LabelFieldInfoController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询标签字段信息列表 不分页
+     */
+    @GetMapping("/labelFieldInfoList")
+    public AjaxResult labelFieldInfoList(LabelFieldInfo labelFieldInfo) {
+        return AjaxResult.success(labelFieldInfoService.selectLabelFieldInfoList(labelFieldInfo));
+    }
+
     /**
      * 导出标签字段信息列表
      */

postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java

@@ -3,6 +3,7 @@ package com.xinelu.manage.controller.patientinfo;
 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;
@@ -10,6 +11,7 @@ import com.xinelu.manage.domain.patientinfo.PatientInfo;
 import com.xinelu.manage.dto.patientinfo.PatientInfoDto;
 import com.xinelu.manage.service.patientinfo.IPatientInfoService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -39,9 +41,11 @@ public class PatientInfoController extends BaseController {
 	/**
 	 * 查询患者信息列表
 	 */
+	@ApiOperation("患者档案列表")
 	@PreAuthorize("@ss.hasPermi('manage:patientInfo:list')")
 	@GetMapping("/list")
     public TableDataInfo list(PatientInfoDto patientInfo) {
+		// 根据用户权限判断查询数据权限
         startPage();
         List<PatientInfo> list = patientInfoService.selectPatientInfoList(patientInfo);
         return getDataTable(list);
@@ -74,8 +78,8 @@ public class PatientInfoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('manage:patientInfo:add')")
     @Log(title = "患者信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody PatientInfo patientInfo) {
-        return toAjax(patientInfoService.insertPatientInfo(patientInfo));
+    public R<PatientInfo> add(@RequestBody PatientInfo patientInfo) {
+        return R.ok(patientInfoService.insertPatientInfo(patientInfo));
     }
 
     /**
@@ -84,8 +88,8 @@ public class PatientInfoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('manage:patientInfo:edit')")
     @Log(title = "患者信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody PatientInfo patientInfo) {
-        return toAjax(patientInfoService.updatePatientInfo(patientInfo));
+    public R<PatientInfo> edit(@RequestBody PatientInfo patientInfo) {
+        return R.ok(patientInfoService.updatePatientInfo(patientInfo));
     }
 
     /**

postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionoptionresult/PatientQuestionOptionResultController.java

@@ -0,0 +1,91 @@
+package com.xinelu.manage.controller.patientquestionoptionresult;
+
+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.page.TableDataInfo;
+import com.xinelu.common.enums.BusinessType;
+import com.xinelu.common.utils.poi.ExcelUtil;
+import com.xinelu.manage.domain.patientquestionoptionresult.PatientQuestionOptionResult;
+import com.xinelu.manage.service.patientquestionoptionresult.IPatientQuestionOptionResultService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 患者问卷题目选项提交结果信息Controller
+ *
+ * @author xinelu
+ * @date 2024-03-28
+ */
+@RestController
+@RequestMapping("/system/patientQuestionOptionResult")
+public class PatientQuestionOptionResultController extends BaseController {
+    @Resource
+    private IPatientQuestionOptionResultService patientQuestionOptionResultService;
+
+    /**
+     * 查询患者问卷题目选项提交结果信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionOptionResult:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PatientQuestionOptionResult patientQuestionOptionResult) {
+        startPage();
+        List<PatientQuestionOptionResult> list = patientQuestionOptionResultService.selectPatientQuestionOptionResultList(patientQuestionOptionResult);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出患者问卷题目选项提交结果信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionOptionResult:export')")
+    @Log(title = "患者问卷题目选项提交结果信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, PatientQuestionOptionResult patientQuestionOptionResult) {
+        List<PatientQuestionOptionResult> list = patientQuestionOptionResultService.selectPatientQuestionOptionResultList(patientQuestionOptionResult);
+        ExcelUtil<PatientQuestionOptionResult> util = new ExcelUtil<>(PatientQuestionOptionResult.class);
+        util.exportExcel(response, list, "患者问卷题目选项提交结果信息数据");
+    }
+
+    /**
+     * 获取患者问卷题目选项提交结果信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionOptionResult:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(patientQuestionOptionResultService.selectPatientQuestionOptionResultById(id));
+    }
+
+    /**
+     * 新增患者问卷题目选项提交结果信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionOptionResult:add')")
+    @Log(title = "患者问卷题目选项提交结果信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody PatientQuestionOptionResult patientQuestionOptionResult) {
+        return toAjax(patientQuestionOptionResultService.insertPatientQuestionOptionResult(patientQuestionOptionResult));
+    }
+
+    /**
+     * 修改患者问卷题目选项提交结果信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionOptionResult:edit')")
+    @Log(title = "患者问卷题目选项提交结果信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody PatientQuestionOptionResult patientQuestionOptionResult) {
+        return toAjax(patientQuestionOptionResultService.updatePatientQuestionOptionResult(patientQuestionOptionResult));
+    }
+
+    /**
+     * 删除患者问卷题目选项提交结果信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionOptionResult:remove')")
+    @Log(title = "患者问卷题目选项提交结果信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(patientQuestionOptionResultService.deletePatientQuestionOptionResultByIds(ids));
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionsubjectresult/PatientQuestionSubjectResultController.java

@@ -0,0 +1,92 @@
+package com.xinelu.manage.controller.patientquestionsubjectresult;
+
+
+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.page.TableDataInfo;
+import com.xinelu.common.enums.BusinessType;
+import com.xinelu.common.utils.poi.ExcelUtil;
+import com.xinelu.manage.domain.patientquestionsubjectresult.PatientQuestionSubjectResult;
+import com.xinelu.manage.service.patientquestionsubjectresult.IPatientQuestionSubjectResultService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 患者问卷题目提交结果信息Controller
+ *
+ * @author xinelu
+ * @date 2024-03-28
+ */
+@RestController
+@RequestMapping("/system/patientQuestionSubjectResult")
+public class PatientQuestionSubjectResultController extends BaseController {
+    @Resource
+    private IPatientQuestionSubjectResultService patientQuestionSubjectResultService;
+
+    /**
+     * 查询患者问卷题目提交结果信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionSubjectResult:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PatientQuestionSubjectResult patientQuestionSubjectResult) {
+        startPage();
+        List<PatientQuestionSubjectResult> list = patientQuestionSubjectResultService.selectPatientQuestionSubjectResultList(patientQuestionSubjectResult);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出患者问卷题目提交结果信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionSubjectResult:export')")
+    @Log(title = "患者问卷题目提交结果信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, PatientQuestionSubjectResult patientQuestionSubjectResult) {
+        List<PatientQuestionSubjectResult> list = patientQuestionSubjectResultService.selectPatientQuestionSubjectResultList(patientQuestionSubjectResult);
+        ExcelUtil<PatientQuestionSubjectResult> util = new ExcelUtil<>(PatientQuestionSubjectResult.class);
+        util.exportExcel(response, list, "患者问卷题目提交结果信息数据");
+    }
+
+    /**
+     * 获取患者问卷题目提交结果信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionSubjectResult:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(patientQuestionSubjectResultService.selectPatientQuestionSubjectResultById(id));
+    }
+
+    /**
+     * 新增患者问卷题目提交结果信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionSubjectResult:add')")
+    @Log(title = "患者问卷题目提交结果信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody PatientQuestionSubjectResult patientQuestionSubjectResult) {
+        return toAjax(patientQuestionSubjectResultService.insertPatientQuestionSubjectResult(patientQuestionSubjectResult));
+    }
+
+    /**
+     * 修改患者问卷题目提交结果信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionSubjectResult:edit')")
+    @Log(title = "患者问卷题目提交结果信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody PatientQuestionSubjectResult patientQuestionSubjectResult) {
+        return toAjax(patientQuestionSubjectResultService.updatePatientQuestionSubjectResult(patientQuestionSubjectResult));
+    }
+
+    /**
+     * 删除患者问卷题目提交结果信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionSubjectResult:remove')")
+    @Log(title = "患者问卷题目提交结果信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(patientQuestionSubjectResultService.deletePatientQuestionSubjectResultByIds(ids));
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionsubmitresult/PatientQuestionSubmitResultController.java

@@ -0,0 +1,91 @@
+package com.xinelu.manage.controller.patientquestionsubmitresult;
+
+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.page.TableDataInfo;
+import com.xinelu.common.enums.BusinessType;
+import com.xinelu.common.utils.poi.ExcelUtil;
+import com.xinelu.manage.domain.patientquestionsubmitresult.PatientQuestionSubmitResult;
+import com.xinelu.manage.service.patientquestionsubmitresult.IPatientQuestionSubmitResultService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 患者问卷提交结果信息Controller
+ *
+ * @author xinelu
+ * @date 2024-03-28
+ */
+@RestController
+@RequestMapping("/system/patientQuestionSubmitResult")
+public class PatientQuestionSubmitResultController extends BaseController {
+    @Resource
+    private IPatientQuestionSubmitResultService patientQuestionSubmitResultService;
+
+    /**
+     * 查询患者问卷提交结果信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionSubmitResult:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PatientQuestionSubmitResult patientQuestionSubmitResult) {
+        startPage();
+        List<PatientQuestionSubmitResult> list = patientQuestionSubmitResultService.selectPatientQuestionSubmitResultList(patientQuestionSubmitResult);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出患者问卷提交结果信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionSubmitResult:export')")
+    @Log(title = "患者问卷提交结果信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, PatientQuestionSubmitResult patientQuestionSubmitResult) {
+        List<PatientQuestionSubmitResult> list = patientQuestionSubmitResultService.selectPatientQuestionSubmitResultList(patientQuestionSubmitResult);
+        ExcelUtil<PatientQuestionSubmitResult> util = new ExcelUtil<>(PatientQuestionSubmitResult.class);
+        util.exportExcel(response, list, "患者问卷提交结果信息数据");
+    }
+
+    /**
+     * 获取患者问卷提交结果信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionSubmitResult:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(patientQuestionSubmitResultService.selectPatientQuestionSubmitResultById(id));
+    }
+
+    /**
+     * 新增患者问卷提交结果信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionSubmitResult:add')")
+    @Log(title = "患者问卷提交结果信息", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody PatientQuestionSubmitResult patientQuestionSubmitResult) {
+        return toAjax(patientQuestionSubmitResultService.insertPatientQuestionSubmitResult(patientQuestionSubmitResult));
+    }
+
+    /**
+     * 修改患者问卷提交结果信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionSubmitResult:edit')")
+    @Log(title = "患者问卷提交结果信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody PatientQuestionSubmitResult patientQuestionSubmitResult) {
+        return toAjax(patientQuestionSubmitResultService.updatePatientQuestionSubmitResult(patientQuestionSubmitResult));
+    }
+
+    /**
+     * 删除患者问卷提交结果信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:patientQuestionSubmitResult:remove')")
+    @Log(title = "患者问卷提交结果信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(patientQuestionSubmitResultService.deletePatientQuestionSubmitResultByIds(ids));
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskexecuterecord/PatientTaskExecuteRecordController.java

@@ -0,0 +1,95 @@
+package com.xinelu.manage.controller.patienttaskexecuterecord;
+
+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.page.TableDataInfo;
+import com.xinelu.common.enums.BusinessType;
+import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord;
+import com.xinelu.manage.service.patienttaskexecuterecord.IPatientTaskExecuteRecordService;
+import com.xinelu.manage.vo.patienttaskexecuterecord.PatientTaskExecuteRecordVO;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * 患者管理任务执行记录Controller
+ *
+ * @author xinelu
+ * @date 2024-03-25
+ */
+@RestController
+@RequestMapping("/system/taskExecuteRecord")
+public class PatientTaskExecuteRecordController extends BaseController {
+    @Resource
+    private IPatientTaskExecuteRecordService patientTaskExecuteRecordService;
+
+    /**
+     * 查询患者管理任务执行记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:taskExecuteRecord:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PatientTaskExecuteRecordVO patientTaskExecuteRecord) {
+        startPage();
+        List<PatientTaskExecuteRecordVO> list = patientTaskExecuteRecordService.selectPatientTaskExecuteRecordList(patientTaskExecuteRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取患者管理任务执行记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:taskExecuteRecord:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(patientTaskExecuteRecordService.selectPatientTaskExecuteRecordById(id));
+    }
+
+    /**
+     * 新增患者管理任务执行记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:taskExecuteRecord:add')")
+    @Log(title = "患者管理任务执行记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody PatientTaskExecuteRecord patientTaskExecuteRecord) {
+        return toAjax(patientTaskExecuteRecordService.insertPatientTaskExecuteRecord(patientTaskExecuteRecord));
+    }
+
+    /**
+     * 修改患者管理任务执行记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:taskExecuteRecord:edit')")
+    @Log(title = "患者管理任务执行记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody PatientTaskExecuteRecord patientTaskExecuteRecord) {
+        return toAjax(patientTaskExecuteRecordService.updatePatientTaskExecuteRecord(patientTaskExecuteRecord));
+    }
+
+    /**
+     * 删除患者管理任务执行记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:taskExecuteRecord:remove')")
+    @Log(title = "患者管理任务执行记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(patientTaskExecuteRecordService.deletePatientTaskExecuteRecordByIds(ids));
+    }
+
+    /**
+     * 根据患者信息查询就诊记录
+     */
+    @GetMapping("/selectVisitRecord")
+    public AjaxResult selectVisitRecord(Long id) {
+        return patientTaskExecuteRecordService.selectVisitRecord(id);
+    }
+
+    /**
+     * 根据任务执行记录查询患者问卷信息
+     */
+    @GetMapping("/selectPatientQuestionSubmit")
+    public AjaxResult selectPatientQuestionSubmit(Long taskExecuteRecordId) {
+        return patientTaskExecuteRecordService.selectPatientQuestionSubmit(taskExecuteRecordId);
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/controller/patienttaskpushrecord/PatientTaskPushRecordController.java

@@ -0,0 +1,97 @@
+package com.xinelu.manage.controller.patienttaskpushrecord;
+
+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.page.TableDataInfo;
+import com.xinelu.common.enums.BusinessType;
+import com.xinelu.common.utils.poi.ExcelUtil;
+import com.xinelu.manage.domain.patienttaskpushrecord.PatientTaskPushRecord;
+import com.xinelu.manage.service.patienttaskpushrecord.IPatientTaskPushRecordService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 患者管理任务推送方式记录Controller
+ *
+ * @author xinelu
+ * @date 2024-03-21
+ */
+@RestController
+@RequestMapping("/system/taskPushRecord")
+public class PatientTaskPushRecordController extends BaseController {
+    @Resource
+    private IPatientTaskPushRecordService patientTaskPushRecordService;
+
+    /**
+     * 查询患者管理任务推送方式记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:taskPushRecord:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PatientTaskPushRecord patientTaskPushRecord) {
+        startPage();
+        List<PatientTaskPushRecord> list = patientTaskPushRecordService.selectPatientTaskPushRecordList(patientTaskPushRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出患者管理任务推送方式记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:taskPushRecord:export')")
+    @Log(title = "患者管理任务推送方式记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, PatientTaskPushRecord patientTaskPushRecord) {
+        List<PatientTaskPushRecord> list = patientTaskPushRecordService.selectPatientTaskPushRecordList(patientTaskPushRecord);
+        ExcelUtil<PatientTaskPushRecord> util = new ExcelUtil<>(PatientTaskPushRecord.class);
+        util.exportExcel(response, list, "患者管理任务推送方式记录数据");
+    }
+
+    /**
+     * 获取患者管理任务推送方式记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:taskPushRecord:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(patientTaskPushRecordService.selectPatientTaskPushRecordById(id));
+    }
+
+    /**
+     * 新增患者管理任务推送方式记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:taskPushRecord:add')")
+    @Log(title = "患者管理任务推送方式记录", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody PatientTaskPushRecord patientTaskPushRecord) {
+        return toAjax(patientTaskPushRecordService.insertPatientTaskPushRecord(patientTaskPushRecord));
+    }
+
+    /**
+     * 修改患者管理任务推送方式记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:taskPushRecord:edit')")
+    @Log(title = "患者管理任务推送方式记录", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody PatientTaskPushRecord patientTaskPushRecord) {
+        return toAjax(patientTaskPushRecordService.updatePatientTaskPushRecord(patientTaskPushRecord));
+    }
+
+    /**
+     * 删除患者管理任务推送方式记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:taskPushRecord:remove')")
+    @Log(title = "患者管理任务推送方式记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(patientTaskPushRecordService.deletePatientTaskPushRecordByIds(ids));
+    }
+
+
+    @GetMapping("/getManageRouteNode")
+    public AjaxResult getManageRouteNode(Long manageRouteNodeId) {
+        return AjaxResult.success(patientTaskPushRecordService.getManageRouteNode(manageRouteNodeId));
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java

@@ -5,12 +5,12 @@ 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.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.patientvisitrecord.PatientVisitRecord;
 import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto;
 import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordImportDto;
+import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordInfoSaveDto;
 import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordSaveDto;
 import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService;
 import io.swagger.annotations.Api;
@@ -19,9 +19,9 @@ import java.util.List;
 import java.util.Objects;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -47,17 +47,6 @@ public class PatientVisitRecordController extends BaseController {
     @Resource
     private IPatientVisitRecordService patientVisitRecordService;
 
-	/**
-	 * 查询患者就诊记录基本信息列表
-	 */
-	@PreAuthorize("@ss.hasPermi('manage:visit:list')")
-	@GetMapping("/list")
-    public TableDataInfo list(PatientVisitRecordDto patientVisitRecord) {
-        startPage();
-        List<PatientVisitRecord> list = patientVisitRecordService.selectPatientVisitRecordList(patientVisitRecord);
-        return getDataTable(list);
-    }
-
 	/**
 	 * 查询患者就诊记录基本信息列表
 	 */
@@ -93,13 +82,26 @@ public class PatientVisitRecordController extends BaseController {
     /**
      * 新增患者就诊记录基本信息
      */
+    @ApiOperation("新增患者就诊记录基本信息")
     @PreAuthorize("@ss.hasPermi('manage:visit:add')")
     @Log(title = "患者就诊记录基本信息", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody PatientVisitRecord patientVisitRecord) {
-        return toAjax(patientVisitRecordService.insertPatientVisitRecord(patientVisitRecord));
+    public R<String> add(@Valid @RequestBody PatientVisitRecordSaveDto patientVisitRecord) {
+	    patientVisitRecordService.insertPatientVisitRecord(patientVisitRecord);
+        return R.ok();
     }
 
+	/**
+	 * 修改患者就诊记录基本信息
+	 */
+	@ApiOperation("修改患者就诊记录基本信息")
+	@PreAuthorize("@ss.hasPermi('manage:visit:edit')")
+	@Log(title = "患者就诊记录基本信息", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@Valid @RequestBody PatientVisitRecord patientVisitRecord) {
+		return toAjax(patientVisitRecordService.updatePatientVisitRecord(patientVisitRecord));
+	}
+
 	/**
 	 * 患者配置——就诊信息保存
 	 */
@@ -107,7 +109,7 @@ public class PatientVisitRecordController extends BaseController {
 	@PreAuthorize("@ss.hasPermi('manage:visit:add')")
 	@Log(title = "患者就诊记录基本信息", businessType = BusinessType.INSERT)
 	@PostMapping("saveRecord")
-	public R<String> saveRecord(@Validated @RequestBody PatientVisitRecordSaveDto saveDto) {
+	public R<String> saveRecord(@Valid @RequestBody PatientVisitRecordInfoSaveDto saveDto) {
 		patientVisitRecordService.saveRecord(saveDto);
 		return R.ok();
 	}
@@ -116,11 +118,12 @@ public class PatientVisitRecordController extends BaseController {
 	/**
      * 修改患者就诊记录基本信息
      */
+	@ApiOperation("患者配置——就诊信息修改")
     @PreAuthorize("@ss.hasPermi('manage:visit:edit')")
     @Log(title = "患者就诊记录基本信息", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody PatientVisitRecordSaveDto patientVisitRecord) {
-        return toAjax(patientVisitRecordService.updatePatientVisitRecord(patientVisitRecord));
+    @PutMapping("updateRecord")
+    public AjaxResult updateRecord(@Valid @RequestBody PatientVisitRecordInfoSaveDto patientVisitRecord) {
+        return toAjax(patientVisitRecordService.updateRecord(patientVisitRecord));
     }
 
     /**

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

@@ -10,9 +10,11 @@ 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.PropagandaInfoSaveDto;
 import com.xinelu.manage.dto.propagandainfo.PropagandaUpdateDto;
 import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService;
 import com.xinelu.manage.vo.department.DepartmentVO;
+import com.xinelu.manage.vo.propagandainfo.PropagandaMaterialsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
@@ -71,8 +73,8 @@ public class PropagandaInfoController extends BaseController {
     @ApiOperation("根据id获取宣教库管理详细信息")
     @PreAuthorize("@ss.hasPermi('manage:propaganda:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(propagandaInfoService.selectPropagandaInfoById(id));
+    public R<PropagandaMaterialsVo> getInfo(@PathVariable("id") Long id) {
+        return R.ok(propagandaInfoService.selectPropagandaInfoById(id));
     }
 
     /**
@@ -82,8 +84,8 @@ public class PropagandaInfoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('manage:propaganda:add')")
     @Log(title = "宣教库管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody PropagandaInfo propagandaInfo) {
-        return toAjax(propagandaInfoService.insertPropagandaInfo(propagandaInfo));
+    public AjaxResult add(@RequestBody PropagandaInfoSaveDto propagandaInfoSaveDto) {
+        return toAjax(propagandaInfoService.insertPropagandaInfo(propagandaInfoSaveDto));
     }
 
     /**
@@ -93,8 +95,8 @@ public class PropagandaInfoController extends BaseController {
     @PreAuthorize("@ss.hasPermi('manage:propaganda:edit')")
     @Log(title = "宣教库管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody PropagandaInfo propagandaInfo) {
-        return toAjax(propagandaInfoService.updatePropagandaInfo(propagandaInfo));
+    public AjaxResult edit(@RequestBody PropagandaInfoSaveDto propagandaInfoSaveDto) {
+        return toAjax(propagandaInfoService.updatePropagandaInfo(propagandaInfoSaveDto));
     }
 
 	/**

postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java

@@ -105,4 +105,12 @@ public class QuestionInfoController extends BaseController {
     public AjaxResult updateQuestionByDepartment(@RequestBody QuestionInfo questionInfo) {
         return questionInfoService.updateQuestionByDepartment(questionInfo);
     }
+
+    /**
+     * 科室问卷数量
+     */
+    @GetMapping("/departmentQuestionCount")
+    public AjaxResult departmentQuestionCount(String departmentName) {
+        return questionInfoService.departmentQuestionCount(departmentName);
+    }
 }

postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java

@@ -3,6 +3,7 @@ package com.xinelu.manage.controller.servicepackage;
 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;
@@ -12,12 +13,18 @@ import com.xinelu.manage.service.servicepackage.IServicePackageService;
 import com.xinelu.manage.vo.servicepackage.ServicePackageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
+import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
+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
@@ -35,13 +42,23 @@ public class ServicePackageController extends BaseController {
     /**
      * 查询服务包基础信息列表
      */
-    @ApiOperation("查询服务包基础信息列表")
+    @ApiOperation("分页查询服务包基础信息列表")
     @PreAuthorize("@ss.hasPermi('manage:servicepackage:list')")
     @GetMapping("/list")
     public TableDataInfo list(ServicePackage servicePackage) {
         return servicePackageService.selectServicePackageList(servicePackage);
     }
 
+	/**
+	 * 查询服务包基础信息列表
+	 */
+	@ApiOperation("查询服务包基础信息列表")
+	@PreAuthorize("@ss.hasPermi('manage:servicepackage:list')")
+	@GetMapping("/getList")
+	public R<List<ServicePackageVO>> getList(ServicePackage servicePackage) {
+		return R.ok(servicePackageService.selectList(servicePackage));
+	}
+
     /**
      * 导出服务包基础信息列表
      */
@@ -66,6 +83,16 @@ public class ServicePackageController extends BaseController {
         return AjaxResult.success(servicePackageService.selectServicePackageById(id));
     }
 
+	/**
+	 * 获取服务包基础信息
+	 */
+	@ApiOperation("获取服务包基础信息")
+	@PreAuthorize("@ss.hasPermi('manage:servicepackage:query')")
+	@GetMapping(value = "/getById/{id}")
+	public R<ServicePackageVO> getById(@PathVariable("id") Long id) {
+		return R.ok(servicePackageService.getById(id));
+	}
+
     /**
      * 新增服务包基础信息
      */
@@ -101,10 +128,6 @@ public class ServicePackageController extends BaseController {
 
     /**
      * 修改服务包发布状态
-     *
-     * @param id
-     * @param whetherRelease
-     * @return
      */
     @ApiOperation("修改服务包发布状态")
     @PutMapping("/editReleaseStatus")

postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicewaycontent/ServiceWayContentController.java

@@ -37,10 +37,6 @@ public class ServiceWayContentController extends BaseController {
 
     /**
      * 查询服务方式列表
-     *
-     * @param serviceWayName
-     * @param id
-     * @return
      */
     @ApiOperation("查询服务方式列表")
     @GetMapping("/serviceWayList")
@@ -51,9 +47,6 @@ public class ServiceWayContentController extends BaseController {
 
     /**
      * 根据服务方式id获取服务方式
-     *
-     * @param id
-     * @return
      */
     @ApiOperation("根据服务方式id获取服务方式")
     @GetMapping(value = "/serviceWay/{id}")
@@ -63,9 +56,6 @@ public class ServiceWayContentController extends BaseController {
 
     /**
      * 新增服务方式
-     *
-     * @param serviceWayContent
-     * @return
      */
     @ApiOperation("新增服务方式")
     @PostMapping("/addServiceWay")
@@ -75,9 +65,6 @@ public class ServiceWayContentController extends BaseController {
 
     /**
      * 修改服务方式
-     *
-     * @param serviceWayContent
-     * @return
      */
     @ApiOperation("修改服务方式")
     @PutMapping("/editServiceWay")
@@ -87,9 +74,6 @@ public class ServiceWayContentController extends BaseController {
 
     /**
      * 根据id删除服务方式
-     *
-     * @param id
-     * @return
      */
     @ApiOperation("根据id删除服务方式")
     @DeleteMapping("/removeServiceWay/{id}")

postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientmanageroute/SignPatientManageRouteController.java

@@ -0,0 +1,97 @@
+package com.xinelu.manage.controller.signpatientmanageroute;
+
+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.page.TableDataInfo;
+import com.xinelu.common.enums.BusinessType;
+import com.xinelu.common.utils.poi.ExcelUtil;
+import com.xinelu.manage.domain.signpatientmanageroute.SignPatientManageRoute;
+import com.xinelu.manage.service.signpatientmanageroute.ISignPatientManageRouteService;
+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-18
+ */
+@RestController
+@RequestMapping("/manage/signroute")
+public class SignPatientManageRouteController extends BaseController {
+    @Resource
+    private ISignPatientManageRouteService signPatientManageRouteService;
+
+/**
+ * 查询签约患者管理任务路径列表
+ */
+@PreAuthorize("@ss.hasPermi('manage:signroute:list')")
+@GetMapping("/list")
+    public TableDataInfo list(SignPatientManageRoute signPatientManageRoute) {
+        startPage();
+        List<SignPatientManageRoute> list = signPatientManageRouteService.selectSignPatientManageRouteList(signPatientManageRoute);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出签约患者管理任务路径列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:signroute:export')")
+    @Log(title = "签约患者管理任务路径", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SignPatientManageRoute signPatientManageRoute) {
+        List<SignPatientManageRoute> list = signPatientManageRouteService.selectSignPatientManageRouteList(signPatientManageRoute);
+        ExcelUtil<SignPatientManageRoute> util = new ExcelUtil<SignPatientManageRoute>(SignPatientManageRoute. class);
+        util.exportExcel(response, list, "签约患者管理任务路径数据");
+    }
+
+    /**
+     * 获取签约患者管理任务路径详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:signroute:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(signPatientManageRouteService.selectSignPatientManageRouteById(id));
+    }
+
+    /**
+     * 新增签约患者管理任务路径
+     */
+    @PreAuthorize("@ss.hasPermi('manage:signroute:add')")
+    @Log(title = "签约患者管理任务路径", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SignPatientManageRoute signPatientManageRoute) {
+        return toAjax(signPatientManageRouteService.insertSignPatientManageRoute(signPatientManageRoute));
+    }
+
+    /**
+     * 修改签约患者管理任务路径
+     */
+    @PreAuthorize("@ss.hasPermi('manage:signroute:edit')")
+    @Log(title = "签约患者管理任务路径", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SignPatientManageRoute signPatientManageRoute) {
+        return toAjax(signPatientManageRouteService.updateSignPatientManageRoute(signPatientManageRoute));
+    }
+
+    /**
+     * 删除签约患者管理任务路径
+     */
+    @PreAuthorize("@ss.hasPermi('manage:signroute:remove')")
+    @Log(title = "签约患者管理任务路径", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(signPatientManageRouteService.deleteSignPatientManageRouteByIds(ids));
+    }
+}

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

@@ -3,6 +3,7 @@ package com.xinelu.manage.controller.signpatientrecord;
 import com.xinelu.common.core.controller.BaseController;
 import com.xinelu.common.core.domain.R;
 import com.xinelu.common.core.page.TableDataInfo;
+import com.xinelu.manage.dto.signpatientrecord.IntentionalSignDto;
 import com.xinelu.manage.dto.signpatientrecord.SignPatientAddDto;
 import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto;
 import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto;
@@ -14,6 +15,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -47,13 +49,24 @@ public class SignPatientRecordController extends BaseController {
 		return getDataTable(list);
 	}
 
+	/**
+	 * 意向签约
+	 */
+	@ApiOperation("意向签约")
+	@PreAuthorize("@ss.hasPermi('manage:signRecord:add')")
+	@PostMapping("/intentionalSign")
+	public R<String> intentionalSign(@Valid @RequestBody IntentionalSignDto body) {
+		int flag = signPatientRecordService.intentionalSign(body);
+		return flag > 0 ? R.ok() : R.fail();
+	}
+
 	/**
 	 * 签约
 	 */
 	@ApiOperation("签约/续约")
 	@PreAuthorize("@ss.hasPermi('manage:signRecord:add')")
 	@PostMapping("/sign")
-	public R<String> sign(@RequestBody SignPatientAddDto body) {
+	public R<String> sign(@Valid @RequestBody SignPatientAddDto body) {
 		int flag = signPatientRecordService.add(body);
 		return flag > 0 ? R.ok() : R.fail();
 	}

postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java

@@ -8,6 +8,7 @@ import com.xinelu.common.enums.BusinessType;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode;
 import com.xinelu.manage.service.specialdiseasenode.ISpecialDiseaseNodeService;
+import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -64,9 +65,9 @@ public class SpecialDiseaseNodeController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:specialDiseaseNode:add')")
     @Log(title = "专病路径-管理节点信息", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody SpecialDiseaseNode specialDiseaseNode) {
-        return toAjax(specialDiseaseNodeService.insertSpecialDiseaseNode(specialDiseaseNode));
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SpecialDiseaseRouteVO specialDiseaseNode) {
+        return specialDiseaseNodeService.insertSpecialDiseaseNode(specialDiseaseNode);
     }
 
     /**
@@ -74,9 +75,9 @@ public class SpecialDiseaseNodeController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:specialDiseaseNode:edit')")
     @Log(title = "专病路径-管理节点信息", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody SpecialDiseaseNode specialDiseaseNode) {
-        return toAjax(specialDiseaseNodeService.updateSpecialDiseaseNode(specialDiseaseNode));
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SpecialDiseaseRouteVO specialDiseaseNode) {
+        return specialDiseaseNodeService.updateSpecialDiseaseNode(specialDiseaseNode);
     }
 
     /**
@@ -88,4 +89,12 @@ public class SpecialDiseaseNodeController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(specialDiseaseNodeService.deleteSpecialDiseaseNodeByIds(ids));
     }
+
+    /**
+     * 查询专病路径-管理节点信息列表
+     */
+    @GetMapping("/selectSpecialDisease")
+    public AjaxResult selectSpecialDisease(Long specialDiseaseRouteId) {
+        return specialDiseaseNodeService.selectSpecialDisease(specialDiseaseRouteId);
+    }
 }

postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java

@@ -0,0 +1,99 @@
+package com.xinelu.manage.controller.specialdiseaseroute;
+
+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.page.TableDataInfo;
+import com.xinelu.common.enums.BusinessType;
+import com.xinelu.common.utils.poi.ExcelUtil;
+import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute;
+import com.xinelu.manage.service.specialdiseaseroute.ISpecialDiseaseRouteService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 专病路径信息Controller
+ *
+ * @author xinelu
+ * @date 2024-03-13
+ */
+@RestController
+@RequestMapping("/system/specialDiseaseRoute")
+public class SpecialDiseaseRouteController extends BaseController {
+    @Resource
+    private ISpecialDiseaseRouteService specialDiseaseRouteService;
+
+    /**
+     * 查询专病路径信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SpecialDiseaseRoute specialDiseaseRoute) {
+        startPage();
+        List<SpecialDiseaseRoute> list = specialDiseaseRouteService.selectSpecialDiseaseRouteList(specialDiseaseRoute);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出专病路径信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:export')")
+    @Log(title = "专病路径信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SpecialDiseaseRoute specialDiseaseRoute) {
+        List<SpecialDiseaseRoute> list = specialDiseaseRouteService.selectSpecialDiseaseRouteList(specialDiseaseRoute);
+        ExcelUtil<SpecialDiseaseRoute> util = new ExcelUtil<SpecialDiseaseRoute>(SpecialDiseaseRoute.class);
+        util.exportExcel(response, list, "专病路径信息数据");
+    }
+
+    /**
+     * 获取专病路径信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(specialDiseaseRouteService.selectSpecialDiseaseRouteById(id));
+    }
+
+    /**
+     * 新增专病路径信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:add')")
+    @Log(title = "专病路径信息", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SpecialDiseaseRoute specialDiseaseRoute) {
+        return toAjax(specialDiseaseRouteService.insertSpecialDiseaseRoute(specialDiseaseRoute));
+    }
+
+    /**
+     * 修改专病路径信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:edit')")
+    @Log(title = "专病路径信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SpecialDiseaseRoute specialDiseaseRoute) {
+        return toAjax(specialDiseaseRouteService.updateSpecialDiseaseRoute(specialDiseaseRoute));
+    }
+
+    /**
+     * 删除专病路径信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:remove')")
+    @Log(title = "专病路径信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(specialDiseaseRouteService.deleteSpecialDiseaseRouteByIds(ids));
+    }
+
+    /**
+     * 科室路径数量
+     */
+    @GetMapping("/departmentRouteCount")
+    public AjaxResult departmentRouteCount(String departmentName) {
+        return specialDiseaseRouteService.departmentRouteCount(departmentName);
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java

@@ -0,0 +1,105 @@
+package com.xinelu.manage.controller.specialdiseasetriggercondition;
+
+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.page.TableDataInfo;
+import com.xinelu.common.enums.BusinessType;
+import com.xinelu.common.utils.poi.ExcelUtil;
+import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition;
+import com.xinelu.manage.dto.specialdiseasetriggercondition.TriggerConditionDTO;
+import com.xinelu.manage.service.specialdiseasetriggercondition.ISpecialDiseaseTriggerConditionService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 触发条件关系Controller
+ *
+ * @author xinelu
+ * @date 2024-03-18
+ */
+@RestController
+@RequestMapping("/system/triggerCondition")
+public class SpecialDiseaseTriggerConditionController extends BaseController {
+    @Resource
+    private ISpecialDiseaseTriggerConditionService specialDiseaseTriggerConditionService;
+
+    /**
+     * 查询触发条件关系列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:triggerCondition:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) {
+        startPage();
+        List<SpecialDiseaseTriggerCondition> list = specialDiseaseTriggerConditionService.selectSpecialDiseaseTriggerConditionList(specialDiseaseTriggerCondition);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询触发条件关系列表
+     */
+    @GetMapping("/triggerConditionList")
+    public AjaxResult triggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) {
+        if (Objects.isNull(specialDiseaseTriggerCondition) || Objects.isNull(specialDiseaseTriggerCondition.getRouteId())) {
+            return AjaxResult.success(new ArrayList<>());
+        }
+        return AjaxResult.success(specialDiseaseTriggerConditionService.selectSpecialDiseaseTriggerConditionList(specialDiseaseTriggerCondition));
+    }
+
+    /**
+     * 导出触发条件关系列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:triggerCondition:export')")
+    @Log(title = "触发条件关系", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) {
+        List<SpecialDiseaseTriggerCondition> list = specialDiseaseTriggerConditionService.selectSpecialDiseaseTriggerConditionList(specialDiseaseTriggerCondition);
+        ExcelUtil<SpecialDiseaseTriggerCondition> util = new ExcelUtil<SpecialDiseaseTriggerCondition>(SpecialDiseaseTriggerCondition.class);
+        util.exportExcel(response, list, "触发条件关系数据");
+    }
+
+    /**
+     * 获取触发条件关系详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:triggerCondition:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(specialDiseaseTriggerConditionService.selectSpecialDiseaseTriggerConditionById(id));
+    }
+
+    /**
+     * 新增触发条件关系
+     */
+    @PreAuthorize("@ss.hasPermi('system:triggerCondition:add')")
+    @Log(title = "触发条件关系", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody TriggerConditionDTO triggerConditionList) {
+        return toAjax(specialDiseaseTriggerConditionService.insertSpecialDiseaseTriggerCondition(triggerConditionList));
+    }
+
+    /**
+     * 修改触发条件关系
+     */
+    @PreAuthorize("@ss.hasPermi('system:triggerCondition:edit')")
+    @Log(title = "触发条件关系", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) {
+        return toAjax(specialDiseaseTriggerConditionService.updateSpecialDiseaseTriggerCondition(specialDiseaseTriggerCondition));
+    }
+
+    /**
+     * 删除触发条件关系
+     */
+    @PreAuthorize("@ss.hasPermi('system:triggerCondition:remove')")
+    @Log(title = "触发条件关系", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(specialDiseaseTriggerConditionService.deleteSpecialDiseaseTriggerConditionByIds(ids));
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/controller/taskpartitiondict/TaskPartitionDictController.java

@@ -38,6 +38,15 @@ public class TaskPartitionDictController extends BaseController {
         return getDataTable(list);
     }
 
+
+    /**
+     * 查询任务细分字典列表 - 不分页
+     */
+    @GetMapping("/taskPartitionList")
+    public AjaxResult taskPartitionList(TaskPartitionDict taskPartitionDict) {
+        return AjaxResult.success(taskPartitionDictService.selectTaskPartitionDictList(taskPartitionDict));
+    }
+
     /**
      * 导出任务细分字典列表
      */

postdischarge-manage/src/main/java/com/xinelu/manage/controller/taskstatusdict/TaskStatusDictController.java

@@ -38,6 +38,11 @@ public class TaskStatusDictController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/taskStatusDictList")
+    public AjaxResult taskStatusDictList(TaskStatusDict taskStatusDict) {
+        return AjaxResult.success(taskStatusDictService.selectTaskStatusDictList(taskStatusDict));
+    }
+
     /**
      * 导出任务状态字典列表
      */
@@ -64,7 +69,7 @@ public class TaskStatusDictController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:taskStatus:add')")
     @Log(title = "任务状态字典", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public AjaxResult add(@RequestBody TaskStatusDict taskStatusDict) {
         return toAjax(taskStatusDictService.insertTaskStatusDict(taskStatusDict));
     }
@@ -74,7 +79,7 @@ public class TaskStatusDictController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:taskStatus:edit')")
     @Log(title = "任务状态字典", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PutMapping("/edit")
     public AjaxResult edit(@RequestBody TaskStatusDict taskStatusDict) {
         return toAjax(taskStatusDictService.updateTaskStatusDict(taskStatusDict));
     }

postdischarge-manage/src/main/java/com/xinelu/manage/controller/textmessage/TextMessageController.java

@@ -50,7 +50,7 @@ public class TextMessageController extends BaseController {
         List<TextMessageTaskVO> list = textMessageService.selectTextMessageList(textMessageDTO);
         //处理上面查询的list集合
         int num = list.size();
-        list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+        list = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(HttpStatus.SUCCESS);
         rspData.setRows(list);

postdischarge-manage/src/main/java/com/xinelu/manage/controller/wechattemplate/WechatTemplateController.java

@@ -49,7 +49,7 @@ public class WechatTemplateController extends BaseController {
         List<WechatTemplateTaskVO> list = wechatTemplateService.selectWechatTemplateList(wechatTemplateDto);
         //处理上面查询的list集合
         int num = list.size();
-        list = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+        list = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(HttpStatus.SUCCESS);
         rspData.setRows(list);

postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java

@@ -12,7 +12,7 @@ import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import java.util.Date;
+import java.time.LocalDate;
 
 /**
  * 科室信息对象 department
@@ -166,7 +166,7 @@ public class Department extends BaseEntity {
     @ApiModelProperty(value = "成立日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "成立日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date establishDate;
+    private LocalDate establishDate;
 
     /**
      * 撤销日期
@@ -174,7 +174,7 @@ public class Department extends BaseEntity {
     @ApiModelProperty(value = "撤销日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "撤销日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date revokeDate;
+    private LocalDate revokeDate;
 
     @Override
     public String toString() {

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

@@ -118,4 +118,7 @@ public class MaterialsInfo extends BaseEntity {
     @Excel(name = "素材排序，值越小排序越靠前")
     private Integer materialsSort;
 
+	/** 删除标识，0：未删除，1：已删除 */
+	private Integer delFlag;
+
 }

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

@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
-import java.util.Date;
+import java.time.LocalDate;
 
 /**
  * 患者信息对象 patient_info
@@ -33,6 +33,15 @@ public class PatientInfo extends BaseEntity {
      */
     private Long id;
 
+    /**
+     * 患者姓名
+     */
+    /**
+     * 居民信息表id
+     */
+    @ApiModelProperty(value = "居民信息表id")
+    private Long residentId;
+
     /**
      * 患者姓名
      */
@@ -58,7 +67,7 @@ public class PatientInfo extends BaseEntity {
      */
     @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date birthDate;
+    private LocalDate birthDate;
 
     /**
      * 身份证号
@@ -110,6 +119,9 @@ public class PatientInfo extends BaseEntity {
     @Excel(name = "签约时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDateTime signTime;
 
+    /**
+     * 就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL
+     */
     /**
      * 开证医生（预住院患者）
      */
@@ -124,6 +136,23 @@ public class PatientInfo extends BaseEntity {
     @Excel(name = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
     private String visitMethod;
 
+    /**
+     * 主治医生id
+     */
+    @ApiModelProperty(value = "主治医生id")
+    @Excel(name = "主治医生id")
+    private Long attendingPhysicianId;
+
+    /**
+     * 主治医生姓名
+     */
+    @ApiModelProperty(value = "主治医生姓名")
+    @Excel(name = "主治医生姓名")
+    private String attendingPhysicianName;
+
+    /**
+     * 主要诊断
+     */
     /**
      * 主要诊断
      */
@@ -137,6 +166,9 @@ public class PatientInfo extends BaseEntity {
     @Excel(name = "主治医生")
     private String attendingPhysician;
 
+    /**
+     * 所属医院id
+     */
     /**
      * 所属医院id
      */
@@ -189,6 +221,9 @@ public class PatientInfo extends BaseEntity {
     @Excel(name = "所属病区名称")
     private String wardName;
 
+    /**
+     * 责任护士
+     */
     /**
      * 住院号
      */
@@ -202,6 +237,15 @@ public class PatientInfo extends BaseEntity {
     @ApiModelProperty(value = "责任护士")
     private String responsibleNurse;
 
+    /**
+     * 最新一条就诊记录id
+     */
+    @ApiModelProperty(value = "最新一条就诊记录id")
+    private Long patientVisitRecordId;
+
+    /**
+     * 就诊流水号
+     */
     /**
      * 就诊流水号
      */
@@ -214,18 +258,24 @@ public class PatientInfo extends BaseEntity {
     @ApiModelProperty(value = "手术名称")
     private String surgicalName;
 
+    /**
+     * 入院时间，时间格式：yyyy-MM-dd
+     */
     /**
      * 入院时间，时间格式：yyyy-MM-dd
      */
     @ApiModelProperty(value = "入院时间")
-    private Date admissionDate;
+    private LocalDateTime admissionTime;
 
     /**
      * 出院时间（出院患者），时间格式：yyyy-MM-dd
      */
     @ApiModelProperty(value = "出院时间（出院患者）")
-    private Date dischargeDate;
+    private LocalDateTime dischargeTime;
 
+    /**
+     * 预约治疗组（取值以及枚举未知？）
+     */
     /**
      * 病历内容
      */
@@ -248,14 +298,20 @@ public class PatientInfo extends BaseEntity {
      * 登记日期（预住院患者），时间格式：yyyy-MM-dd
      */
     @ApiModelProperty(value = "登记日期（预住院患者），时间格式：yyyy-MM-dd")
-    private Date registrationDate;
+    private LocalDate registrationDate;
 
     /**
      * 预约时间（预住院患者），时间格式：yyyy-MM-dd
      */
     @ApiModelProperty(value = "预约时间（预住院患者），时间格式：yyyy-MM-dd")
-    private Date appointmentDate;
+    private LocalDate appointmentDate;
 
+    /**
+     * 门诊/住院号
+     */
+    @ApiModelProperty(value = "门诊/住院号 ")
+    @Excel(name = "门诊/住院号 ", readConverterExp = "门诊/住院号 ")
+    private String inHospitalNumber;
     /**
      * 门诊号（门诊患者）
      */
@@ -263,12 +319,19 @@ public class PatientInfo extends BaseEntity {
     @Excel(name = "门诊号", readConverterExp = "门=诊患者")
     private String outpatientNumber;
 
+    /**
+     * 就诊时间，格式：yyyy-MM-dd HH:mm:ss
+     */
+    @ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "就诊时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
+    private LocalDateTime visitDate;
     /**
      * 就诊时间（门诊患者），时间格式：yyyy-MM-dd
      */
     @ApiModelProperty(value = "就诊时间")
     @Excel(name = "就诊时间", readConverterExp = "门=诊患者")
-    private Date visitTime;
+    private LocalDate visitTime;
 
     /**
      * 出院方式（出院患者）
@@ -277,6 +340,9 @@ public class PatientInfo extends BaseEntity {
     @Excel(name = "出院方式", readConverterExp = "出=院患者")
     private String dischargeMethod;
 
+    /**
+     * 患者来源，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END
+     */
     /**
      * 微信小程序openid，微信小程序唯一标识
      */

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java

@@ -1,9 +1,10 @@
 package com.xinelu.manage.domain.patientprehospitalization;
 
+import com.xinelu.common.annotation.Excel;
 import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 
 /**
@@ -19,6 +20,12 @@ public class PatientPreHospitalization extends BaseEntity {
     */
     @ApiModelProperty("主键Id")
     private Long id;
+	/**
+	 * 居民信息表id
+	 */
+	@ApiModelProperty("居民信息表id")
+	private Long residentId;
+
     /**
     * 患者表id
     */
@@ -28,31 +35,37 @@ public class PatientPreHospitalization extends BaseEntity {
     * 姓名
     */
     @ApiModelProperty("姓名")
+    @Excel(name = "姓名")
     private String patientName;
     /**
     * 患者电话
     */
     @ApiModelProperty("患者电话")
+    @Excel(name = "电话")
     private String patientPhone;
     /**
     * 身份证号
     */
     @ApiModelProperty("身份证号")
+    @Excel(name = "身份证号")
     private String cardNo;
     /**
     * 性别，男：MALE，女：FEMALE
     */
     @ApiModelProperty("性别，男：MALE，女：FEMALE")
+    @Excel(name = "性别",readConverterExp = "MALE=男,FEMALE=女")
     private String sex;
     /**
     * 出生日期，格式：yyyy-MM-dd
     */
     @ApiModelProperty("出生日期，格式：yyyy-MM-dd")
-    private Date birthDate;
+    @Excel(name = "出生日期")
+    private LocalDate birthDate;
     /**
     * 家属电话
     */
     @ApiModelProperty("家属电话")
+    @Excel(name = "家属电话")
     private String familyMemberPhone;
     /**
     * 住址
@@ -63,6 +76,7 @@ public class PatientPreHospitalization extends BaseEntity {
     * 主要诊断
     */
     @ApiModelProperty("主要诊断")
+    @Excel(name = "诊断")
     private String mainDiagnosis;
     /**
     * 所属医院id
@@ -93,6 +107,7 @@ public class PatientPreHospitalization extends BaseEntity {
     * 所属科室名称
     */
     @ApiModelProperty("所属科室名称")
+    @Excel(name = "科室名称")
     private String departmentName;
     /**
     * 所属病区id
@@ -102,28 +117,33 @@ public class PatientPreHospitalization extends BaseEntity {
     /**
     * 所属病区名称
     */
+    @Excel(name = "预约病区")
     @ApiModelProperty("所属病区名称")
     private String wardName;
     /**
     * 预约治疗组（取值以及枚举未知？）
     */
     @ApiModelProperty("预约治疗组（取值以及枚举未知？）")
+    @Excel(name = "预约治疗组")
     private String appointmentTreatmentGroup;
     /**
     * 登记号（预住院患者）
     */
     @ApiModelProperty("登记号（预住院患者）")
+    @Excel(name = "登记号")
     private String registrationNo;
     /**
     * 登记日期（预住院患者），时间格式：yyyy-MM-dd
     */
     @ApiModelProperty("登记日期（预住院患者），时间格式：yyyy-MM-dd")
-    private Date registrationDate;
+    @Excel(name = "登记日期")
+    private LocalDate registrationDate;
     /**
     * 预约时间（预住院患者），时间格式：yyyy-MM-dd
     */
     @ApiModelProperty("预约时间（预住院患者），时间格式：yyyy-MM-dd")
-    private Date appointmentDate;
+    @Excel(name = "预约日期")
+    private LocalDate appointmentDate;
     /**
     * 开证医生id
     */
@@ -133,6 +153,7 @@ public class PatientPreHospitalization extends BaseEntity {
     * 开证医生姓名
     */
     @ApiModelProperty("开证医生姓名")
+    @Excel(name = "开证医生")
     private String certificateIssuingDoctorName;
     /**
     * 责任护士

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionoptionresult/PatientQuestionOptionResult.java

@@ -0,0 +1,126 @@
+package com.xinelu.manage.domain.patientquestionoptionresult;
+
+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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+
+/**
+ * 患者问卷题目选项提交结果信息对象 patient_question_option_result
+ *
+ * @author xinelu
+ * @date 2024-03-28
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "患者问卷题目选项提交结果信息对象", description = "patient_question_option_result")
+public class PatientQuestionOptionResult extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 问卷题目提交结果信息表id
+     */
+    @ApiModelProperty(value = "问卷题目提交结果信息表id")
+    @Excel(name = "问卷题目提交结果信息表id")
+    private Long questionSubjectResultId;
+
+    /**
+     * 问卷题目表id
+     */
+    @ApiModelProperty(value = "问卷题目表id")
+    @Excel(name = "问卷题目表id")
+    private Long questionnaireSubjectId;
+
+    /**
+     * 题目名称
+     */
+    @ApiModelProperty(value = "题目名称")
+    @Excel(name = "题目名称")
+    private String questionName;
+
+    /**
+     * 选项名称
+     */
+    @ApiModelProperty(value = "选项名称")
+    @Excel(name = "选项名称")
+    private String optionName;
+
+    /**
+     * 选项答案
+     */
+    @ApiModelProperty(value = "选项答案")
+    @Excel(name = "选项答案")
+    private String optionAnswer;
+
+    /**
+     * 选项分值
+     */
+    @ApiModelProperty(value = "选项分值")
+    @Excel(name = "选项分值")
+    private BigDecimal optionScore;
+
+    /**
+     * 题目选项选择标识，0：已选择，1：未选择
+     */
+    @ApiModelProperty(value = "题目选项选择标识，0：已选择，1：未选择")
+    @Excel(name = "题目选项选择标识，0：已选择，1：未选择")
+    private Integer optionChooseSign;
+
+    /**
+     * 选项题目提交答案
+     */
+    @ApiModelProperty(value = "选项题目提交答案")
+    @Excel(name = "选项题目提交答案")
+    private String optionSubmitAnswer;
+
+    /**
+     * 选项排序
+     */
+    @ApiModelProperty(value = "选项排序")
+    @Excel(name = "选项排序")
+    private Integer optionSort;
+
+    /**
+     * 选项备注
+     */
+    @ApiModelProperty(value = "选项备注")
+    @Excel(name = "选项备注")
+    private String optionRemark;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("questionSubjectResultId", getQuestionSubjectResultId())
+                .append("questionnaireSubjectId", getQuestionnaireSubjectId())
+                .append("questionName", getQuestionName())
+                .append("optionName", getOptionName())
+                .append("optionAnswer", getOptionAnswer())
+                .append("optionScore", getOptionScore())
+                .append("optionChooseSign", getOptionChooseSign())
+                .append("optionSubmitAnswer", getOptionSubmitAnswer())
+                .append("optionSort", getOptionSort())
+                .append("optionRemark", getOptionRemark())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubjectresult/PatientQuestionSubjectResult.java

@@ -0,0 +1,147 @@
+package com.xinelu.manage.domain.patientquestionsubjectresult;
+
+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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+
+/**
+ * 患者问卷题目提交结果信息对象 patient_question_subject_result
+ *
+ * @author xinelu
+ * @date 2024-03-28
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "患者问卷题目提交结果信息对象", description = "patient_question_subject_result")
+public class PatientQuestionSubjectResult extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 问卷提交结果信息表id
+     */
+    @ApiModelProperty(value = "问卷提交结果信息表id")
+    @Excel(name = "问卷提交结果信息表id")
+    private Long questionSubmitResultId;
+
+    /**
+     * 问卷表id
+     */
+    @ApiModelProperty(value = "问卷表id")
+    @Excel(name = "问卷表id")
+    private Long questionInfoId;
+
+    /**
+     * 题目序号
+     */
+    @ApiModelProperty(value = "题目序号")
+    @Excel(name = "题目序号")
+    private BigDecimal questionNumber;
+
+    /**
+     * 题目类型，单选题：MULTIPLE_CHOICE，多选题：MULTIPLE_CHOICE_QUESTIONS，填空题：FILL_IN_THE_BLANKS，打分题：SCORING_QUESTIONS，
+     * 组合单选题：COMBINATION_RADIO_SUBJECT，组合多选题：COMBINATION_MULTIPLE_SUBJECT，组合填空题：COMBINATION_BLANKS_SUBJECT，
+     * 组合打分题：COMBINATION_SCORING_SUBJECT，日期填空题：DATE_BLANKS_SUBJECT，时间填空题：TIME_BLANKS_SUBJECT
+     */
+    @ApiModelProperty(value = "题目类型，单选题：MULTIPLE_CHOICE，多选题：MULTIPLE_CHOICE_QUESTIONS，填空题：FILL_IN_THE_BLANKS，打分题：SCORING_QUESTIONS， 组合单选题：COMBINATION_RADIO_SUBJECT，组合多选题：COMBINATION_MULTIPLE_SUBJECT，组合填空题：COMBINATION_BLANKS_SUBJECT， 组合打分题：COMBINATION_SCORING_SUBJECT，日期填空题：DATE_BLANKS_SUBJECT，时间填空题：TIME_BLANKS_SUBJECT")
+    @Excel(name = "题目类型，单选题：MULTIPLE_CHOICE，多选题：MULTIPLE_CHOICE_QUESTIONS，填空题：FILL_IN_THE_BLANKS，打分题：SCORING_QUESTIONS， 组合单选题：COMBINATION_RADIO_SUBJECT，组合多选题：COMBINATION_MULTIPLE_SUBJECT，组合填空题：COMBINATION_BLANKS_SUBJECT， 组合打分题：COMBINATION_SCORING_SUBJECT，日期填空题：DATE_BLANKS_SUBJECT，时间填空题：TIME_BLANKS_SUBJECT")
+    private String questionType;
+
+    /**
+     * 题目名称
+     */
+    @ApiModelProperty(value = "题目名称")
+    @Excel(name = "题目名称")
+    private String questionName;
+
+    /**
+     * 题目说明
+     */
+    @ApiModelProperty(value = "题目说明")
+    @Excel(name = "题目说明")
+    private String questionDescription;
+
+    /**
+     * 填写说明
+     */
+    @ApiModelProperty(value = "填写说明")
+    @Excel(name = "填写说明")
+    private String writeDescription;
+
+    /**
+     * 回答（填空题）
+     */
+    @ApiModelProperty(value = "回答")
+    @Excel(name = "回答", readConverterExp = "填=空题")
+    private String fillBlanksAnswer;
+
+    /**
+     * 选项个数（打分题）
+     */
+    @ApiModelProperty(value = "选项个数")
+    @Excel(name = "选项个数", readConverterExp = "打=分题")
+    private Integer optionCount;
+
+    /**
+     * 是否计分，0：否，1：是
+     */
+    @ApiModelProperty(value = "是否计分，0：否，1：是")
+    @Excel(name = "是否计分，0：否，1：是")
+    private Integer whetherScore;
+
+    /**
+     * 计分方式，每个选项都有对应分值：NOT_UNIQUE_ANSWER，全部答对才得分：UNIQUE_ANSWER
+     */
+    @ApiModelProperty(value = "计分方式，每个选项都有对应分值：NOT_UNIQUE_ANSWER，全部答对才得分：UNIQUE_ANSWER")
+    @Excel(name = "计分方式，每个选项都有对应分值：NOT_UNIQUE_ANSWER，全部答对才得分：UNIQUE_ANSWER")
+    private String scoringMethod;
+
+    /**
+     * 计分说明
+     */
+    @ApiModelProperty(value = "计分说明")
+    @Excel(name = "计分说明")
+    private String scoringDescription;
+
+    /**
+     * 题目分值
+     */
+    @ApiModelProperty(value = "题目分值")
+    @Excel(name = "题目分值")
+    private BigDecimal questionScore;
+
+    /**
+     * 题目排序
+     */
+    @ApiModelProperty(value = "题目排序")
+    @Excel(name = "题目排序")
+    private Integer questionSort;
+
+    /**
+     * 题目备注
+     */
+    @ApiModelProperty(value = "题目备注")
+    @Excel(name = "题目备注")
+    private String questionRemark;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("questionSubmitResultId", getQuestionSubmitResultId()).append("questionInfoId", getQuestionInfoId()).append("questionNumber", getQuestionNumber()).append("questionType", getQuestionType()).append("questionName", getQuestionName()).append("questionDescription", getQuestionDescription()).append("writeDescription", getWriteDescription()).append("fillBlanksAnswer", getFillBlanksAnswer()).append("optionCount", getOptionCount()).append("whetherScore", getWhetherScore()).append("scoringMethod", getScoringMethod()).append("scoringDescription", getScoringDescription()).append("questionScore", getQuestionScore()).append("questionSort", getQuestionSort()).append("questionRemark", getQuestionRemark()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).toString();
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubmitresult/PatientQuestionSubmitResult.java

@@ -0,0 +1,200 @@
+package com.xinelu.manage.domain.patientquestionsubmitresult;
+
+
+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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+
+/**
+ * 患者问卷提交结果信息对象 patient_question_submit_result
+ *
+ * @author xinelu
+ * @date 2024-03-28
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "患者问卷提交结果信息对象", description = "patient_question_submit_result")
+public class PatientQuestionSubmitResult extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 管理任务执行记录表id
+     */
+    @ApiModelProperty(value = "管理任务执行记录表id")
+    @Excel(name = "管理任务执行记录表id")
+    private Long taskExecuteRecordId;
+
+    /**
+     * 患者表id
+     */
+    @ApiModelProperty(value = "患者表id")
+    @Excel(name = "患者表id")
+    private Long patientId;
+
+    /**
+     * 签约患者管理任务表id
+     */
+    @ApiModelProperty(value = "签约患者管理任务表id")
+    @Excel(name = "签约患者管理任务表id")
+    private Long manageRouteId;
+
+    /**
+     * 签约患者管理任务节点表id
+     */
+    @ApiModelProperty(value = "签约患者管理任务节点表id")
+    @Excel(name = "签约患者管理任务节点表id")
+    private Long manageRouteNodeId;
+
+    /**
+     * 患者姓名（提交者姓名）
+     */
+    @ApiModelProperty(value = "患者姓名")
+    @Excel(name = "患者姓名", readConverterExp = "提=交者姓名")
+    private String patientName;
+
+    /**
+     * 签约患者管理任务名称
+     */
+    @ApiModelProperty(value = "签约患者管理任务名称")
+    @Excel(name = "签约患者管理任务名称")
+    private String manageRouteName;
+
+    /**
+     * 签约患者管理路径节点名称
+     */
+    @ApiModelProperty(value = "签约患者管理路径节点名称")
+    @Excel(name = "签约患者管理路径节点名称")
+    private String manageRouteNodeName;
+
+    /**
+     * 问卷表id
+     */
+    @ApiModelProperty(value = "问卷表id")
+    @Excel(name = "问卷表id")
+    private Long questionInfoId;
+
+    /**
+     * 所属科室id
+     */
+    @ApiModelProperty(value = "所属科室id")
+    @Excel(name = "所属科室id")
+    private Long departmentId;
+
+    /**
+     * 所属科室名称
+     */
+    @ApiModelProperty(value = "所属科室名称")
+    @Excel(name = "所属科室名称")
+    private String departmentName;
+
+    /**
+     * 病种id
+     */
+    @ApiModelProperty(value = "病种id")
+    @Excel(name = "病种id")
+    private Long diseaseTypeId;
+
+    /**
+     * 病种名称
+     */
+    @ApiModelProperty(value = "病种名称")
+    @Excel(name = "病种名称")
+    private String diseaseTypeName;
+
+    /**
+     * 问卷标题
+     */
+    @ApiModelProperty(value = "问卷标题")
+    @Excel(name = "问卷标题")
+    private String questionnaireName;
+
+    /**
+     * 问卷说明
+     */
+    @ApiModelProperty(value = "问卷说明")
+    @Excel(name = "问卷说明")
+    private String questionnaireDescription;
+
+    /**
+     * 作答方式，一页一题：ONE_PAGE_ONE_QUESTION，非一页一题：NOT_ONE_PAGE_ONE_QUESTION
+     */
+    @ApiModelProperty(value = "作答方式，一页一题：ONE_PAGE_ONE_QUESTION，非一页一题：NOT_ONE_PAGE_ONE_QUESTION")
+    @Excel(name = "作答方式，一页一题：ONE_PAGE_ONE_QUESTION，非一页一题：NOT_ONE_PAGE_ONE_QUESTION")
+    private String answeringMethod;
+
+    /**
+     * 问卷ID
+     */
+    @ApiModelProperty(value = "问卷ID")
+    @Excel(name = "问卷ID")
+    private String questionnaireId;
+
+    /**
+     * 问题个数
+     */
+    @ApiModelProperty(value = "问题个数")
+    @Excel(name = "问题个数")
+    private Integer questionCount;
+
+    /**
+     * 问卷总分值，小数点后两位
+     */
+    @ApiModelProperty(value = "问卷总分值，小数点后两位")
+    @Excel(name = "问卷总分值，小数点后两位")
+    private BigDecimal questionnaireTotalScore;
+
+    /**
+     * 问卷总得分，根据患者提交问卷得出的分值
+     */
+    @ApiModelProperty(value = "问卷总得分，根据患者提交问卷得出的分值")
+    @Excel(name = "问卷总得分，根据患者提交问卷得出的分值")
+    private BigDecimal totalScore;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("taskExecuteRecordId", getTaskExecuteRecordId())
+                .append("patientId", getPatientId())
+                .append("manageRouteId", getManageRouteId())
+                .append("manageRouteNodeId", getManageRouteNodeId())
+                .append("patientName", getPatientName())
+                .append("manageRouteName", getManageRouteName())
+                .append("manageRouteNodeName", getManageRouteNodeName())
+                .append("questionInfoId", getQuestionInfoId())
+                .append("departmentId", getDepartmentId())
+                .append("departmentName", getDepartmentName())
+                .append("diseaseTypeId", getDiseaseTypeId())
+                .append("diseaseTypeName", getDiseaseTypeName())
+                .append("questionnaireName", getQuestionnaireName())
+                .append("questionnaireDescription", getQuestionnaireDescription())
+                .append("answeringMethod", getAnsweringMethod())
+                .append("questionnaireId", getQuestionnaireId())
+                .append("questionCount", getQuestionCount())
+                .append("questionnaireTotalScore", getQuestionnaireTotalScore())
+                .append("totalScore", getTotalScore())
+                .append("remark", getRemark())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patienttaskexecuterecord/PatientTaskExecuteRecord.java

@@ -0,0 +1,140 @@
+package com.xinelu.manage.domain.patienttaskexecuterecord;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+
+/**
+ * 患者管理任务执行记录对象 patient_task_execute_record
+ *
+ * @author xinelu
+ * @date 2024-03-25
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "患者管理任务执行记录对象", description = "patient_task_execute_record")
+public class PatientTaskExecuteRecord extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 患者表id
+     */
+    @ApiModelProperty(value = "患者表id")
+    @Excel(name = "患者表id")
+    private Long patientId;
+
+    /**
+     * 签约患者管理任务表id
+     */
+    @ApiModelProperty(value = "签约患者管理任务表id")
+    @Excel(name = "签约患者管理任务表id")
+    private Long manageRouteId;
+
+    /**
+     * 签约患者管理任务节点表id
+     */
+    @ApiModelProperty(value = "签约患者管理任务节点表id")
+    @Excel(name = "签约患者管理任务节点表id")
+    private Long manageRouteNodeId;
+
+    /**
+     * 患者姓名
+     */
+    @ApiModelProperty(value = "患者姓名")
+    @Excel(name = "患者姓名")
+    private String patientName;
+
+    /**
+     * 签约患者管理任务名称
+     */
+    @ApiModelProperty(value = "签约患者管理任务名称")
+    @Excel(name = "签约患者管理任务名称")
+    private String manageRouteName;
+
+    /**
+     * 签约患者管理路径节点名称
+     */
+    @ApiModelProperty(value = "签约患者管理路径节点名称")
+    @Excel(name = "签约患者管理路径节点名称")
+    private String manageRouteNodeName;
+
+    /**
+     * 任务内容，电话外呼：PHONE_OUTBOUND，问卷量表：QUESTIONNAIRE_SCALE，宣教文章：PROPAGANDA_ARTICLE，文字提醒：TEXT_REMIND，人工随访：ARTIFICIAL_FOLLOW_UP
+     */
+    @ApiModelProperty(value = "任务内容，电话外呼：PHONE_OUTBOUND，问卷量表：QUESTIONNAIRE_SCALE，宣教文章：PROPAGANDA_ARTICLE，文字提醒：TEXT_REMIND，人工随访：ARTIFICIAL_FOLLOW_UP")
+    @Excel(name = "任务内容，电话外呼：PHONE_OUTBOUND，问卷量表：QUESTIONNAIRE_SCALE，宣教文章：PROPAGANDA_ARTICLE，文字提醒：TEXT_REMIND，人工随访：ARTIFICIAL_FOLLOW_UP")
+    private String taskContent;
+
+    /**
+     * 任务执行时间，格式：yyyy-MM-dd HH:mm:ss
+     */
+    @ApiModelProperty(value = "任务执行时间，格式：yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "任务执行时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date executeTime;
+
+    /**
+     * 执行人姓名，手动执行时记录
+     */
+    @ApiModelProperty(value = "执行人姓名，手动执行时记录")
+    @Excel(name = "执行人姓名，手动执行时记录")
+    private String executePerson;
+
+    /**
+     * 任务执行方式，人工执行：MANUAL_EXECUTE，系统自动执行：SYSTEM_AUTOMATIC_EXECUTE
+     */
+    @ApiModelProperty(value = "任务执行方式，人工执行：MANUAL_EXECUTE，系统自动执行：SYSTEM_AUTOMATIC_EXECUTE")
+    @Excel(name = "任务执行方式，人工执行：MANUAL_EXECUTE，系统自动执行：SYSTEM_AUTOMATIC_EXECUTE")
+    private String executeType;
+
+    /**
+     * 备注信息
+     */
+    @ApiModelProperty(value = "备注信息")
+    @Excel(name = "备注信息")
+    private String executeRemark;
+
+    @ApiModelProperty(value = "患者就诊记录基本信息表id")
+    @Excel(name = "患者就诊记录基本信息表id")
+    private Long visitRecordId;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("patientId", getPatientId())
+                .append("manageRouteId", getManageRouteId())
+                .append("manageRouteNodeId", getManageRouteNodeId())
+                .append("patientName", getPatientName())
+                .append("manageRouteName", getManageRouteName())
+                .append("manageRouteNodeName", getManageRouteNodeName())
+                .append("taskContent", getTaskContent())
+                .append("executeTime", getExecuteTime())
+                .append("executePerson", getExecutePerson())
+                .append("executeType", getExecuteType())
+                .append("executeRemark", getExecuteRemark())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patienttaskpushrecord/PatientTaskPushRecord.java

@@ -0,0 +1,104 @@
+package com.xinelu.manage.domain.patienttaskpushrecord;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 患者管理任务推送方式记录对象 patient_task_push_record
+ *
+ * @author xinelu
+ * @date 2024-03-21
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "患者管理任务推送方式记录对象", description = "patient_task_push_record")
+public class PatientTaskPushRecord extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 患者表id
+     */
+    @ApiModelProperty(value = "患者表id")
+    @Excel(name = "患者表id")
+    private Long patientId;
+
+    /**
+     * 签约患者管理任务节点表id
+     */
+    @ApiModelProperty(value = "签约患者管理任务节点表id")
+    @Excel(name = "签约患者管理任务节点表id")
+    private Long manageRouteNodeId;
+
+    /**
+     * 患者姓名
+     */
+    @ApiModelProperty(value = "患者姓名")
+    @Excel(name = "患者姓名")
+    private String patientName;
+
+    /**
+     * 管理路径节点名称
+     */
+    @ApiModelProperty(value = "管理路径节点名称")
+    @Excel(name = "管理路径节点名称")
+    private String routeNodeName;
+
+    /**
+     * 管理任务推送方式，微信小程序：微信公众号：，短信：，IM：
+     */
+    @ApiModelProperty(value = "管理任务推送方式，微信小程序：微信公众号：，短信：，IM：")
+    @Excel(name = "管理任务推送方式，微信小程序：微信公众号：，短信：，IM：")
+    private String taskPushType;
+
+    /**
+     * 管理任务推送时间，格式：yyyy-MM-dd HH:mm:ss
+     */
+    @ApiModelProperty(value = "管理任务推送时间，格式：yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "管理任务推送时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date taskPushDate;
+
+    /**
+     * 管理任务推送备注
+     */
+    @ApiModelProperty(value = "管理任务推送备注")
+    @Excel(name = "管理任务推送备注")
+    private String taskPushRemark;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("patientId", getPatientId())
+                .append("manageRouteNodeId", getManageRouteNodeId())
+                .append("patientName", getPatientName())
+                .append("routeNodeName", getRouteNodeName())
+                .append("taskPushType", getTaskPushType())
+                .append("taskPushDate", getTaskPushDate())
+                .append("taskPushRemark", getTaskPushRemark())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitinhospital/PatientVisitInHospital.java

@@ -5,7 +5,7 @@ import com.xinelu.common.annotation.Excel;
 import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -82,7 +82,7 @@ public class PatientVisitInHospital extends BaseEntity {
     @ApiModelProperty(value = "签名日期，格式：yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "签名日期，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date signatureDate;
+    private LocalDateTime signatureDate;
 
     /** 体格检查 */
     @ApiModelProperty(value = "体格检查")

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitoperation/PatientVisitOperation.java

@@ -5,7 +5,7 @@ import com.xinelu.common.annotation.Excel;
 import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -42,7 +42,7 @@ public class PatientVisitOperation extends BaseEntity {
     @ApiModelProperty(value = "手术日期，格式：yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "手术日期，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date operationDate;
+    private LocalDateTime operationDate;
 
     /** 手术麻醉方式，全身麻醉：GENERAL_ANESTHESIA，局部麻醉：LOCAL_ANESTHESIA */
     @ApiModelProperty(value = "手术麻醉方式，全身麻醉：GENERAL_ANESTHESIA，局部麻醉：LOCAL_ANESTHESIA")

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java

@@ -5,7 +5,8 @@ import com.xinelu.common.annotation.Excel;
 import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -28,6 +29,10 @@ public class PatientVisitRecord extends BaseEntity {
     /** 主键Id */
     private Long id;
 
+	/** 居民信息表id */
+	@ApiModelProperty(value = "居民信息表id")
+	private Long residentId;
+
     /** 患者表id */
     @ApiModelProperty(value = "患者表id")
     @Excel(name = "患者表id")
@@ -67,7 +72,7 @@ public class PatientVisitRecord extends BaseEntity {
     @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "出生日期，格式：yyyy-MM-dd", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date birthDate;
+    private LocalDate birthDate;
 
     /** 年龄 */
     @ApiModelProperty(value = "年龄")
@@ -79,16 +84,16 @@ public class PatientVisitRecord extends BaseEntity {
     @Excel(name = "民族")
     private String nation;
 
-    /** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED */
-    @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED")
-    @Excel(name = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED")
-    private String visitType;
+    /** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL */
+    @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
+    @Excel(name = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
+    private String visitMethod;
 
     /** 就诊时间，格式：yyyy-MM-dd HH:mm:ss */
     @ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @Excel(name = "就诊时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date visitDate;
+    private LocalDateTime visitDate;
 
     /** 就诊名称 */
     @ApiModelProperty(value = "就诊名称")
@@ -162,20 +167,20 @@ public class PatientVisitRecord extends BaseEntity {
 
     /** 入院时间 */
     @ApiModelProperty(value = "入院时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @Excel(name = "入院时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date admissionTime;
+    private LocalDateTime admissionTime;
 
     /** 出院时间 */
     @ApiModelProperty(value = "出院时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @Excel(name = "出院时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date dischargeTime;
+    private LocalDateTime dischargeTime;
 
     /** _记录时间（入院记录） */
     @ApiModelProperty(value = "_记录时间")
-    @Excel(name = "_记录时间", readConverterExp = "入=院记录")
-    private Date recordTime;
+    @Excel(name = "_记录时间", readConverterExp = "入院记录")
+    private LocalDateTime recordTime;
 
     /** 门诊记录信息（就诊记录-门诊记录） */
     @ApiModelProperty(value = "门诊记录信息")
@@ -217,4 +222,11 @@ public class PatientVisitRecord extends BaseEntity {
     @Excel(name = "手术名称")
     private String surgicalName;
 
+	/** 手术记录 */
+	@ApiModelProperty(value = "手术记录")
+	private String surgicalRecord;
+
+	/** 删除标识，0：未删除，1：已删除 */
+	private Integer delFlag;
+
 }

postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectbatch/ProjectBatch.java

@@ -3,7 +3,8 @@ package com.xinelu.manage.domain.projectbatch;
 import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import lombok.Data;
 
 /**
@@ -38,7 +39,7 @@ public class ProjectBatch extends BaseEntity {
     * 出生日期，格式：yyyy-MM-dd
     */
     @ApiModelProperty("出生日期，格式：yyyy-MM-dd")
-    private Date birthDate;
+    private LocalDate birthDate;
     /**
     * 身份证号
     */
@@ -73,7 +74,7 @@ public class ProjectBatch extends BaseEntity {
     * 批次创建时间，格式：yyyy-MM-dd HH:mm:ss
     */
     @ApiModelProperty("批次创建时间，格式：yyyy-MM-dd HH:mm:ss")
-    private Date batchDate;
+    private LocalDateTime batchDate;
     /**
     * 删除标识，0：否，1：是
     */

postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastresult/ProjectLastResult.java

@@ -5,7 +5,7 @@ import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import lombok.Data;
 
 /**
@@ -115,7 +115,7 @@ public class ProjectLastResult extends BaseEntity {
     * 检测时间
     */
     @ApiModelProperty("检测时间")
-    private Date measureTime;
+    private LocalDateTime measureTime;
     /**
     * 检测人姓名，自动上传时为空，手动上传为上传人姓名
     */

postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectresult/ProjectResult.java

@@ -6,7 +6,7 @@ import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -124,7 +124,7 @@ private static final long serialVersionUID=1L;
     @ApiModelProperty(value = "检测时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "检测时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date measureTime;
+    private LocalDateTime measureTime;
 
     /** 检测人姓名，自动上传时为空，手动上传为上传人姓名 */
     @ApiModelProperty(value = "检测人姓名，自动上传时为空，手动上传为上传人姓名")

postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandamaterials/PropagandaMaterials.java

@@ -33,7 +33,7 @@ public class PropagandaMaterials extends BaseEntity {
 
     /** 宣教名称（宣教标题） */
     @ApiModelProperty(value = "宣教名称")
-    @Excel(name = "宣教名称", readConverterExp = "宣=教标题")
+    @Excel(name = "宣教名称", readConverterExp = "宣教标题")
     private String propagandaTitle;
 
     /** 素材表id */
@@ -46,5 +46,6 @@ public class PropagandaMaterials extends BaseEntity {
     @Excel(name = "素材名称")
     private String materialsName;
 
-
+	/** 删除标识，0：未删除，1：已删除 */
+	private Integer delFlag;
 }

postdischarge-manage/src/main/java/com/xinelu/manage/domain/residentinfo/ResidentInfo.java

@@ -0,0 +1,81 @@
+package com.xinelu.manage.domain.residentinfo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xinelu.common.annotation.Excel;
+import com.xinelu.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDate;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 居民信息对象 resident_info
+ *
+ * @author haown
+ * @date 2024-03-27
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "居民信息对象", description = "resident_info")
+public class ResidentInfo extends BaseEntity {
+	private static final long serialVersionUID=1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 姓名 */
+    @ApiModelProperty(value = "姓名")
+    @Excel(name = "姓名")
+    private String patientName;
+
+    /** 电话 */
+    @ApiModelProperty(value = "电话")
+    @Excel(name = "电话")
+    private String patientPhone;
+
+    /** 家属电话 */
+    @ApiModelProperty(value = "家属电话")
+    @Excel(name = "家属电话")
+    private String familyMemberPhone;
+
+	/** 出生日期，格式：yyyy-MM-dd */
+	@ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private LocalDate birthDate;
+
+    /** 身份证号 */
+    @ApiModelProperty(value = "身份证号")
+    @Excel(name = "身份证号")
+    private String cardNo;
+
+    /** 性别，男：MALE，女：FEMALE */
+    @ApiModelProperty(value = "性别，男：MALE，女：FEMALE")
+    @Excel(name = "性别，男：MALE，女：FEMALE")
+    private String sex;
+
+    /** 住址 */
+    @ApiModelProperty(value = "住址")
+    @Excel(name = "住址")
+    private String address;
+
+    /** 微信小程序openid，微信小程序唯一标识 */
+    @ApiModelProperty(value = "微信小程序openid，微信小程序唯一标识")
+    @Excel(name = "微信小程序openid，微信小程序唯一标识")
+    private String openId;
+
+    /** 微信unionid，微信小程序和微信公众号统一标识 */
+    @ApiModelProperty(value = "微信unionid，微信小程序和微信公众号统一标识")
+    @Excel(name = "微信unionid，微信小程序和微信公众号统一标识")
+    private String unionId;
+
+    /** 微信公众号openid，微信公众号唯一标识 */
+    @ApiModelProperty(value = "微信公众号openid，微信公众号唯一标识")
+    @Excel(name = "微信公众号openid，微信公众号唯一标识")
+    private String officialAccountOpenid;
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroute/SignPatientManageRoute.java

@@ -0,0 +1,114 @@
+package com.xinelu.manage.domain.signpatientmanageroute;
+
+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;
+
+/**
+ * 签约患者管理任务路径对象 sign_patient_manage_route
+ *
+ * @author haown
+ * @date 2024-03-18
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "签约患者管理任务路径对象", description = "sign_patient_manage_route")
+public class SignPatientManageRoute extends BaseEntity {
+	private static final long serialVersionUID=1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 签约记录表id */
+    @ApiModelProperty(value = "签约记录表id")
+    @Excel(name = "签约记录表id")
+    private Long signPatientRecordId;
+
+    /** 患者表id */
+    @ApiModelProperty(value = "患者表id")
+    @Excel(name = "患者表id")
+    private Long patientId;
+
+    /** 患者姓名 */
+    @ApiModelProperty(value = "患者姓名")
+    @Excel(name = "患者姓名")
+    private String patientName;
+
+    /** 所属科室id */
+    @ApiModelProperty(value = "所属科室id")
+    @Excel(name = "所属科室id")
+    private Long departmentId;
+
+    /** 所属科室名称 */
+    @ApiModelProperty(value = "所属科室名称")
+    @Excel(name = "所属科室名称")
+    private String departmentName;
+
+    /** 所属服务包表id */
+    @ApiModelProperty(value = "所属服务包表id")
+    @Excel(name = "所属服务包表id")
+    private Long servicePackageId;
+
+    /** 服务包名称 */
+    @ApiModelProperty(value = "服务包名称")
+    @Excel(name = "服务包名称")
+    private String packageName;
+
+    /** 病种id */
+    @ApiModelProperty(value = "病种id")
+    @Excel(name = "病种id")
+    private Long diseaseTypeId;
+
+    /** 病种名称 */
+    @ApiModelProperty(value = "病种名称")
+    @Excel(name = "病种名称")
+    private String diseaseTypeName;
+
+	/** 路径主键 */
+	@ApiModelProperty(value = "路径主键")
+	@Excel(name = "路径主键", readConverterExp = "路径主键")
+	private Long routeId;
+
+    /** 路径名称（任务名称） */
+    @ApiModelProperty(value = "路径名称")
+    @Excel(name = "路径名称", readConverterExp = "任=务名称")
+    private String routeName;
+
+    /** 任务创建类型，手动创建：MANUAL_CREATE，自动匹配：MANUAL_MATCHE */
+    @ApiModelProperty(value = "任务创建类型，手动创建：MANUAL_CREATE，自动匹配：MANUAL_MATCHE")
+    @Excel(name = "任务创建类型，手动创建：MANUAL_CREATE，自动匹配：MANUAL_MATCHE")
+    private String taskCreateType;
+
+    /** 版本号 */
+    @ApiModelProperty(value = "版本号")
+    @Excel(name = "版本号")
+    private String version;
+
+    /** 路径分类（任务分类），全部：ALL，科室管理路径：DEPARTMENT_MANAGE_PATH，专病管理路径：SPECIAL_DIEASE_MANAGE_PATH */
+    @ApiModelProperty(value = "路径分类")
+    @Excel(name = "路径分类", readConverterExp = "任=务分类")
+    private String routeClassify;
+
+    /** 适用范围，在院：IN_THE_HOSPITAL，出院：DISCHARGE，门诊：OUTPATIENT_SERVICE，门诊+出院：OUTPATIENT_SERVICE_DISCHARGE */
+    @ApiModelProperty(value = "适用范围，在院：IN_THE_HOSPITAL，出院：DISCHARGE，门诊：OUTPATIENT_SERVICE，门诊+出院：OUTPATIENT_SERVICE_DISCHARGE")
+    @Excel(name = "适用范围，在院：IN_THE_HOSPITAL，出院：DISCHARGE，门诊：OUTPATIENT_SERVICE，门诊+出院：OUTPATIENT_SERVICE_DISCHARGE")
+    private String suitRange;
+
+    /** 排序 */
+    @ApiModelProperty(value = "排序")
+    @Excel(name = "排序")
+    private Integer routeSort;
+
+    /** 备注信息 */
+    @ApiModelProperty(value = "备注信息")
+    @Excel(name = "备注信息")
+    private String routeRemark;
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java

@@ -0,0 +1,313 @@
+package com.xinelu.manage.domain.signpatientmanageroutenode;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xinelu.common.annotation.Excel;
+import com.xinelu.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 签约患者管理任务路径节点对象 sign_patient_manage_route_node
+ *
+ * @author haown
+ * @date 2024-03-18
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "签约患者管理任务路径节点对象", description = "sign_patient_manage_route_node")
+public class SignPatientManageRouteNode extends BaseEntity {
+	private static final long serialVersionUID=1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 签约患者管理任务表id */
+    @ApiModelProperty(value = "签约患者管理任务表id")
+    @Excel(name = "签约患者管理任务表id")
+    private Long manageRouteId;
+
+    /** 路径名称（任务名称） */
+    @ApiModelProperty(value = "路径名称")
+    @Excel(name = "路径名称", readConverterExp = "任=务名称")
+    private String manageRouteName;
+
+    /** 管理路径节点名称 */
+    @ApiModelProperty(value = "管理路径节点名称")
+    @Excel(name = "管理路径节点名称")
+    private String routeNodeName;
+
+    /** 管理路径节点时间，时间单位为：天 */
+    @ApiModelProperty(value = "管理路径节点时间，时间单位为：天")
+    @Excel(name = "管理路径节点时间，时间单位为：天")
+    private Integer routeNodeDay;
+
+    /** 任务类型，电话外呼：PHONE_OUTBOUND，问卷量表：QUESTIONNAIRE_SCALE，宣教文章：PROPAGANDA_ARTICLE，文字提醒：TEXT_REMIND，人工随访：ARTIFICIAL_FOLLOW_UP */
+    @ApiModelProperty(value = "任务类型，电话外呼：PHONE_OUTBOUND，问卷量表：QUESTIONNAIRE_SCALE，宣教文章：PROPAGANDA_ARTICLE，文字提醒：TEXT_REMIND，人工随访：ARTIFICIAL_FOLLOW_UP")
+    @Excel(name = "任务类型，电话外呼：PHONE_OUTBOUND，问卷量表：QUESTIONNAIRE_SCALE，宣教文章：PROPAGANDA_ARTICLE，文字提醒：TEXT_REMIND，人工随访：ARTIFICIAL_FOLLOW_UP")
+    private String taskType;
+
+    /** 任务状态 */
+    @ApiModelProperty(value = "任务状态")
+    @Excel(name = "任务状态")
+    private String taskStatus;
+
+    /** 任务细分 */
+    @ApiModelProperty(value = "任务细分")
+    @Excel(name = "任务细分")
+    private String taskSubdivision;
+
+    /** 二级分类描述 */
+    @ApiModelProperty(value = "二级分类描述")
+    @Excel(name = "二级分类描述")
+    private String secondClassifyDescribe;
+
+    /** 执行时间，格式：HH:mm */
+    @ApiModelProperty(value = "执行时间，格式：HH:mm")
+    @JsonFormat(pattern = "HH:mm")
+    @Excel(name = "执行时间，格式：HH:mm", width = 30, dateFormat = "yyyy-MM-dd")
+    private LocalTime executeTime;
+
+    /** 电话推送标识，0：未开启，1：已开启 */
+    @ApiModelProperty(value = "电话推送标识，0：未开启，1：已开启")
+    @Excel(name = "电话推送标识，0：未开启，1：已开启")
+    private Integer phonePushSign;
+
+    /** 电话话术表id */
+    @ApiModelProperty(value = "电话话术表id")
+    @Excel(name = "电话话术表id")
+    private Long phoneId;
+
+    /** 电话模板ID */
+    @ApiModelProperty(value = "电话模板ID")
+    @Excel(name = "电话模板ID")
+    private String phoneTemplateId;
+
+    /** 电话模板名称 */
+    @ApiModelProperty(value = "电话模板名称")
+    @Excel(name = "电话模板名称")
+    private String phoneTemplateName;
+
+    /** 电话内容（富文本存放整个节点的信息，包含标签画像的名称以及其它，标签画像名称使用特殊符号进行标记） */
+    @ApiModelProperty(value = "电话内容")
+    @Excel(name = "电话内容", readConverterExp = "富=文本存放整个节点的信息，包含标签画像的名称以及其它，标签画像名称使用特殊符号进行标记")
+    private String phoneNodeContent;
+
+    /** 电话重拨次数，重拨一次：REDIAL_ONCE，重拨二次：REDIAL_TWICE，不重播：NOT_REPLAY */
+    @ApiModelProperty(value = "电话重拨次数，重拨一次：REDIAL_ONCE，重拨二次：REDIAL_TWICE，不重播：NOT_REPLAY")
+    @Excel(name = "电话重拨次数，重拨一次：REDIAL_ONCE，重拨二次：REDIAL_TWICE，不重播：NOT_REPLAY")
+    private String phoneRedialTimes;
+
+    /** 电话时间间隔，单位为：分钟 */
+    @ApiModelProperty(value = "电话时间间隔，单位为：分钟")
+    @Excel(name = "电话时间间隔，单位为：分钟")
+    private Integer phoneTimeInterval;
+
+    /** 电话短信提醒，不发送短信：NOT_SEND_MESSAGE，未接通发短信：NOT_CONNECTED_SEND_MESSAGE，接通后发短信：CONNECTED_SEND_MESSAGE，所有人发短信：EVERYONE_SEND_MESSAGE */
+    @ApiModelProperty(value = "电话短信提醒，不发送短信：NOT_SEND_MESSAGE，未接通发短信：NOT_CONNECTED_SEND_MESSAGE，接通后发短信：CONNECTED_SEND_MESSAGE，所有人发短信：EVERYONE_SEND_MESSAGE")
+    @Excel(name = "电话短信提醒，不发送短信：NOT_SEND_MESSAGE，未接通发短信：NOT_CONNECTED_SEND_MESSAGE，接通后发短信：CONNECTED_SEND_MESSAGE，所有人发短信：EVERYONE_SEND_MESSAGE")
+    private String phoneMessageRemind;
+
+    /** 电话短信模板表id */
+    @ApiModelProperty(value = "电话短信模板表id")
+    @Excel(name = "电话短信模板表id")
+    private Long phoneMessageTemplateId;
+
+    /** 电话短信模板名称 */
+    @ApiModelProperty(value = "电话短信模板名称")
+    @Excel(name = "电话短信模板名称")
+    private String phoneMessageTemplateName;
+
+    /** 问卷表id */
+    @ApiModelProperty(value = "问卷表id")
+    @Excel(name = "问卷表id")
+    private Long questionInfoId;
+
+    /** 问卷模板名称 */
+    @ApiModelProperty(value = "问卷模板名称")
+    @Excel(name = "问卷模板名称")
+    private String questionnaireName;
+
+    /** 问卷模板内容（富文本存放整个节点的信息，包含标签画像的名称以及其它，标签画像名称使用特殊符号进行标记） */
+    @ApiModelProperty(value = "问卷模板内容")
+    @Excel(name = "问卷模板内容", readConverterExp = "富=文本存放整个节点的信息，包含标签画像的名称以及其它，标签画像名称使用特殊符号进行标记")
+    private String questionnaireContent;
+
+    /** 问卷有效期，单位：天 */
+    @ApiModelProperty(value = "问卷有效期，单位：天")
+    @Excel(name = "问卷有效期，单位：天")
+    private Integer questionExpirationDate;
+
+    /** 宣教文章表id */
+    @ApiModelProperty(value = "宣教文章表id")
+    @Excel(name = "宣教文章表id")
+    private Long propagandaInfoId;
+
+    /** 宣教文章模板标题（宣教模板名称） */
+    @ApiModelProperty(value = "宣教文章模板标题")
+    @Excel(name = "宣教文章模板标题", readConverterExp = "宣=教模板名称")
+    private String propagandaTitle;
+
+    /** 宣教文章内容（富文本存放整个节点的信息，包含标签画像的名称以及其它，标签画像名称使用特殊符号进行标记） */
+    @ApiModelProperty(value = "宣教文章内容")
+    @Excel(name = "宣教文章内容", readConverterExp = "富=文本存放整个节点的信息，包含标签画像的名称以及其它，标签画像名称使用特殊符号进行标记")
+    private String propagandaContent;
+
+    /** 短信推送标识，0：未开启，1：已开启 */
+    @ApiModelProperty(value = "短信推送标识，0：未开启，1：已开启")
+    @Excel(name = "短信推送标识，0：未开启，1：已开启")
+    private Integer messagePushSign;
+
+    /** 短信模板表id */
+    @ApiModelProperty(value = "短信模板表id")
+    @Excel(name = "短信模板表id")
+    private Long messageTemplateId;
+
+    /** 短信模板名称 */
+    @ApiModelProperty(value = "短信模板名称")
+    @Excel(name = "短信模板名称")
+    private String messageTemplateName;
+
+    /** 短信预览 */
+    @ApiModelProperty(value = "短信预览")
+    @Excel(name = "短信预览")
+    private String messagePreview;
+
+    /** 短信节点内容（富文本存放整个节点的信息，包含标签画像的名称以及其它，标签画像名称使用特殊符号进行标记） */
+    @ApiModelProperty(value = "短信节点内容")
+    @Excel(name = "短信节点内容", readConverterExp = "富=文本存放整个节点的信息，包含标签画像的名称以及其它，标签画像名称使用特殊符号进行标记")
+    private String messageNodeContent;
+
+    /** 公众号推送标识，0：未开启，1：已开启 */
+    @ApiModelProperty(value = "公众号推送标识，0：未开启，1：已开启")
+    @Excel(name = "公众号推送标识，0：未开启，1：已开启")
+    private Integer officialPushSign;
+
+    /** 公众号模板表id */
+    @ApiModelProperty(value = "公众号模板表id")
+    @Excel(name = "公众号模板表id")
+    private Long officialTemplateId;
+
+    /** 公众号模板名称 */
+    @ApiModelProperty(value = "公众号模板名称")
+    @Excel(name = "公众号模板名称")
+    private String officialTemplateName;
+
+    /** 公众号提醒内容 */
+    @ApiModelProperty(value = "公众号提醒内容")
+    @Excel(name = "公众号提醒内容")
+    private String officialRemindContent;
+
+    /** 公众号节点内容（富文本存放整个节点的信息，包含标签画像的名称以及其它，标签画像名称使用特殊符号进行标记） */
+    @ApiModelProperty(value = "公众号节点内容")
+    @Excel(name = "公众号节点内容", readConverterExp = "富=文本存放整个节点的信息，包含标签画像的名称以及其它，标签画像名称使用特殊符号进行标记")
+    private String officialNodeContent;
+
+    /** 小程序推送标识，0：未开启，1：已开启 */
+    @ApiModelProperty(value = "小程序推送标识，0：未开启，1：已开启")
+    @Excel(name = "小程序推送标识，0：未开启，1：已开启")
+    private Integer appletPushSign;
+
+    /** 小程序模板表id */
+    @ApiModelProperty(value = "小程序模板表id")
+    @Excel(name = "小程序模板表id")
+    private Long appletTemplateId;
+
+    /** 小程序模板名称 */
+    @ApiModelProperty(value = "小程序模板名称")
+    @Excel(name = "小程序模板名称")
+    private String appletTemplateName;
+
+    /** 小程序提醒内容 */
+    @ApiModelProperty(value = "小程序提醒内容")
+    @Excel(name = "小程序提醒内容")
+    private String appletRemindContent;
+
+    /** 小程序提示说明 */
+    @ApiModelProperty(value = "小程序提示说明")
+    @Excel(name = "小程序提示说明")
+    private String appletPromptDescription;
+
+    /** 小程序节点内容（富文本存放整个节点的信息，包含标签画像的名称以及其它，标签画像名称使用特殊符号进行标记） */
+    @ApiModelProperty(value = "小程序节点内容")
+    @Excel(name = "小程序节点内容", readConverterExp = "富=文本存放整个节点的信息，包含标签画像的名称以及其它，标签画像名称使用特殊符号进行标记")
+    private String appletNodeContent;
+
+    /** 人工随访模板表id */
+    @ApiModelProperty(value = "人工随访模板表id")
+    @Excel(name = "人工随访模板表id")
+    private Long followTemplateId;
+
+    /** 人工随访模板名称 */
+    @ApiModelProperty(value = "人工随访模板名称")
+    @Excel(name = "人工随访模板名称")
+    private String followTemplateName;
+
+    /** 人工随访模板内容（富文本存放整个节点的信息，包含标签画像的名称以及其它，标签画像名称使用特殊符号进行标记） */
+    @ApiModelProperty(value = "人工随访模板内容")
+    @Excel(name = "人工随访模板内容", readConverterExp = "富=文本存放整个节点的信息，包含标签画像的名称以及其它，标签画像名称使用特殊符号进行标记")
+    private String followContent;
+
+    /** 节点审核状态，同意：AGREE，不同意：DISAGREE */
+    @ApiModelProperty(value = "节点审核状态，同意：AGREE，不同意：DISAGREE")
+    @Excel(name = "节点审核状态，同意：AGREE，不同意：DISAGREE")
+    private String routeCheckStatus;
+
+    /** 节点审核人姓名 */
+    @ApiModelProperty(value = "节点审核人姓名")
+    @Excel(name = "节点审核人姓名")
+    private String routeCheckPerson;
+
+    /** 节点审核时间 */
+    @ApiModelProperty(value = "节点审核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "节点审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private LocalDateTime routeCheckDate;
+
+    /** 节点审核备注信息，存储审核备注信息以及审核不通过原因等信息 */
+    @ApiModelProperty(value = "节点审核备注信息，存储审核备注信息以及审核不通过原因等信息")
+    @Excel(name = "节点审核备注信息，存储审核备注信息以及审核不通过原因等信息")
+    private String routeCheckRemark;
+
+    /** 备注信息 */
+    @ApiModelProperty(value = "备注信息")
+    @Excel(name = "备注信息")
+    private String routeNodeRemark;
+
+    /** 节点任务执行状态，已执行：EXECUTED，未执行：UNEXECUTED */
+    @ApiModelProperty(value = "节点任务执行状态，已执行：EXECUTED，未执行：UNEXECUTED")
+    @Excel(name = "节点任务执行状态，已执行：EXECUTED，未执行：UNEXECUTED")
+    private String nodeExecuteStatus;
+
+    /** 任务处理信息 */
+    @ApiModelProperty(value = "任务处理信息")
+    @Excel(name = "任务处理信息")
+    private String routeHandleRemark;
+
+    /** 任务处理人id */
+    @ApiModelProperty(value = "任务处理人id")
+    @Excel(name = "任务处理人id")
+    private Long routeHandleId;
+
+    /** 任务处理人姓名 */
+    @ApiModelProperty(value = "任务处理人姓名")
+    @Excel(name = "任务处理人姓名")
+    private String routeHandlePerson;
+
+    /** 任务链接 */
+    @ApiModelProperty(value = "任务链接")
+    @Excel(name = "任务链接")
+    private String routeLink;
+
+    /** 文字提醒内容 */
+    @ApiModelProperty(value = "文字提醒内容")
+    @Excel(name = "文字提醒内容")
+    private String textRemindContent;
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientpackage/SignPatientPackage.java

@@ -6,7 +6,7 @@ import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -64,17 +64,26 @@ public class SignPatientPackage extends BaseEntity {
     @ApiModelProperty(value = "服务开始时间，格式：yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "服务开始时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date serviceStartTime;
+    private LocalDateTime serviceStartTime;
 
     /** 服务结束时间，格式：yyyy-MM-dd HH:mm:ss */
     @ApiModelProperty(value = "服务结束时间，格式：yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "服务结束时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date serviceEndTime;
+    private LocalDateTime serviceEndTime;
 
-    /** 服务周期，单位是月 */
-    @ApiModelProperty(value = "服务周期，单位是月")
-    @Excel(name = "服务周期，单位是月")
-    private Integer serviceCycle;
+	/**
+	 * 服务包期限
+	 */
+	@ApiModelProperty(value = "服务包期限")
+	@Excel(name = "服务包期限")
+	private Integer packageTerm;
+
+	/**
+	 * 服务包期限单位，年，月，日
+	 */
+	@ApiModelProperty(value = "服务包期限单位，年，月，日")
+	@Excel(name = "服务包期限单位，年，月，日")
+	private String packageTermUnit;
 
 }

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

@@ -4,15 +4,14 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-
 /**
  * 患者签约记录表
  *
@@ -67,7 +66,7 @@ public class SignPatientRecord extends BaseEntity {
      */
     @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date birthDate;
+    private LocalDate birthDate;
 
     /**
      * 签约时间，格式：yyyy-MM-dd HH:mm:ss
@@ -173,7 +172,7 @@ public class SignPatientRecord extends BaseEntity {
      * 加入意向时间（意向签约）
      */
     @ApiModelProperty(value = "加入意向时间（意向签约）")
-    private Date intentionalTime;
+    private LocalDateTime intentionalTime;
 
     /**
      * 开单医生id（意向签约）
@@ -191,7 +190,7 @@ public class SignPatientRecord extends BaseEntity {
      * 提交时间（待续签）
      */
     @ApiModelProperty(value = "提交时间（待续签）")
-    private Date submissionTime;
+    private LocalDateTime submissionTime;
     /**
      * 金额
      */

postdischarge-manage/src/main/java/com/xinelu/manage/domain/signroutetriggercondition/SignRouteTriggerCondition.java

@@ -0,0 +1,69 @@
+package com.xinelu.manage.domain.signroutetriggercondition;
+
+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;
+
+/**
+ * 签约患者管理任务（路径）触发条件关系对象 sign_route_trigger_condition
+ *
+ * @author haown
+ * @date 2024-03-18
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "签约患者管理任务（路径）触发条件关系对象", description = "sign_route_trigger_condition")
+public class SignRouteTriggerCondition extends BaseEntity {
+
+	private static final long serialVersionUID=1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 签约患者管理任务表id */
+    @ApiModelProperty(value = "签约患者管理任务表id")
+    @Excel(name = "签约患者管理任务表id")
+    private Long patientManageRouteId;
+
+    /** 路径名称（任务名称） */
+    @ApiModelProperty(value = "路径名称")
+    @Excel(name = "路径名称", readConverterExp = "任=务名称")
+    private String routeName;
+
+    /** 触发条件编码 */
+    @ApiModelProperty(value = "触发条件编码")
+    @Excel(name = "触发条件编码")
+    private String triggerConditionCode;
+
+    /** 触发条件名称，诊断：DIAGNOSIS，换药日期：DRESSING_CHANGE_DATE，治疗方式：TREATMENT_METHOD，手术名称：SURGICAL_NAME，药品名称：DRUG_NAME */
+    @ApiModelProperty(value = "触发条件名称，诊断：DIAGNOSIS，换药日期：DRESSING_CHANGE_DATE，治疗方式：TREATMENT_METHOD，手术名称：SURGICAL_NAME，药品名称：DRUG_NAME")
+    @Excel(name = "触发条件名称，诊断：DIAGNOSIS，换药日期：DRESSING_CHANGE_DATE，治疗方式：TREATMENT_METHOD，手术名称：SURGICAL_NAME，药品名称：DRUG_NAME")
+    private String triggerConditionName;
+
+    /** 触发条件运算符，包含：CONTAIN，不包含：NOT_CONTAIN，等于：EQUAL_TO，不等于：NOT_EQUAL_TO */
+    @ApiModelProperty(value = "触发条件运算符，包含：CONTAIN，不包含：NOT_CONTAIN，等于：EQUAL_TO，不等于：NOT_EQUAL_TO")
+    @Excel(name = "触发条件运算符，包含：CONTAIN，不包含：NOT_CONTAIN，等于：EQUAL_TO，不等于：NOT_EQUAL_TO")
+    private String triggerConditionOperator;
+
+    /** 触发条件值 */
+    @ApiModelProperty(value = "触发条件值")
+    @Excel(name = "触发条件值")
+    private String triggerConditionValue;
+
+    /** 排序 */
+    @ApiModelProperty(value = "排序")
+    @Excel(name = "排序")
+    private Integer triggerConditionSort;
+
+    /** 备注信息 */
+    @ApiModelProperty(value = "备注信息")
+    @Excel(name = "备注信息")
+    private String triggerConditionRemark;
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java

@@ -12,6 +12,7 @@ import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.time.LocalTime;
 import java.util.Date;
 
 /**
@@ -93,9 +94,9 @@ public class SpecialDiseaseNode extends BaseEntity {
      * 执行时间，格式：HH:mm
      */
     @ApiModelProperty(value = "执行时间，格式：HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "执行时间，格式：HH:mm", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date executionTime;
+    @JsonFormat(pattern = "HH:mm")
+    @Excel(name = "执行时间，格式：HH:mm", width = 30, dateFormat = "HH:mm")
+    private LocalTime executionTime;
 
     /**
      * 模板表id
@@ -315,6 +316,13 @@ public class SpecialDiseaseNode extends BaseEntity {
     @Excel(name = "节点审核备注信息，存储审核备注信息以及审核不通过原因等信息")
     private String routeCheckRemark;
 
+    /**
+     * 节点内容
+     */
+    @ApiModelProperty(value = "节点内容")
+    @Excel(name = "节点内容")
+    private String nodeContent;
+
 
     @Override
     public String toString() {

postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseaseroute/SpecialDiseaseRoute.java

@@ -0,0 +1,140 @@
+package com.xinelu.manage.domain.specialdiseaseroute;
+
+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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 专病路径信息对象 special_disease_route
+ *
+ * @author xinelu
+ * @date 2024-03-13
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "专病路径信息对象", description = "special_disease_route")
+public class SpecialDiseaseRoute extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 所属科室id
+     */
+    @ApiModelProperty(value = "所属科室id")
+    @Excel(name = "所属科室id")
+    private Long departmentId;
+
+    /**
+     * 所属科室名称
+     */
+    @ApiModelProperty(value = "所属科室名称")
+    @Excel(name = "所属科室名称")
+    private String departmentName;
+
+    /**
+     * 病种id
+     */
+    @ApiModelProperty(value = "病种id")
+    @Excel(name = "病种id")
+    private Long diseaseTypeId;
+
+    /**
+     * 病种名称
+     */
+    @ApiModelProperty(value = "病种名称")
+    @Excel(name = "病种名称")
+    private String diseaseTypeName;
+
+    /**
+     * 路径名称
+     */
+    @ApiModelProperty(value = "路径名称")
+    @Excel(name = "路径名称")
+    private String routeName;
+
+    /**
+     * 路径编码
+     */
+    @ApiModelProperty(value = "路径编码")
+    @Excel(name = "路径编码")
+    private String routeCode;
+
+    /**
+     * 版本号
+     */
+    @ApiModelProperty(value = "版本号")
+    @Excel(name = "版本号")
+    private String version;
+
+    /**
+     * 路径分类，全部：ALL，科室管理路径：DEPARTMENT_MANAGE_PATH，专病管理路径：SPECIAL_DIEASE_MANAGE_PATH
+     */
+    @ApiModelProperty(value = "路径分类，全部：ALL，科室管理路径：DEPARTMENT_MANAGE_PATH，专病管理路径：SPECIAL_DIEASE_MANAGE_PATH")
+    @Excel(name = "路径分类，全部：ALL，科室管理路径：DEPARTMENT_MANAGE_PATH，专病管理路径：SPECIAL_DIEASE_MANAGE_PATH")
+    private String routeClassify;
+
+    /**
+     * 发布状态，全部：ALL，已发布：PUBLISHED，未发布：UNPUBLISHED
+     */
+    @ApiModelProperty(value = "发布状态，全部：ALL，已发布：PUBLISHED，未发布：UNPUBLISHED")
+    @Excel(name = "发布状态，全部：ALL，已发布：PUBLISHED，未发布：UNPUBLISHED")
+    private String releaseStatus;
+
+    /**
+     * 适用范围，在院：IN_THE_HOSPITAL，出院：DISCHARGE，门诊：OUTPATIENT_SERVICE，门诊+出院：OUTPATIENT_SERVICE_DISCHARGE
+     */
+    @ApiModelProperty(value = "适用范围，在院：IN_THE_HOSPITAL，出院：DISCHARGE，门诊：OUTPATIENT_SERVICE，门诊+出院：OUTPATIENT_SERVICE_DISCHARGE")
+    @Excel(name = "适用范围，在院：IN_THE_HOSPITAL，出院：DISCHARGE，门诊：OUTPATIENT_SERVICE，门诊+出院：OUTPATIENT_SERVICE_DISCHARGE")
+    private String suitRange;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    @Excel(name = "排序")
+    private Long routeSort;
+
+    /**
+     * 备注信息
+     */
+    @ApiModelProperty(value = "备注信息")
+    @Excel(name = "备注信息")
+    private String routeRemark;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("departmentId", getDepartmentId())
+                .append("departmentName", getDepartmentName())
+                .append("diseaseTypeId", getDiseaseTypeId())
+                .append("diseaseTypeName", getDiseaseTypeName())
+                .append("routeName", getRouteName())
+                .append("routeCode", getRouteCode())
+                .append("version", getVersion())
+                .append("routeClassify", getRouteClassify())
+                .append("releaseStatus", getReleaseStatus())
+                .append("suitRange", getSuitRange())
+                .append("routeSort", getRouteSort())
+                .append("routeRemark", getRouteRemark())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasetriggercondition/SpecialDiseaseTriggerCondition.java

@@ -0,0 +1,108 @@
+package com.xinelu.manage.domain.specialdiseasetriggercondition;
+
+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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 触发条件关系对象 special_disease_trigger_condition
+ *
+ * @author xinelu
+ * @date 2024-03-18
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "触发条件关系对象", description = "special_disease_trigger_condition")
+public class SpecialDiseaseTriggerCondition extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 专病路径表id
+     */
+    @ApiModelProperty(value = "专病路径表id")
+    @Excel(name = "专病路径表id")
+    private Long routeId;
+
+    /**
+     * 路径名称
+     */
+    @ApiModelProperty(value = "路径名称")
+    @Excel(name = "路径名称")
+    private String routeName;
+
+    /**
+     * 触发条件编码
+     */
+    @ApiModelProperty(value = "触发条件编码")
+    @Excel(name = "触发条件编码")
+    private String triggerConditionCode;
+
+    /**
+     * 触发条件名称，诊断：DIAGNOSIS，换药日期：DRESSING_CHANGE_DATE，治疗方式：TREATMENT_METHOD，手术名称：SURGICAL_NAME，药品名称：DRUG_NAME
+     */
+    @ApiModelProperty(value = "触发条件名称，诊断：DIAGNOSIS，换药日期：DRESSING_CHANGE_DATE，治疗方式：TREATMENT_METHOD，手术名称：SURGICAL_NAME，药品名称：DRUG_NAME")
+    @Excel(name = "触发条件名称，诊断：DIAGNOSIS，换药日期：DRESSING_CHANGE_DATE，治疗方式：TREATMENT_METHOD，手术名称：SURGICAL_NAME，药品名称：DRUG_NAME")
+    private String triggerConditionName;
+
+    /**
+     * 触发条件运算符，包含：CONTAIN，不包含：NOT_CONTAIN，等于：EQUAL_TO，不等于：NOT_EQUAL_TO
+     */
+    @ApiModelProperty(value = "触发条件运算符，包含：CONTAIN，不包含：NOT_CONTAIN，等于：EQUAL_TO，不等于：NOT_EQUAL_TO")
+    @Excel(name = "触发条件运算符，包含：CONTAIN，不包含：NOT_CONTAIN，等于：EQUAL_TO，不等于：NOT_EQUAL_TO")
+    private String triggerConditionOperator;
+
+    /**
+     * 触发条件值
+     */
+    @ApiModelProperty(value = "触发条件值")
+    @Excel(name = "触发条件值")
+    private String triggerConditionValue;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    @Excel(name = "排序")
+    private Integer triggerConditionSort;
+
+    /**
+     * 备注信息
+     */
+    @ApiModelProperty(value = "备注信息")
+    @Excel(name = "备注信息")
+    private String triggerConditionRemark;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("routeId", getRouteId())
+                .append("routeName", getRouteName())
+                .append("triggerConditionCode", getTriggerConditionCode())
+                .append("triggerConditionName", getTriggerConditionName())
+                .append("triggerConditionOperator", getTriggerConditionOperator())
+                .append("triggerConditionValue", getTriggerConditionValue())
+                .append("triggerConditionSort", getTriggerConditionSort())
+                .append("triggerConditionRemark", getTriggerConditionRemark())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/domain/taskpartitiondict/TaskPartitionDict.java

@@ -12,9 +12,7 @@ import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import java.sql.Time;
 import java.time.LocalTime;
-import java.util.Date;
 
 /**
  * 任务细分字典对象 task_partition_dict
@@ -92,6 +90,19 @@ public class TaskPartitionDict extends BaseEntity {
     @Excel(name = "任务细分备注")
     private String taskPartitionRemark;
 
+    /**
+     * 任务细分模板内容
+     */
+    @ApiModelProperty(value = "任务细分模板内容")
+    @Excel(name = "任务细分模板内容")
+    private String taskPartitionContent;
+
+    /**
+     * 模板类型
+     */
+    @ApiModelProperty(value = "模板类型")
+    @Excel(name = "模板类型")
+    private String templateType;
 
     @Override
     public String toString() {

postdischarge-manage/src/main/java/com/xinelu/manage/dto/agency/HospitalDTO.java

@@ -0,0 +1,27 @@
+package com.xinelu.manage.dto.agency;
+
+import lombok.Data;
+
+@Data
+public class HospitalDTO {
+
+    /**
+     * 类型
+     */
+    private String nodeType;
+
+    /**
+     * 医院id
+     */
+    private Long hospitalId;
+
+    /**
+     * 园区id
+     */
+    private Long campusId;
+
+    /**
+     * 科室id
+     */
+    private Long departmentId;
+}

postdischarge-manage/src/main/java/com/xinelu/manage/dto/labelfieldcontent/LabelFieldContentAddDTO.java

@@ -3,6 +3,7 @@ package com.xinelu.manage.dto.labelfieldcontent;
 import com.xinelu.common.custominterface.Insert;
 import com.xinelu.common.custominterface.Update;
 import com.xinelu.manage.domain.labelfieldcontent.LabelFieldContent;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@ import java.util.List;
  * @date : 2024/3/11 17:09
  */
 @Data
+@ApiModel(value ="标签字段内容AddDTO")
 public class LabelFieldContentAddDTO {
 
     /**

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

@@ -1,11 +1,11 @@
 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 java.time.LocalDate;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @description: 素材库查询传输对象
@@ -17,12 +17,12 @@ import lombok.Data;
 public class MaterialsInfoDto {
 
 	@ApiModelProperty(value = "创建时间开始，yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date createTimeStart;
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private LocalDate createTimeStart;
 
 	@ApiModelProperty(value = "创建时间结束，yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date createTimeEnd;
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private LocalDate createTimeEnd;
 
 	/** 素材状态，已上架：LISTED，未上架：NOT_LISTED */
 	@ApiModelProperty(value = "素材状态,已上架：LISTED，未上架：NOT_LISTED")

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

@@ -2,7 +2,7 @@ package com.xinelu.manage.dto.patientinfo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 
 /**
@@ -51,8 +51,8 @@ public class PatientInfoDto {
 	private String patientType;
 
 	/** 主治医生 */
-	@ApiModelProperty(value = "主治医生")
-	private String attendingPhysician;
+	@ApiModelProperty(value = "主治医生id")
+	private Long attendingPhysicianId;
 
 	/** 患者来源，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END */
 	@ApiModelProperty(value = "患者来源，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END")
@@ -64,27 +64,27 @@ public class PatientInfoDto {
 
 	/** 就诊时间开始（门诊患者），时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "就诊时间开始")
-	private Date visitTimeStart;
+	private LocalDate visitDateStart;
 
 	/** 就诊时间结束（门诊患者），时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "就诊时间结束")
-	private Date visitTimeEnd;
+	private LocalDate visitDateEnd;
 
 	/** 入院时间开始，时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "入院时间开始")
-	private Date admissionDateStart;
+	private LocalDate admissionTimeStart;
 
 	/** 入院时间结束，时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "入院时间结束")
-	private Date admissionDateEnd;
+	private LocalDate admissionTimeEnd;
 
 	/** 预约时间开始（预住院患者），时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "预约时间开始（预住院患者），时间格式：yyyy-MM-dd")
-	private Date appointmentDateStart;
+	private LocalDate appointmentDateStart;
 
 	/** 预约时间开始（预住院患者），时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "预约时间结束（预住院患者），时间格式：yyyy-MM-dd")
-	private Date appointmentDateEnd;
+	private LocalDate appointmentDateEnd;
 
 	/** 预约治疗组（取值以及枚举未知？） */
 	@ApiModelProperty(value = "预约治疗组（取值以及枚举未知？）")
@@ -92,7 +92,7 @@ public class PatientInfoDto {
 
 	/** 开证医生（预住院患者） */
 	@ApiModelProperty(value = "开证医生")
-	private String certificateIssuingDoctor;
+	private String certificateIssuingDoctorId;
 
 	/** 登记号（预住院患者） */
 	@ApiModelProperty(value = "登记号（预住院患者）")

postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java

@@ -1,9 +1,10 @@
 package com.xinelu.manage.dto.patientvisitrecord;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xinelu.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @description: 患者就诊记录查询传输对象
@@ -13,24 +14,33 @@ import lombok.Data;
 @Data
 public class PatientVisitRecordDto {
 
+	/** 居民信息表id */
+	@ApiModelProperty(value = "居民信息表id")
+	private Long residentId;
+
 	/** 患者表id */
 	@ApiModelProperty(value = "患者表id")
 	private Long patientId;
 
+	/** 所属医院id */
+	@ApiModelProperty(value = "所属医院id")
+	@Excel(name = "所属医院id")
+	private Long hospitalAgencyId;
+
 	/**
-	 * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED
+	 * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL
 	 */
-	@ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED")
-	private String visitType;
+	@ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
+	private String visitMethod;
 
 	@ApiModelProperty(value = "住院/门诊号")
 	private String inHospitalNumber;
 
 	@ApiModelProperty(value = "就诊时间开始")
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date visitDateStart;
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private LocalDate visitDateStart;
 
 	@ApiModelProperty(value = "就诊时间结束")
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date visitDateEnd;
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private LocalDate visitDateEnd;
 }

postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java

@@ -4,7 +4,8 @@ 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 java.time.LocalDate;
+import java.time.LocalDateTime;
 import lombok.Data;
 
 /**
@@ -35,7 +36,12 @@ public class PatientVisitRecordImportDto {
 	/** 入院时间，时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "入院时间")
 	@Excel(name = "入院时间")
-	private Date admissionDate;
+	private LocalDateTime admissionTime;
+
+	/** 出院时间 */
+	@ApiModelProperty(value = "出院时间")
+	@Excel(name = "出院时间")
+	private LocalDateTime dischargeTime;
 
 	/** 身份证号 */
 	@ApiModelProperty(value = "身份证号")
@@ -46,7 +52,7 @@ public class PatientVisitRecordImportDto {
 	@ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	@Excel(name = "出生日期")
-	private Date birthDate;
+	private LocalDate birthDate;
 
 	/** 性别，男：MALE，女：FEMALE */
 
@@ -77,7 +83,7 @@ public class PatientVisitRecordImportDto {
 	/** 主治医生 */
 	@ApiModelProperty(value = "主治医生")
 	@Excel(name = "主治医生")
-	private String attendingPhysician;
+	private String attendingPhysicianName;
 
 	@ApiModelProperty(value = "住院/门诊号")
 	@Excel(name = "住院号")

postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java

@@ -0,0 +1,128 @@
+package com.xinelu.manage.dto.patientvisitrecord;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xinelu.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * @description: 患者配置——就诊信息保存传输对象
+ * @author: haown
+ * @create: 2024-03-13 14:46
+ **/
+@ApiModel("患者配置——就诊信息保存传输对象")
+@Data
+public class PatientVisitRecordInfoSaveDto {
+
+	/** 就诊信息表id */
+	@ApiModelProperty(value = "就诊信息表id")
+	private Long id;
+
+	/** 患者表id */
+	@ApiModelProperty(value = "患者表id")
+	@NotNull(message = "患者数据不能为空")
+	private Long patientId;
+
+	/**
+	 * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL
+	 */
+	@ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
+	@NotNull(message = "就诊类型不能为空")
+	private String visitMethod;
+
+	/** 主要诊断 */
+	@ApiModelProperty(value = "主要诊断")
+	@NotNull(message = "主要诊断不能为空")
+	private String mainDiagnosis;
+
+	/** 就诊流水号 */
+	@ApiModelProperty(value = "就诊流水号")
+	@NotNull(message = "就诊流水号不能为空")
+	private String visitSerialNumber;
+
+	/** 主治医生id */
+	@ApiModelProperty(value = "主治医生id")
+	@NotNull(message = "主治医生不能为空")
+	private Long attendingPhysicianId;
+
+	/** 主治医生姓名 */
+	@ApiModelProperty(value = "主治医生姓名")
+	private String attendingPhysicianName;
+
+	/** 所属医院id */
+	@ApiModelProperty(value = "所属医院id")
+	@Excel(name = "所属医院id")
+	private Long hospitalAgencyId;
+
+	/** 所属医院名称 */
+	@ApiModelProperty(value = "所属医院名称")
+	@Excel(name = "所属医院名称")
+	private String hospitalAgencyName;
+
+	/** 所属院区id */
+	@ApiModelProperty(value = "所属院区id")
+	@Excel(name = "所属院区id")
+	private Long campusAgencyId;
+
+	/** 所属院区名称 */
+	@ApiModelProperty(value = "所属院区名称")
+	@Excel(name = "所属院区名称")
+	private String campusAgencyName;
+
+	/** 所属科室id */
+	@NotNull(message = "科室不能为空")
+	@ApiModelProperty(value = "所属科室id")
+	private Long departmentId;
+
+	/** 所属科室名称 */
+	@ApiModelProperty(value = "所属科室名称")
+	private String departmentName;
+
+	/** 所属病区id */
+	@ApiModelProperty(value = "所属病区id")
+	@Excel(name = "所属病区id")
+	private Long wardId;
+
+	/** 所属病区名称 */
+	@ApiModelProperty(value = "所属病区名称")
+	@Excel(name = "所属病区名称")
+	private String wardName;
+
+	/** 入院时间 */
+	@ApiModelProperty(value = "入院时间")
+	@NotNull(message = "入院时间不能为空")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+	private LocalDateTime admissionTime;
+
+	/** 出院时间 */
+	@ApiModelProperty(value = "出院时间")
+	@NotNull(message = "出院时间不能为空")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+	private LocalDateTime dischargeTime;
+
+	@ApiModelProperty(value = "住院/门诊号")
+	private String inHospitalNumber;
+
+	/** 入院病历信息，存储患者入院的整个病历信息 */
+	@ApiModelProperty(value = "入院病历信息，存储患者入院的整个病历信息")
+	@NotNull(message = "入院病历不能为空")
+	private String inHospitalInfo;
+
+	/** 出院病历信息，存储患者出院的整个病历信息 */
+	@ApiModelProperty(value = "出院病历信息，存储患者出院的整个病历信息")
+	private String outHospitalInfo;
+
+	/** 手术名称 */
+	@ApiModelProperty(value = "手术名称")
+	@Excel(name = "手术名称")
+	private String surgicalName;
+
+	/** 手术记录 */
+	@ApiModelProperty(value = "手术记录")
+	@Excel(name = "手术记录")
+	private String surgicalRecord;
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java

@@ -2,74 +2,86 @@ package com.xinelu.manage.dto.patientvisitrecord;
 
 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 javax.validation.constraints.NotBlank;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**
- * @description: 患者配置——就诊信息保存传输对象
+ * @description: 就诊记录保存传输对象
  * @author: haown
- * @create: 2024-03-13 14:46
+ * @create: 2024-03-25 09:43
  **/
-@ApiModel("患者配置——就诊信息保存传输对象")
 @Data
 public class PatientVisitRecordSaveDto {
 
+	/** 主键Id */
+	private Long id;
+
 	/** 患者表id */
 	@ApiModelProperty(value = "患者表id")
-	@NotBlank(message = "患者数据不能为空")
 	private Long patientId;
 
-	/**
-	 * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED
-	 */
-	@ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED")
-	@NotBlank(message = "就诊类型不能为空")
-	private String visitType;
+	/** 身份证号 */
+	@ApiModelProperty(value = "身份证号")
+	@NotNull(message = "身份证号不能为空")
+	private String cardNo;
 
-	/** 主要诊断 */
-	@ApiModelProperty(value = "主要诊断")
-	@NotBlank(message = "主要诊断不能为空")
-	private String mainDiagnosis;
+	/** 姓名 */
+	@ApiModelProperty(value = "姓名")
+	private String patientName;
 
-	/** 就诊流水号 */
-	@ApiModelProperty(value = "就诊流水号")
-	@NotBlank(message = "就诊流水号不能为空")
-	private String visitSerialNumber;
+	/** 患者电话 */
+	@ApiModelProperty(value = "患者电话")
+	private String patientPhone;
 
-	/** 主治医生id */
-	@ApiModelProperty(value = "主治医生id")
-	@NotBlank(message = "主治医生不能为空")
-	private Long attendingPhysicianId;
+	/** 家属电话 */
+	@ApiModelProperty(value = "家属电话")
+	private String familyMemberPhone;
 
-	/** 主治医生姓名 */
-	@ApiModelProperty(value = "主治医生姓名")
-	private String attendingPhysicianName;
+	/** 地址 */
+	@ApiModelProperty(value = "地址")
+	private String address;
+
+	/** 性别，男：MALE，女：FEMALE */
+	@ApiModelProperty(value = "性别，男：MALE，女：FEMALE")
+	private String sex;
+
+	/** 出生日期，格式：yyyy-MM-dd */
+	@ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private LocalDate birthDate;
+
+	/** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL */
+	@ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
+	@NotNull(message = "就诊类型不能为空")
+	private String visitMethod;
+
+	/** 就诊时间，格式：yyyy-MM-dd HH:mm:ss */
+	@ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private LocalDateTime visitDate;
 
 	/** 所属医院id */
 	@ApiModelProperty(value = "所属医院id")
-	@Excel(name = "所属医院id")
+	@NotNull(message = "所属医院不能为空")
 	private Long hospitalAgencyId;
 
 	/** 所属医院名称 */
 	@ApiModelProperty(value = "所属医院名称")
-	@Excel(name = "所属医院名称")
+	@NotNull(message = "所属医院不能为空")
 	private String hospitalAgencyName;
 
 	/** 所属院区id */
 	@ApiModelProperty(value = "所属院区id")
-	@Excel(name = "所属院区id")
 	private Long campusAgencyId;
 
 	/** 所属院区名称 */
 	@ApiModelProperty(value = "所属院区名称")
-	@Excel(name = "所属院区名称")
 	private String campusAgencyName;
 
 	/** 所属科室id */
-	@NotBlank(message = "科室不能为空")
 	@ApiModelProperty(value = "所属科室id")
 	private Long departmentId;
 
@@ -77,34 +89,78 @@ public class PatientVisitRecordSaveDto {
 	@ApiModelProperty(value = "所属科室名称")
 	private String departmentName;
 
+	/** 所属病区id */
+	@ApiModelProperty(value = "所属病区id")
+	private Long wardId;
+
+	/** 所属病区名称 */
+	@ApiModelProperty(value = "所属病区名称")
+	private String wardName;
+
+	/** 主治医生id */
+	@ApiModelProperty(value = "主治医生id")
+	private Long attendingPhysicianId;
+
+	/** 主治医生姓名 */
+	@ApiModelProperty(value = "主治医生姓名")
+	private String attendingPhysicianName;
+
+	/** 主要诊断 */
+	@ApiModelProperty(value = "主要诊断")
+	private String mainDiagnosis;
+
 	/** 入院时间 */
 	@ApiModelProperty(value = "入院时间")
-	@NotBlank(message = "入院时间不能为空")
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date admissionTime;
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+	private LocalDateTime admissionTime;
 
 	/** 出院时间 */
 	@ApiModelProperty(value = "出院时间")
-	@NotBlank(message = "出院时间不能为空")
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date dischargeTime;
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+	private LocalDateTime dischargeTime;
 
-	@ApiModelProperty(value = "住院/门诊号")
-	private String inHospitalNumber;
+	/** _记录时间（入院记录） */
+	@ApiModelProperty(value = "_记录时间")
+	@Excel(name = "_记录时间", readConverterExp = "入=院记录")
+	private LocalDateTime recordTime;
+
+	/** 住院天数（出院记录），单位为：天 */
+	@ApiModelProperty(value = "住院天数")
+	@Excel(name = "住院天数", readConverterExp = "出=院记录")
+	private Integer hospitalizationDays;
 
 	/** 入院病历信息，存储患者入院的整个病历信息 */
 	@ApiModelProperty(value = "入院病历信息，存储患者入院的整个病历信息")
-	@NotBlank(message = "入院病历不能为空")
 	private String inHospitalInfo;
 
 	/** 出院病历信息，存储患者出院的整个病历信息 */
 	@ApiModelProperty(value = "出院病历信息，存储患者出院的整个病历信息")
-	@NotBlank(message = "出院病历不能为空")
 	private String outHospitalInfo;
 
-	/** 门诊记录信息（就诊记录-门诊记录） */
-	@ApiModelProperty(value = "门诊记录信息")
-	@NotBlank(message = "门诊记录信息不能为空")
-	private String outpatientVisitInfo;
+	/** 就诊流水号 */
+	@ApiModelProperty(value = "就诊流水号")
+	private String visitSerialNumber;
 
+	/** 门诊/住院号 */
+	@ApiModelProperty(value = "门诊/住院号")
+	@NotNull(message = "门诊/住院号不能为空")
+	private String inHospitalNumber;
+
+	/** 责任护士 */
+	@ApiModelProperty(value = "责任护士")
+	private String responsibleNurse;
+
+	/** 手术名称 */
+	@ApiModelProperty(value = "手术名称")
+	private String surgicalName;
+
+	/** 患者类型，预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，
+	 签约患者：CONTRACTED_PATIENT */
+	@ApiModelProperty(value = "患者类型，预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT")
+	@NotNull(message = "患者类型不能为空")
+	private String patientType;
+
+	/** 手术记录 */
+	@ApiModelProperty(value = "手术记录")
+	private String surgicalRecord;
 }

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

@@ -2,7 +2,7 @@ package com.xinelu.manage.dto.projectrecord;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 
 /**
@@ -30,11 +30,11 @@ public class ProjectRecordDto {
 	 * 检测时间
 	 */
 	@ApiModelProperty("检测时间开始")
-	private Date measureTimeStart;
+	private LocalDate measureTimeStart;
 
 	/**
 	 * 检测时间
 	 */
 	@ApiModelProperty("检测时间结束")
-	private Date measureTimeEnd;
+	private LocalDate measureTimeEnd;
 }

postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectresult/ProjectResultStatisticDto.java

@@ -3,7 +3,7 @@ package com.xinelu.manage.dto.projectresult;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 
 /**
@@ -46,13 +46,13 @@ public class ProjectResultStatisticDto {
 	 */
 	@ApiModelProperty("检测时间开始")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date measureTimeStart;
+	private LocalDate measureTimeStart;
 
 	/**
 	 * 检测时间结束
 	 */
 	@ApiModelProperty("检测时间结束")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date measureTimeEnd;
+	private LocalDate measureTimeEnd;
 
 }

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

@@ -1,11 +1,11 @@
 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 java.time.LocalDate;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @description: 宣教库查询传输对象
@@ -55,13 +55,13 @@ public class PropagandaInfoDto {
 	 * 创建时间
 	 */
 	@ApiModelProperty(value = "创建时间开始")
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date createTimeStart;
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private LocalDate createTimeStart;
 
 	/**
 	 * 创建时间
 	 */
 	@ApiModelProperty(value = "创建时间结束")
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date createTimeEnd;
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private LocalDate createTimeEnd;
 }

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

@@ -0,0 +1,97 @@
+package com.xinelu.manage.dto.propagandainfo;
+
+import com.xinelu.common.annotation.Excel;
+import com.xinelu.manage.domain.materialsinfo.MaterialsInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @description: 宣教库保存传输对象
+ * @author: haown
+ * @create: 2024-03-28 09:08
+ **/
+@ApiModel("宣教库保存传输对象")
+@Data
+public class PropagandaInfoSaveDto {
+
+	/** 主键id */
+	@ApiModelProperty("主键id")
+	private Long id;
+
+	/** 所属医院id */
+	@ApiModelProperty(value = "所属医院id")
+	private Long hospitalAgencyId;
+
+	/** 所属医院名称 */
+	@ApiModelProperty(value = "所属医院名称")
+	@Excel(name = "所属医院名称")
+	private String hospitalAgencyName;
+
+	/** 所属科室id */
+	@ApiModelProperty(value = "所属科室id")
+	private Long departmentId;
+
+	/** 所属科室名称 */
+	@ApiModelProperty(value = "所属科室名称")
+	@Excel(name = "所属科室名称")
+	private String departmentName;
+
+	/** 宣教标题（宣教名称） */
+	@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 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 = "所属病种名称")
+	@Excel(name = "所属病种名称")
+	private String diseaseTypeName;
+
+	/** 宣教链接 */
+	@ApiModelProperty(value = "宣教链接")
+	private String propagandaLink;
+
+	/** 宣教二维码图片存放地址 */
+	@ApiModelProperty(value = "宣教二维码图片存放地址")
+	private String propagandaBarcodePath;
+
+	/** 所选素材对象列表 */
+	@ApiModelProperty(value = "所选素材对象列表")
+	List<MaterialsInfo> materialsInfoList;
+}

postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientpackage/SignPatientPackageSaveDto.java

@@ -0,0 +1,62 @@
+package com.xinelu.manage.dto.signpatientpackage;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * @description: 居民签约服务包保存传输对象
+ * @author: haown
+ * @create: 2024-03-18 14:35
+ **/
+@ApiModel("居民签约服务包保存传输对象")
+@Data
+public class SignPatientPackageSaveDto {
+
+	/** 服务包表id */
+	@ApiModelProperty(value = "服务包表id")
+	@NotNull(message = "请选择服务包！")
+	private Long servicePackageId;
+
+	/** 服务包名称 */
+	@ApiModelProperty(value = "服务包名称")
+	private String packageName;
+
+	/** 服务包缴费状态，已缴费：PAID，未交费：UNPAID_FEES */
+	@ApiModelProperty(value = "服务包缴费状态，已缴费：PAID，未交费：UNPAID_FEES")
+	private String packagePaymentStatus;
+
+	/** 服务包价格，小数点后两位 */
+	@ApiModelProperty(value = "服务包价格，小数点后两位")
+	@NotNull(message = "服务包价格不能为空！")
+	private BigDecimal packagePrice;
+
+	/** 服务开始时间，格式：yyyy-MM-dd HH:mm:ss */
+	@ApiModelProperty(value = "服务开始时间，格式：yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@NotNull(message = "服务开始时间不能为空！")
+	private LocalDate serviceStartTime;
+
+	/** 服务结束时间，格式：yyyy-MM-dd HH:mm:ss */
+	@ApiModelProperty(value = "服务结束时间，格式：yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@NotNull(message = "服务结束时间不能为空！")
+	private LocalDate serviceEndTime;
+
+	/**
+	 * 服务包周期
+	 */
+	@ApiModelProperty(value = "服务包周期")
+	private Integer packageTerm;
+
+	/**
+	 * 服务包周期单位，年，月，日
+	 */
+	@ApiModelProperty(value = "服务包周期单位，年，月，日")
+	private String packageTermUnit;
+
+}

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

@@ -0,0 +1,32 @@
+package com.xinelu.manage.dto.signpatientrecord;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * @description: 意向签约传输对象
+ * @author: haown
+ * @create: 2024-03-28 16:51
+ **/
+@ApiModel("意向签约传输对象")
+@Data
+public class IntentionalSignDto {
+
+	@ApiModelProperty("患者信息表id")
+	@NotNull(message = "患者信息不能为空")
+	private Long patientId;
+
+	@ApiModelProperty("开单医生id（意向签约）")
+	@NotNull(message = "开单医生不能为空")
+	private Long billingDoctorId;
+
+	@ApiModelProperty("开单医生姓名（意向签约）")
+	@NotNull(message = "开单医生不能为空")
+	private String billingDoctorName;
+
+	@ApiModelProperty("意向来源（意向签约，字典枚举）,DOCTOR_BILLING:医生开单")
+	@NotNull(message = "意向来源不能为空")
+	private String intentionalSource;
+}

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

@@ -1,11 +1,13 @@
 package com.xinelu.manage.dto.signpatientrecord;
 
 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.signpatientpackage.SignPatientPackageSaveDto;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**
@@ -19,10 +21,27 @@ public class SignPatientAddDto {
 
 	private SignPatientRecord record;
 
-	private SignPatientPackage signPackage;
+	/**
+	 * 服务包
+	 */
+	@ApiModelProperty("服务包对象")
+	private SignPatientPackageSaveDto signPackage;
+
+	/**
+	 * 管理路径
+	 */
+	@ApiModelProperty("管理路径id")
+	@NotNull(message = "请选择管理路径")
+	private Long routeId;
+
+	@ApiModelProperty("管理路径名称")
+	private String routeName;
 
 	private List<SignPatientPackageHardware> devices;
 
 	private List<SignPatientInformed> informeds;
 
+	@ApiModelProperty("签约类型，签约：sign, 续约：reSign")
+	private String signCategory;
+
 }

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

@@ -3,7 +3,7 @@ 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;
+import java.time.LocalDate;
 import lombok.Data;
 
 /**
@@ -42,13 +42,13 @@ public class SignPatientListDto {
 	 * 加入意向时间（意向签约）
 	 */
 	@ApiModelProperty(value = "加入意向时间开始（意向签约）")
-	private Date intentionalTimeStart;
+	private LocalDate intentionalTimeStart;
 
 	/**
 	 * 加入意向时间（意向签约）
 	 */
 	@ApiModelProperty(value = "加入意向时间结束（意向签约）")
-	private Date intentionalTimeEnd;
+	private LocalDate intentionalTimeEnd;
 
 	/**
 	 * 意向来源（意向签约，字典枚举）
@@ -60,10 +60,10 @@ public class SignPatientListDto {
 	 * 签约时间，格式：yyyy-MM-dd
 	 */
 	@ApiModelProperty(value = "签约时间开始，格式：yyyy-MM-dd")
-	private Date signTimeStart;
+	private LocalDate signTimeStart;
 
 	@ApiModelProperty(value = "签约时间结束，格式：yyyy-MM-dd")
-	private Date signTimeEnd;
+	private LocalDate signTimeEnd;
 	/**
 	 * 签约时所属医院id
 	 */
@@ -102,10 +102,10 @@ public class SignPatientListDto {
 
 	@ApiModelProperty(value = "服务结束时间开始")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date serviceEndTimeStart;
+	private LocalDate serviceEndTimeStart;
 
 	@ApiModelProperty(value = "服务结束时间结束")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date serviceEndTimeEnd;
+	private LocalDate serviceEndTimeEnd;
 
 }

postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasetriggercondition/TriggerConditionDTO.java

@@ -0,0 +1,21 @@
+package com.xinelu.manage.dto.specialdiseasetriggercondition;
+
+import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 触发条件关系DTO
+ *
+ * @author xinelu
+ * @date 2024-03-18
+ */
+@Data
+public class TriggerConditionDTO {
+
+    /**
+     * 触发条件集和
+     */
+    List<SpecialDiseaseTriggerCondition> triggerConditionList;
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java

@@ -62,20 +62,11 @@ public interface LabelFieldContentMapper {
 
     /**
      * 检查数据库中同一个fieldId下内容名称的重复性
-     *
-     * @param fieldId
-     * @param contentName
-     * @return
      */
     int existCountByFieldIdAndContentName(@Param("fieldId") Long fieldId, @Param("contentName") String contentName);
 
     /**
      * 检查除去当前记录外有没有重复内容名称
-     *
-     * @param id
-     * @param fieldId
-     * @param contentName
-     * @return
      */
     int existCountByContentNameExcludingId(@Param("id") Long id, @Param("fieldId") Long fieldId, @Param("contentName") String contentName);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldinfo/LabelFieldInfoMapper.java

@@ -62,20 +62,11 @@ public interface LabelFieldInfoMapper {
 
     /**
      * 检查同类型下有没有重复字段名称
-     *
-     * @param fieldType
-     * @param fieldNames
-     * @return
      */
     int countDuplicateFieldNamesByType(@Param("fieldType") String fieldType, @Param("fieldNames") List<String> fieldNames);
 
     /**
      * 检查除当前记录外有没有同名的字段信息名称
-     *
-     * @param id
-     * @param fieldType
-     * @param fieldName
-     * @return
      */
     int countByFieldNameExcludingId(@Param("id") Long id, @Param("fieldType") String fieldType, @Param("fieldName") String fieldName);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/operationInfo/OperationInfoMapper.java

@@ -62,20 +62,11 @@ public interface OperationInfoMapper {
 
     /**
      * 检查所属科室下手术名称是否重复
-     *
-     * @param departmentId
-     * @param operationName
-     * @return
      */
     int countByDepartmentIdAndOperationName(@Param("departmentId") Long departmentId, @Param("operationName") String operationName);
 
     /**
      * 检查除当前记录之外是否存在同名的手术名称
-     *
-     * @param id
-     * @param departmentId
-     * @param operationName
-     * @return
      */
     int countByOperationNameExcludingId(@Param("id") Long id, @Param("departmentId") Long departmentId, @Param("operationName") String operationName);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientinfo/PatientInfoMapper.java

@@ -2,6 +2,8 @@ package com.xinelu.manage.mapper.patientinfo;
 
 import com.xinelu.manage.domain.patientinfo.PatientInfo;
 import com.xinelu.manage.dto.patientinfo.PatientInfoDto;
+import com.xinelu.manage.vo.patientinfo.PatientBaseInfoVo;
+
 import java.util.List;
 
 /**
@@ -19,6 +21,14 @@ public interface PatientInfoMapper {
      */
     public PatientInfo selectPatientInfoById(Long id);
 
+    /**
+     * 查询患者信息
+     *
+     * @param id 主键id
+     * @return 患者信息
+     */
+    public PatientBaseInfoVo getPatientBaseInfo(Long id);
+
     /**
      * 查询患者信息列表
      *

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionoptionresult/PatientQuestionOptionResultMapper.java

@@ -0,0 +1,61 @@
+package com.xinelu.manage.mapper.patientquestionoptionresult;
+
+import com.xinelu.manage.domain.patientquestionoptionresult.PatientQuestionOptionResult;
+
+import java.util.List;
+
+/**
+ * 患者问卷题目选项提交结果信息Mapper接口
+ *
+ * @author xinelu
+ * @date 2024-03-28
+ */
+public interface PatientQuestionOptionResultMapper {
+    /**
+     * 查询患者问卷题目选项提交结果信息
+     *
+     * @param id 患者问卷题目选项提交结果信息主键
+     * @return 患者问卷题目选项提交结果信息
+     */
+    PatientQuestionOptionResult selectPatientQuestionOptionResultById(Long id);
+
+    /**
+     * 查询患者问卷题目选项提交结果信息列表
+     *
+     * @param patientQuestionOptionResult 患者问卷题目选项提交结果信息
+     * @return 患者问卷题目选项提交结果信息集合
+     */
+    List<PatientQuestionOptionResult> selectPatientQuestionOptionResultList(PatientQuestionOptionResult patientQuestionOptionResult);
+
+    /**
+     * 新增患者问卷题目选项提交结果信息
+     *
+     * @param patientQuestionOptionResult 患者问卷题目选项提交结果信息
+     * @return 结果
+     */
+    int insertPatientQuestionOptionResult(PatientQuestionOptionResult patientQuestionOptionResult);
+
+    /**
+     * 修改患者问卷题目选项提交结果信息
+     *
+     * @param patientQuestionOptionResult 患者问卷题目选项提交结果信息
+     * @return 结果
+     */
+    int updatePatientQuestionOptionResult(PatientQuestionOptionResult patientQuestionOptionResult);
+
+    /**
+     * 删除患者问卷题目选项提交结果信息
+     *
+     * @param id 患者问卷题目选项提交结果信息主键
+     * @return 结果
+     */
+    int deletePatientQuestionOptionResultById(Long id);
+
+    /**
+     * 批量删除患者问卷题目选项提交结果信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deletePatientQuestionOptionResultByIds(Long[] ids);
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubjectresult/PatientQuestionSubjectResultMapper.java

@@ -0,0 +1,61 @@
+package com.xinelu.manage.mapper.patientquestionsubjectresult;
+
+import com.xinelu.manage.domain.patientquestionsubjectresult.PatientQuestionSubjectResult;
+
+import java.util.List;
+
+/**
+ * 患者问卷题目提交结果信息Mapper接口
+ *
+ * @author xinelu
+ * @date 2024-03-28
+ */
+public interface PatientQuestionSubjectResultMapper {
+    /**
+     * 查询患者问卷题目提交结果信息
+     *
+     * @param id 患者问卷题目提交结果信息主键
+     * @return 患者问卷题目提交结果信息
+     */
+    PatientQuestionSubjectResult selectPatientQuestionSubjectResultById(Long id);
+
+    /**
+     * 查询患者问卷题目提交结果信息列表
+     *
+     * @param patientQuestionSubjectResult 患者问卷题目提交结果信息
+     * @return 患者问卷题目提交结果信息集合
+     */
+    List<PatientQuestionSubjectResult> selectPatientQuestionSubjectResultList(PatientQuestionSubjectResult patientQuestionSubjectResult);
+
+    /**
+     * 新增患者问卷题目提交结果信息
+     *
+     * @param patientQuestionSubjectResult 患者问卷题目提交结果信息
+     * @return 结果
+     */
+    int insertPatientQuestionSubjectResult(PatientQuestionSubjectResult patientQuestionSubjectResult);
+
+    /**
+     * 修改患者问卷题目提交结果信息
+     *
+     * @param patientQuestionSubjectResult 患者问卷题目提交结果信息
+     * @return 结果
+     */
+    int updatePatientQuestionSubjectResult(PatientQuestionSubjectResult patientQuestionSubjectResult);
+
+    /**
+     * 删除患者问卷题目提交结果信息
+     *
+     * @param id 患者问卷题目提交结果信息主键
+     * @return 结果
+     */
+    int deletePatientQuestionSubjectResultById(Long id);
+
+    /**
+     * 批量删除患者问卷题目提交结果信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deletePatientQuestionSubjectResultByIds(Long[] ids);
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.java

@@ -0,0 +1,70 @@
+package com.xinelu.manage.mapper.patientquestionsubmitresult;
+
+import com.xinelu.manage.domain.patientquestionsubmitresult.PatientQuestionSubmitResult;
+import com.xinelu.manage.vo.patientquestionsubmitresult.PatientQuestionSubmitResultDTO;
+
+import java.util.List;
+
+/**
+ * 患者问卷提交结果信息Mapper接口
+ *
+ * @author xinelu
+ * @date 2024-03-28
+ */
+public interface PatientQuestionSubmitResultMapper {
+    /**
+     * 查询患者问卷提交结果信息
+     *
+     * @param id 患者问卷提交结果信息主键
+     * @return 患者问卷提交结果信息
+     */
+    PatientQuestionSubmitResult selectPatientQuestionSubmitResultById(Long id);
+
+    /**
+     * 查询患者问卷提交结果信息列表
+     *
+     * @param patientQuestionSubmitResult 患者问卷提交结果信息
+     * @return 患者问卷提交结果信息集合
+     */
+    List<PatientQuestionSubmitResult> selectPatientQuestionSubmitResultList(PatientQuestionSubmitResult patientQuestionSubmitResult);
+
+    /**
+     * 新增患者问卷提交结果信息
+     *
+     * @param patientQuestionSubmitResult 患者问卷提交结果信息
+     * @return 结果
+     */
+    int insertPatientQuestionSubmitResult(PatientQuestionSubmitResult patientQuestionSubmitResult);
+
+    /**
+     * 修改患者问卷提交结果信息
+     *
+     * @param patientQuestionSubmitResult 患者问卷提交结果信息
+     * @return 结果
+     */
+    int updatePatientQuestionSubmitResult(PatientQuestionSubmitResult patientQuestionSubmitResult);
+
+    /**
+     * 删除患者问卷提交结果信息
+     *
+     * @param id 患者问卷提交结果信息主键
+     * @return 结果
+     */
+    int deletePatientQuestionSubmitResultById(Long id);
+
+    /**
+     * 批量删除患者问卷提交结果信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deletePatientQuestionSubmitResultByIds(Long[] ids);
+
+    /**
+     * 根据任务执行记录查询患者问卷信息
+     *
+     * @param taskExecuteRecordId 患者管理任务执行记录表id
+     * @return PatientQuestionSubmitResultDTO
+     */
+    PatientQuestionSubmitResultDTO selectResultByTaskExecuteRecordId(Long taskExecuteRecordId);
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskexecuterecord/PatientTaskExecuteRecordMapper.java

@@ -0,0 +1,78 @@
+package com.xinelu.manage.mapper.patienttaskexecuterecord;
+
+import com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord;
+import com.xinelu.manage.vo.patienttaskexecuterecord.PatientTaskExecuteRecordVO;
+
+import java.util.List;
+
+/**
+ * 患者管理任务执行记录Mapper接口
+ *
+ * @author xinelu
+ * @date 2024-03-25
+ */
+public interface PatientTaskExecuteRecordMapper {
+    /**
+     * 查询患者管理任务执行记录
+     *
+     * @param id 患者管理任务执行记录主键
+     * @return 患者管理任务执行记录
+     */
+    PatientTaskExecuteRecord selectPatientTaskExecuteRecordById(Long id);
+
+    /**
+     * 查询患者管理任务执行记录列表
+     *
+     * @param patientTaskExecuteRecord 患者管理任务执行记录
+     * @return 患者管理任务执行记录集合
+     */
+    List<PatientTaskExecuteRecord> selectPatientTaskExecuteRecordList(PatientTaskExecuteRecord patientTaskExecuteRecord);
+
+    /**
+     * 查询患者管理任务执行记录列表
+     *
+     * @param patientTaskExecuteRecord 患者管理任务执行记录
+     * @return 患者管理任务执行记录集合
+     */
+    List<PatientTaskExecuteRecordVO> selectPatientAndExecuteRecordList(PatientTaskExecuteRecordVO patientTaskExecuteRecord);
+
+    /**
+     * 新增患者管理任务执行记录
+     *
+     * @param patientTaskExecuteRecord 患者管理任务执行记录
+     * @return 结果
+     */
+    int insertPatientTaskExecuteRecord(PatientTaskExecuteRecord patientTaskExecuteRecord);
+
+    /**
+     * 修改患者管理任务执行记录
+     *
+     * @param patientTaskExecuteRecord 患者管理任务执行记录
+     * @return 结果
+     */
+    int updatePatientTaskExecuteRecord(PatientTaskExecuteRecord patientTaskExecuteRecord);
+
+    /**
+     * 删除患者管理任务执行记录
+     *
+     * @param id 患者管理任务执行记录主键
+     * @return 结果
+     */
+    int deletePatientTaskExecuteRecordById(Long id);
+
+    /**
+     * 批量删除患者管理任务执行记录
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deletePatientTaskExecuteRecordByIds(Long[] ids);
+
+    /**
+     * 根据患者信息查询就诊记录
+     *
+     * @param id id
+     * @return AjaxResult
+     */
+    PatientTaskExecuteRecordVO selectVisitRecord(Long id);
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patienttaskpushrecord/PatientTaskPushRecordMapper.java

@@ -0,0 +1,62 @@
+package com.xinelu.manage.mapper.patienttaskpushrecord;
+
+import com.xinelu.manage.domain.patienttaskpushrecord.PatientTaskPushRecord;
+
+import java.util.List;
+
+
+/**
+ * 患者管理任务推送方式记录Mapper接口
+ *
+ * @author xinelu
+ * @date 2024-03-21
+ */
+public interface PatientTaskPushRecordMapper {
+    /**
+     * 查询患者管理任务推送方式记录
+     *
+     * @param id 患者管理任务推送方式记录主键
+     * @return 患者管理任务推送方式记录
+     */
+    public PatientTaskPushRecord selectPatientTaskPushRecordById(Long id);
+
+    /**
+     * 查询患者管理任务推送方式记录列表
+     *
+     * @param patientTaskPushRecord 患者管理任务推送方式记录
+     * @return 患者管理任务推送方式记录集合
+     */
+    List<PatientTaskPushRecord> selectPatientTaskPushRecordList(PatientTaskPushRecord patientTaskPushRecord);
+
+    /**
+     * 新增患者管理任务推送方式记录
+     *
+     * @param patientTaskPushRecord 患者管理任务推送方式记录
+     * @return 结果
+     */
+    int insertPatientTaskPushRecord(PatientTaskPushRecord patientTaskPushRecord);
+
+    /**
+     * 修改患者管理任务推送方式记录
+     *
+     * @param patientTaskPushRecord 患者管理任务推送方式记录
+     * @return 结果
+     */
+    int updatePatientTaskPushRecord(PatientTaskPushRecord patientTaskPushRecord);
+
+    /**
+     * 删除患者管理任务推送方式记录
+     *
+     * @param id 患者管理任务推送方式记录主键
+     * @return 结果
+     */
+    int deletePatientTaskPushRecordById(Long id);
+
+    /**
+     * 批量删除患者管理任务推送方式记录
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deletePatientTaskPushRecordByIds(Long[] ids);
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientvisitrecord/PatientVisitRecordMapper.java

@@ -1,10 +1,10 @@
 package com.xinelu.manage.mapper.patientvisitrecord;
-import org.apache.ibatis.annotations.Param;
-import java.util.Collection;
 
 import com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord;
 import com.xinelu.manage.dto.patientvisitrecord.PatientVisitRecordDto;
+import java.util.Collection;
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 患者就诊记录基本信息Mapper接口
@@ -61,4 +61,15 @@ public interface PatientVisitRecordMapper {
      * @return 结果
      */
     public int deletePatientVisitRecordByIds(Long[] ids);
+
+	PatientVisitRecord judgeRepeat(@Param("hospitalAgencyId") Long hospitalAgencyId, @Param("cardNo") String cardNo,
+		@Param("inHospitalNumber") String inHospitalNumber);
+
+	/**
+	 * 获取居民在当前机构最新一条就诊记录
+	 * @param hospitalAgencyId 机构id
+	 * @param patientId 患者id
+	 * @return 结果
+	 */
+	PatientVisitRecord getLastRecord(@Param("hospitalAgencyId") Long hospitalAgencyId, @Param("patientId") Long patientId);
 }

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

@@ -4,6 +4,7 @@ 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 com.xinelu.manage.vo.propagandainfo.PropagandaMaterialsVo;
 import java.util.List;
 
 /**
@@ -21,6 +22,14 @@ public interface PropagandaInfoMapper {
      */
     public PropagandaInfo selectPropagandaInfoById(Long id);
 
+	/**
+	 * 查询宣教素材信息
+	 *
+	 * @param id 宣教库管理主键
+	 * @return 宣教库管理
+	 */
+	PropagandaMaterialsVo selectPropagandaInfo(Long id);
+
     /**
      * 查询宣教库管理列表
      *

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandamaterials/PropagandaMaterialsMapper.java

@@ -35,6 +35,7 @@ public interface PropagandaMaterialsMapper {
      */
     public int insertPropagandaMaterials(PropagandaMaterials propagandaMaterials);
 
+
     /**
      * 修改宣教素材关系
      *
@@ -46,10 +47,26 @@ public interface PropagandaMaterialsMapper {
     /**
      * 删除宣教素材关系
      *
-     * @param id 宣教素材关系主键
+     * @param propagandaId 宣教库id
      * @return 结果
      */
-    public int deletePropagandaMaterialsById(Long id);
+    public int deleteByPropagandaId(Long propagandaId);
+
+	/**
+	 * 批量删除宣教素材关系
+	 *
+	 * @param propagandaIds 宣教库id
+	 * @return 结果
+	 */
+	public int deleteByPropagandaIds(Long[] propagandaIds);
+
+	/**
+	 * 删除宣教素材关系
+	 *
+	 * @param id 宣教素材关系
+	 * @return 结果
+	 */
+	public int deletePropagandaMaterialsById(Long id);
 
     /**
      * 批量删除宣教素材关系

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/questioninfo/QuestionInfoMapper.java

@@ -1,6 +1,7 @@
 package com.xinelu.manage.mapper.questioninfo;
 
 import com.xinelu.manage.domain.questioninfo.QuestionInfo;
+import com.xinelu.manage.vo.department.DepartmentVO;
 
 import java.util.List;
 
@@ -59,4 +60,13 @@ public interface QuestionInfoMapper {
      * @return 结果
      */
     int deleteQuestionInfoByIds(Long[] ids);
+
+
+    /**
+     * 科室路径数量
+     *
+     * @param departmentName 科室名称
+     * @return DepartmentVO
+     */
+    List<DepartmentVO> departmentQuestionByDepartmentName(String departmentName);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/residentinfo/ResidentInfoMapper.java

@@ -0,0 +1,61 @@
+package com.xinelu.manage.mapper.residentinfo;
+
+import com.xinelu.manage.domain.residentinfo.ResidentInfo;
+import java.util.List;
+
+
+/**
+ * 居民信息Mapper接口
+ *
+ * @author haown
+ * @date 2024-03-27
+ */
+public interface ResidentInfoMapper {
+    /**
+     * 查询居民信息
+     *
+     * @param id 居民信息主键
+     * @return 居民信息
+     */
+    public ResidentInfo selectResidentInfoById(Long id);
+
+    /**
+     * 查询居民信息列表
+     *
+     * @param residentInfo 居民信息
+     * @return 居民信息集合
+     */
+    List<ResidentInfo> selectResidentInfoList(ResidentInfo residentInfo);
+
+    /**
+     * 新增居民信息
+     *
+     * @param residentInfo 居民信息
+     * @return 结果
+     */
+    int insertResidentInfo(ResidentInfo residentInfo);
+
+    /**
+     * 修改居民信息
+     *
+     * @param residentInfo 居民信息
+     * @return 结果
+     */
+    int updateResidentInfo(ResidentInfo residentInfo);
+
+    /**
+     * 删除居民信息
+     *
+     * @param id 居民信息主键
+     * @return 结果
+     */
+    int deleteResidentInfoById(Long id);
+
+    /**
+     * 批量删除居民信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteResidentInfoByIds(Long[] ids);
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java

@@ -62,18 +62,11 @@ public interface ScriptInfoMapper {
 
     /**
      * 判断通用话术名称是否存在
-     *
-     * @param scriptInfo
-     * @return
      */
     int countByScriptInfo(ScriptInfo scriptInfo);
 
     /**
      * 检查是否存在除当前记录之外的同名记录
-     * @param scriptName
-     * @param departmentId
-     * @param id
-     * @return
      */
-    int countByScriptNameExcludingId(@Param("scriptName") String scriptName, @Param("departmentId") Long departmentId, @Param("id") Long id);
+    int countByScriptNameExcludingId(@Param("scriptName") String scriptName, @Param("departmentId") Long departmentId, @Param("id") Long id, @Param("commonScriptName") String commonScriptName);
 }