diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 32e5925..33bc383 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -384,8 +384,6 @@ public class PatientFacade { hospitalList = new ArrayList<>(); fmHospitalList = new ArrayList<>(); - fmHospitalList.add(riskPatientsQueryRequest.getFmHospital()); - String hospital = autoMatchFacade.getHospitalId(userId); if (null != hospital) { hospitalList.add(hospital); @@ -454,12 +452,20 @@ public class PatientFacade { } fmHospitalList.retainAll(orgId); } - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFprovinceId())) + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFmHospital())) + { + fmHospitalList.add(riskPatientsQueryRequest.getFmHospital()); + } + else { - patientsQuery.setFmHospitalList(fmHospitalList); + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFprovinceId())) + { + patientsQuery.setFmHospitalList(fmHospitalList); + } } + } else { patientsQuery.setFmHospital(riskPatientsQueryRequest.getFmHospital());