Bläddra i källkod

1、术语关联映射-禁用术语匹配

zhaops 3 år sedan
förälder
incheckning
7709382d00
1 ändrade filer med 10 tillägg och 7 borttagningar
  1. 10 7
      src/main/java/com/diagbot/facade/MappingConfigFacade.java

+ 10 - 7
src/main/java/com/diagbot/facade/MappingConfigFacade.java

@@ -572,11 +572,6 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
     public List<MappingConfigWrapper> precDataProcess(List<MappingConfigWrapper> originList, Integer type) {
         List<MappingConfigWrapper> retList = Lists.newLinkedList();
         List<MappingConfigWrapper> dataList = Lists.newLinkedList();
-        List<MappingConfigWrapper> standardList = Lists.newLinkedList();
-        List<MappingConfigWrapper> synonymsList = Lists.newLinkedList();
-        List<MappingConfigWrapper> codeList = Lists.newLinkedList();
-        List<MappingConfigWrapper> historyList = Lists.newLinkedList();
-        List<MappingConfigWrapper> drugList = Lists.newLinkedList();
 
         //数据完整性校验
         List<Integer> emptyNumList = Lists.newLinkedList();
@@ -2169,11 +2164,19 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
                                 if (formConceptId == null) {
                                     forms.add("");
                                 } else {
-                                    forms.add(idNameMap.get(formConceptId));
+                                    if (idNameMap.containsKey(formConceptId)) {
+                                        forms.add(idNameMap.get(formConceptId));
+                                    } else {
+                                        forms.add("");
+                                    }
                                 }
                             }
                             forms = forms.stream().distinct().collect(Collectors.toList());
-                            thirdMap.put(idNameMap.get(thirdEntry.getKey()), forms);
+                            if (idNameMap.containsKey(thirdEntry.getKey())) {
+                                thirdMap.put(idNameMap.get(thirdEntry.getKey()), forms);
+                            } /*else {
+                                thirdMap.put("", Lists.newLinkedList());
+                            }*/
                         }
                     }
                     subMap.put(subEntry.getKey(), thirdMap);