病种修改

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

@@ -199,6 +199,11 @@ public class Constants {
      */
     public static final String AGENCY_CODE = "AYC";
 
+    /**
+     * 科室病种编码
+     */
+    public static final String DISEASE_TYPE_CODE = "DTC";
+
     /**
      * 任务状态编码
      */

postdischarge-manage/src/main/java/com/xinelu/manage/service/departmentdiseasetype/impl/DepartmentDiseaseTypeServiceImpl.java

@@ -1,6 +1,8 @@
 package com.xinelu.manage.service.departmentdiseasetype.impl;
 
+import com.xinelu.common.constant.Constants;
 import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.common.utils.codes.GenerateSystemCodeUtil;
 import com.xinelu.manage.domain.departmentdiseasetype.DepartmentDiseaseType;
 import com.xinelu.manage.mapper.departmentdiseasetype.DepartmentDiseaseTypeMapper;
 import com.xinelu.manage.service.departmentdiseasetype.IDepartmentDiseaseTypeService;
@@ -24,6 +26,8 @@ import java.util.List;
 public class DepartmentDiseaseTypeServiceImpl implements IDepartmentDiseaseTypeService {
     @Resource
     private DepartmentDiseaseTypeMapper departmentDiseaseTypeMapper;
+    @Resource
+    private GenerateSystemCodeUtil generateSystemCodeUtil;
 
     /**
      * 查询科室病种信息
@@ -56,6 +60,7 @@ public class DepartmentDiseaseTypeServiceImpl implements IDepartmentDiseaseTypeS
     @Override
     public int insertDepartmentDiseaseType(DepartmentDiseaseType departmentDiseaseType) {
         departmentDiseaseType.setCreateTime(LocalDateTime.now());
+        departmentDiseaseType.setDiseaseTypeCode(Constants.DISEASE_TYPE_CODE + generateSystemCodeUtil.generateSystemCode(Constants.DISEASE_TYPE_CODE));
         return departmentDiseaseTypeMapper.insertDepartmentDiseaseType(departmentDiseaseType);
     }
 

postdischarge-manage/src/main/java/com/xinelu/manage/service/info/impl/InfoServiceImpl.java

@@ -93,7 +93,6 @@ public class InfoServiceImpl implements IInfoService {
         if (Objects.isNull(infoByID)) {
             return AjaxResult.error("当前资讯信息不存在，无法修改，请联系管理员！");
         }
-
         //添加修改人 修改时间
         info.setInfoReviser(SecurityUtils.getUsername());
         info.setInfoModifyTime(LocalDateTime.now());
@@ -101,12 +100,10 @@ public class InfoServiceImpl implements IInfoService {
         if (count <= 0) {
             throw new ServiceException("修改资讯信息失败，请联系管理员！");
         }
-
         //如果两个图片不相等，删除之前的图片
         if (!info.getInfoLargePictureUrl().equals(infoByID.getInfoLargePictureUrl())) {
             deletePictureUrl(infoByID.getInfoLargePictureUrl());
         }
-
         //遍历修改前后内容相不相等，如果不为空且不相等，寻找遍历前后图片的差集，然后删除.
         if (StringUtils.isNotBlank(info.getInfoContent()) && StringUtils.isNotBlank(infoByID.getInfoContent())
                 && !info.getInfoContent().equals(infoByID.getInfoContent())) {
@@ -117,7 +114,6 @@ public class InfoServiceImpl implements IInfoService {
             //遍历删除图片
             List<String> subList = new ArrayList<>(CollectionUtils.subtract(infoImgSrc, infoByIDImgSrc));
             for (String picUrl : subList) {
-
                 if (StringUtils.isBlank(picUrl)) {       //删除富文本图片
                     continue;
                 }
@@ -126,7 +122,6 @@ public class InfoServiceImpl implements IInfoService {
                 //删除富文本图片
                 deletePictureUrl(substring);
             }
-
         }
         return AjaxResult.success();
     }

postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml

@@ -206,12 +206,8 @@
             <if test="voicebroadcast != null">voicebroadcast =
                 #{voicebroadcast},
             </if>
-            <if test="diseaseTypeId != null">disease_type_id =
+            disease_type_id = #{diseaseTypeId},
-                #{diseaseTypeId},
+            disease_type_name = #{diseaseTypeName},
-            </if>
-            <if test="diseaseTypeName != null">disease_type_name =
-                #{diseaseTypeName},
-            </if>
             <if test="propagandaLink != null">propaganda_link =
                 #{propagandaLink},
             </if>

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

@@ -224,12 +224,8 @@
             <if test="departmentName != null">department_name =
             #{departmentName},
             </if>
-            <if test="diseaseTypeId != null">disease_type_id =
+            disease_type_id = #{diseaseTypeId},
-            #{diseaseTypeId},
+            disease_type_name = #{diseaseTypeName},
-            </if>
-            <if test="diseaseTypeName != null">disease_type_name =
-            #{diseaseTypeName},
-            </if>
             <if test="commonScriptName != null">common_script_name =
             #{commonScriptName},
             </if>

postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml

@@ -330,12 +330,8 @@
             <if test="departmentName != null">department_name =
             #{departmentName},
             </if>
-            <if test="diseaseTypeId != null">disease_type_id =
+            disease_type_id = #{diseaseTypeId},
-            #{diseaseTypeId},
+            disease_type_name = #{diseaseTypeName},
-            </if>
-            <if test="diseaseTypeName != null">disease_type_name =
-            #{diseaseTypeName},
-            </if>
             <if test="packageName != null">package_name =
             #{packageName},
             </if>

postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml

@@ -246,12 +246,8 @@
             <if test="departmentName != null">department_name =
             #{departmentName},
             </if>
-            <if test="diseaseTypeId != null">disease_type_id =
+            disease_type_id = #{diseaseTypeId},
-            #{diseaseTypeId},
+            disease_type_name = #{diseaseTypeName},
-            </if>
-            <if test="diseaseTypeName != null">disease_type_name =
-            #{diseaseTypeName},
-            </if>
             <if test="textMessageName != null">text_message_name =
             #{textMessageName},
             </if>

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

@@ -277,12 +277,8 @@
             <if test="departmentName != null">department_name =
             #{departmentName},
             </if>
-            <if test="diseaseTypeId != null">disease_type_id =
+            disease_type_id = #{diseaseTypeId},
-            #{diseaseTypeId},
+            disease_type_name = #{diseaseTypeName},
-            </if>
-            <if test="diseaseTypeName != null">disease_type_name =
-            #{diseaseTypeName},
-            </if>
             <if test="wechatTemplateName != null">wechat_template_name =
             #{wechatTemplateName},
             </if>