|
@@ -50,195 +50,202 @@ public class AssembleFacade {
|
|
|
* @return
|
|
|
*/
|
|
|
public SearchData assembleData(SearchData searchData) {
|
|
|
- //化验公表转换
|
|
|
- List<String> lisHisNameList = Lists.newArrayList();
|
|
|
- //lis
|
|
|
- if (ListUtil.isNotEmpty(searchData.getLis())) {
|
|
|
- lisHisNameList.addAll(searchData.getLis()
|
|
|
- .stream()
|
|
|
- .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
- .map(i -> i.getName())
|
|
|
- .collect(Collectors.toList()));
|
|
|
- }
|
|
|
- //lisOrder
|
|
|
- if (ListUtil.isNotEmpty(searchData.getLisOrder())) {
|
|
|
- lisHisNameList.addAll(searchData.getLisOrder()
|
|
|
- .stream()
|
|
|
- .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
- .map(i -> i.getName())
|
|
|
- .collect(Collectors.toList()));
|
|
|
+ HospitalInfo hospitalInfo = hospitalInfoFacade.getById(searchData.getHospitalId());
|
|
|
+ Integer isConnect = 0;
|
|
|
+ if (hospitalInfo != null && hospitalInfo.getIsDeleted().equals(IsDeleteEnum.N.getKey())) {
|
|
|
+ isConnect = 1;
|
|
|
}
|
|
|
- lisHisNameList = lisHisNameList
|
|
|
- .stream()
|
|
|
- .distinct()
|
|
|
- .collect(Collectors.toList());
|
|
|
-
|
|
|
- if (ListUtil.isNotEmpty(lisHisNameList)) {
|
|
|
- Map<String, Map<String, Map<String, Long>>> lisConfigMap
|
|
|
- = lisConfigFacade.getConfigMap(searchData.getHospitalId(), lisHisNameList, null);
|
|
|
+ if (isConnect.equals(1)) {
|
|
|
+ //化验公表转换
|
|
|
+ List<String> lisHisNameList = Lists.newArrayList();
|
|
|
+ //lis
|
|
|
if (ListUtil.isNotEmpty(searchData.getLis())) {
|
|
|
- List<Lis> convertLis = lisConvert(searchData.getLis(), lisConfigMap);
|
|
|
- searchData.setLis(convertLis);
|
|
|
+ lisHisNameList.addAll(searchData.getLis()
|
|
|
+ .stream()
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
+ .map(i -> i.getName())
|
|
|
+ .collect(Collectors.toList()));
|
|
|
}
|
|
|
+ //lisOrder
|
|
|
if (ListUtil.isNotEmpty(searchData.getLisOrder())) {
|
|
|
- List<Lis> convertLis = lisConvert(searchData.getLisOrder(), lisConfigMap);
|
|
|
- searchData.setLisOrder(convertLis);
|
|
|
+ lisHisNameList.addAll(searchData.getLisOrder()
|
|
|
+ .stream()
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
+ .map(i -> i.getName())
|
|
|
+ .collect(Collectors.toList()));
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- //辅检公表转换
|
|
|
- List<String> pacsHisNameList = Lists.newArrayList();
|
|
|
- //pacs
|
|
|
- if (ListUtil.isNotEmpty(searchData.getPacs())) {
|
|
|
- pacsHisNameList.addAll(searchData.getPacs()
|
|
|
+ lisHisNameList = lisHisNameList
|
|
|
.stream()
|
|
|
- .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
- .map(i -> i.getName())
|
|
|
- .collect(Collectors.toList()));
|
|
|
- }
|
|
|
- //pacsOrder
|
|
|
- if (ListUtil.isNotEmpty(searchData.getPacsOrder())) {
|
|
|
- pacsHisNameList.addAll(searchData.getPacsOrder()
|
|
|
- .stream()
|
|
|
- .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
- .map(i -> i.getName())
|
|
|
- .collect(Collectors.toList()));
|
|
|
- }
|
|
|
- pacsHisNameList = pacsHisNameList
|
|
|
- .stream()
|
|
|
- .distinct()
|
|
|
- .collect(Collectors.toList());
|
|
|
+ .distinct()
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
|
|
- if (ListUtil.isNotEmpty(pacsHisNameList)) {
|
|
|
- Map<String, Map<String, Long>> pacsConfigMap
|
|
|
- = pacsConfigFacade.getConfigMap(searchData.getHospitalId(), pacsHisNameList, null);
|
|
|
+ if (ListUtil.isNotEmpty(lisHisNameList)) {
|
|
|
+ Map<String, Map<String, Map<String, Long>>> lisConfigMap
|
|
|
+ = lisConfigFacade.getConfigMap(searchData.getHospitalId(), lisHisNameList, null);
|
|
|
+ if (ListUtil.isNotEmpty(searchData.getLis())) {
|
|
|
+ List<Lis> convertLis = lisConvert(searchData.getLis(), lisConfigMap);
|
|
|
+ searchData.setLis(convertLis);
|
|
|
+ }
|
|
|
+ if (ListUtil.isNotEmpty(searchData.getLisOrder())) {
|
|
|
+ List<Lis> convertLis = lisConvert(searchData.getLisOrder(), lisConfigMap);
|
|
|
+ searchData.setLisOrder(convertLis);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //辅检公表转换
|
|
|
+ List<String> pacsHisNameList = Lists.newArrayList();
|
|
|
+ //pacs
|
|
|
if (ListUtil.isNotEmpty(searchData.getPacs())) {
|
|
|
- List<Pacs> convertPacs = pacsConvert(searchData.getPacs(), pacsConfigMap);
|
|
|
- searchData.setPacs(convertPacs);
|
|
|
+ pacsHisNameList.addAll(searchData.getPacs()
|
|
|
+ .stream()
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
+ .map(i -> i.getName())
|
|
|
+ .collect(Collectors.toList()));
|
|
|
}
|
|
|
+ //pacsOrder
|
|
|
if (ListUtil.isNotEmpty(searchData.getPacsOrder())) {
|
|
|
- List<Pacs> convertPacs = pacsConvert(searchData.getPacsOrder(), pacsConfigMap);
|
|
|
- searchData.setPacsOrder(convertPacs);
|
|
|
+ pacsHisNameList.addAll(searchData.getPacsOrder()
|
|
|
+ .stream()
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
+ .map(i -> i.getName())
|
|
|
+ .collect(Collectors.toList()));
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- //诊断公表转换
|
|
|
- List<String> diagHisNameList = Lists.newArrayList();
|
|
|
- //diag
|
|
|
- if (ListUtil.isNotEmpty(searchData.getDiag())) {
|
|
|
- diagHisNameList.addAll(searchData.getDiag()
|
|
|
+ pacsHisNameList = pacsHisNameList
|
|
|
.stream()
|
|
|
- .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
- .map(i -> i.getName())
|
|
|
- .collect(Collectors.toList()));
|
|
|
- }
|
|
|
- //diagOrder
|
|
|
- if (ListUtil.isNotEmpty(searchData.getDiagOrder())) {
|
|
|
- diagHisNameList.addAll(searchData.getDiagOrder()
|
|
|
- .stream()
|
|
|
- .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
- .map(i -> i.getName())
|
|
|
- .collect(Collectors.toList()));
|
|
|
- }
|
|
|
- diagHisNameList = diagHisNameList
|
|
|
- .stream()
|
|
|
- .distinct()
|
|
|
- .collect(Collectors.toList());
|
|
|
+ .distinct()
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
|
|
- if (ListUtil.isNotEmpty(diagHisNameList)) {
|
|
|
- Map<String, Map<String, Long>> configMap
|
|
|
- = diseaseConfigFacade.getConfigMap(searchData.getHospitalId(), diagHisNameList, null);
|
|
|
+ if (ListUtil.isNotEmpty(pacsHisNameList)) {
|
|
|
+ Map<String, Map<String, Long>> pacsConfigMap
|
|
|
+ = pacsConfigFacade.getConfigMap(searchData.getHospitalId(), pacsHisNameList, null);
|
|
|
+ if (ListUtil.isNotEmpty(searchData.getPacs())) {
|
|
|
+ List<Pacs> convertPacs = pacsConvert(searchData.getPacs(), pacsConfigMap);
|
|
|
+ searchData.setPacs(convertPacs);
|
|
|
+ }
|
|
|
+ if (ListUtil.isNotEmpty(searchData.getPacsOrder())) {
|
|
|
+ List<Pacs> convertPacs = pacsConvert(searchData.getPacsOrder(), pacsConfigMap);
|
|
|
+ searchData.setPacsOrder(convertPacs);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //诊断公表转换
|
|
|
+ List<String> diagHisNameList = Lists.newArrayList();
|
|
|
+ //diag
|
|
|
if (ListUtil.isNotEmpty(searchData.getDiag())) {
|
|
|
- List<Item> convertItem = itemConvert(searchData.getDiag(), configMap);
|
|
|
- searchData.setDiag(convertItem);
|
|
|
+ diagHisNameList.addAll(searchData.getDiag()
|
|
|
+ .stream()
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
+ .map(i -> i.getName())
|
|
|
+ .collect(Collectors.toList()));
|
|
|
}
|
|
|
+ //diagOrder
|
|
|
if (ListUtil.isNotEmpty(searchData.getDiagOrder())) {
|
|
|
- List<Item> convertItem = itemConvert(searchData.getDiagOrder(), configMap);
|
|
|
- searchData.setDiagOrder(convertItem);
|
|
|
+ diagHisNameList.addAll(searchData.getDiagOrder()
|
|
|
+ .stream()
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
+ .map(i -> i.getName())
|
|
|
+ .collect(Collectors.toList()));
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- //药品公表转换
|
|
|
- List<String> drugHisNameList = Lists.newArrayList();
|
|
|
- //drug
|
|
|
- if (ListUtil.isNotEmpty(searchData.getDrug())) {
|
|
|
- drugHisNameList.addAll(searchData.getDrug()
|
|
|
- .stream()
|
|
|
- .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
- .map(i -> i.getName())
|
|
|
- .collect(Collectors.toList()));
|
|
|
- }
|
|
|
- //drugOrder
|
|
|
- if (ListUtil.isNotEmpty(searchData.getDrugOrder())) {
|
|
|
- drugHisNameList.addAll(searchData.getDrugOrder()
|
|
|
+ diagHisNameList = diagHisNameList
|
|
|
.stream()
|
|
|
- .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
- .map(i -> i.getName())
|
|
|
- .collect(Collectors.toList()));
|
|
|
- }
|
|
|
- drugHisNameList = drugHisNameList
|
|
|
- .stream()
|
|
|
- .distinct()
|
|
|
- .collect(Collectors.toList());
|
|
|
+ .distinct()
|
|
|
+ .collect(Collectors.toList());
|
|
|
+
|
|
|
+ if (ListUtil.isNotEmpty(diagHisNameList)) {
|
|
|
+ Map<String, Map<String, Long>> configMap
|
|
|
+ = diseaseConfigFacade.getConfigMap(searchData.getHospitalId(), diagHisNameList, null);
|
|
|
+ if (ListUtil.isNotEmpty(searchData.getDiag())) {
|
|
|
+ List<Item> convertItem = itemConvert(searchData.getDiag(), configMap);
|
|
|
+ searchData.setDiag(convertItem);
|
|
|
+ }
|
|
|
+ if (ListUtil.isNotEmpty(searchData.getDiagOrder())) {
|
|
|
+ List<Item> convertItem = itemConvert(searchData.getDiagOrder(), configMap);
|
|
|
+ searchData.setDiagOrder(convertItem);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- if (ListUtil.isNotEmpty(drugHisNameList)) {
|
|
|
- Map<String, Map<String, Long>> configMap
|
|
|
- = drugConfigFacade.getConfigMap(searchData.getHospitalId(), drugHisNameList, null);
|
|
|
+ //药品公表转换
|
|
|
+ List<String> drugHisNameList = Lists.newArrayList();
|
|
|
+ //drug
|
|
|
if (ListUtil.isNotEmpty(searchData.getDrug())) {
|
|
|
- List<Item> convertItem = itemConvert(searchData.getDrug(), configMap);
|
|
|
- searchData.setDrug(convertItem);
|
|
|
+ drugHisNameList.addAll(searchData.getDrug()
|
|
|
+ .stream()
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
+ .map(i -> i.getName())
|
|
|
+ .collect(Collectors.toList()));
|
|
|
}
|
|
|
+ //drugOrder
|
|
|
if (ListUtil.isNotEmpty(searchData.getDrugOrder())) {
|
|
|
- List<Item> convertItem = itemConvert(searchData.getDrugOrder(), configMap);
|
|
|
- searchData.setDrugOrder(convertItem);
|
|
|
+ drugHisNameList.addAll(searchData.getDrugOrder()
|
|
|
+ .stream()
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
+ .map(i -> i.getName())
|
|
|
+ .collect(Collectors.toList()));
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- //手术公表转换
|
|
|
- List<String> operationHisNameList = Lists.newArrayList();
|
|
|
- //operationOrder
|
|
|
- if (ListUtil.isNotEmpty(searchData.getOperationOrder())) {
|
|
|
- operationHisNameList.addAll(searchData.getOperationOrder()
|
|
|
+ drugHisNameList = drugHisNameList
|
|
|
.stream()
|
|
|
- .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
- .map(i -> i.getName())
|
|
|
- .collect(Collectors.toList()));
|
|
|
- }
|
|
|
- operationHisNameList = operationHisNameList
|
|
|
- .stream()
|
|
|
- .distinct()
|
|
|
- .collect(Collectors.toList());
|
|
|
+ .distinct()
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
|
|
- if (ListUtil.isNotEmpty(operationHisNameList)) {
|
|
|
- Map<String, Map<String, Long>> configMap
|
|
|
- = operationConfigFacade.getConfigMap(searchData.getHospitalId(), operationHisNameList, null);
|
|
|
- if (ListUtil.isNotEmpty(searchData.getOperationOrder())) {
|
|
|
- List<Item> convertItem = itemConvert(searchData.getOperationOrder(), configMap);
|
|
|
- searchData.setOperationOrder(convertItem);
|
|
|
+ if (ListUtil.isNotEmpty(drugHisNameList)) {
|
|
|
+ Map<String, Map<String, Long>> configMap
|
|
|
+ = drugConfigFacade.getConfigMap(searchData.getHospitalId(), drugHisNameList, null);
|
|
|
+ if (ListUtil.isNotEmpty(searchData.getDrug())) {
|
|
|
+ List<Item> convertItem = itemConvert(searchData.getDrug(), configMap);
|
|
|
+ searchData.setDrug(convertItem);
|
|
|
+ }
|
|
|
+ if (ListUtil.isNotEmpty(searchData.getDrugOrder())) {
|
|
|
+ List<Item> convertItem = itemConvert(searchData.getDrugOrder(), configMap);
|
|
|
+ searchData.setDrugOrder(convertItem);
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- //科室公表转换
|
|
|
- List<String> deptHisNameList = Lists.newArrayList();
|
|
|
- //dept
|
|
|
- if (ListUtil.isNotEmpty(searchData.getDept())) {
|
|
|
- deptHisNameList.addAll(searchData.getDept()
|
|
|
+ //手术公表转换
|
|
|
+ List<String> operationHisNameList = Lists.newArrayList();
|
|
|
+ //operationOrder
|
|
|
+ if (ListUtil.isNotEmpty(searchData.getOperationOrder())) {
|
|
|
+ operationHisNameList.addAll(searchData.getOperationOrder()
|
|
|
+ .stream()
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
+ .map(i -> i.getName())
|
|
|
+ .collect(Collectors.toList()));
|
|
|
+ }
|
|
|
+ operationHisNameList = operationHisNameList
|
|
|
.stream()
|
|
|
- .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
- .map(i -> i.getName())
|
|
|
- .collect(Collectors.toList()));
|
|
|
- }
|
|
|
- deptHisNameList = deptHisNameList
|
|
|
- .stream()
|
|
|
- .distinct()
|
|
|
- .collect(Collectors.toList());
|
|
|
+ .distinct()
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
|
|
- if (ListUtil.isNotEmpty(deptHisNameList)) {
|
|
|
- Map<String, Map<String, Long>> configMap
|
|
|
- = deptConfigFacade.getConfigMap(searchData.getHospitalId(), deptHisNameList, null);
|
|
|
+ if (ListUtil.isNotEmpty(operationHisNameList)) {
|
|
|
+ Map<String, Map<String, Long>> configMap
|
|
|
+ = operationConfigFacade.getConfigMap(searchData.getHospitalId(), operationHisNameList, null);
|
|
|
+ if (ListUtil.isNotEmpty(searchData.getOperationOrder())) {
|
|
|
+ List<Item> convertItem = itemConvert(searchData.getOperationOrder(), configMap);
|
|
|
+ searchData.setOperationOrder(convertItem);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //科室公表转换
|
|
|
+ List<String> deptHisNameList = Lists.newArrayList();
|
|
|
+ //dept
|
|
|
if (ListUtil.isNotEmpty(searchData.getDept())) {
|
|
|
- List<Item> convertItem = itemConvert(searchData.getDept(), configMap);
|
|
|
- searchData.setDept(convertItem);
|
|
|
+ deptHisNameList.addAll(searchData.getDept()
|
|
|
+ .stream()
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
+ .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;
|