Merge branch '0418_小程序开发' of http://182.92.166.109:3000/zhuangyuanke/PostDischargePatientManage into 0418_小程序开发

postdischarge-admin/src/main/resources/application.yml

@@ -32,7 +32,7 @@ xinelu:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 9090
   servlet:
     # 应用的访问路径
     context-path: /
@@ -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
   # 微信小程序授权类型

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) {
             // 存在同名的通用话术名称，不能进行更新

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_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