Merge branch '3.11_院后第二增量' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量

 Conflicts:

	postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java

postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java

@@ -208,4 +208,14 @@ public class Constants {
 	 * 出院
 	 */
 	public static final String DISCHARGED = "discharged";
+
+    /**
+     * 字段信息编码前缀
+     */
+    public static final String FIELD_ENCODING = "FE";
+
+    /**
+     * 字段内容编码前缀
+     */
+    public static final String CONTENT_ENCODING = "CE";
 }

postdischarge-common/src/main/java/com/xinelu/common/constant/LabelFieldInfoFieldTypeConstants.java

@@ -1,29 +0,0 @@
-package com.xinelu.common.constant;
-
-/**
- * 字段标签信息字段类型
- *
- * @author : youxilong
- * @date : 2024/3/11 10:19
- */
-public class LabelFieldInfoFieldTypeConstants {
-    /**
-     * 画像标签字段
-     */
-    public static final String PORTRAIT_LABEL_FIELD = "PORTRAIT_LABEL_FIELD";
-
-    /**
-     * 知识库字段
-     */
-    public static final String KNOWLEDGE_FIELD = "KNOWLEDGE_FIELD";
-
-    /**
-     * 字段信息编码前缀
-     */
-    public static final String FIELD_ENCODING = "FE";
-
-    /**
-     * 字段内容编码前缀
-     */
-    public static final String CONTENT_ENCODING = "CE";
-}

postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyCategoryManageLevelEnum.java

