二期模板维护代和量表维护修改

icssman-service/src/main/java/com/diagbot/dto/DeptDTO.java

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/4/9 14:27
+ */
+@Setter
+@Getter
+public class DeptDTO {
+
+    //id
+    private Long id;
+    //名称
+    private String name;
+}

icssman-service/src/main/java/com/diagbot/dto/DisDTO.java

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/4/9 14:27
+ */
+@Setter
+@Getter
+public class DisDTO {
+    //id
+    private Long parentId;
+    //名称
+    private String name;
+
+}

icssman-service/src/main/java/com/diagbot/dto/GetAllDeptAndDisInfoDTO.java

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2019/4/9 14:25
+ */
+@Setter
+@Getter
+public class GetAllDeptAndDisInfoDTO {
+
+    private List<DeptDTO> deptDTOS;
+
+    private List<DisDTO> disDTOS;
+}

icssman-service/src/main/java/com/diagbot/facade/DisScaleFacade.java

@@ -15,6 +15,7 @@ import com.diagbot.service.DisScaleService;
 import com.diagbot.service.impl.DisScaleServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddDisScaleInfoVO;
@@ -106,13 +107,15 @@ public class DisScaleFacade extends DisScaleServiceImpl {
         for (GetDisScaleAllInfoDTO getDisScaleAllInfoDTO : data.getRecords()) {
             userIds.add(getDisScaleAllInfoDTO.getModifier());
         }
-        RespDTO<Map<String, String>> userMap = userServiceClient.getUserInfoByIds(userIds);
-        if (RespDTOUtil.respIsNG(userMap)) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取用户信息失败");
-        }
-        for (GetDisScaleAllInfoDTO getDisScaleAllInfoDTO : data.getRecords()) {
-            getDisScaleAllInfoDTO.setUserName(userMap.data.get(getDisScaleAllInfoDTO.getModifier()));
+        if(ListUtil.isNotEmpty(userIds)){
+            RespDTO<Map<String, String>> userMap = userServiceClient.getUserInfoByIds(userIds);
+            if (RespDTOUtil.respIsNG(userMap)) {
+                throw new CommonException(CommonErrorCode.RPC_ERROR,
+                        "获取用户信息失败");
+            }
+            for (GetDisScaleAllInfoDTO getDisScaleAllInfoDTO : data.getRecords()) {
+                getDisScaleAllInfoDTO.setUserName(userMap.data.get(getDisScaleAllInfoDTO.getModifier()));
+            }
         }
         return data;
     }

icssman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.DeptDTO;
+import com.diagbot.dto.DisDTO;
+import com.diagbot.dto.GetAllDeptAndDisInfoDTO;
 import com.diagbot.dto.GetModuleDetailInfoDTO;
 import com.diagbot.dto.GetModuleInfoOneDTO;
 import com.diagbot.dto.GetModuleTypeDTO;
@@ -13,6 +16,7 @@ import com.diagbot.dto.ModuleInfoListDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.DictionaryInfo;
+import com.diagbot.entity.DisType;
 import com.diagbot.entity.ModuleDetail;
 import com.diagbot.entity.ModuleInfo;
 import com.diagbot.entity.QuestionInfo;
@@ -63,6 +67,8 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
     DictionaryFacade dictionaryFacade;
     @Autowired
     DeptInfoFacade deptInfoFacade;
+    @Autowired
+    DisTypeFacade disTypeFacade;
 
     /**
      * 根据id删除标签模板
@@ -407,4 +413,34 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         }
         return getModuleTypeDTOS;
     }
+
+    public GetAllDeptAndDisInfoDTO getAllDeptAndDisInfo(){
+        QueryWrapper<DeptInfo> deptInfoQueryWrapper = new QueryWrapper<>();
+        deptInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
+        List<DeptInfo> deptInfoList = deptInfoFacade.list(deptInfoQueryWrapper);
+        List<DeptDTO> deptDTOS = BeanUtil.listCopyTo(deptInfoList,DeptDTO.class);
+        QueryWrapper<DisType> disTypeQueryWrapper = new QueryWrapper<>();
+        disTypeQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
+                .eq("type",1);
+        List<DisType> disTypes = disTypeFacade.list(disTypeQueryWrapper);
+        List<DisDTO> disDTOS = BeanUtil.listCopyTo(disTypes,DisDTO.class);
+        List<Long> questionIds = disTypes.stream().map(DisType::getParentId).collect(Collectors.toList());
+        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+        questionInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
+                .in("id",questionIds);
+        Map<Long,QuestionInfo> questionInfoMap = questionFacade.list(questionInfoQueryWrapper)
+                .stream()
+                .collect(Collectors.toMap(QuestionInfo::getId,questionInfo -> questionInfo));
+        for (DisDTO disDTO: disDTOS) {
+            if(questionInfoMap.get(disDTO.getParentId()) != null){
+                disDTO.setName(questionInfoMap.get(disDTO.getParentId()).getTagName());
+            }
+        }
+        GetAllDeptAndDisInfoDTO getAllDeptAndDisInfoDTO = new GetAllDeptAndDisInfoDTO();
+        getAllDeptAndDisInfoDTO.setDeptDTOS(deptDTOS);
+        getAllDeptAndDisInfoDTO.setDisDTOS(disDTOS);
+        return getAllDeptAndDisInfoDTO;
+    }
+
+
 }

icssman-service/src/main/java/com/diagbot/vo/GetModuleInfoVO.java

@@ -18,6 +18,8 @@ public class GetModuleInfoVO extends Page {
     private Integer type;
     //模板类型
     private Integer moduleType;
+    //关联id
+    private Long relationId;
     //要去重的子模板
     private List<Long> noIds;
 }

icssman-service/src/main/java/com/diagbot/web/ModuleInfoController.java

@@ -3,6 +3,7 @@ package com.diagbot.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetAllDeptAndDisInfoDTO;
 import com.diagbot.dto.GetModuleDetailInfoDTO;
 import com.diagbot.dto.GetModuleInfoOneDTO;
 import com.diagbot.dto.GetQuestionInfoDTO;
@@ -155,4 +156,13 @@ public class ModuleInfoController {
         return RespDTO.onSuc(date);
     }
 
+    @ApiOperation(value = "2期-获取科室和疾病所有信息[by:wangyu]",
+            notes = "")
+    @PostMapping("/getAllDeptAndDisInfo")
+    @SysLogger("getAllDeptAndDisInfo")
+    public RespDTO<GetAllDeptAndDisInfoDTO> getAllDeptAndDisInfo() {
+        GetAllDeptAndDisInfoDTO date = moduleInfoFacade.getAllDeptAndDisInfo();
+        return RespDTO.onSuc(date);
+    }
+
 }

icssman-service/src/main/resources/mapper/ModuleInfoMapper.xml

@@ -33,6 +33,12 @@
         <if test="type != null and type != ''">
             and type = #{type}
         </if>
+        <if test="moduleType != null and moduleType != ''">
+            and  module_type = #{moduleType}
+        </if>
+        <if test="relationId != null and relationId != ''">
+            and  relation_id = #{relationId}
+        </if>
         order by gmt_modified desc
     </select>
 </mapper>