فهرست منبع

静态知识自动化测试

zhaops 4 سال پیش
والد
کامیت
2430fa14c0

+ 13 - 0
cdssman-service/src/main/java/com/diagbot/facade/KlConceptDetailFacade.java

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.KlConceptDetailServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/29 10:48
+ */
+@Component
+public class KlConceptDetailFacade extends KlConceptDetailServiceImpl {
+}

+ 40 - 0
cdssman-service/src/main/java/com/diagbot/facade/KlConceptStaticFacade.java

@@ -1,5 +1,6 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.CdssCoreClient;
@@ -8,7 +9,13 @@ import com.diagbot.dto.KlConceptStaticDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.StaticKnowledgeDTO;
 import com.diagbot.dto.StaticKnowledgeIndexDTO;
+import com.diagbot.entity.KlConcept;
+import com.diagbot.entity.KlConceptDetail;
+import com.diagbot.entity.KlConceptStatic;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
 import com.diagbot.service.impl.KlConceptStaticServiceImpl;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ChangeStatusVO;
@@ -37,6 +44,10 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
     private CdssCoreClient cdssCoreClient;
     @Autowired
     private UserServiceClient userServiceClient;
+    @Autowired
+    private KlConceptDetailFacade klConceptDetailFacade;
+    @Autowired
+    private KlConceptFacade klConceptFacade;
 
     /**
      * 静态知识检索
@@ -172,4 +183,33 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
         }
         return exist;
     }
+
+    /**
+     * 获取全静态知识
+     *
+     * @return
+     */
+    public List<KlConcept> getAllConcept() {
+        List<KlConcept> retList = Lists.newLinkedList();
+        QueryWrapper<KlConceptStatic> staticQueryWrapper = new QueryWrapper<>();
+        staticQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("status", StatusEnum.Enable.getKey());
+        List<KlConceptStatic> staticList = this.list(staticQueryWrapper);
+
+        if (ListUtil.isNotEmpty(staticList)) {
+            List<Long> conceptIds = staticList.stream().map(i -> i.getConceptId()).distinct().collect(Collectors.toList());
+            QueryWrapper<KlConceptDetail> detailQueryWrapper = new QueryWrapper<>();
+            detailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("concept_id", conceptIds);
+            List<KlConceptDetail> detailsList = klConceptDetailFacade.list(detailQueryWrapper);
+            if (ListUtil.isNotEmpty(detailsList)) {
+                conceptIds = detailsList.stream().map(i -> i.getConceptId()).distinct().collect(Collectors.toList());
+                retList = klConceptFacade.list(new QueryWrapper<KlConcept>()
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("status", StatusEnum.Enable.getKey())
+                        .in("id", conceptIds));
+            }
+        }
+        return retList;
+    }
 }

+ 19 - 24
cdssman-service/src/main/java/com/diagbot/facade/ResultStaticKnowledgeFacade.java

@@ -9,7 +9,6 @@ import com.diagbot.dto.ExportCommonTestDTO;
 import com.diagbot.dto.ExportLisStaticTestDTO;
 import com.diagbot.dto.ExportLisTestDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.ConceptInfo;
 import com.diagbot.entity.DiseaseConfig;
 import com.diagbot.entity.DrugConfig;
 import com.diagbot.entity.KlConcept;
@@ -21,7 +20,6 @@ import com.diagbot.entity.PacsConfig;
 import com.diagbot.entity.ResultStaticInfo;
 import com.diagbot.entity.ResultStaticKnowledge;
 import com.diagbot.enums.ConceptTypeEnum;
-import com.diagbot.enums.GraphLabelEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.LexiconEnum;
 import com.diagbot.enums.StatusEnum;
@@ -64,9 +62,6 @@ import java.util.stream.Collectors;
 public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImpl {
     @Autowired
     private CdssCoreClient cdssCoreClient;
-    @Autowired
-    private ConceptInfoFacade conceptInfoFacade;
-
     @Autowired
     private KlConceptFacade klConceptFacade;
     @Autowired
@@ -229,18 +224,18 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         }
 
         //验证静态知识
