Merge branch 'dev/staticKnowledge20210407' into dev/evaluation_20210412

src/main/java/com/diagbot/facade/KlConceptStaticFacade.java

@@ -76,13 +76,13 @@ public class KlConceptStaticFacade {
      * @return
      */
     public StaticKnowledgeDTO getStaticKnowledge(StaticKnowledgeVO staticKnowledgeVO) {
-        StaticKnowledgeDTO staticKnowledgeDTO = new StaticKnowledgeDTO();
-
         RespDTO<StaticKnowledgeDTO> respDTO = cdssCoreClient.getStaticKnowledge(staticKnowledgeVO);
         if (RespDTOUtil.respIsOK(respDTO)) {
-            staticKnowledgeDTO = respDTO.data;
+            StaticKnowledgeDTO staticKnowledgeDTO = respDTO.data;
+            return staticKnowledgeDTO;
+        } else {
+            return null;
         }
-        return staticKnowledgeDTO;
     }
 
     /**
@@ -106,28 +106,6 @@ public class KlConceptStaticFacade {
             BeanUtil.copyProperties(staticKnowledgeHISVO, staticKnowledgeVO);
             staticKnowledgeVO.setName(uniqueName);
             StaticKnowledgeDTO staticKnowledgeDTO = getStaticKnowledge(staticKnowledgeVO);
-            //检验检查大小项互取静态知识
-            if (staticKnowledgeDTO == null) {
-                if (staticKnowledgeHISVO.getType() != null) {
-                    switch (staticKnowledgeHISVO.getType()) {
-                        case 3:
-                            staticKnowledgeVO.setType(4);
-                            break;
-                        case 4:
-                            staticKnowledgeVO.setType(3);
-                            break;
-                        case 5:
-                            staticKnowledgeVO.setType(6);
-                            break;
-                        case 6:
-                            staticKnowledgeVO.setType(5);
-                            break;
-                        default:
-                            break;
-                    }
-                    staticKnowledgeDTO = getStaticKnowledge(staticKnowledgeVO);
-                }
-            }
             if (staticKnowledgeDTO != null) {
                 StaticKnowledgeHISDTO staticKnowledgeHISDTO = new StaticKnowledgeHISDTO();
                 BeanUtil.copyProperties(staticKnowledgeDTO, staticKnowledgeHISDTO);