代码整理

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

@@ -136,7 +136,8 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         moduleInfo.setType(addModulInfoVO.getType());
         moduleInfo.setModuleType(addModulInfoVO.getModuleType());
         //当添加为科室专用模板或者慢病模板时添加关联id
-        if (addModulInfoVO.getModuleType().intValue() == 1 || addModulInfoVO.getModuleType().intValue() == 2) {
+        if (addModulInfoVO.getModuleType().intValue() == 1
+                || addModulInfoVO.getModuleType().intValue() == 2) {
             moduleInfo.setRelationId(addModulInfoVO.getRelationId());
         }
         this.save(moduleInfo);
@@ -233,7 +234,9 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
             moduleInfoQueryWrapper.eq("relation_id", getModuleInfoVO.getRelationId());
         }
         List<ModuleInfo> moduleInfoList = this.list(moduleInfoQueryWrapper);
-        List<Long> moduleIdList = moduleInfoList.stream().map(m -> m.getId()).collect(Collectors.toList());
+        List<Long> moduleIdList
+                = moduleInfoList.stream()
+                .map(m -> m.getId()).collect(Collectors.toList());
         //给ModuleInfoDTO设值
         List<ModuleInfoDTO> moduleInfoDTOList = new ArrayList<>();
         if (ListUtil.isNotEmpty(moduleIdList)) {
@@ -290,14 +293,16 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         //获取科室名称
         ConceptTypeVO conceptTypeVO = new ConceptTypeVO();
         conceptTypeVO.setType(1);
-        RespDTO<List<ConceptBaseDTO>> deptInfoList = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
+        RespDTO<List<ConceptBaseDTO>> deptInfoList
+                = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
         RespDTOUtil.respNGDeal(deptInfoList, "获取科室信息失败");
         Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream()
                 .collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
         //获取疾病名称
         conceptTypeVO = new ConceptTypeVO();
         conceptTypeVO.setType(3);
-        RespDTO<List<ConceptBaseDTO>> disInfoList = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
+        RespDTO<List<ConceptBaseDTO>> disInfoList
+                = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
         RespDTOUtil.respNGDeal(disInfoList, "获取疾病信息失败");
         Map<Long, ConceptBaseDTO> disInfoMap = disInfoList.data.stream()
                 .collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
@@ -370,7 +375,8 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
             //如果是辅检，调用knowledgeman获取辅检信息
             ConceptTypeVO conceptTypeVO = new ConceptTypeVO();
             conceptTypeVO.setType(2);
-            RespDTO<List<ConceptBaseDTO>> pacsCeptInfo = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
+            RespDTO<List<ConceptBaseDTO>> pacsCeptInfo
+                    = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
             Map<Long, ConceptBaseDTO> pacsCeptMap = pacsCeptInfo.data.stream()
                     .collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
             //循环给出参赋值
@@ -455,14 +461,16 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         //获取科室名称
         ConceptTypeVO conceptTypeVO = new ConceptTypeVO();
         conceptTypeVO.setType(1);
-        RespDTO<List<ConceptBaseDTO>> deptInfoList = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
+        RespDTO<List<ConceptBaseDTO>> deptInfoList
+                = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
         RespDTOUtil.respNGDeal(deptInfoList, "获取科室信息失败");
         Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream()
                 .collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
         //获取疾病名称
         conceptTypeVO = new ConceptTypeVO();
         conceptTypeVO.setType(3);
-        RespDTO<List<ConceptBaseDTO>> disInfoList = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
+        RespDTO<List<ConceptBaseDTO>> disInfoList
+                = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
         RespDTOUtil.respNGDeal(disInfoList, "获取疾病信息失败");
         Map<Long, ConceptBaseDTO> disInfoMap = disInfoList.data.stream()
                 .collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
@@ -548,11 +556,14 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         deptType.setType(1);
         RespDTO<List<ConceptBaseDTO>> deptInfoList = knowledgemanServiceClient.getConceptListByType(deptType);
         RespDTOUtil.respNGDeal(deptInfoList, "获取科室信息失败");
-        if (getAllDeptAndDisInfoVO.getModuleType() != null && getAllDeptAndDisInfoVO.getModuleType().intValue() == 1) {
+        if (getAllDeptAndDisInfoVO.getModuleType() != null
+                && getAllDeptAndDisInfoVO.getModuleType().intValue() == 1) {
             //过滤添加过得科室
             List<ModuleInfo> moduleInfoList = getModuleInfos(getAllDeptAndDisInfoVO.getModuleType(),
                     getAllDeptAndDisInfoVO.getType());
-            List<Long> deptIds = moduleInfoList.stream().map(ModuleInfo::getRelationId).collect(Collectors.toList());
+            List<Long> deptIds = moduleInfoList.stream()
+                    .map(ModuleInfo::getRelationId)
+                    .collect(Collectors.toList());
             Iterator<ConceptBaseDTO> deptIterator = deptInfoList.data.iterator();
             for (Long deptId : deptIds) {
                 while (deptIterator.hasNext()) {
@@ -573,7 +584,9 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 && getAllDeptAndDisInfoVO.getModuleType().intValue() == 2) {//过滤添加过得疾病
             List<ModuleInfo> moduleInfoList = getModuleInfos(getAllDeptAndDisInfoVO.getModuleType(),
                     getAllDeptAndDisInfoVO.getType());
-            List<Long> disIds = moduleInfoList.stream().map(ModuleInfo::getRelationId).collect(Collectors.toList());
+            List<Long> disIds = moduleInfoList.stream()
+                    .map(ModuleInfo::getRelationId)
+                    .collect(Collectors.toList());
             Iterator<ConceptBaseDTO> disIterator = disTypes.data.iterator();
             for (Long disId : disIds) {
                 while (disIterator.hasNext()) {
@@ -619,7 +632,9 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("question_id", getQuestiongAndModuleRelationsVO.getQuestionId()));
         if (ListUtil.isNotEmpty(moduleDetails)) {
-            List<Long> moduleIds = moduleDetails.stream().map(row -> row.getModuleId()).collect(Collectors.toList());
+            List<Long> moduleIds = moduleDetails.stream()
+                    .map(row -> row.getModuleId())
+                    .collect(Collectors.toList());
             List<String> moduleNames = this.list(new QueryWrapper<ModuleInfo>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .in("id", moduleIds))
@@ -641,7 +656,8 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
             }
         }
         titalMsg.append("该标签已关联父级:").append(questionMsg).append("<br/>").append(errMsg);*/
-        GetQuestiongAndModuleRelationsDTO getQuestiongAndModuleRelationsDTO = new GetQuestiongAndModuleRelationsDTO();
+        GetQuestiongAndModuleRelationsDTO getQuestiongAndModuleRelationsDTO
+                = new GetQuestiongAndModuleRelationsDTO();
         getQuestiongAndModuleRelationsDTO.setRelationInfos(errMsg);
         return getQuestiongAndModuleRelationsDTO;
     }

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

@@ -255,7 +255,8 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
             conceptTypeVO.setType(1);
             RespDTO<List<ConceptBaseDTO>> deptInfoList = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
             RespDTOUtil.respNGDeal(deptInfoList, "获取科室信息失败");
-            Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream().collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
+            Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream()
+                    .collect(Collectors.toMap(ConceptBaseDTO::getConceptId, conceptBaseDTO -> conceptBaseDTO));
             //获取模板类型
             BeanUtil.copyProperties(moduleInfo, getModuleInfoOneDTO);
             //获取模板类型名称
@@ -265,7 +266,8 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                     .eq("return_type", 1)
                     .orderByDesc("order_no");
             List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
-            Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream().collect(Collectors.toMap(DictionaryInfo::getVal, dictionaryInfo -> dictionaryInfo));
+            Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream()
+                    .collect(Collectors.toMap(DictionaryInfo::getVal, dictionaryInfo -> dictionaryInfo));
             if (null != dictionaryInfoMap.get(getModuleInfoOneDTO.getType())) {
                 getModuleInfoOneDTO.setAscriptionName(dictionaryInfoMap.get(getModuleInfoOneDTO.getType()).getName());
             }
@@ -283,8 +285,12 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                     .eq("module_id", getModuleInfoOneVO.getModuleId())
                     .orderByAsc("order_no");
             List<ModuleDetail> moduleDetailList = moduleDetailFacade.list(moduleDetailQueryWrapper);
-            List<Long> questionIdList = moduleDetailList.stream().map(moduleDetail -> moduleDetail.getQuestionId()).collect(Collectors.toList());
-            List<Long> moduleIdList = moduleDetailList.stream().map(moduleDetail -> moduleDetail.getRelationModule()).collect(Collectors.toList());
+            List<Long> questionIdList = moduleDetailList.stream()
+                    .map(moduleDetail -> moduleDetail.getQuestionId())
+                    .collect(Collectors.toList());
+            List<Long> moduleIdList = moduleDetailList.stream()
+                    .map(moduleDetail -> moduleDetail.getRelationModule())
+                    .collect(Collectors.toList());
             //获取标签信息
             Map<Long, QuestionInfo> questionInfoMap = new HashMap<>();
             if (ListUtil.isNotEmpty(questionIdList)) {