1、静态知识自动化测试

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

@@ -12,7 +12,6 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.StaticKnowledgeDTO;
 import com.diagbot.entity.DiseaseConfig;
 import com.diagbot.entity.DrugConfig;
-import com.diagbot.entity.KlConcept;
 import com.diagbot.entity.LisConfig;
 import com.diagbot.entity.OperationConfig;
 import com.diagbot.entity.PacsConfig;
@@ -20,7 +19,6 @@ import com.diagbot.entity.ResultStaticInfo;
 import com.diagbot.entity.ResultStaticKnowledge;
 import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.LexiconEnum;
 import com.diagbot.enums.MatchSourceEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -63,17 +61,11 @@ public class ResultStaticKnowledgeNeoFacade extends ResultStaticKnowledgeService
     @Autowired
     private CdssCoreClient cdssCoreClient;
     @Autowired
-    private KlConceptFacade klConceptFacade;
-    @Autowired
-    private KlRelationFacade klRelationFacade;
-    @Autowired
     private KlConceptStaticFacade klConceptStaticFacade;
-
     @Autowired
     private MappingConfigFacade mappingConfigFacade;
     @Autowired
     private RunningInfoFacade runningInfoFacade;
-
     @Autowired
     @Qualifier("resultStaticKnowledgeServiceImpl")
     private ResultStaticKnowledgeService resultStaticKnowledgeService;
@@ -216,7 +208,7 @@ public class ResultStaticKnowledgeNeoFacade extends ResultStaticKnowledgeService
             }
         }
 
