zhoutg 5 سال پیش
والد
کامیت
339b25bca3

+ 0 - 1
precman-service/src/main/java/com/diagbot/client/KnowledgemanServiceClient.java

@@ -21,7 +21,6 @@ import java.util.Map;
 public interface KnowledgemanServiceClient {
 
 
-
     /**
      * 根据概念Id列表获取概念列表Map
      *

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

@@ -192,7 +192,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));
         //获取模板类型名称
         QueryWrapper<DictionaryInfo> dictionaryInfoQueryWrapper = new QueryWrapper<>();
         dictionaryInfoQueryWrapper
@@ -201,7 +202,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 (ListUtil.isNotEmpty(moduleInfoDTOIPage.getRecords())) {
             //获取用户信息
             RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
@@ -215,13 +217,15 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 if (moduleInfoListDTO.getModuleType().intValue() == 1) {//根据科室
                     if (moduleInfoListDTO.getRelationId().intValue() != -1) {//判断是不是科室通用子模板
                         if (null != deptInfoMap.get(moduleInfoListDTO.getRelationId())) {
-                            moduleInfoListDTO.setRelationName(deptInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
+                            moduleInfoListDTO.setRelationName(
+                                    deptInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
                         }
                     } else {
                         moduleInfoListDTO.setRelationName(ModuleInfoTypeEnum.Common.getName());
                     }
                 }
-                moduleInfoListDTO.setModuleTypeName(ModuleInfoTypeEnum.getName(moduleInfoListDTO.getModuleType().intValue()));
+                moduleInfoListDTO.setModuleTypeName(
+                        ModuleInfoTypeEnum.getName(moduleInfoListDTO.getModuleType().intValue()));
             }
         }
         return moduleInfoDTOIPage;

+ 6 - 3
precman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -382,10 +382,12 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         paramMap.put("notControlType", questionIndexSubVO.getNotControlType());
 
         QueryWrapper<QuestionMapping> questionMappingQueryWrapper = new QueryWrapper<>();
-        questionMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("parent_question", questionIndexSubVO.getParentId());
+        questionMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("parent_question", questionIndexSubVO.getParentId());
         List<QuestionMapping> questionMappingList = questionMappingFacade.list(questionMappingQueryWrapper);
         if (ListUtil.isNotEmpty(questionMappingList)) {
-            List<Long> sonIds = questionMappingList.stream().map(questionMapping -> questionMapping.getSonQuestion()).collect(Collectors.toList());
+            List<Long> sonIds = questionMappingList.stream().map(questionMapping -> questionMapping.getSonQuestion())
+                    .collect(Collectors.toList());
             paramMap.put("ids", sonIds);
         }
         List<QuestionInfo> res = this.index(paramMap);
@@ -431,7 +433,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             paramMap1.put("ids", sonQuestionIds);
             //获取第二级子标签
             List<QuestionInfoWrapper> questionMapping1 = this.getByQuestionMapping(paramMap1);
-            Map<Long, List<QuestionInfoWrapper>> qm1 = EntityUtil.makeEntityListMap(questionMapping1, "parentQuestion");
+            Map<Long, List<QuestionInfoWrapper>> qm1 =
+                    EntityUtil.makeEntityListMap(questionMapping1, "parentQuestion");
             for (QuestionDTO bean : sonQuestionList) {
                 List<QuestionDetail> questionDetailList1 = sonQuestionMap.get(bean.getId());
                 if (ListUtil.isEmpty(questionDetailList1)) {

+ 0 - 2
precman-service/src/main/java/com/diagbot/service/QuestionInfoService.java

@@ -39,7 +39,6 @@ public interface QuestionInfoService extends IService<QuestionInfo> {
     public void deleteByIds(Map map);
 
 
-
     /**
      * 检索
      *
@@ -58,7 +57,6 @@ public interface QuestionInfoService extends IService<QuestionInfo> {
     IPage<QuestionPageDTO> getList(QuestionPageVO questionPageVO);
 
 
-
     /**
      * 获取关联的父级标签
      *

+ 3 - 3
precman-service/src/main/java/com/diagbot/vo/AddModuleInfoVO.java

@@ -16,15 +16,15 @@ import java.util.List;
 public class AddModuleInfoVO {
     //模板id,修改时传,新增不用传
     private Long id;
-    @NotNull(message="模板名称不能为空")
+    @NotNull(message = "模板名称不能为空")
     private String name;
-    @NotNull(message="模板归属不能为空")
+    @NotNull(message = "模板归属不能为空")
     private String type;
     //特殊标签归属类型
     private Integer textType;
     //标签id
     private List<AddModuleDetailVO> moduleDetail;
-    @NotNull(message="模板类型不能为空")//模板类型(通用,普通,慢病)
+    @NotNull(message = "模板类型不能为空")//模板类型(通用,普通,慢病)
     private Long moduleType;
     //关联id
     private Long relationId;

+ 1 - 1
precman-service/src/main/java/com/diagbot/vo/ModuleGetQuestionInfoVO.java

@@ -32,6 +32,6 @@ public class ModuleGetQuestionInfoVO {
     /**
      * 标签类型
      */
-    @NotNull(message="归属类型不能为空")
+    @NotNull(message = "归属类型不能为空")
     private Integer type;
 }