河北演示项目历史病例、检查相关内容添加

cdssman-service/src/main/java/com/diagbot/enums/DiseaseRelationTypeEnum.java

@@ -21,7 +21,10 @@ public enum DiseaseRelationTypeEnum implements KeyedNamed {
     disDifferentDis(508, "100&508&100"),
     disLiangbiao(509, "100&509&124"),
     disNurse(510, "100&510&123"),
-    disClassicCase(516, "100&516&411");
+    disClassicCase(516, "100&516&411"),
+    disHistoricalCases(517, "100&517&412"),
+    IdentificationCheck(518, "100&518&109"),
+    comorbidityCheck(519, "100&519&109");
 
 
     @Setter

cdssman-service/src/main/java/com/diagbot/enums/RelationLibTypeEnum.java

@@ -26,7 +26,11 @@ public enum RelationLibTypeEnum implements KeyedNamed {
     relationSystem(513,"307"),
     relationAccSymptom(514,"103"),
     relationNature(515,"126"),
-    relationClassicCase(516,"411");
+    relationClassicCase(516,"411"),
+    relationHistoricalCases(517,"412"),
+    IdentificationCheck(518,"109"),
+    comorbidityCheck(519,"109");
+
 
 
     @Setter

cdssman-service/src/main/java/com/diagbot/facade/KlDiseaseFacade.java

@@ -99,7 +99,7 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
      * @return
      */
     public DiseaseTreeDetailDTO getDetail(GetDiseaseDetailVO getDiseaseDetailVO) {
-        List<Integer> relations = Arrays.asList(501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 516);
+        List<Integer> relations = Arrays.asList(501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 516, 517, 518, 519);
         List<KlLexiconRelationship> klLexiconRelationships = klLexiconRelationshipFacade.list(new QueryWrapper<KlLexiconRelationship>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("code", relations)
@@ -151,22 +151,39 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
         }
         List<DiseaseSubDetailDTO> datas = Lists.newArrayList();
         List<List<String>> types = Lists.newArrayList();
-        relation_name.forEach((x, y) -> {
-            List<String> split = Arrays.asList(DiseaseRelationTypeEnum.getName(x).split("&"));
-            List<Integer> collect = Arrays.stream(RelationLibTypeEnum.getName(x).split("&")).map(z -> Integer.parseInt(z)).collect(Collectors.toList());
+        for (Map.Entry<Integer, String> entry : relation_name.entrySet()) {
+            List<String> split = Arrays.asList(DiseaseRelationTypeEnum.getName(entry.getKey()).split("&"));
+            List<Integer> collect = Arrays.stream(RelationLibTypeEnum.getName(entry.getKey()).split("&")).map(z -> Integer.parseInt(z)).collect(Collectors.toList());
             types.add(split);
-            if (disSubDetailMap.containsKey(x)) {
-                DiseaseSubDetailDTO diseaseSubDetailDTO = disSubDetailMap.get(x);
+            if (disSubDetailMap.containsKey(entry.getKey())) {
+                DiseaseSubDetailDTO diseaseSubDetailDTO = disSubDetailMap.get(entry.getKey());
                 diseaseSubDetailDTO.setLibType(collect);
                 datas.add(diseaseSubDetailDTO);
             } else {
                 DiseaseSubDetailDTO diseaseSubDetailDTO = new DiseaseSubDetailDTO();
                 diseaseSubDetailDTO.setLibType(collect);
-                diseaseSubDetailDTO.setRname(relation_name.get(x));
-                diseaseSubDetailDTO.setRid(x);
+                diseaseSubDetailDTO.setRname(relation_name.get(entry.getKey()));
+                diseaseSubDetailDTO.setRid(entry.getKey());
                 datas.add(diseaseSubDetailDTO);
             }
-        });
+        }
+
+//        relation_name.forEach((x, y) -> {
+//            List<String> split = Arrays.asList(DiseaseRelationTypeEnum.getName(x).split("&"));
+//            List<Integer> collect = Arrays.stream(RelationLibTypeEnum.getName(x).split("&")).map(z -> Integer.parseInt(z)).collect(Collectors.toList());
+//            types.add(split);
+//            if (disSubDetailMap.containsKey(x)) {
+//                DiseaseSubDetailDTO diseaseSubDetailDTO = disSubDetailMap.get(x);
+//                diseaseSubDetailDTO.setLibType(collect);
+//                datas.add(diseaseSubDetailDTO);
+//            } else {
+//                DiseaseSubDetailDTO diseaseSubDetailDTO = new DiseaseSubDetailDTO();
+//                diseaseSubDetailDTO.setLibType(collect);
+//                diseaseSubDetailDTO.setRname(relation_name.get(x));
+//                diseaseSubDetailDTO.setRid(x);
+//                datas.add(diseaseSubDetailDTO);
+//            }
+//        });
         diseaseDetailDTO.setDatas(datas);
         diseaseTreeDetailDTO.setDiseaseDetailDTO(diseaseDetailDTO);
         diseaseTreeDetailDTO.setTypes(types);

cdssman-service/src/main/java/com/diagbot/facade/MappingConfigFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.CdssClient;
 import com.diagbot.client.CdssCoreClient;
 import com.diagbot.dto.DictionaryInfoDTO;
+import com.diagbot.dto.DiseaseSubDetailDTO;
 import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.AdministrationRouteConfig;
@@ -732,4 +733,19 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
         addNames(retList);
         return retList;
     }
+
+//    /**
+//     * 获取历史病例
+//     *
+//     * @param name
+//     * @return
+//     */
+//    public DiseaseSubDetailDTO getHistoricalCases(String name) {
+//        RespDTO<DiseaseSubDetailDTO> respDTO = cdssClient.getHistoricalCases(name);
+//        if (RespDTOUtil.respIsOK(respDTO)) {
+//            return respDTO.data;
+//        } else {
+//            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, respDTO.msg);
+//        }
+//    }
 }

cdssman-service/src/main/resources/mapper/KlDiseaseMapper.xml

@@ -151,7 +151,7 @@
                     #{item}
                 </foreach>
             </if>-->
-            AND kr.relation_id IN (501,502,503,504,505,506,507,508,509,510,516)
+            AND kr.relation_id IN (501,502,503,504,505,506,507,508,509,510,516,517,518,519)
         )t1
         LEFT JOIN kl_drug t2 ON t1.eid = t2.concept_id
         ORDER BY