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] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=85=8D=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