Merge branch '0418_小程序开发' of http://182.92.166.109:3000/zhuangyuanke/PostDischargePatientManage into 0418_小程序开发

 Conflicts:

	postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java

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

@@ -0,0 +1,30 @@
+package com.xinelu.common.enums;
+
+
+import lombok.Getter;
+
+/**
+ * @Description 电话推送方式
+ * @Author zh
+ * @Date 2024-06-27
+ */
+@Getter
+public enum PhoneDialMethodEnum {
+
+    /**
+     * AI
+     */
+    AI("AI"),
+
+    /**
+     * 手动
+     */
+    COMMON("COMMON"),
+    ;
+
+    final private String info;
+
+    PhoneDialMethodEnum(String info) {
+        this.info = info;
+    }
+}

postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java

@@ -11,6 +11,7 @@ import com.xinelu.common.enums.PhoneMessageRemindEnum;
 import com.xinelu.common.enums.RouteNodeNameEnum;
 import com.xinelu.common.enums.TaskContentEnum;
 import com.xinelu.common.enums.TaskCreateTypeEnum;
+import com.xinelu.common.enums.*;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.AgeUtil;
 import com.xinelu.common.utils.SecurityUtils;
@@ -62,15 +63,6 @@ import com.xinelu.manage.vo.specialdiseasenode.RouteTaskAuditVo;
 import com.xinelu.manage.vo.specialdiseasenode.SpecialDiseaseNodeAuditVo;
 import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseChildRouteAuditVo;
 import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteAuditVo;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import javax.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -81,6 +73,16 @@ import org.jsoup.select.Elements;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 
 /**
  * 签约患者管理任务路径Service业务层处理
@@ -659,6 +661,9 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
             signPatientManageRouteNode.setPhoneMessageRemind(StringUtils.isBlank(routeNode.getPhoneMessageRemind()) ? null : routeNode.getPhoneMessageRemind());
             signPatientManageRouteNode.setPhoneMessageTemplateId(Objects.isNull(routeNode.getPhoneMessageTemplateId()) ? null : routeNode.getPhoneMessageTemplateId());
             signPatientManageRouteNode.setPhoneMessageTemplateName(StringUtils.isBlank(routeNode.getPhoneMessageTemplateName()) ? null : routeNode.getPhoneMessageTemplateName());
+            signPatientManageRouteNode.setQuestionInfoId(Objects.isNull(routeNode.getQuestionInfoId()) ? null : routeNode.getQuestionInfoId());
+            signPatientManageRouteNode.setQuestionnaireName(StringUtils.isBlank(routeNode.getQuestionnaireName()) ? null : routeNode.getQuestionnaireName());
+            signPatientManageRouteNode.setQuestionnaireContent(StringUtils.isBlank(routeNode.getQuestionnaireContent()) ? null : routeNode.getQuestionnaireContent());
         }
         if (Objects.nonNull(routeNode) && TaskContentEnum.QUESTIONNAIRE_SCALE.getInfo().equals(routeNode.getTaskType())) {
             signPatientManageRouteNode.setQuestionInfoId(Objects.isNull(routeNode.getQuestionInfoId()) ? null : routeNode.getQuestionInfoId());
@@ -675,6 +680,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
             signPatientManageRouteNode.setTextRemindContent(StringUtils.isBlank(routeNode.getTextRemindContent()) ? null : routeNode.getTextRemindContent());
         }
         if (Objects.nonNull(routeNode) && TaskContentEnum.ARTIFICIAL_FOLLOW_UP.getInfo().equals(routeNode.getTaskType())) {
+            signPatientManageRouteNode.setPhoneDialMethod(PhoneDialMethodEnum.COMMON.getInfo());
             signPatientManageRouteNode.setPhoneTemplateId(Objects.isNull(routeNode.getPhoneTemplateId()) ? null : routeNode.getPhoneTemplateId());
             signPatientManageRouteNode.setPhoneNodeContent(StringUtils.isBlank(routeNode.getPhoneNodeContent()) ? null : routeNode.getPhoneNodeContent());
             signPatientManageRouteNode.setPhoneTemplateName(StringUtils.isBlank(routeNode.getPhoneTemplateName()) ? null : routeNode.getPhoneTemplateName());

postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml

@@ -780,7 +780,7 @@
             #{specialDiseaseNodeList.routeCheckRemark},
             #{specialDiseaseNodeList.nodeContent},
             #{specialDiseaseNodeList.createBy},
-            #{specialDiseaseNodeList.createTime}
+            #{specialDiseaseNodeList.createTime},
             #{specialDiseaseNodeList.phoneDialMethod}
             )
         </foreach>