Browse Source

选择的手术转化

gaodm 4 years ago
parent
commit
3b744a2ec5
1 changed files with 10 additions and 0 deletions
  1. 10 0
      src/main/java/com/diagbot/aggregate/AssembleAggregate.java

+ 10 - 0
src/main/java/com/diagbot/aggregate/AssembleAggregate.java

@@ -120,6 +120,11 @@ public class AssembleAggregate {
                 List<Item> convertItem = itemConvert(searchData.getOperationOrder(), operationConfigMap);
                 searchData.setOperationOrder(convertItem);
             }
+            if (searchData.getOperationName() != null
+                    && StringUtil.isNotBlank(searchData.getOperationName().getName())) {
+                List<Item> convertItem = itemConvert(Lists.newArrayList(searchData.getOperationName()), operationConfigMap);
+                searchData.setOperationName(convertItem.get(0));
+            }
         }
         //科室
         if (MapUtils.isNotEmpty(deptConfigMap)) {
@@ -299,6 +304,11 @@ public class AssembleAggregate {
                     .map(i -> i.getName())
                     .collect(Collectors.toList()));
         }
+        //operationName
+        if (searchData.getOperationName() != null
+                && StringUtil.isNotBlank(searchData.getOperationName().getName())) {
+            operationHisNameList.add(searchData.getDiseaseName().getName());
+        }
         operationHisNameList = operationHisNameList
                 .stream()
                 .distinct()