开单项映射bug

aipt-service/src/main/java/com/diagbot/facade/TransferFacade.java

@@ -142,7 +142,6 @@ public class TransferFacade {
         if (ListUtil.isEmpty(pacs)) {
             return Lists.newLinkedList();
         }
-        Map<String, Pacs> pacsOriginalMap = EntityUtil.makeEntityMap(pacs, "name");
         List<Pacs> convertPacs = Lists.newLinkedList();
         PacsConfigVO pacsConfigVO = new PacsConfigVO();
         pacsConfigVO.setHosCode(hosCode);
@@ -154,16 +153,21 @@ public class TransferFacade {
         RespDTO<Map<String, List<String>>> pacsRespDTO = tranServiceClient.getPacsConfig(pacsConfigVO);
         if (RespDTOUtil.respIsOK(pacsRespDTO)) {
             Map<String, List<String>> pacsMap = pacsRespDTO.data;
-            for (Map.Entry<String, Pacs> entry : pacsOriginalMap.entrySet()) {
-                if (ListUtil.isNotEmpty(pacsMap.get(entry.getKey()))) {
-                    for (String uniqueName : pacsMap.get(entry.getKey())) {
-                        Pacs pacsResult = new Pacs();
-                        BeanUtil.copyProperties(entry.getValue(), pacsResult);
-                        pacsResult.setUniqueName(uniqueName);
+            for (Pacs pacsResult : pacs) {
+                if (StringUtil.isBlank(pacsResult.getName())) {
+                    convertPacs.add(pacsResult);
+                    continue;
+                } else {
+                    if (ListUtil.isNotEmpty(pacsMap.get(pacsResult.getName()))) {
+                        for (String uniqueName : pacsMap.get(pacsResult.getName())) {
+                            Pacs convertPacsResult = new Pacs();
+                            BeanUtil.copyProperties(pacsResult, convertPacsResult);
+                            convertPacsResult.setUniqueName(uniqueName);
+                            convertPacs.add(convertPacsResult);
+                        }
+                    } else {
                         convertPacs.add(pacsResult);
                     }
-                } else {
-                    convertPacs.add(entry.getValue());
                 }
             }
         }
@@ -203,7 +207,6 @@ public class TransferFacade {
         if (ListUtil.isEmpty(items)) {
             return Lists.newLinkedList();
         }
-        Map<String, Item> itemOriginalMap = EntityUtil.makeEntityMap(items, "name");
         List<Item> convertItems = Lists.newLinkedList();
         List<String> nameList = items
                 .stream().map(item -> item.getName())
@@ -217,12 +220,14 @@ public class TransferFacade {
             RespDTO<Map<String, String>> disRespDTO = tranServiceClient.getDiseaseIcdMap(diseaseIcdVO);
             if (RespDTOUtil.respIsOK(disRespDTO)) {
                 disMap = disRespDTO.data;
-                for (Map.Entry<String, Item> entry : itemOriginalMap.entrySet()) {
-                    if (disMap.containsKey(entry.getKey())) {
-                        entry.getValue().setUniqueName(disMap.get(entry.getKey()));
+                for (Item disease : items) {
+                    if (StringUtil.isBlank(disease.getName())) {
+                        continue;
+                    } else {
+                        disease.setUniqueName(disMap.get(disease.getName()));
                     }
-                    convertItems.add(entry.getValue());
                 }
+                convertItems = BeanUtil.listCopyTo(items, Item.class);
             }
         } else if (type.equals(ConceptTypeEnum.Drug.getKey())) {
             //暂无映射关系