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