浏览代码

模板维护bug

wangyu 6 年之前
父节点
当前提交
753b2b5b4c
共有 1 个文件被更改,包括 6 次插入3 次删除
  1. 6 3
      icssman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

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

@@ -290,11 +290,14 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         RespDTOUtil.respNGDeal(deptInfoList,"获取科室信息失败");
         Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream().collect(Collectors.toMap(ConceptBaseDTO::getConceptId,conceptBaseDTO -> conceptBaseDTO));
         //获取疾病名称
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+        RespDTO<List<ConceptBaseDTO>> disInfoList = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
+        RespDTOUtil.respNGDeal(disInfoList,"获取科室信息失败");
+        Map<Long, ConceptBaseDTO> disInfoMap = disInfoList.data.stream().collect(Collectors.toMap(ConceptBaseDTO::getConceptId,conceptBaseDTO -> conceptBaseDTO));
+        /*QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("id", disId);
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-        Map<Long, QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getId,questionInfo -> questionInfo));
+        Map<Long, QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getId,questionInfo -> questionInfo));*/
         //获取模板类型名称
         QueryWrapper<DictionaryInfo> dictionaryInfoQueryWrapper = new QueryWrapper<>();
         dictionaryInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -322,7 +325,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 }
                 if(moduleInfoListDTO.getModuleType().intValue() == 2){//根据疾病
                     if(moduleInfoListDTO.getRelationId().intValue() != -1){//判断是不是科室通用子模板
-                        moduleInfoListDTO.setRelationName(questionInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
+                        moduleInfoListDTO.setRelationName(disInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
                     }else {
                         moduleInfoListDTO.setRelationName(ModuleInfoTypeEnum.Common.getName());
                     }