药品术语映射

src/main/java/com/diagbot/aggregate/AssemblePushAggregate.java

@@ -184,12 +184,19 @@ public class AssemblePushAggregate {
             List<String> uniqueNameList = retDrug.stream()
                     .map(i -> i.getName())
                     .collect(Collectors.toList());
-            Map<String, Map<String, Map<String,Long>>> uniqueNameMap
+            Map<String, Map<String, Map<String, Long>>> uniqueNameMap
                     = drugConfigFacade.getUniqueNameConfigMap(hospitalId, null, uniqueNameList);
             if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
                 retDrug.forEach(item -> {
                     if (uniqueNameMap.get(item.getName()) != null) {
-                        item.setHisNameList(new ArrayList<>(uniqueNameMap.get(item.getName()).keySet()));
+                        List<String> hisNameList = Lists.newLinkedList();
+                        for (Map.Entry<String, Map<String, Long>> entry : uniqueNameMap.get(item.getName()).entrySet()) {
+                            if (entry.getValue() != null) {
+                                hisNameList.addAll(new ArrayList<>(entry.getValue().keySet()));
+                            }
+                        }
+                        item.setHisNameList(hisNameList);
+                        //item.setHisNameList(new ArrayList<>(uniqueNameMap.get(item.getName()).keySet()));
                     }
                 });
             }