1、术语关联映射

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

@@ -144,7 +144,7 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
 
         // 已存在数据
         Map<String, Map<String, Map<String, List<String>>>> hisConfigMap
-                = mappingConfigFacade.groupByHisNameWithName(null, ConceptTypeEnum.LisPack.getKey(), Long.valueOf(hospitalId));
+                = mappingConfigFacade.groupByHisNameWithName(null, ConceptTypeEnum.LisPack.getKey(), Long.valueOf(hospitalId), StatusEnum.Enable.getKey());
 
         //术语映射
         for (LisConfig config : lisConfigList) {
@@ -346,7 +346,7 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
 
         // 已存在数据
         Map<String, Map<String, Map<String, List<String>>>> hisConfigMap
-                = mappingConfigFacade.groupByHisNameWithName(null, ConceptTypeEnum.Pacs.getKey(), Long.valueOf(hospitalId));
+                = mappingConfigFacade.groupByHisNameWithName(null, ConceptTypeEnum.Pacs.getKey(), Long.valueOf(hospitalId), StatusEnum.Enable.getKey());
         //术语映射
         for (PacsConfig config : pacsConfigList) {
             ResultStaticKnowledge result = new ResultStaticKnowledge();
@@ -538,7 +538,7 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
 
         // 已存在数据
         Map<String, Map<String, Map<String, List<String>>>> hisConfigMap
-                = mappingConfigFacade.groupByHisNameWithName(null, ConceptTypeEnum.Drug.getKey(), Long.valueOf(hospitalId));
+                = mappingConfigFacade.groupByHisNameWithName(null, ConceptTypeEnum.Drug.getKey(), Long.valueOf(hospitalId), StatusEnum.Enable.getKey());
 
         //术语映射
         for (DrugConfig config : drugConfigList) {
@@ -696,7 +696,7 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
 
         // 已存在数据
         Map<String, Map<String, Map<String, List<String>>>> hisConfigMap
-                = mappingConfigFacade.groupByHisNameWithName(null, ConceptTypeEnum.Disease.getKey(), Long.valueOf(hospitalId));
+                = 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);
 
         //术语映射
@@ -855,7 +855,7 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
 
         // 已存在数据
         Map<String, Map<String, Map<String, List<String>>>> hisConfigMap
-                = mappingConfigFacade.groupByHisNameWithName(null, ConceptTypeEnum.Operation.getKey(), Long.valueOf(hospitalId));
+                = 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);
 
         //术语映射