From 2857d04864bf2d9703e54d65b4a7f1a929046d61 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 1 Jul 2024 15:15:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- postdischarge-admin/src/main/resources/application.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/postdischarge-admin/src/main/resources/application.yml b/postdischarge-admin/src/main/resources/application.yml index a6da37a7..8a269528 100644 --- a/postdischarge-admin/src/main/resources/application.yml +++ b/postdischarge-admin/src/main/resources/application.yml @@ -191,10 +191,10 @@ xss: # 院后微信小程序参数配置信息 wechat-applet-chat-config: - # 微信小程序id，wxdec3416aa3d60cab - applet-id: wxdc32268eca6b78f9 - # 微信小程序密钥，f58e19be0380c2ebc6e9e9684c0dacce - secret: 0d0e41432908750460aef2bf0aa871ae + # 微信小程序id + applet-id: wx68efddfbe8eb703a + # 微信小程序密钥 + secret: a6c75e3be9d690f049f0781367f1714f # 微信小程序返回国家语言 lang: zh_CN # 微信小程序授权类型 From 334d2976b84a2c975f375f3687f708356f3ef972 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 1 Jul 2024 15:16:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- postdischarge-admin/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postdischarge-admin/src/main/resources/application.yml b/postdischarge-admin/src/main/resources/application.yml index 8a269528..6e907cdc 100644 --- a/postdischarge-admin/src/main/resources/application.yml +++ b/postdischarge-admin/src/main/resources/application.yml @@ -32,7 +32,7 @@ xinelu: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 8080 + port: 9090 servlet: # 应用的访问路径 context-path: / From a0b6c67e444bd0053033fed2f67e7d4a68bf3c0c Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 1 Jul 2024 15:51:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java | 3 --- .../com/xinelu/manage/vo/signpatientmanageroute/PhonePush.java | 2 ++ .../signpatientmanageroute/SignPatientManageRouteMapper.xml | 1 + 3 files changed, 3 insertions(+), 3 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 ba7c5a48..fbdd6776 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 @@ -108,9 +108,6 @@ public class ScriptInfoServiceImpl implements IScriptInfoService { if (Objects.isNull(scriptInfo1)) { throw new ServiceException("该话术名称已删除！"); } - if (ScriptStatusEnum.NORMAL.getInfo().equals(scriptInfo.getScriptStatus()) && Objects.isNull(scriptInfo1.getScriptFilePath())) { - throw new ServiceException("请生成话术图片后上架该话术！"); - } // 检查除当前记录之外是否存在同名的话术名称 if (scriptInfoMapper.countByScriptNameExcludingId(scriptInfo.getScriptName(), scriptInfo.getDepartmentId(), scriptInfo.getId(), scriptInfo.getCommonScriptName()) > 0) { // 存在同名的通用话术名称，不能进行更新 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 71a1e8c8..7ab98f51 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 @@ -96,4 +96,6 @@ public class PhonePush { @ApiModelProperty(value = "话术图片文件路径") private String scriptFilePath; + + private String phoneMessageTemplateContent; } 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 90767dbb..4d986def 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml @@ -649,6 +649,7 @@ spmrn.route_handle_remark, spmrn.phone_message_template_id, spmrn.phone_message_template_name, + spmrn.phone_message_template_content, si.script_file_path from sign_patient_manage_route_node spmrn LEFT JOIN script_info si ON spmrn.phone_id = si.script_id From a9238baa3fede62a9ade9bcdb9918bb06ada4464 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 1 Jul 2024 16:06:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xinelu/manage/vo/signpatientmanageroute/PhonePush.java | 2 -- .../signpatientmanageroute/SignPatientManageRouteMapper.xml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) 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 7ab98f51..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 @@ -96,6 +96,4 @@ public class PhonePush { @ApiModelProperty(value = "话术图片文件路径") private String scriptFilePath; - - private String phoneMessageTemplateContent; } 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 4d986def..dfa19f8c 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml @@ -649,7 +649,7 @@ spmrn.route_handle_remark, spmrn.phone_message_template_id, spmrn.phone_message_template_name, - spmrn.phone_message_template_content, + spmrn.phone_node_content, si.script_file_path from sign_patient_manage_route_node spmrn LEFT JOIN script_info si ON spmrn.phone_id = si.script_id