Browse Source

ICSS后台模板维护修改

wangyu 6 years ago
parent
commit
e7a971c8b4

+ 6 - 1
icssman-service/src/main/java/com/diagbot/entity/ModuleInfo.java

@@ -68,7 +68,12 @@ public class ModuleInfo implements Serializable {
     /**
      * 慢病
      */
-    private Long diseaseType;
+    private Long moduleType;
+
+    /**
+     * 关联id
+     */
+    private Long relationId;
 
     /**
      * 备注

+ 0 - 48
icssman-service/src/main/java/com/diagbot/facade/ModuleDetailFacade.java

@@ -2,9 +2,7 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.entity.ModuleDeptMapping;
 import com.diagbot.entity.ModuleDetail;
-import com.diagbot.entity.ModuleDiseaseMapping;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.TagTypeEnum;
@@ -167,52 +165,6 @@ public class ModuleDetailFacade extends ModuleDetailServiceImpl {
         }
         //添加模板明细
         moduleDetailService.saveBatch(moduleDetailList);
-        //判断是否根据科室划分
-        if(addModuleInfoVO.getDiseaseType() == 1){
-            ModuleDeptMapping moduleDeptMapping = moduleDeptMappingFacade.geModuleDeptInfo(addModuleInfoVO.getDeptId(),moduleId);
-            if(null != moduleDeptMapping){
-                //添加过删除
-                UpdateWrapper<ModuleDeptMapping> moduleDeptMappingUpdateWrapper = new UpdateWrapper<>();
-                moduleDeptMappingUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("module_id",moduleId)
-                        .eq("dept_id",addModuleInfoVO.getDeptId())
-                        .set("is_deleted",IsDeleteEnum.Y.getKey())
-                        .set("modifier",userId)
-                        .set("gmt_modified",now);
-                moduleDeptMappingFacade.update(new ModuleDeptMapping(),moduleDeptMappingUpdateWrapper);
-            }
-                ModuleDeptMapping moduleDept = new ModuleDeptMapping();
-                moduleDept.setGmtCreate(DateUtil.now());
-                moduleDept.setGmtModified(DateUtil.now());
-                moduleDept.setCreator(userId);
-                moduleDept.setModifier(userId);
-                moduleDept.setDeptId(addModuleInfoVO.getDeptId());
-                moduleDept.setModuleId(moduleId);
-                moduleDeptMappingFacade.save(moduleDept);
-        }
-        //判断是否是慢病模板
-        if(addModuleInfoVO.getDiseaseType() == 0){
-            ModuleDiseaseMapping moduleDiseaseMapping = moduleDiseaseMappingFacade.geModuleDiseaseInfo(addModuleInfoVO.getDisId(),moduleId);
-            if(null != moduleDiseaseMapping){
-                //添加过删除
-                UpdateWrapper<ModuleDiseaseMapping> moduleDiseaseMappingUpdateWrapper = new UpdateWrapper<>();
-                moduleDiseaseMappingUpdateWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("module_id",moduleId)
-                        .eq("dis_id",addModuleInfoVO.getDisId())
-                        .set("is_deleted",IsDeleteEnum.Y.getKey())
-                        .set("modifier",userId)
-                        .set("gmt_modified",now);
-                moduleDiseaseMappingFacade.update(new ModuleDiseaseMapping(),moduleDiseaseMappingUpdateWrapper);
-            }
-            ModuleDiseaseMapping moduleDiseMapping = new ModuleDiseaseMapping();
-            moduleDiseMapping.setGmtCreate(DateUtil.now());
-            moduleDiseMapping.setGmtModified(DateUtil.now());
-            moduleDiseMapping.setCreator(userId);
-            moduleDiseMapping.setModifier(userId);
-            moduleDiseMapping.setDisId(addModuleInfoVO.getDisId());
-            moduleDiseMapping.setModuleId(moduleId);
-            moduleDiseaseMappingFacade.save(moduleDiseMapping);
-        }
         return true;
     }
 }

+ 4 - 6
icssman-service/src/main/java/com/diagbot/vo/AddModuleInfoVO.java

@@ -22,10 +22,8 @@ public class AddModuleInfoVO {
     private Integer textType;
     //标签id
     private List<AddModuleDetailVO> modelDetils;
-    //模板类型(慢病,普通,通用)
-    private Long diseaseType;
-    //疾病id
-    private Long disId;
-    //科室id
-    private Long deptId;
+    //模板类型(通用,普通,慢病)
+    private Long moduleType;
+    //关联id
+    private Long relationId;
 }

+ 2 - 1
icssman-service/src/main/resources/mapper/ModuleInfoMapper.xml

@@ -12,7 +12,8 @@
         <result column="modifier" property="modifier" />
         <result column="name" property="name" />
         <result column="type" property="type" />
-        <result column="disease_type" property="diseaseType" />
+        <result column="module_type" property="moduleType" />
+        <result column="relation_id" property="relationId" />
         <result column="remark" property="remark" />
     </resultMap>