|
@@ -444,36 +444,36 @@ public class AssembleFacade {
|
|
|
}
|
|
|
//手术
|
|
|
if (ListUtil.isNotEmpty(data.getOperations())) {
|
|
|
- List<PushBaseDTO> retOpt = data.getOperations();
|
|
|
- List<String> uniqueNameList = retOpt.stream()
|
|
|
+ List<PushBaseDTO> retOperation = data.getOperations();
|
|
|
+ List<String> uniqueNameList = retOperation.stream()
|
|
|
.map(i -> i.getName())
|
|
|
.collect(Collectors.toList());
|
|
|
Map<String, Map<String, Long>> uniqueNameMap
|
|
|
= operationConfigFacade.getUniqueNameConfigMap(hospitalId, null, uniqueNameList);
|
|
|
if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
|
|
|
- retOpt.forEach(item -> {
|
|
|
+ retOperation.forEach(item -> {
|
|
|
if (uniqueNameMap.get(item.getName()) != null) {
|
|
|
item.setHisNameList(new ArrayList<>(uniqueNameMap.get(item.getName()).keySet()));
|
|
|
}
|
|
|
});
|
|
|
- data.setPacs(retOpt);
|
|
|
+ data.setPacs(retOperation);
|
|
|
}
|
|
|
}
|
|
|
//药品
|
|
|
if (ListUtil.isNotEmpty(data.getMedicines())) {
|
|
|
- List<PushBaseDTO> retMed = data.getMedicines();
|
|
|
- List<String> uniqueNameList = retMed.stream()
|
|
|
+ List<PushBaseDTO> retDrug = data.getMedicines();
|
|
|
+ List<String> uniqueNameList = retDrug.stream()
|
|
|
.map(i -> i.getName())
|
|
|
.collect(Collectors.toList());
|
|
|
Map<String, Map<String, Long>> uniqueNameMap
|
|
|
= drugConfigFacade.getUniqueNameConfigMap(hospitalId, null, uniqueNameList);
|
|
|
if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
|
|
|
- retMed.forEach(item -> {
|
|
|
+ retDrug.forEach(item -> {
|
|
|
if (uniqueNameMap.get(item.getName()) != null) {
|
|
|
item.setHisNameList(new ArrayList<>(uniqueNameMap.get(item.getName()).keySet()));
|
|
|
}
|
|
|
});
|
|
|
- data.setPacs(retMed);
|
|
|
+ data.setPacs(retDrug);
|
|
|
}
|
|
|
}
|
|
|
}
|