@@ -0,0 +1,34 @@
+package com.xinelu.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Description 机构分类管理类别
+ * @Author zh
+ * @Date 2024-03-19
+ */
+@Getter
+public enum AgencyCategoryManageLevelEnum {
+
+    /**
+     * 非营利性医疗机构
+     */
+    NON_PROFIT_MEDICAL_AGENCY("NON_PROFIT_MEDICAL_AGENCY"),
+
+    /**
+     * 营利性医疗机构
+     */
+    FOR_PROFIT_MEDICAL_AGENCY("FOR_PROFIT_MEDICAL_AGENCY"),
+
+    /**
+     * 其他卫生机构
+     */
+    OTHER_HEALTH_AGENCY("OTHER_HEALTH_AGENCY"),
+    ;
+
+    final private String info;
+
+    AgencyCategoryManageLevelEnum(String info) {
+        this.info = info;
+    }
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyStatusEnum.java

@@ -0,0 +1,29 @@
+package com.xinelu.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Description 机构状态
+ * @Author zh
+ * @Date 2024-03-19
+ */
+@Getter
+public enum AgencyStatusEnum {
+
+    /**
+     * 启用
+     */
+    ON("ON"),
+
+    /**
+     * 禁用
+     */
+    OFF("OFF"),
+    ;
+
+    final private String info;
+
+    AgencyStatusEnum(String info) {
+        this.info = info;
+    }
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/HardWareTypeEnum.java

@@ -0,0 +1,25 @@
+package com.xinelu.common.enums;
+
+/**
+ * 硬件类型标识
+ *
+ * @author : youxilong
+ * @date : 2024/3/19 10:09
+ */
+public enum HardWareTypeEnum {
+
+    /**
+     * 硬件类型:血压仪
+     */
+    BLOOD_PRESSURE,
+
+    /**
+     * 硬件类型:血糖仪
+     */
+    GLUCOSE_METER,
+
+    /**
+     * 硬件类型:心电仪
+     */
+    ELECTROCARDIOGRA
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/LabelFieldTypeEnum.java

@@ -0,0 +1,20 @@
+package com.xinelu.common.enums;
+
+/**
+ * 字段类型标识
+ *
+ * @author : youxilong
+ * @date : 2024/3/19 10:22
+ */
+public enum LabelFieldTypeEnum {
+
+    /**
+     * 字段类型:画像标签字段
+     */
+    PORTRAIT_LABEL_FIELD,
+
+    /**
+     * 字段类型:知识库字段
+     */
+    KNOWLEDGE_FIELD
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/NodeTypeEnum.java

@@ -0,0 +1,64 @@
+package com.xinelu.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Description 节点类型
+ * @Author zh
+ * @Date 2024-03-19
+ */
+@Getter
+public enum NodeTypeEnum {
+
+    /**
+     * 卫健委
+     */
+    HEALTH_COMMISSION("HEALTH_COMMISSION"),
+
+    /**
+     * 医保局
+     */
+    MEDICAL_INSURANCE_BUREAU("MEDICAL_INSURANCE_BUREAU"),
+
+    /**
+     * 医院
+     */
+    HOSPITAL("HOSPITAL"),
+
+    /**
+     * 院区
+     */
+    CAMPUS("CAMPUS"),
+
+    /**
+     * 药店
+     */
+    PHARMACY("PHARMACY"),
+
+    /**
+     * 科室
+     */
+    DEPARTMENT("DEPARTMENT"),
+
+    /**
+     * 病区
+     */
+    WARD("WARD"),
+
+    /**
+     * 中国
+     */
+    CHINA("CHINA"),
+
+    /**
+     * 省份：
+     */
+    PROVINCE("PROVINCE"),
+    ;
+
+    final private String info;
+
+    NodeTypeEnum(String info) {
+        this.info = info;
+    }
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/ScriptStatusEnum.java

@@ -0,0 +1,25 @@
+package com.xinelu.common.enums;
+
+/**
+ * 话术状态标识
+ *
+ * @author : youxilong
+ * @date : 2024/3/19 10:06
+ */
+public enum ScriptStatusEnum {
+
+    /**
+     * 话术状态，正常
+     */
+    NORMAL,
+
+    /**
+     * 话术状态:下架
+     */
+    OFF_SHELF,
+
+    /**
+     * 话术状态:暂停
+     */
+    SUSPEND
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/ServiceFrequencyTypeEnum.java

@@ -0,0 +1,20 @@
+package com.xinelu.common.enums;
+
+/**
+ * 服务频次标识
+ *
+ * @author : youxilong
+ * @date : 2024/3/19 10:12
+ */
+public enum ServiceFrequencyTypeEnum {
+
+    /**
+     * 服务频次类型：数字：DIGIT
+     */
+    DIGIT,
+
+    /**
+     * 服务频次类型：文本：TEXT
+     */
+    TEXT
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/ServiceTypeEnum.java

@@ -6,7 +6,7 @@ package com.xinelu.common.enums;
  * @author : youxilong
  * @date : 2024/2/29 20:08
  */
-public enum ServiceWayContentServiceType {
+public enum ServiceTypeEnum {
 
     /**
      * 服务方式
@@ -21,16 +21,6 @@ public enum ServiceWayContentServiceType {
     /**
      * 服务频次
      */
-    SERVICE_FREQUENCY,
+    SERVICE_FREQUENCY
-
-    /**
-     * 服务频次类型：数字：DIGIT
-     */
-    DIGIT,
-
-    /**
-     * 服务频次类型：文本：TEXT
-     */
-    TEXT
 
 }

postdischarge-common/src/main/java/com/xinelu/common/enums/TextMessageChannelEnum.java

@@ -0,0 +1,15 @@
+package com.xinelu.common.enums;
+
+/**
+ * 短信通道标识
+ *
+ * @author : youxilong
+ * @date : 2024/3/19 10:14
+ */
+public enum TextMessageChannelEnum {
+
+    /**
+     * 短信通道：水滴平台
+     */
+    WATER_DROPLET_PLATFORM
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/TextMessageStatusEnum.java

@@ -0,0 +1,20 @@
+package com.xinelu.common.enums;
+
+/**
+ * 短信状态标识
+ *
+ * @author : youxilong
+ * @date : 2024/3/19 10:15
+ */
+public enum TextMessageStatusEnum {
+
+    /**
+     * 短信状态:上架
+     */
+    GROUNDING,
+
+    /**
+     * 短信状态:下架：
+     */
+    OFF_SHELF
+}

postdischarge-common/src/main/java/com/xinelu/common/enums/WeChatTemplateSourceEnum.java

@@ -0,0 +1,21 @@
+package com.xinelu.common.enums;
+
+/**
+ * 微信模板来源
+ *
+ * @author : youxilong
+ * @date : 2024/3/19 10:19
+ */
+public enum WeChatTemplateSourceEnum {
+
+    /**
+     * 模板来源:小程序
+     */
+    WE_CHAT_APPLET,
+
+    /**
+     * 模板来源:公众号
+     */
+    WE_CHAT_OFFICIAL_ACCOUNT
+
+}

postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java

@@ -128,10 +128,6 @@ public class ServicePackageController extends BaseController {
 
     /**
      * 修改服务包发布状态
-     *
-     * @param id
-     * @param whetherRelease
-     * @return
      */
     @ApiOperation("修改服务包发布状态")
     @PutMapping("/editReleaseStatus")

postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java

@@ -7,6 +7,7 @@ import com.xinelu.common.core.page.TableDataInfo;
 import com.xinelu.common.enums.BusinessType;
 import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition;
+import com.xinelu.manage.dto.specialdiseasetriggercondition.TriggerConditionDTO;
 import com.xinelu.manage.service.specialdiseasetriggercondition.ISpecialDiseaseTriggerConditionService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -65,8 +66,8 @@ public class SpecialDiseaseTriggerConditionController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:triggerCondition:add')")
     @Log(title = "触发条件关系", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) {
+    public AjaxResult add(@RequestBody TriggerConditionDTO triggerConditionList) {
-        return toAjax(specialDiseaseTriggerConditionService.insertSpecialDiseaseTriggerCondition(specialDiseaseTriggerCondition));
+        return toAjax(specialDiseaseTriggerConditionService.insertSpecialDiseaseTriggerCondition(triggerConditionList));
     }
 
     /**

postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasetriggercondition/TriggerConditionDTO.java

@@ -0,0 +1,21 @@
+package com.xinelu.manage.dto.specialdiseasetriggercondition;
+
+import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 触发条件关系DTO
+ *
+ * @author xinelu
+ * @date 2024-03-18
+ */
+@Data
+public class TriggerConditionDTO {
+
+    /**
+     * 触发条件集和
+     */
+    List<SpecialDiseaseTriggerCondition> triggerConditionList;
+}

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java

@@ -62,18 +62,11 @@ public interface ScriptInfoMapper {
 
     /**
      * 判断通用话术名称是否存在
-     *
-     * @param scriptInfo
-     * @return
      */
     int countByScriptInfo(ScriptInfo scriptInfo);
 
     /**
      * 检查是否存在除当前记录之外的同名记录
-     * @param scriptName
-     * @param departmentId
-     * @param id
-     * @return
      */
-    int countByScriptNameExcludingId(@Param("scriptName") String scriptName, @Param("departmentId") Long departmentId, @Param("id") Long id);
+    int countByScriptNameExcludingId(@Param("scriptName") String scriptName, @Param("departmentId") Long departmentId, @Param("id") Long id, @Param("commonScriptName") String commonScriptName);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java

@@ -17,7 +17,7 @@ public interface SpecialDiseaseTriggerConditionMapper {
      * @param id 触发条件关系主键
      * @return 触发条件关系
      */
-    public SpecialDiseaseTriggerCondition selectSpecialDiseaseTriggerConditionById(Long id);
+    SpecialDiseaseTriggerCondition selectSpecialDiseaseTriggerConditionById(Long id);
 
     /**
      * 查询触发条件关系列表
@@ -25,7 +25,7 @@ public interface SpecialDiseaseTriggerConditionMapper {
      * @param specialDiseaseTriggerCondition 触发条件关系
      * @return 触发条件关系集合
      */
-    public List<SpecialDiseaseTriggerCondition> selectSpecialDiseaseTriggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition);
+    List<SpecialDiseaseTriggerCondition> selectSpecialDiseaseTriggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition);
 
     /**
      * 新增触发条件关系
@@ -33,7 +33,15 @@ public interface SpecialDiseaseTriggerConditionMapper {
      * @param specialDiseaseTriggerCondition 触发条件关系
      * @return 结果
      */
-    public int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition);
+    int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition);
+
+    /**
+     * 批量新增触发条件关系
+     *
+     * @param triggerConditionList 触发条件关系
+     * @return 结果
+     */
+    int insertTriggerConditionList(List<SpecialDiseaseTriggerCondition> triggerConditionList);
 
     /**
      * 修改触发条件关系
@@ -41,7 +49,7 @@ public interface SpecialDiseaseTriggerConditionMapper {
      * @param specialDiseaseTriggerCondition 触发条件关系
      * @return 结果
      */
-    public int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition);
+    int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition);
 
     /**
      * 删除触发条件关系
@@ -49,7 +57,7 @@ public interface SpecialDiseaseTriggerConditionMapper {
      * @param id 触发条件关系主键
      * @return 结果
      */
-    public int deleteSpecialDiseaseTriggerConditionById(Long id);
+    int deleteSpecialDiseaseTriggerConditionById(Long id);
 
     /**
      * 批量删除触发条件关系
@@ -57,5 +65,5 @@ public interface SpecialDiseaseTriggerConditionMapper {
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids);
+    int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/wechattemplate/WechatTemplateMapper.java

@@ -102,5 +102,5 @@ public interface WechatTemplateMapper {
     /**
      * 检查除当前记录之外是否存在同名的微信模板名称
      */
-    int countByWechatTemplateNameExcludingId(@Param("id") Long id, @Param("departmentId") Long departmentId, @Param("wechatTemplateName") String wechatTemplateName);
+    int countByWechatTemplateNameExcludingId(@Param("id") Long id, @Param("departmentId") Long departmentId, @Param("wechatTemplateName") String wechatTemplateName, @Param("templateSource") String templateSource);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java

@@ -1,6 +1,6 @@
 package com.xinelu.manage.service.labelfieldcontent.impl;
 
-import com.xinelu.common.constant.LabelFieldInfoFieldTypeConstants;
+import com.xinelu.common.constant.Constants;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.SecurityUtils;
 import com.xinelu.common.utils.bean.BeanUtils;
@@ -128,7 +128,7 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService {
             BeanUtils.copyProperties(contentDTO, labelFieldContent);
             labelFieldContent.setFieldId(labelFieldContentAddDTO.getFieldId());
             labelFieldContent.setFieldName(labelFieldContentAddDTO.getFieldName());
-            labelFieldContent.setContentCode(LabelFieldInfoFieldTypeConstants.CONTENT_ENCODING + systemCodeUtil.generateDepartCode(LabelFieldInfoFieldTypeConstants.CONTENT_ENCODING));
+            labelFieldContent.setContentCode(Constants.CONTENT_ENCODING + systemCodeUtil.generateDepartCode(Constants.CONTENT_ENCODING));
             labelFieldContent.setCreateBy(SecurityUtils.getUsername());
             labelFieldContent.setCreateTime(LocalDateTime.now());
             if (labelFieldContentMapper.insertLabelFieldContent(labelFieldContent) <= 0) {

postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java

@@ -1,6 +1,6 @@
 package com.xinelu.manage.service.labelfieldinfo.impl;
 
-import com.xinelu.common.constant.LabelFieldInfoFieldTypeConstants;
+import com.xinelu.common.constant.Constants;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.SecurityUtils;
 import com.xinelu.common.utils.codes.GenerateSystemCodeUtil;
@@ -142,7 +142,7 @@ public class LabelFieldInfoServiceImpl implements ILabelFieldInfoService {
         }
         // 如果不存在，执行新增操作
         for (LabelFieldInfo labelFieldInfo : fieldInfoList) {
-            labelFieldInfo.setFieldCode(LabelFieldInfoFieldTypeConstants.FIELD_ENCODING + systemCodeUtil.generateDepartCode(LabelFieldInfoFieldTypeConstants.FIELD_ENCODING));
+            labelFieldInfo.setFieldCode(Constants.FIELD_ENCODING + systemCodeUtil.generateDepartCode(Constants.FIELD_ENCODING));
             labelFieldInfo.setCreateBy(SecurityUtils.getUsername());
             labelFieldInfo.setCreateTime(LocalDateTime.now());
             if (labelFieldInfoMapper.insertLabelFieldInfo(labelFieldInfo) <= 0) {

postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java

@@ -84,7 +84,7 @@ public class ScriptInfoServiceImpl implements IScriptInfoService {
     @Transactional(rollbackFor = Exception.class)
     public int updateScriptInfo(ScriptInfo scriptInfo) {
         // 检查除当前记录之外是否存在同名的话术名称
-        if (scriptInfoMapper.countByScriptNameExcludingId(scriptInfo.getCommonScriptName(), scriptInfo.getDepartmentId(), scriptInfo.getId()) > 0) {
+        if (scriptInfoMapper.countByScriptNameExcludingId(scriptInfo.getScriptName(), scriptInfo.getDepartmentId(), scriptInfo.getId(),scriptInfo.getCommonScriptName()) > 0) {
             // 存在同名的通用话术名称，不能进行更新
             throw new ServiceException("通用话术名称已存在，请使用其他名称。");
         }

postdischarge-manage/src/main/java/com/xinelu/manage/service/servicewaycontent/impl/ServiceWayContentServiceImpl.java

@@ -1,7 +1,8 @@
 package com.xinelu.manage.service.servicewaycontent.impl;
 
 import com.xinelu.common.constant.Constants;
-import com.xinelu.common.enums.ServiceWayContentServiceType;
+import com.xinelu.common.enums.ServiceFrequencyTypeEnum;
+import com.xinelu.common.enums.ServiceTypeEnum;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.SecurityUtils;
 import com.xinelu.common.utils.bean.BeanUtils;
@@ -85,7 +86,7 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
                 throw new ServiceException("当前服务内容下服务频次已存在");
             }
             // 如果当前服务内容下服务频次不存在，新增服务频次
-            serviceFrequency.setServiceType(ServiceWayContentServiceType.SERVICE_FREQUENCY.toString());
+            serviceFrequency.setServiceType(ServiceTypeEnum.SERVICE_FREQUENCY.toString());
             serviceFrequency.setServiceContentId(serviceWayContentVO.getId());
             serviceFrequency.setServiceFrequencyType(serviceWayContentAddDTO.getServiceFrequencyType());
             serviceFrequency.setServiceFrequencyText(serviceWayContentAddDTO.getServiceFrequencyText());
@@ -100,7 +101,7 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
             // 如果服务内容在服务内容表不存在，新增服务内容，新增服务频次
             // 新增服务内容
             ServiceWayContent serviceContent = new ServiceWayContent();
-            serviceContent.setServiceType(ServiceWayContentServiceType.SERVICE_CONTENT.toString());
+            serviceContent.setServiceType(ServiceTypeEnum.SERVICE_CONTENT.toString());
             serviceContent.setServiceWayId(serviceWayContentAddDTO.getServiceWayId());
             serviceContent.setServiceContent(serviceWayContentAddDTO.getServiceContent());
             serviceContent.setCreateBy(username);
@@ -109,7 +110,7 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
                 throw new ServiceException("新增服务内容失败");
             }
             // 新增服务频次
-            serviceFrequency.setServiceType(ServiceWayContentServiceType.SERVICE_FREQUENCY.toString());
+            serviceFrequency.setServiceType(ServiceTypeEnum.SERVICE_FREQUENCY.toString());
             serviceFrequency.setServiceContentId(serviceContent.getId());
             serviceFrequency.setServiceFrequencyType(serviceWayContentAddDTO.getServiceFrequencyType());
             serviceFrequency.setServiceFrequencyText(serviceWayContentAddDTO.getServiceFrequencyText());
@@ -159,7 +160,7 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
                 ServiceWayContent newServiceContent = new ServiceWayContent();
                 newServiceContent.setServiceWayId(serviceWayContentEditDTO.getServiceWayId());
                 newServiceContent.setServiceContent(serviceWayContentEditDTO.getServiceContent());
-                newServiceContent.setServiceType(ServiceWayContentServiceType.SERVICE_CONTENT.toString());
+                newServiceContent.setServiceType(ServiceTypeEnum.SERVICE_CONTENT.toString());
                 newServiceContent.setCreateBy(username);
                 newServiceContent.setCreateTime(LocalDateTime.now());
                 serviceWayContentMapper.insertServiceWayContent(newServiceContent);
@@ -176,9 +177,9 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
         // 如果服务频次改变了，检查新服务频次的重复性
         if (serviceFrequencyChanged) {
             boolean isFrequencyDuplicate = false;
-            if (ServiceWayContentServiceType.TEXT.toString().equals(serviceWayContentEditDTO.getServiceFrequencyType())) {
+            if (ServiceFrequencyTypeEnum.TEXT.toString().equals(serviceWayContentEditDTO.getServiceFrequencyType())) {
                 isFrequencyDuplicate = serviceWayContentMapper.isServiceFrequencyTextDuplicate(serviceWayContentEditDTO);
-            } else if (ServiceWayContentServiceType.DIGIT.toString().equals(serviceWayContentEditDTO.getServiceFrequencyType())) {
+            } else if (ServiceFrequencyTypeEnum.DIGIT.toString().equals(serviceWayContentEditDTO.getServiceFrequencyType())) {
                 isFrequencyDuplicate = serviceWayContentMapper.isServiceFrequencyDigitDuplicate(serviceWayContentEditDTO);
             }
             if (isFrequencyDuplicate) {
@@ -246,7 +247,7 @@ public class ServiceWayContentServiceImpl implements IServiceWayContentService {
         }
         // 如果不存在，执行新增功能
         serviceWayContent.setServiceWayCode(Constants.SERVICE_MODE_ENCODING + systemCodeUtil.generateDepartCode(Constants.SERVICE_MODE_ENCODING));
-        serviceWayContent.setServiceType(ServiceWayContentServiceType.SERVICE_WRY.toString());
+        serviceWayContent.setServiceType(ServiceTypeEnum.SERVICE_WRY.toString());
         serviceWayContent.setCreateBy(SecurityUtils.getUsername());
         serviceWayContent.setCreateTime(LocalDateTime.now());
         return serviceWayContentMapper.insertServiceWayContent(serviceWayContent);

postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/ISpecialDiseaseTriggerConditionService.java

@@ -1,6 +1,7 @@
 package com.xinelu.manage.service.specialdiseasetriggercondition;
 
 import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition;
+import com.xinelu.manage.dto.specialdiseasetriggercondition.TriggerConditionDTO;
 
 import java.util.List;
 
@@ -17,7 +18,7 @@ public interface ISpecialDiseaseTriggerConditionService {
      * @param id 触发条件关系主键
      * @return 触发条件关系
      */
-    public SpecialDiseaseTriggerCondition selectSpecialDiseaseTriggerConditionById(Long id);
+    SpecialDiseaseTriggerCondition selectSpecialDiseaseTriggerConditionById(Long id);
 
     /**
      * 查询触发条件关系列表
@@ -25,15 +26,15 @@ public interface ISpecialDiseaseTriggerConditionService {
      * @param specialDiseaseTriggerCondition 触发条件关系
      * @return 触发条件关系集合
      */
-    public List<SpecialDiseaseTriggerCondition> selectSpecialDiseaseTriggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition);
+    List<SpecialDiseaseTriggerCondition> selectSpecialDiseaseTriggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition);
 
     /**
      * 新增触发条件关系
      *
-     * @param specialDiseaseTriggerCondition 触发条件关系
+     * @param triggerConditionList 触发条件关系
      * @return 结果
      */
-    public int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition);
+    int insertSpecialDiseaseTriggerCondition(TriggerConditionDTO triggerConditionList);
 
     /**
      * 修改触发条件关系
@@ -41,7 +42,7 @@ public interface ISpecialDiseaseTriggerConditionService {
      * @param specialDiseaseTriggerCondition 触发条件关系
      * @return 结果
      */
-    public int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition);
+    int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition);
 
     /**
      * 批量删除触发条件关系
@@ -49,7 +50,7 @@ public interface ISpecialDiseaseTriggerConditionService {
      * @param ids 需要删除的触发条件关系主键集合
      * @return 结果
      */
-    public int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids);
+    int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids);
 
     /**
      * 删除触发条件关系信息
@@ -57,5 +58,5 @@ public interface ISpecialDiseaseTriggerConditionService {
      * @param id 触发条件关系主键
      * @return 结果
      */
-    public int deleteSpecialDiseaseTriggerConditionById(Long id);
+    int deleteSpecialDiseaseTriggerConditionById(Long id);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java

@@ -1,6 +1,8 @@
 package com.xinelu.manage.service.specialdiseasetriggercondition.impl;
 
+import com.xinelu.common.utils.SecurityUtils;
 import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition;
+import com.xinelu.manage.dto.specialdiseasetriggercondition.TriggerConditionDTO;
 import com.xinelu.manage.mapper.specialdiseasetriggercondition.SpecialDiseaseTriggerConditionMapper;
 import com.xinelu.manage.service.specialdiseasetriggercondition.ISpecialDiseaseTriggerConditionService;
 import org.springframework.stereotype.Service;
@@ -46,13 +48,14 @@ public class SpecialDiseaseTriggerConditionServiceImpl implements ISpecialDiseas
     /**
      * 新增触发条件关系
      *
-     * @param specialDiseaseTriggerCondition 触发条件关系
+     * @param triggerConditionList 触发条件关系
      * @return 结果
      */
     @Override
-    public int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) {
+    public int insertSpecialDiseaseTriggerCondition(TriggerConditionDTO triggerConditionList) {
-        specialDiseaseTriggerCondition.setCreateTime(LocalDateTime.now());
+        triggerConditionList.getTriggerConditionList().forEach(item -> item.setCreateTime(LocalDateTime.now()));
-        return specialDiseaseTriggerConditionMapper.insertSpecialDiseaseTriggerCondition(specialDiseaseTriggerCondition);
+        triggerConditionList.getTriggerConditionList().forEach(item -> item.setCreateBy(SecurityUtils.getUsername()));
+        return specialDiseaseTriggerConditionMapper.insertTriggerConditionList(triggerConditionList.getTriggerConditionList());
     }
 
     /**

postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/IWechatTemplateService.java

@@ -1,11 +1,9 @@
 package com.xinelu.manage.service.wechattemplate;
 
-import com.xinelu.common.core.page.TableDataInfo;
 import com.xinelu.manage.domain.wechattemplate.WechatTemplate;
 import com.xinelu.manage.dto.wechattemplate.WechatTemplateDTO;
 import com.xinelu.manage.dto.wechattemplate.WechatTemplateTaskDTO;
 import com.xinelu.manage.vo.wechattemplate.WechatTemplateTaskVO;
-import com.xinelu.manage.vo.wechattemplate.WechatTemplateVO;
 
 import java.util.List;
 
@@ -65,7 +63,7 @@ public interface IWechatTemplateService {
     public int deleteWechatTemplateById(Long id);
 
     /**
-     * 根据id查询微信模板Dto
+     * 根据id查询微信模板
      */
     WechatTemplateTaskVO selectWechatTemplateDtoById(Long id);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/wechattemplate/impl/WechatTemplateServiceImpl.java

@@ -2,7 +2,6 @@ package com.xinelu.manage.service.wechattemplate.impl;
 
 import com.xinelu.common.core.domain.entity.SysDictData;
 import com.xinelu.common.exception.ServiceException;
-import com.xinelu.common.utils.PageServiceUtil;
 import com.xinelu.common.utils.SecurityUtils;
 import com.xinelu.common.utils.bean.BeanUtils;
 import com.xinelu.manage.domain.wechattemplate.WechatTemplate;
@@ -148,7 +147,7 @@ public class WechatTemplateServiceImpl implements IWechatTemplateService {
     @Transactional(rollbackFor = Exception.class)
     public int updateWechatTemplate(WechatTemplateTaskDTO wechatTemplateTaskDTO) {
         // 检查除当前记录之外是否存在同名的微信模板名称
-        if (wechatTemplateMapper.countByWechatTemplateNameExcludingId(wechatTemplateTaskDTO.getId(), wechatTemplateTaskDTO.getDepartmentId(), wechatTemplateTaskDTO.getWechatTemplateName()) > 0) {
+        if (wechatTemplateMapper.countByWechatTemplateNameExcludingId(wechatTemplateTaskDTO.getId(), wechatTemplateTaskDTO.getDepartmentId(), wechatTemplateTaskDTO.getWechatTemplateName(), wechatTemplateTaskDTO.getTemplateSource()) > 0) {
             throw new ServiceException("微信模板名称已存在");
         }
         // 设置修改者和修改时间

postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml

@@ -126,13 +126,15 @@
         from script_info
         where department_id = #{departmentId}
           and common_script_name = #{commonScriptName}
+          and script_name = #{scriptName}
     </select>
 
     <select id="countByScriptNameExcludingId" resultType="java.lang.Integer">
         SELECT COUNT(1)
         FROM script_info
-        WHERE common_script_name = #{scriptName}
+        WHERE common_script_name = #{commonScriptName}
           and department_id = #{departmentId}
+          and script_name = #{scriptName}
           and id != #{id}
     </select>
 

postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml

@@ -132,6 +132,35 @@
         </trim>
     </insert>
 
+    <insert id="insertTriggerConditionList">
+        insert into special_disease_trigger_condition(
+        route_id,
+        route_name,
+        trigger_condition_code,
+        trigger_condition_name,
+        trigger_condition_operator,
+        trigger_condition_value,
+        trigger_condition_sort,
+        trigger_condition_remark,
+        create_by,
+        create_time
+        )values
+        <foreach item="triggerConditionList" index="index" collection="list" separator=",">
+            (
+            #{triggerConditionList.routeId},
+            #{triggerConditionList.routeName},
+            #{triggerConditionList.triggerConditionCode},
+            #{triggerConditionList.triggerConditionName},
+            #{triggerConditionList.triggerConditionOperator},
+            #{triggerConditionList.triggerConditionValue},
+            #{triggerConditionList.triggerConditionSort},
+            #{triggerConditionList.triggerConditionRemark},
+            #{triggerConditionList.createBy},
+            #{triggerConditionList.createTime}
+            )
+        </foreach>
+    </insert>
+
     <update id="updateSpecialDiseaseTriggerCondition" parameterType="SpecialDiseaseTriggerCondition">
         update special_disease_trigger_condition
         <trim prefix="SET" suffixOverrides=",">

postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml

@@ -181,6 +181,7 @@
         from wechat_template wt
         where department_id = #{departmentId}
           and wechat_template_name = #{wechatTemplateName}
+          and template_source = #{templateSource}
     </select>
 
     <select id="countByWechatTemplateNameExcludingId" resultType="java.lang.Integer">
@@ -188,6 +189,7 @@
         from wechat_template
         where department_id = #{departmentId}
           and wechat_template_name = #{wechatTemplateName}
+          and template_source = #{templateSource}
           and id != #{id}
     </select>