|
@@ -382,6 +382,7 @@ public class AssembleFacade {
|
|
isConnect = 1;
|
|
isConnect = 1;
|
|
}
|
|
}
|
|
if (isConnect.equals(1)) {
|
|
if (isConnect.equals(1)) {
|
|
|
|
+ //检验
|
|
if (ListUtil.isNotEmpty(data.getLis())) {
|
|
if (ListUtil.isNotEmpty(data.getLis())) {
|
|
List<PushBaseDTO> retLis = data.getLis();
|
|
List<PushBaseDTO> retLis = data.getLis();
|
|
List<String> uniqueNameList = retLis.stream()
|
|
List<String> uniqueNameList = retLis.stream()
|
|
@@ -398,6 +399,7 @@ public class AssembleFacade {
|
|
data.setLis(retLis);
|
|
data.setLis(retLis);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ //检查
|
|
if (ListUtil.isNotEmpty(data.getPacs())) {
|
|
if (ListUtil.isNotEmpty(data.getPacs())) {
|
|
List<PushBaseDTO> retPacs = data.getPacs();
|
|
List<PushBaseDTO> retPacs = data.getPacs();
|
|
List<String> uniqueNameList = retPacs.stream()
|
|
List<String> uniqueNameList = retPacs.stream()
|
|
@@ -414,6 +416,7 @@ public class AssembleFacade {
|
|
data.setPacs(retPacs);
|
|
data.setPacs(retPacs);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ //诊断
|
|
if (data.getDis() != null && data.getDis().size() > 0) {
|
|
if (data.getDis() != null && data.getDis().size() > 0) {
|
|
Map<String, List<PushBaseDTO>> retMap = data.getDis();
|
|
Map<String, List<PushBaseDTO>> retMap = data.getDis();
|
|
List<String> uniqueNameList = Lists.newLinkedList();
|
|
List<String> uniqueNameList = Lists.newLinkedList();
|
|
@@ -439,6 +442,40 @@ public class AssembleFacade {
|
|
data.setDis(retMap);
|
|
data.setDis(retMap);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ //手术
|
|
|
|
+ if (ListUtil.isNotEmpty(data.getOperations())) {
|
|
|
|
+ List<PushBaseDTO> retOpt = data.getOperations();
|
|
|
|
+ List<String> uniqueNameList = retOpt.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 -> {
|
|
|
|
+ if (uniqueNameMap.get(item.getName()) != null) {
|
|
|
|
+ item.setHisNameList(new ArrayList<>(uniqueNameMap.get(item.getName()).keySet()));
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ data.setPacs(retOpt);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ //药品
|
|
|
|
+ if (ListUtil.isNotEmpty(data.getMedicines())) {
|
|
|
|
+ List<PushBaseDTO> retMed = data.getMedicines();
|
|
|
|
+ List<String> uniqueNameList = retMed.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 -> {
|
|
|
|
+ if (uniqueNameMap.get(item.getName()) != null) {
|
|
|
|
+ item.setHisNameList(new ArrayList<>(uniqueNameMap.get(item.getName()).keySet()));
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ data.setPacs(retMed);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return data;
|
|
return data;
|
|
}
|
|
}
|