|
@@ -40,6 +40,8 @@ public class AssembleFacade {
|
|
|
private OperationConfigFacade operationConfigFacade;
|
|
|
@Autowired
|
|
|
private HospitalInfoFacade hospitalInfoFacade;
|
|
|
+ @Autowired
|
|
|
+ private DeptConfigFacade deptConfigFacade;
|
|
|
|
|
|
/**
|
|
|
* 入参映射
|
|
@@ -215,6 +217,30 @@ public class AssembleFacade {
|
|
|
searchData.setOperationOrder(convertItem);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ //科室公表转换
|
|
|
+ List<String> deptHisNameList = Lists.newArrayList();
|
|
|
+ //dept
|
|
|
+ if (ListUtil.isNotEmpty(searchData.getDept())) {
|
|
|
+ deptHisNameList.addAll(searchData.getDept()
|
|
|
+ .stream()
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getName()))
|
|
|
+ .map(i -> i.getName())
|
|
|
+ .collect(Collectors.toList()));
|
|
|
+ }
|
|
|
+ deptHisNameList = deptHisNameList
|
|
|
+ .stream()
|
|
|
+ .distinct()
|
|
|
+ .collect(Collectors.toList());
|
|
|
+
|
|
|
+ if (ListUtil.isNotEmpty(deptHisNameList)) {
|
|
|
+ Map<String, Map<String, Long>> configMap
|
|
|
+ = deptConfigFacade.getConfigMap(searchData.getHospitalId(), deptHisNameList, null);
|
|
|
+ if (ListUtil.isNotEmpty(searchData.getDept())) {
|
|
|
+ List<Item> convertItem = itemConvert(searchData.getDept(), configMap);
|
|
|
+ searchData.setDept(convertItem);
|
|
|
+ }
|
|
|
+ }
|
|
|
return searchData;
|
|
|
}
|
|
|
|
|
@@ -297,7 +323,7 @@ public class AssembleFacade {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 药品、手术、诊断转换
|
|
|
+ * 药品、手术、诊断、科室转换
|
|
|
*
|
|
|
* @param items
|
|
|
* @param configMap
|