From 6ac60b54c25eaf59363b467810e93cbee8cca1e0 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Thu, 27 Jun 2024 15:44:18 +0800 Subject: [PATCH 1/2] =?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/SpecialDiseaseNode.java | 7 +++++++ .../SpecialDiseaseNodeMapper.xml | 18 +++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) 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 56f80413..be4bc973 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 @@ -238,6 +238,13 @@ public class SpecialDiseaseNode extends BaseEntity { @Excel(name = "AL电话推送标识，0：未开启，1：已开启") private Integer phonePushSign; + /** + * AI：自动 或 COMMON：手动 + */ + @ApiModelProperty(value = "AI：自动 或 COMMON：手动") + @Excel(name = "AI：自动 或 COMMON：手动") + private String phoneDialMethod; + /** * 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 a7cad4b4..aadfe061 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml @@ -55,6 +55,7 @@ + @@ -106,6 +107,7 @@ + @@ -156,6 +158,7 @@ applet_prompt_description, applet_node_content, phone_push_sign, + phone_dial_method, phone_template_id, phone_template_name, phone_message_remind, @@ -219,6 +222,9 @@ and message_push_sign = #{messagePushSign} + + and phone_dial_method = #{phoneDialMethod} + and message_template__id = #{messageTemplateId} @@ -410,6 +416,8 @@ node_content, + phone_dial_method, + #{routeId}, @@ -506,6 +514,8 @@ #{nodeContent}, + #{phoneDialMethod} + @@ -653,6 +663,9 @@ node_content = #{nodeContent}, + phone_dial_method = + #{phoneDialMethod}, + where id = #{id} @@ -717,7 +730,8 @@ route_check_remark, node_content, create_by, - create_time + create_time, + phone_dial_method ) values ( @@ -767,6 +781,7 @@ #{specialDiseaseNodeList.nodeContent}, #{specialDiseaseNodeList.createBy}, #{specialDiseaseNodeList.createTime} + #{specialDiseaseNodeList.phoneDialMethod} ) @@ -837,6 +852,7 @@ sdn.route_check_date, sdn.route_check_remark, sdn.node_content, + sdn.phone_dial_method, (select COUNT(1) from special_disease_node where route_id = specialDiseaseRouteId) totalNumber, From 8f35d891f0dc7c49939c234c2bf6916600c1531f Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Thu, 27 Jun 2024 16:14:03 +0800 Subject: [PATCH 2/2] =?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 --- .../SignPatientManageRouteNode.java | 7 +++++++ .../SignPatientManageRouteNodeMapper.xml | 19 +++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) 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 46e7996f..bd522d96 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 @@ -324,4 +324,11 @@ public class SignPatientManageRouteNode extends BaseEntity { @ApiModelProperty(value = "默认已接通：CONNECTED；未接通:NOTCONNECTED") private String phoneConnectStatus; + + /** + * AI：自动 或 COMMON：手动 + */ + @ApiModelProperty(value = "AI：自动 或 COMMON：手动") + @Excel(name = "AI：自动 或 COMMON：手动") + private String phoneDialMethod; } 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 3d903f25..491253f3 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -68,10 +68,11 @@ + - select id, manage_route_id, manage_route_name, route_node_id, route_node_name, route_node_day, task_type, task_status, task_subdivision, second_classify_describe, execute_time, phone_push_sign, phone_id, phone_template_id, phone_template_name, phone_node_content, phone_redial_times, phone_time_interval, phone_message_remind, phone_message_template_id, phone_message_template_name,phone_message_template_content,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, route_check_status, route_check_person, route_check_date, route_check_remark, route_node_remark, node_execute_status, route_handle_remark, route_handle_id, route_handle_person, route_link,text_remind_content, node_content,message_status, del_flag, create_by, create_time, update_by, update_time from sign_patient_manage_route_node + select id, manage_route_id, manage_route_name, route_node_id, route_node_name, route_node_day, task_type, task_status, task_subdivision, second_classify_describe, execute_time, phone_push_sign, phone_id, phone_template_id, phone_template_name, phone_node_content, phone_redial_times, phone_time_interval, phone_message_remind, phone_message_template_id, phone_message_template_name,phone_message_template_content,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, route_check_status, route_check_person, route_check_date, route_check_remark, route_node_remark, node_execute_status, route_handle_remark, route_handle_id, route_handle_person, route_link,text_remind_content, node_content,message_status, del_flag, create_by, create_time, update_by, update_time, phone_dial_method from sign_patient_manage_route_node @@ -150,7 +154,7 @@ node.official_push_sign, node.official_template_id, node.official_template_name, node.official_remind_content, node.official_node_content, node.applet_push_sign, node.applet_template_id, node.applet_template_name, node.applet_remind_content, node.applet_prompt_description, node.applet_node_content, node.route_check_status, node.route_check_person, node.route_check_date, node.route_check_remark, node.route_node_remark, - node.node_execute_status, node.route_handle_remark, node.route_handle_id, node.route_handle_person, node.route_link,node.text_remind_content,node.node_content + node.node_execute_status, node.route_handle_remark, node.route_handle_id, node.route_handle_person, node.route_link,node.text_remind_content,node.node_content,node.phone_dial_method from sign_patient_manage_route_node node left join sign_patient_manage_route route on node.manage_route_id = route.id @@ -316,6 +320,8 @@ update_time, + phone_dial_method, + #{manageRouteId}, @@ -442,6 +448,8 @@ #{updateTime}, + #{phoneDialMethod} + @@ -451,7 +459,7 @@ 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, 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) + route_handle_id, route_handle_person, route_link, text_remind_content,node_content, del_flag, create_by, create_time, update_by, update_time,phone_dial_method) values (#{item.manageRouteId},#{item.manageRouteName},#{item.routeNodeId},#{item.routeNodeName},#{item.routeNodeDay},#{item.taskType},#{item.taskStatus},#{item.taskSubdivision},#{item.secondClassifyDescribe}, @@ -460,7 +468,7 @@ #{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.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}) + #{item.routeHandleId},#{item.routeHandlePerson},#{item.routeLink},#{item.textRemindContent},#{item.nodeContent},0,#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.phoneDialMethod}) @@ -652,6 +660,9 @@ update_time = #{updateTime}, + phone_dial_method = + #{phoneDialMethod}, + where id = #{id}