From 86d03ba54751d474169e770fc78e5f7267489ba3 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Thu, 27 Jun 2024 16:50:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=93=E7=97=85=E8=B7=AF=E5=BE=84?=
=?UTF-8?q?=E5=8F=8A=E6=89=8B=E5=8A=A8=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E6=96=B0=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SignRouteTriggerConditionMapper.xml | 4 ++--
.../manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signroutetriggercondition/SignRouteTriggerConditionMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signroutetriggercondition/SignRouteTriggerConditionMapper.xml
index d8faab8f..c1064809 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/signroutetriggercondition/SignRouteTriggerConditionMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/signroutetriggercondition/SignRouteTriggerConditionMapper.xml
@@ -175,14 +175,14 @@
trigger_condition_code,trigger_condition_name,trigger_condition_operator,
trigger_condition_value,trigger_condition_sort,trigger_condition_remark,
create_by,create_time,
- update_by,update_time)
+ update_by,update_time,phone_dial_method)
values
(#{item.id,jdbcType=NUMERIC},#{item.patientManageRouteId,jdbcType=NUMERIC},#{item.routeName,jdbcType=VARCHAR},
#{item.triggerConditionCode,jdbcType=VARCHAR},#{item.triggerConditionName,jdbcType=VARCHAR},#{item.triggerConditionOperator,jdbcType=VARCHAR},
#{item.triggerConditionValue,jdbcType=VARCHAR},#{item.triggerConditionSort,jdbcType=NUMERIC},#{item.triggerConditionRemark,jdbcType=VARCHAR},
#{item.createBy,jdbcType=VARCHAR},#{item.createTime},
- #{item.updateBy,jdbcType=VARCHAR},#{item.updateTime})
+ #{item.updateBy,jdbcType=VARCHAR},#{item.updateTime},#{item.phoneDialMethod})
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml
index aadfe061..4224dff4 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml
+++ b/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}
)
From a306b3413b9308b2352dceafce48ab39182ae8f5 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Thu, 27 Jun 2024 16:53:22 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=93=E7=97=85=E8=B7=AF=E5=BE=84?=
=?UTF-8?q?=E5=8F=8A=E6=89=8B=E5=8A=A8=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E6=96=B0=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SignRouteTriggerConditionMapper.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signroutetriggercondition/SignRouteTriggerConditionMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signroutetriggercondition/SignRouteTriggerConditionMapper.xml
index c1064809..d8faab8f 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/signroutetriggercondition/SignRouteTriggerConditionMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/signroutetriggercondition/SignRouteTriggerConditionMapper.xml
@@ -175,14 +175,14 @@
trigger_condition_code,trigger_condition_name,trigger_condition_operator,
trigger_condition_value,trigger_condition_sort,trigger_condition_remark,
create_by,create_time,
- update_by,update_time,phone_dial_method)
+ update_by,update_time)
values
(#{item.id,jdbcType=NUMERIC},#{item.patientManageRouteId,jdbcType=NUMERIC},#{item.routeName,jdbcType=VARCHAR},
#{item.triggerConditionCode,jdbcType=VARCHAR},#{item.triggerConditionName,jdbcType=VARCHAR},#{item.triggerConditionOperator,jdbcType=VARCHAR},
#{item.triggerConditionValue,jdbcType=VARCHAR},#{item.triggerConditionSort,jdbcType=NUMERIC},#{item.triggerConditionRemark,jdbcType=VARCHAR},
#{item.createBy,jdbcType=VARCHAR},#{item.createTime},
- #{item.updateBy,jdbcType=VARCHAR},#{item.updateTime},#{item.phoneDialMethod})
+ #{item.updateBy,jdbcType=VARCHAR},#{item.updateTime})
From 4748c61b4fa8f8ad1fef98fa6fe491e700918a54 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Thu, 27 Jun 2024 17:20:27 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=88=9B=E5=BB=BA?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=96=B0=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/enums/PhoneDialMethodEnum.java | 30 ++++++++
.../SignPatientManageRouteServiceImpl.java | 69 ++++++++++---------
2 files changed, 65 insertions(+), 34 deletions(-)
create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/PhoneDialMethodEnum.java
diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/PhoneDialMethodEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/PhoneDialMethodEnum.java
new file mode 100644
index 00000000..40396b98
--- /dev/null
+++ b/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;
+ }
+}
\ No newline at end of file
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java
index ec5c1948..8b2ccf5b 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java
@@ -5,11 +5,7 @@ import com.xinelu.common.constant.TaskContentConstants;
import com.xinelu.common.constant.TaskCreateTypeConstant;
import com.xinelu.common.constant.TemplateTypeConstants;
import com.xinelu.common.core.domain.AjaxResult;
-import com.xinelu.common.enums.NodeExecuteStatusEnum;
-import com.xinelu.common.enums.PhoneConnectStatusEnum;
-import com.xinelu.common.enums.PhoneMessageRemindEnum;
-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;
@@ -61,15 +57,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;
@@ -80,6 +67,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业务层处理
@@ -105,26 +102,26 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
private SignRouteTriggerConditionMapper signRouteTriggerConditionMapper;
@Resource
private ISignPatientManageRouteNodeService iSignPatientManageRouteNodeService;
- @Resource
- private SignPatientRecordMapper signPatientRecordMapper;
- @Resource
- private ISpecialDiseaseRouteService specialDiseaseRouteService;
- @Resource
- private ISpecialDiseaseNodeService specialDiseaseNodeService;
- @Resource
- private PatientVisitRecordMapper patientVisitRecordMapper;
- @Resource
- private ScriptInfoMapper scriptInfoMapper;
- @Resource
- private IQuestionInfoService questionInfoService;
- @Resource
- private IPropagandaInfoService propagandaInfoService;
- @Resource
- private LabelFieldContentMapper labelFieldContentMapper;
- @Resource
- private TextMessageMapper textMessageMapper;
- @Resource
- private WechatTemplateMapper wechatTemplateMapper;
+ @Resource
+ private SignPatientRecordMapper signPatientRecordMapper;
+ @Resource
+ private ISpecialDiseaseRouteService specialDiseaseRouteService;
+ @Resource
+ private ISpecialDiseaseNodeService specialDiseaseNodeService;
+ @Resource
+ private PatientVisitRecordMapper patientVisitRecordMapper;
+ @Resource
+ private ScriptInfoMapper scriptInfoMapper;
+ @Resource
+ private IQuestionInfoService questionInfoService;
+ @Resource
+ private IPropagandaInfoService propagandaInfoService;
+ @Resource
+ private LabelFieldContentMapper labelFieldContentMapper;
+ @Resource
+ private TextMessageMapper textMessageMapper;
+ @Resource
+ private WechatTemplateMapper wechatTemplateMapper;
/**
* 查询签约患者管理任务路径
@@ -643,6 +640,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());
@@ -659,6 +659,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());