-        //todo 验证静态知识
+        //验证静态知识
         for (ResultStaticKnowledge result : mappingList) {
             if (result.getHasStandName() != null && result.getHasStandName().equals(1)) {
                 StaticKnowledgeVO staticKnowledgeVO = new StaticKnowledgeVO();
@@ -254,7 +246,6 @@ public class ResultStaticKnowledgeNeoFacade extends ResultStaticKnowledgeService
     }
 
 
-
     /**
      * 辅检静态知识测试
      *
@@ -381,7 +372,7 @@ public class ResultStaticKnowledgeNeoFacade extends ResultStaticKnowledgeService
             }
         }
 
-        //todo 静态知识
+        //验证静态知识
         for (ResultStaticKnowledge result : mappingList) {
             //静态知识是否存在
             if (result.getHasStandName() != null && result.getHasStandName().equals(1)) {
@@ -423,7 +414,6 @@ public class ResultStaticKnowledgeNeoFacade extends ResultStaticKnowledgeService
      * @param testVO
      * @return
      */
-
     public Boolean drugTest(MultipartFile file, StaticKnowledgeTestVO testVO) {
         RunningInfoVO runningInfoVO = new RunningInfoVO();
         runningInfoVO.setCaseId(testVO.getCaseId());
@@ -545,22 +535,27 @@ public class ResultStaticKnowledgeNeoFacade extends ResultStaticKnowledgeService
         }
 
         //验证静态知识
-        List<KlConcept> infoList = klConceptStaticFacade.getAllConcept();
-        if (ListUtil.isEmpty(infoList)) {
-            infoList = Lists.newLinkedList();
-        }
-        List<String> drugStaticNames = infoList.stream()
-                .filter(i -> i.getLibType().equals(LexiconEnum.Medicine.getKey()))
-                .map(i -> i.getLibName())
-                .distinct()
-                .collect(Collectors.toList());
-
         for (ResultStaticKnowledge result : mappingList) {
             //静态知识是否存在
             if (result.getHasStandName() != null && result.getHasStandName().equals(1)) {
-                if (drugStaticNames.contains(result.getName())) {
-                    result.setHasStaticKnowledge(1);
-                } else {
+                StaticKnowledgeVO staticKnowledgeVO = new StaticKnowledgeVO();
+                staticKnowledgeVO.setName(result.getName());
+                staticKnowledgeVO.setType(2);
+                staticKnowledgeVO.setContentTypes(Arrays.asList(new Integer[] { 1 }));
+                try {
+                    StaticKnowledgeDTO staticKnowledgeDTO = klConceptStaticFacade.getStaticKnowledge(staticKnowledgeVO);
+                    if (null != staticKnowledgeDTO
+                            && null != staticKnowledgeDTO.getDetails()
+                            && staticKnowledgeDTO.getDetails().size() > 0) {
+                        result.setHasStaticKnowledge(1);
+                    } else {
+                        result.setHasStaticKnowledge(0);
+                        result.setMessage(result.getMessage() + "缺少静态知识；");
+                    }
+                } catch (CommonException e) {
+                    result.setHasStaticKnowledge(0);
+                    result.setMessage(result.getMessage() + "缺少静态知识；");
+                } catch (Exception e) {
                     result.setHasStaticKnowledge(0);
                     result.setMessage(result.getMessage() + "缺少静态知识；");
                 }
@@ -581,7 +576,6 @@ public class ResultStaticKnowledgeNeoFacade extends ResultStaticKnowledgeService
      * @param testVO
      * @return
      */
-
     public Boolean diseaseTest(MultipartFile file, StaticKnowledgeTestVO testVO) {
         RunningInfoVO runningInfoVO = new RunningInfoVO();
         runningInfoVO.setCaseId(testVO.getCaseId());
@@ -637,7 +631,6 @@ public class ResultStaticKnowledgeNeoFacade extends ResultStaticKnowledgeService
         // 已存在数据
         Map<String, Map<String, Map<String, List<String>>>> hisConfigMap
                 = mappingConfigFacade.groupByHisNameWithName(null, ConceptTypeEnum.Disease.getKey(), Long.valueOf(hospitalId), StatusEnum.Enable.getKey());
-        //Map<String, Map<String, List<Long>>> hisConfigMap = diseaseConfigFacade.getConfigMap(Long.valueOf(hospitalId), null, null);
 
         //术语映射
         for (DiseaseConfig config : diseaseConfigList) {
@@ -704,22 +697,27 @@ public class ResultStaticKnowledgeNeoFacade extends ResultStaticKnowledgeService
         }
 
         //验证静态知识
-        List<KlConcept> infoList = klConceptStaticFacade.getAllConcept();
-        if (ListUtil.isEmpty(infoList)) {
-            infoList = Lists.newLinkedList();
-        }
-        List<String> diseaseStaticNames = infoList.stream()
-                .filter(i -> i.getLibType().equals(LexiconEnum.Disease.getKey()))
-                .map(i -> i.getLibName())
-                .distinct()
-                .collect(Collectors.toList());
-
         for (ResultStaticKnowledge result : mappingList) {
             //静态知识是否存在
             if (result.getHasStandName() != null && result.getHasStandName().equals(1)) {
-                if (diseaseStaticNames.contains(result.getName())) {
-                    result.setHasStaticKnowledge(1);
-                } else {
+                StaticKnowledgeVO staticKnowledgeVO = new StaticKnowledgeVO();
+                staticKnowledgeVO.setName(result.getName());
+                staticKnowledgeVO.setType(1);
+                staticKnowledgeVO.setContentTypes(Arrays.asList(new Integer[] { 1, 3 }));
+                try {
+                    StaticKnowledgeDTO staticKnowledgeDTO = klConceptStaticFacade.getStaticKnowledge(staticKnowledgeVO);
+                    if (null != staticKnowledgeDTO
+                            && null != staticKnowledgeDTO.getDetails()
+                            && staticKnowledgeDTO.getDetails().size() > 0) {
+                        result.setHasStaticKnowledge(1);
+                    } else {
+                        result.setHasStaticKnowledge(0);
+                        result.setMessage(result.getMessage() + "缺少静态知识；");
+                    }
+                } catch (CommonException e) {
+                    result.setHasStaticKnowledge(0);
+                    result.setMessage(result.getMessage() + "缺少静态知识；");
+                } catch (Exception e) {
                     result.setHasStaticKnowledge(0);
                     result.setMessage(result.getMessage() + "缺少静态知识；");
                 }
@@ -796,7 +794,6 @@ public class ResultStaticKnowledgeNeoFacade extends ResultStaticKnowledgeService
         // 已存在数据
         Map<String, Map<String, Map<String, List<String>>>> hisConfigMap
                 = mappingConfigFacade.groupByHisNameWithName(null, ConceptTypeEnum.Operation.getKey(), Long.valueOf(hospitalId), StatusEnum.Enable.getKey());
-        //Map<String, Map<String, List<Long>>> hisConfigMap = operationConfigFacade.getConfigMap(Long.valueOf(hospitalId), null, null);
 
         //术语映射
         for (OperationConfig config : operationConfigList) {
@@ -863,22 +860,27 @@ public class ResultStaticKnowledgeNeoFacade extends ResultStaticKnowledgeService
         }
 
         //验证静态知识
-        List<KlConcept> infoList = klConceptStaticFacade.getAllConcept();
-        if (ListUtil.isEmpty(infoList)) {
-            infoList = Lists.newLinkedList();
-        }
-        List<String> diseaseStaticNames = infoList.stream()
-                .filter(i -> i.getLibType().equals(LexiconEnum.Operation.getKey()))
-                .map(i -> i.getLibName())
-                .distinct()
-                .collect(Collectors.toList());
-
         for (ResultStaticKnowledge result : mappingList) {
             //静态知识是否存在
             if (result.getHasStandName() != null && result.getHasStandName().equals(1)) {
-                if (diseaseStaticNames.contains(result.getName())) {
-                    result.setHasStaticKnowledge(1);
-                } else {
+                StaticKnowledgeVO staticKnowledgeVO = new StaticKnowledgeVO();
+                staticKnowledgeVO.setName(result.getName());
+                staticKnowledgeVO.setType(7);
+                staticKnowledgeVO.setContentTypes(Arrays.asList(new Integer[] { 1 }));
+                try {
+                    StaticKnowledgeDTO staticKnowledgeDTO = klConceptStaticFacade.getStaticKnowledge(staticKnowledgeVO);
+                    if (null != staticKnowledgeDTO
+                            && null != staticKnowledgeDTO.getDetails()
+                            && staticKnowledgeDTO.getDetails().size() > 0) {
+                        result.setHasStaticKnowledge(1);
+                    } else {
+                        result.setHasStaticKnowledge(0);
+                        result.setMessage(result.getMessage() + "缺少静态知识；");
+                    }
+                } catch (CommonException e) {
+                    result.setHasStaticKnowledge(0);
+                    result.setMessage(result.getMessage() + "缺少静态知识；");
+                } catch (Exception e) {
                     result.setHasStaticKnowledge(0);
                     result.setMessage(result.getMessage() + "缺少静态知识；");
                 }
@@ -899,7 +901,6 @@ public class ResultStaticKnowledgeNeoFacade extends ResultStaticKnowledgeService
      * @param testVO
      * @return
      */
-
     @Transactional
     public Boolean saveResult(List<ResultStaticKnowledge> list, StaticKnowledgeTestVO testVO, Integer totleNum) {
         Date now = new Date();
@@ -1002,4 +1003,4 @@ public class ResultStaticKnowledgeNeoFacade extends ResultStaticKnowledgeService
     }
 
     //endregion --------------------------导出------------------------------
-}
+}