-        List<ConceptInfo> infoList = conceptInfoFacade.getAllConceptInfo();
+        List<KlConcept> infoList = klConceptStaticFacade.getAllConcept();
         if (ListUtil.isEmpty(infoList)) {
             infoList = Lists.newLinkedList();
         }
         List<String> lisStaticNames = infoList.stream()
-                .filter(i -> i.getType().equals(GraphLabelEnum.LisName.getName()))
-                .map(i -> i.getName())
+                .filter(i -> i.getLibType().equals(LexiconEnum.LisSubName.getKey()))
+                .map(i -> i.getLibName())
                 .distinct()
                 .collect(Collectors.toList());
         List<String> lisPackStaticNames = infoList.stream()
-                .filter(i -> i.getType().equals(GraphLabelEnum.LisSet.getName()))
-                .map(i -> i.getName())
+                .filter(i -> i.getLibType().equals(LexiconEnum.LisName.getKey()))
+                .map(i -> i.getLibName())
                 .distinct()
                 .collect(Collectors.toList());
 
@@ -419,18 +414,18 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         }
 
         //静态知识
-        List<ConceptInfo> infoList = conceptInfoFacade.getAllConceptInfo();
+        List<KlConcept> infoList = klConceptStaticFacade.getAllConcept();
         if (ListUtil.isEmpty(infoList)) {
             infoList = Lists.newLinkedList();
         }
         List<String> pacsStaticNames = infoList.stream()
-                .filter(i -> i.getType().equals(GraphLabelEnum.PacsName.getName()))
-                .map(i -> i.getName())
+                .filter(i -> i.getLibType().equals(LexiconEnum.PacsName.getKey()))
+                .map(i -> i.getLibName())
                 .distinct()
                 .collect(Collectors.toList());
         List<String> subPacsPackStaticNames = infoList.stream()
-                .filter(i -> i.getType().equals(GraphLabelEnum.PacsSubName.getName()))
-                .map(i -> i.getName())
+                .filter(i -> i.getLibType().equals(LexiconEnum.PacsSubName.getKey()))
+                .map(i -> i.getLibName())
                 .distinct()
                 .collect(Collectors.toList());
 
@@ -610,13 +605,13 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         }
 
         //验证静态知识
-        List<ConceptInfo> infoList = conceptInfoFacade.getAllConceptInfo();
+        List<KlConcept> infoList = klConceptStaticFacade.getAllConcept();
         if (ListUtil.isEmpty(infoList)) {
             infoList = Lists.newLinkedList();
         }
         List<String> drugStaticNames = infoList.stream()
-                .filter(i -> i.getType().equals(GraphLabelEnum.Medicine.getName()))
-                .map(i -> i.getName())
+                .filter(i -> i.getLibType().equals(LexiconEnum.Medicine.getKey()))
+                .map(i -> i.getLibName())
                 .distinct()
                 .collect(Collectors.toList());
 
@@ -766,13 +761,13 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         }
 
         //验证静态知识
-        List<ConceptInfo> infoList = conceptInfoFacade.getAllConceptInfo();
+        List<KlConcept> infoList = klConceptStaticFacade.getAllConcept();
         if (ListUtil.isEmpty(infoList)) {
             infoList = Lists.newLinkedList();
         }
         List<String> diseaseStaticNames = infoList.stream()
-                .filter(i -> i.getType().equals(GraphLabelEnum.YiBaoDiseaseName.getName()))
-                .map(i -> i.getName())
+                .filter(i -> i.getLibName().equals(LexiconEnum.Disease.getKey()))
+                .map(i -> i.getLibName())
                 .distinct()
                 .collect(Collectors.toList());
 
@@ -922,13 +917,13 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         }
 
         //验证静态知识
-        List<ConceptInfo> infoList = conceptInfoFacade.getAllConceptInfo();
+        List<KlConcept> infoList = klConceptStaticFacade.getAllConcept();
         if (ListUtil.isEmpty(infoList)) {
             infoList = Lists.newLinkedList();
         }
         List<String> diseaseStaticNames = infoList.stream()
-                .filter(i -> i.getType().equals(GraphLabelEnum.YiBaoOperationName.getName()))
-                .map(i -> i.getName())
+                .filter(i -> i.getLibType().equals(LexiconEnum.Operation.getKey()))
+                .map(i -> i.getLibName())
                 .distinct()
                 .collect(Collectors.toList());