gaodm 4 gadi atpakaļ
vecāks
revīzija
f25e8a7350
1 mainītis faili ar 9 papildinājumiem un 25 dzēšanām
  1. 9 25
      src/main/java/com/diagbot/facade/ExportFacade.java

+ 9 - 25
src/main/java/com/diagbot/facade/ExportFacade.java

@@ -317,12 +317,8 @@ public class ExportFacade {
     }
 
     private void graphRelationDeal() {
-        List<KlConcept> klConcepts
-                = klConceptService.list(new QueryWrapper<KlConcept>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-        );
-        Map<String, KlConcept> map
-                = EntityUtil.makeEntityMapByKeys(klConcepts, "_", "libName", "libType");
+        //获取标准词库Map
+        Map<String, KlConcept> map = getConceptMap();
         //药品化学物质类别树形结构
         List<ExportRelation> exportRelations = exportRelationRepository.getDrugRelationA();
         import2MySqlR(exportRelations, 301, 101, map);
@@ -373,12 +369,8 @@ public class ExportFacade {
     }
 
     private void graphRelationDealdiagnose() {
-        List<KlConcept> klConcepts
-                = klConceptService.list(new QueryWrapper<KlConcept>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-        );
-        Map<String, KlConcept> map
-                = EntityUtil.makeEntityMapByKeys(klConcepts, "_", "libName", "libType");
+        //获取标准词库Map
+        Map<String, KlConcept> map = getConceptMap();
         //主症状
         List<ExportRelation> exportRelations = exportRelationRepository.symptomMainPush();
         import2MySqlR(exportRelations, 100, 103, 501, map);
@@ -414,12 +406,8 @@ public class ExportFacade {
 
     public Map<String, Object> importExcel(MultipartFile file) {
         List<ImportDataVO> data = ExcelUtils.importExcel(file, 0, 1, ImportDataVO.class);
-        List<KlConcept> klConcepts
-                = klConceptService.list(new QueryWrapper<KlConcept>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-        );
-        Map<String, KlConcept> map
-                = EntityUtil.makeEntityMapByKeys(klConcepts, "_", "libName", "libType");
+        //获取标准词库Map
+        Map<String, KlConcept> map = getConceptMap();
         List<KlRelation> klRelations = new ArrayList<>();
         List<String> relations = new ArrayList<>();
         for (ImportDataVO importDataVO : data) {
@@ -485,13 +473,8 @@ public class ExportFacade {
         mapPath.put("【开单合理性_输血】", path + File.separator + "【开单合理性_输血】.xlsx");
         mapPath.put("【检查结果与项目重复开立规则】", path + File.separator + "【检查结果与项目重复开立规则】.xlsx");
         paramMap.put("mapPath", mapPath);
-
-        List<KlConcept> klConcepts
-                = klConceptService.list(new QueryWrapper<KlConcept>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-        );
-        Map<String, KlConcept> map
-                = EntityUtil.makeEntityMapByKeys(klConcepts, "_", "libName", "libType");
+        //获取标准词库Map
+        Map<String, KlConcept> map = getConceptMap();
         //开单合理性(除输血外)
         allOrder(mapPath, map);
         //开单合理性_输血
@@ -1555,6 +1538,7 @@ public class ExportFacade {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .orderByAsc("concept_id", "order_no"));
         Map<Long, List<GraphConceptDetail>> graphConceptDetailMap = EntityUtil.makeEntityListMap(graphConceptDetails, "conceptId");
+        //获取标准词库Map
         Map<String, KlConcept> conceptMap = getConceptMap();
         List<KlConceptStatic> klConceptStatics = new ArrayList<>();
         Map<Long, Long> graphIdMap = new HashMap<>();