化验、辅检、手术结构化的映射没有匹配的用name替代

src/main/java/com/diagbot/facade/CommonFacade.java

@@ -642,14 +642,14 @@ public class CommonFacade {
         CoreUtil.addList(operationList, CoreUtil.getPropertyList(wordCrfDTO.getPresentLabel().getOperations()));
         // 3、既往史手术
         CoreUtil.addList(operationList, CoreUtil.getPropertyList(wordCrfDTO.getPastLabel().getOperations()));
-//        // 4、开单手术
-//        CoreUtil.addList(operationList, CoreUtil.filterUniqueList(wordCrfDTO.getOperationOrder()));
-//        // 5、结构化手术
-//        CoreUtil.addList(operationList, CoreUtil.filterUniqueList(wordCrfDTO.getOperation()));
-//        // 6、选中手术
-//        if (wordCrfDTO.getOperationName() != null && StringUtils.isBlank(wordCrfDTO.getOperationName().getUniqueName())) {
-//            operationList.add(wordCrfDTO.getOperationName().getName());
-//        }
+        // 4、开单手术
+        CoreUtil.addList(operationList, CoreUtil.filterUniqueList(wordCrfDTO.getOperationOrder()));
+        // 5、结构化手术
+        CoreUtil.addList(operationList, CoreUtil.filterUniqueList(wordCrfDTO.getOperation()));
+        // 6、选中手术
+        if (wordCrfDTO.getOperationName() != null && StringUtils.isBlank(wordCrfDTO.getOperationName().getUniqueName())) {
+            operationList.add(wordCrfDTO.getOperationName().getName());
+        }
         operationList = operationList
                 .stream()
                 .distinct()
@@ -668,18 +668,18 @@ public class CommonFacade {
             // 3、既往史手术
 //            setListProperty(wordCrfDTO.getPastLabel(), "operations", "standName", configMap);
             setListProperty(wordCrfDTO.getPastLabel(),"operations", ConceptTypeEnum.Operation.getKey(),"StandName",operstionMap);
-//            // 4、结构化手术
-////            setListProperty(wordCrfDTO, "operation", "uniqueName", configMap);
-//            setListProperty(wordCrfDTO, "operation", ConceptTypeEnum.Operation.getKey(),"UniqueName",operstionMap);
-//            // 5、手术
-////            setListProperty(wordCrfDTO, "operationOrder", "uniqueName", configMap);
-//            setListProperty(wordCrfDTO, "operationOrder", ConceptTypeEnum.Operation.getKey(),"UniqueName",operstionMap);
-//            // 6、选中手术
-//            if (wordCrfDTO.getOperationName() != null &&
-//                    StringUtil.isNotBlank(wordCrfDTO.getOperationName().getName()) &&
-//                    StringUtil.isBlank(wordCrfDTO.getOperationName().getUniqueName())) {
-//                wordCrfDTO.getOperationName().setUniqueName(wordCrfDTO.getOperationName().getName());
-//            }
+            // 4、结构化手术
+//            setListProperty(wordCrfDTO, "operation", "uniqueName", configMap);
+            setListProperty(wordCrfDTO, "operation", ConceptTypeEnum.Operation.getKey(),"UniqueName",operstionMap);
+            // 5、手术
+//            setListProperty(wordCrfDTO, "operationOrder", "uniqueName", configMap);
+            setListProperty(wordCrfDTO, "operationOrder", ConceptTypeEnum.Operation.getKey(),"UniqueName",operstionMap);
+            // 6、选中手术
+            if (wordCrfDTO.getOperationName() != null &&
+                    StringUtil.isNotBlank(wordCrfDTO.getOperationName().getName()) &&
+                    StringUtil.isBlank(wordCrfDTO.getOperationName().getUniqueName())) {
+                wordCrfDTO.getOperationName().setUniqueName(wordCrfDTO.getOperationName().getName());
+            }
         }
     }
 
@@ -692,9 +692,9 @@ public class CommonFacade {
         // 【所有辅检】
         List<String> pacsList = new ArrayList<>();
         // 1、结构化
-//        CoreUtil.addList(pacsList, CoreUtil.getPropertyList(wordCrfDTO.getPacs()));
+        CoreUtil.addList(pacsList, CoreUtil.filterUniqueList(wordCrfDTO.getPacs()));
 //        // 2、开单
-//        CoreUtil.addList(pacsList, CoreUtil.getPropertyList(wordCrfDTO.getPacsOrder()));
+        CoreUtil.addList(pacsList, CoreUtil.filterUniqueList(wordCrfDTO.getPacsOrder()));
         PacsLabel pacsLabel = wordCrfDTO.getPacsLabel();
         if(pacsLabel != null){
             pacsList = pacsLabel.getItem().stream()
@@ -705,6 +705,7 @@ public class CommonFacade {
         if (ListUtil.isNotEmpty(pacsList)) {
             Map<String, Map<String, Map<String, List<String>>>> pacsMap = mappingConfigFacade.groupByHisNameWithName(pacsList, ConceptTypeEnum.Pacs.getKey(), wordCrfDTO.getHospitalId());
             setListProperty(wordCrfDTO, "pacs", ConceptTypeEnum.Pacs.getKey(),"UniqueName",pacsMap);
+            setListProperty(wordCrfDTO, "pacsOrder", ConceptTypeEnum.Pacs.getKey(),"UniqueName",pacsMap);
             setListProperty(pacsLabel, "item", ConceptTypeEnum.Pacs.getKey(),"UniqueName",pacsMap);
         }
     }
@@ -885,6 +886,9 @@ public class CommonFacade {
                         retList.add(item);
                     }
                 } else {
+                    if (propertyName.equals("UniqueName")) {
+                        BeanUtils.copyProperty(item, "uniqueName", name);
+                    }
                     retList.add(item);
                 }
             }