bug8237修改

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

@@ -269,15 +269,15 @@ public class TermImportFacade {
         res = klLibraryInfoService.updateBatchById(libraryInfos);
 
         //增加同义词
-        Map<String, ImportConceptAllVO> conceptListMap = conceptList.stream().collect(Collectors.toMap(r -> r.getLibName()+r.getLibType(), r -> r));
+        Map<String, ImportConceptAllVO> conceptListMap = conceptList.stream().collect(Collectors.toMap(r -> r.getLibName() + r.getLibType(), r -> r));
 
-        Map<String, KlConcept> klConceptsMap = klConcepts.stream().collect(Collectors.toMap(r -> r.getLibName()+r.getLibType(), r -> r));
+        Map<String, KlConcept> klConceptsMap = klConcepts.stream().collect(Collectors.toMap(r -> r.getLibName() + r.getLibType(), r -> r));
 
         List<KlLibraryInfo> libraryInfosSub = new ArrayList<>();
 
         for (Map.Entry<String, KlConcept> klConData : klConceptsMap.entrySet()) {
             KlConcept value = klConData.getValue();
-            ImportConceptAllVO importConceptAllVOS = conceptListMap.get(value.getLibName()+value.getLibType());
+            ImportConceptAllVO importConceptAllVOS = conceptListMap.get(value.getLibName() + value.getLibType());
             List<ImportConceptSubVO> synonymsList = importConceptAllVOS.getSynonymsList();
             if (ListUtil.isNotEmpty(synonymsList)) {
                 for (ImportConceptSubVO subVO : synonymsList) {
@@ -302,25 +302,23 @@ public class TermImportFacade {
         List<KlConceptCommon> conceptCommonList = new ArrayList<>();
         for (Map.Entry<String, ImportConceptAllVO> entry : conceptListMap.entrySet()) {
             ImportConceptAllVO value = entry.getValue();
-            for (Map.Entry<String, KlConcept> entry2 : klConceptsMap.entrySet()) {
-                KlConcept value1 = entry2.getValue();
-                if (value.getLibName().equals(value1.getLibName())) {
-                    if (null != value.getIsHasCommon() && value.getIsHasCommon().equals(1)) {
-                        KlConceptCommon conceptCommon = new KlConceptCommon();
-                        conceptCommon.setSexType(value.getSexType());
-                        conceptCommon.setMaxAge(value.getMaxAge());
-                        conceptCommon.setMinAge(value.getMinAge());
-                        conceptCommon.setConceptId(value1.getId());
-                        conceptCommon.setCreator(UserUtils.getCurrentPrincipleID());
-                        conceptCommon.setModifier(UserUtils.getCurrentPrincipleID());
-                        conceptCommon.setGmtCreate(now);
-                        conceptCommon.setGmtModified(now);
-                        conceptCommonList.add(conceptCommon);
-                    }
+            KlConcept klConcept = klConceptsMap.get(value.getLibName() + value.getLibType());
+            if (null != klConcept) {
+                if (null != value.getIsHasCommon() && value.getIsHasCommon().equals(1)) {
+                    KlConceptCommon conceptCommon = new KlConceptCommon();
+                    conceptCommon.setSexType(value.getSexType());
+                    conceptCommon.setMaxAge(value.getMaxAge());
+                    conceptCommon.setMinAge(value.getMinAge());
+                    conceptCommon.setConceptId(klConcept.getId());
+                    conceptCommon.setCreator(UserUtils.getCurrentPrincipleID());
+                    conceptCommon.setModifier(UserUtils.getCurrentPrincipleID());
+                    conceptCommon.setGmtCreate(now);
+                    conceptCommon.setGmtModified(now);
+                    conceptCommonList.add(conceptCommon);
                 }
-
             }
 
+
         }
         res = klConceptCommonService.saveBatch(conceptCommonList);
     }