From ad56903781e6ed2e4b9e35f69f87e5ed99164d3d Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 14 Jun 2024 14:58:23 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=B8=93=E7=97=85=E8=B7=AF=E5=BE=84?= =?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 --- .../SpecialDiseaseNode.java | 4 +++ .../SpecialDiseaseNodeMapper.xml | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java index 707381f3..344b8e19 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java @@ -259,6 +259,10 @@ public class SpecialDiseaseNode extends BaseEntity { @Excel(name = "AI电话短信提醒，不发送短信：NOT_SEND_MESSAGE，未接通发短信：NOT_CONNECTED_SEND_MESSAGE，接通后发短信：CONNECTED_SEND_MESSAGE，所有人发短信：EVERYONE_SEND_MESSAGE") private String phoneMessageRemind; + private String phoneRedialTimes; + + private String phoneTimeInterval; + /** * AI电话短信模板表id */ 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 614dae12..d6b7ab81 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml @@ -58,6 +58,8 @@ + + @@ -107,6 +109,8 @@ + + @@ -155,6 +159,8 @@ phone_template_id, phone_template_name, phone_message_remind, + phone_redial_times, + phone_time_interval, phone_message_template_id, phone_message_template_name, phone_agency_name, @@ -374,6 +380,10 @@ phone_message_remind, + phone_redial_times, + + phone_time_interval, + phone_message_template_id, phone_message_template_name, @@ -466,6 +476,10 @@ #{phoneMessageRemind}, + #{phoneRedialTimes}, + + #{phoneTimeInterval}, + #{phoneMessageTemplateId}, #{phoneMessageTemplateName}, @@ -594,6 +608,12 @@ phone_message_remind = #{phoneMessageRemind}, + phone_redial_times = + #{phoneRedialTimes}, + + phone_time_interval = + #{phoneTimeInterval}, + phone_message_template_id = #{phoneMessageTemplateId}, @@ -685,6 +705,8 @@ phone_template_id, phone_template_name, phone_message_remind, + phone_redial_times, + phone_time_interval, phone_message_template_id, phone_message_template_name, phone_agency_name, @@ -732,6 +754,8 @@ #{specialDiseaseNodeList.phoneTemplateId}, #{specialDiseaseNodeList.phoneTemplateName}, #{specialDiseaseNodeList.phoneMessageRemind}, + #{specialDiseaseNodeList.phoneRedialTimes}, + #{specialDiseaseNodeList.phoneTimeInterval}, #{specialDiseaseNodeList.phoneMessageTemplateId}, #{specialDiseaseNodeList.phoneMessageTemplateName}, #{specialDiseaseNodeList.phoneAgencyName}, @@ -802,6 +826,8 @@ sdn.phone_template_id, sdn.phone_template_name, sdn.phone_message_remind, + sdn.phone_redial_times, + sdn.phone_time_interval, sdn.phone_message_template_id, sdn.phone_message_template_name, sdn.phone_agency_name, From e140100bf997184e3fb04d93e84a83cc78f0df46 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 14 Jun 2024 14:58:51 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=B8=B8=E7=94=A8=E8=AF=9D=E6=9C=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/scriptInfo/impl/ScriptInfoServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java index 2eaff91e..f6dd95ae 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java @@ -237,8 +237,12 @@ public class ScriptInfoServiceImpl implements IScriptInfoService { for (Node node : scriptVO.getNodes()) { node.setScriptInfoId(scriptVO.getScriptInfoId()); String[] split = node.getLabel().split("\\n"); - node.setScriptNodeName(StringUtils.isBlank(split[0]) ? "" : split[0]); - node.setScriptContent(StringUtils.isBlank(split[1]) ? "" : split[0]); + if (split.length > 0) { + node.setScriptNodeName(split[0]); + } + if (split.length > 1) { + node.setScriptContent(split[1]); + } node.setScriptNodeType(node.getType()); node.setCreateBy(SecurityUtils.getUsername()); node.setCreateTime(LocalDateTime.now()); From a238be0ec06d35a1f875d00d95b724abaa6d554c Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 14 Jun 2024 18:11:13 +0800 Subject: [PATCH 03/10] =?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 --- .../xinelu/common/enums/ScriptStatusEnum.java | 17 ++++++++++--- .../SpecialDiseaseNode.java | 2 +- .../vo/signpatientmanageroute/PhonePush.java | 24 +++++++++++++++++++ .../SignPatientManageRouteMapper.xml | 4 ++++ 4 files changed, 43 insertions(+), 4 deletions(-) diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/ScriptStatusEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/ScriptStatusEnum.java index cdc5fb1f..159a439f 100644 --- a/postdischarge-common/src/main/java/com/xinelu/common/enums/ScriptStatusEnum.java +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/ScriptStatusEnum.java @@ -1,25 +1,36 @@ package com.xinelu.common.enums; +import lombok.Getter; + /** * 话术状态标识 * * @author : youxilong * @date : 2024/3/19 10:06 */ +@Getter public enum ScriptStatusEnum { /** * 话术状态，正常 */ - NORMAL, + NORMAL("NORMAL"), /** * 话术状态:下架 */ - OFF_SHELF, + OFF_SHELF("OFF_SHELF"), /** * 话术状态:暂停 */ - SUSPEND + SUSPEND("SUSPEND"), + ; + + + final private String info; + + ScriptStatusEnum(String info) { + this.info = info; + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java index 344b8e19..56f80413 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/specialdiseasenode/SpecialDiseaseNode.java @@ -261,7 +261,7 @@ public class SpecialDiseaseNode extends BaseEntity { private String phoneRedialTimes; - private String phoneTimeInterval; + private Integer phoneTimeInterval; /** * AI电话短信模板表id diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/PhonePush.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/PhonePush.java index d82aac31..71a1e8c8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/PhonePush.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/PhonePush.java @@ -6,6 +6,17 @@ import lombok.Data; @Data public class PhonePush { + /** + * 管理路径节点名称，出院后：AFTER_DISCHARGE，入院后：AFTER_ADMISSION，就诊后：AFTER_CONSULTATION + */ + private String routeNodeName; + + /** + * 管理路径节点时间，时间单位为：天 + */ + private String routeNodeDay; + + private String patientName; /** @@ -14,6 +25,9 @@ public class PhonePush { @ApiModelProperty(value = "患者电话") private String patientPhone; + /** + * 电话推送标识 + */ private Integer phonePushSign; /** @@ -58,6 +72,16 @@ public class PhonePush { @ApiModelProperty(value = "电话短信提醒，不发送短信：NOT_SEND_MESSAGE，未接通发短信：NOT_CONNECTED_SEND_MESSAGE，接通后发短信：CONNECTED_SEND_MESSAGE，所有人发短信：EVERYONE_SEND_MESSAGE") private String phoneMessageRemind; + /** + * 默认已接通：CONNECTED；未接通:NOTCONNECTED + */ + private String phoneConnectStatus; + + /** + * 任务处理信息；执行结果记录(电话反馈 + */ + private String routeHandleRemark; + /** * 电话短信模板表id */ diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml index 75f4cf2e..c6ee9d37 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml @@ -622,12 +622,16 @@ resultType="com.xinelu.manage.vo.signpatientmanageroute.PhonePush"> select pi.patient_name, pi.patient_phone, + spmrn.route_node_name, + spmrn.route_node_day, spmrn.phone_id, spmrn.phone_template_id, spmrn.phone_template_name, spmrn.phone_redial_times, spmrn.phone_time_interval, spmrn.phone_message_remind, + spmrn.phone_connect_status, + spmrn.route_handle_remark, spmrn.phone_message_template_id, spmrn.phone_message_template_name, si.script_file_path From 450e3d69a822bcdf9b81fdb1694beb83235e507b Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 14 Jun 2024 18:12:48 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=B8=93=E7=97=85=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SpecialDiseaseNodeServiceImpl.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java index 2d213258..2574a6a9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java @@ -21,15 +21,6 @@ import com.xinelu.manage.service.patientinfo.IPatientAllInfoViewService; import com.xinelu.manage.service.specialdiseasenode.ISpecialDiseaseNodeService; import com.xinelu.manage.vo.specialdiseasenode.SpecialDiseaseNodeVO; import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.TreeSet; -import java.util.stream.Collectors; -import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -41,6 +32,11 @@ 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.*; +import java.util.stream.Collectors; + /** * 专病路径-管理节点信息Service业务层处理 * @@ -155,7 +151,7 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService diseaseNode.setRouteName(specialDiseaseNode.getRouteName()); diseaseNode.setTemplateType(null); if (StringUtils.isNotBlank(diseaseNode.getTaskSubdivisiontemplateType()) - && (TemplateTypeEnum.QUESTIONNAIRE.getInfo().equals(diseaseNode.getTaskSubdivisiontemplateType()) || TemplateTypeEnum.PROPAGANDA.getInfo().equals(diseaseNode.getTaskSubdivisiontemplateType()))) { + && (TemplateTypeEnum.QUESTIONNAIRE.getInfo().equals(diseaseNode.getTaskSubdivisiontemplateType()) || TemplateTypeEnum.PROPAGANDA.getInfo().equals(diseaseNode.getTaskSubdivisiontemplateType()) || TemplateTypeEnum.SCRIPT.getInfo().equals(diseaseNode.getTaskSubdivisiontemplateType()))) { diseaseNode.setTemplateType(diseaseNode.getTaskSubdivisiontemplateType()); } diseaseNode.setUpdateTime(LocalDateTime.now()); From 58d4303bf9998438310e8b8a64a49dc10c640a62 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 17 Jun 2024 11:27:06 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E8=AF=9D=E6=9C=AF=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/mapper/scriptInfo/ScriptInfoMapper.java | 4 ++++ .../scriptInfo/impl/ScriptInfoServiceImpl.java | 2 ++ .../mapper/manage/scriptInfo/ScriptInfoMapper.xml | 12 ++++++++++++ 3 files changed, 18 insertions(+) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java index 7dd49eac..a74aaa04 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java @@ -77,4 +77,8 @@ public interface ScriptInfoMapper { List selectScriptInfoEdgeIds(Long id); List selectScriptInfoNodeIds(Long id); + + int deleteScriptInfoNode(Long id); + + int deleteScriptInfoEdge(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java index f6dd95ae..4382a312 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java @@ -222,6 +222,8 @@ public class ScriptInfoServiceImpl implements IScriptInfoService { public AjaxResult updateScriptEdgeNode(ScriptVO scriptVO) { List scriptInfoEdgeIds = scriptInfoMapper.selectScriptInfoEdgeIds(scriptVO.getScriptInfoId()); List scriptInfoNodeIds = scriptInfoMapper.selectScriptInfoNodeIds(scriptVO.getScriptInfoId()); + scriptInfoMapper.deleteScriptInfoNode(scriptVO.getScriptInfoId()); + scriptInfoMapper.deleteScriptInfoEdge(scriptVO.getScriptInfoId()); ScriptInfo scriptInfo = new ScriptInfo(); scriptInfo.setId(scriptVO.getScriptInfoId()); scriptInfo.setFlowScheme(scriptVO.getFlowScheme()); diff --git a/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml index 1e908ab3..20dbb1e3 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml @@ -316,4 +316,16 @@ from script_info_node where script_info_id = #{id} + + + delete + from script_info_node + where script_info_id = #{id} + + + + delete + from script_info_edge + where script_info_id = #{id} + \ No newline at end of file From 10a2bb36f5cdaa118cd1764d8f24c9355cecda29 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 17 Jun 2024 14:12:13 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E9=9A=8F=E8=AE=BF?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/scriptInfo/ScriptInfoController.java | 2 +- .../SignPatientManageRouteNode.java | 3 +++ .../PatientQuestionSubmitResultDTO.java | 3 +++ .../impl/SignPatientManageRouteServiceImpl.java | 1 + .../SignPatientManageRouteNodeMapper.xml | 11 +++++++++-- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/scriptInfo/ScriptInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/scriptInfo/ScriptInfoController.java index fb717019..c6a656a8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/scriptInfo/ScriptInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/scriptInfo/ScriptInfoController.java @@ -126,7 +126,7 @@ public class ScriptInfoController extends BaseController { } /** - * 新增话术节点 + * 新增话术节点(暂时不用) */ @PostMapping("/insertScriptEdgeNode") public AjaxResult insertScriptEdgeNode(@RequestBody ScriptVO scriptVO) { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java index cdbda48e..8ae494b2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java @@ -330,4 +330,7 @@ public class SignPatientManageRouteNode extends BaseEntity { @ApiModelProperty(value = "消息状态：已读：READ；未读：UNREAD。") private String messageStatus; + + @ApiModelProperty(value = "默认已接通：CONNECTED；未接通:NOTCONNECTED") + private String phoneConnectStatus; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientquestionsubmitresult/PatientQuestionSubmitResultDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientquestionsubmitresult/PatientQuestionSubmitResultDTO.java index bd02b986..360c59c8 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientquestionsubmitresult/PatientQuestionSubmitResultDTO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientquestionsubmitresult/PatientQuestionSubmitResultDTO.java @@ -30,6 +30,9 @@ public class PatientQuestionSubmitResultDTO extends PatientQuestionSubmitResult @ApiModelProperty(value = "任务处理信息") private String routeHandleRemark; + @ApiModelProperty(value = "电话是否接通：已接通：CONNECTED；未接通:NOTCONNECTED") + private String phoneConnectStatus; + @ApiModelProperty(value = "患者就诊记录基本信息表id") private Long visitRecordId; 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 4af27356..91c6ed71 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 @@ -348,6 +348,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout signPatientManageRouteNode.setId(dto.getManageRouteNodeId()); signPatientManageRouteNode.setNodeExecuteStatus(NodeExecuteStatusEnum.EXECUTED.toString()); signPatientManageRouteNode.setRouteHandleRemark(dto.getRouteHandleRemark()); + signPatientManageRouteNode.setPhoneConnectStatus(dto.getPhoneConnectStatus()); signPatientManageRouteNode.setRouteHandleId(dto.getRouteHandleId()); signPatientManageRouteNode.setRouteHandlePerson(routeHandlePerson); signPatientManageRouteNode.setUpdateBy(routeHandlePerson); diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml index 74e74677..efd712e5 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -301,6 +301,8 @@ route_handle_remark, + phone_connect_status, + route_handle_id, route_handle_person, @@ -429,6 +431,8 @@ #{routeHandleRemark}, + #{phoneConnectStatus}, + #{routeHandleId}, #{routeHandlePerson}, @@ -457,7 +461,7 @@ phone_message_template_name, question_info_id, questionnaire_name, questionnaire_content, question_expiration_date, propaganda_info_id, propaganda_title, propaganda_content, message_push_sign, message_template_id, message_template_name, message_preview, message_node_content, official_push_sign, official_template_id, official_template_name, official_remind_content, official_node_content, applet_push_sign, applet_template_id, applet_template_name, applet_remind_content, applet_prompt_description, applet_node_content, follow_template_id, - follow_template_name, follow_content, route_check_status, route_check_person, route_check_date, route_check_remark, route_node_remark, node_execute_status, route_handle_remark, + follow_template_name, follow_content, route_check_status, route_check_person, route_check_date, route_check_remark, route_node_remark, node_execute_status, route_handle_remark,phone_connect_status, route_handle_id, route_handle_person, route_link, text_remind_content,node_content, del_flag, create_by, create_time, update_by, update_time) values @@ -466,7 +470,7 @@ #{item.questionInfoId},#{item.questionnaireName},#{item.questionnaireContent},#{item.questionExpirationDate},#{item.propagandaInfoId},#{item.propagandaTitle},#{item.propagandaContent},#{item.messagePushSign},#{item.messageTemplateId}, #{item.messageTemplateName},#{item.messagePreview},#{item.messageNodeContent},#{item.officialPushSign},#{item.officialTemplateId},#{item.officialTemplateName},#{item.officialRemindContent},#{item.officialNodeContent}, #{item.appletPushSign},#{item.appletTemplateId},#{item.appletTemplateName},#{item.appletRemindContent},#{item.appletPromptDescription},#{item.appletNodeContent},#{item.followTemplateId}, - #{item.followTemplateName},#{item.followContent},#{item.routeCheckStatus},#{item.routeCheckPerson},#{item.routeCheckDate},#{item.routeCheckRemark},#{item.routeNodeRemark},#{item.nodeExecuteStatus},#{item.routeHandleRemark}, + #{item.followTemplateName},#{item.followContent},#{item.routeCheckStatus},#{item.routeCheckPerson},#{item.routeCheckDate},#{item.routeCheckRemark},#{item.routeNodeRemark},#{item.nodeExecuteStatus},#{item.routeHandleRemark},#{item.phoneConnectStatus}, #{item.routeHandleId},#{item.routeHandlePerson},#{item.routeLink},#{item.textRemindContent},#{item.nodeContent},0,#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime}) @@ -632,6 +636,9 @@ route_handle_remark = #{routeHandleRemark}, + phone_connect_status = + #{phoneConnectStatus}, + route_handle_id = #{routeHandleId}, From d5c6fde48f53ff57f1dec547a4e17ce3d54a2a4d Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 17 Jun 2024 16:01:01 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E9=9A=8F=E8=AE=BF?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/PhoneConnectStatusEnum.java | 24 +++++++++++++ .../common/enums/PhoneMessageRemindEnum.java | 34 +++++++++++++++++++ .../PatientQuestionSubmitResultDTO.java | 3 ++ .../SignPatientManageRouteServiceImpl.java | 13 +++++-- 4 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/PhoneConnectStatusEnum.java create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/PhoneMessageRemindEnum.java diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/PhoneConnectStatusEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/PhoneConnectStatusEnum.java new file mode 100644 index 00000000..c907816a --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/PhoneConnectStatusEnum.java @@ -0,0 +1,24 @@ +package com.xinelu.common.enums; + +import lombok.Getter; + +@Getter +public enum PhoneConnectStatusEnum { + + /** + * 已接通 + */ + CONNECTED("CONNECTED"), + + /** + * 未接通 + */ + NOTCONNECTED("NOTCONNECTED"), + ; + + final private String info; + + PhoneConnectStatusEnum(String info) { + this.info = info; + } +} \ No newline at end of file diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/PhoneMessageRemindEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/PhoneMessageRemindEnum.java new file mode 100644 index 00000000..b6960acb --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/PhoneMessageRemindEnum.java @@ -0,0 +1,34 @@ +package com.xinelu.common.enums; + +import lombok.Getter; + +@Getter +public enum PhoneMessageRemindEnum { + + /** + * 不发送短信 + */ + NOT_SEND_MESSAGE("NOT_SEND_MESSAGE"), + + /** + * 未接通发短信 + */ + NOT_CONNECTED_SEND_MESSAGE("NOT_CONNECTED_SEND_MESSAGE"), + + /** + * 接通后发短信 + */ + CONNECTED_SEND_MESSAGE("CONNECTED_SEND_MESSAGE"), + + /** + * 所有人发短信 + */ + EVERYONE_SEND_MESSAGE("EVERYONE_SEND_MESSAGE"), + ; + + final private String info; + + PhoneMessageRemindEnum(String info) { + this.info = info; + } +} \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientquestionsubmitresult/PatientQuestionSubmitResultDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientquestionsubmitresult/PatientQuestionSubmitResultDTO.java index 360c59c8..7d1d5ae4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientquestionsubmitresult/PatientQuestionSubmitResultDTO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientquestionsubmitresult/PatientQuestionSubmitResultDTO.java @@ -33,6 +33,9 @@ public class PatientQuestionSubmitResultDTO extends PatientQuestionSubmitResult @ApiModelProperty(value = "电话是否接通：已接通：CONNECTED；未接通:NOTCONNECTED") private String phoneConnectStatus; + @ApiModelProperty(value = "电话短信提醒，不发送短信：NOT_SEND_MESSAGE，未接通发短信：NOT_CONNECTED_SEND_MESSAGE，接通后发短信：CONNECTED_SEND_MESSAGE，所有人发短信：EVERYONE_SEND_MESSAGE") + private String phoneMessageRemind; + @ApiModelProperty(value = "患者就诊记录基本信息表id") private Long visitRecordId; 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 91c6ed71..24124ce2 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 @@ -2,9 +2,7 @@ package com.xinelu.manage.service.signpatientmanageroute.impl; import com.xinelu.common.constant.TaskCreateTypeConstant; import com.xinelu.common.core.domain.AjaxResult; -import com.xinelu.common.enums.NodeExecuteStatusEnum; -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; @@ -28,6 +26,7 @@ import com.xinelu.manage.mapper.signpatientmanageroute.SignPatientManageRouteMap import com.xinelu.manage.mapper.signpatientmanageroutenode.SignPatientManageRouteNodeMapper; import com.xinelu.manage.mapper.signroutetriggercondition.SignRouteTriggerConditionMapper; import com.xinelu.manage.service.signpatientmanageroute.ISignPatientManageRouteService; +import com.xinelu.manage.service.signpatientmanageroutenode.ISignPatientManageRouteNodeService; import com.xinelu.manage.vo.manualfollowup.ManualFollowPatientVO; import com.xinelu.manage.vo.manualfollowup.ManualFollowUpVO; import com.xinelu.manage.vo.signpatientmanageroute.SignPatientManageRouteVO; @@ -67,6 +66,8 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout private PatientQuestionOptionResultMapper patientQuestionOptionResultMapper; @Resource private SignRouteTriggerConditionMapper signRouteTriggerConditionMapper; + @Resource + private ISignPatientManageRouteNodeService iSignPatientManageRouteNodeService; /** * 查询签约患者管理任务路径 @@ -259,6 +260,12 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout updateSignPatientManageRouteNode(dto, routeHandlePerson, time); // 新增患者管理任务执行记录 insertPatientTaskExecuteRecord(dto, routeHandlePerson, time); + // 发送短信 + if (PhoneMessageRemindEnum.EVERYONE_SEND_MESSAGE.getInfo().equals(dto.getPhoneMessageRemind()) + || (PhoneConnectStatusEnum.CONNECTED.getInfo().equals(dto.getPhoneConnectStatus()) && PhoneMessageRemindEnum.CONNECTED_SEND_MESSAGE.getInfo().equals(dto.getPhoneMessageRemind())) + || (PhoneConnectStatusEnum.NOTCONNECTED.getInfo().equals(dto.getPhoneConnectStatus()) && PhoneMessageRemindEnum.NOT_CONNECTED_SEND_MESSAGE.getInfo().equals(dto.getPhoneMessageRemind()))) { + iSignPatientManageRouteNodeService.generateTask(dto.getManageRouteNodeId(), dto.getTaskType()); + } } else { // 如果任务类型不是电话外呼,更新节点任务表,新增患者管理任务执行记录,新增问卷提交结果表、题目表、选项表 // 更新节点任务表 From 361c09207acf683f1029a935058f609a315c5f41 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 17 Jun 2024 17:20:13 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E9=9A=8F=E8=AE=BF?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SignPatientManageRouteServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 24124ce2..56ed1999 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 @@ -261,9 +261,12 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout // 新增患者管理任务执行记录 insertPatientTaskExecuteRecord(dto, routeHandlePerson, time); // 发送短信 - if (PhoneMessageRemindEnum.EVERYONE_SEND_MESSAGE.getInfo().equals(dto.getPhoneMessageRemind()) + if (StringUtils.isBlank(dto.getPhoneConnectStatus())) { + dto.setPhoneConnectStatus(PhoneConnectStatusEnum.CONNECTED.getInfo()); + } + if (StringUtils.isNotBlank(dto.getPhoneMessageRemind()) && (PhoneMessageRemindEnum.EVERYONE_SEND_MESSAGE.getInfo().equals(dto.getPhoneMessageRemind()) || (PhoneConnectStatusEnum.CONNECTED.getInfo().equals(dto.getPhoneConnectStatus()) && PhoneMessageRemindEnum.CONNECTED_SEND_MESSAGE.getInfo().equals(dto.getPhoneMessageRemind())) - || (PhoneConnectStatusEnum.NOTCONNECTED.getInfo().equals(dto.getPhoneConnectStatus()) && PhoneMessageRemindEnum.NOT_CONNECTED_SEND_MESSAGE.getInfo().equals(dto.getPhoneMessageRemind()))) { + || (PhoneConnectStatusEnum.NOTCONNECTED.getInfo().equals(dto.getPhoneConnectStatus()) && PhoneMessageRemindEnum.NOT_CONNECTED_SEND_MESSAGE.getInfo().equals(dto.getPhoneMessageRemind())))) { iSignPatientManageRouteNodeService.generateTask(dto.getManageRouteNodeId(), dto.getTaskType()); } } else { From 0ba4194526c1601da1d18f57830a07eaa0aa4e40 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 18 Jun 2024 16:04:37 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=BB=A1?= =?UTF-8?q?=E6=84=8F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/homepage/HomePageMapper.xml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml index daca4435..801dc7b5 100644 --- a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml +++ b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml @@ -67,20 +67,21 @@