diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java index 8d356a3..42f7d37 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java @@ -44,6 +44,9 @@ public class PredictedStatisticsFacade { @Autowired private UsersService usersService; + @Autowired + private AutoMatchFacade autoMatchFacade; + public PredictedStatisticsResult predictedStatistics(PredictedStatisticsRequest predictedStatisticsRequest) { PredictedStatisticsResult predictedStatisticsResult = new PredictedStatisticsResult(); PatientsQuery patientsQuery = new PatientsQuery(); @@ -66,7 +69,7 @@ public class PredictedStatisticsFacade { patientsQuery.setDueDateEnd(endDate); patientsQuery.setNeed(YnEnums.YES.name()); patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setHospitalId(usersService.getUsers(predictedStatisticsRequest.getOperatorId()).getOrgId().toString()); + patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(predictedStatisticsRequest.getOperatorId())); patientsQuery.setType(1); String doctorId = predictedStatisticsRequest.getDoctorId(); if (!StringUtils.isEmpty(doctorId)) { @@ -109,7 +112,7 @@ public class PredictedStatisticsFacade { Date endDate = DateUtil.getMonthEndTime(date); PatientsQuery patientsQuery = new PatientsQuery(); String doctorId = predictedStatisticsRequest.getDoctorId(); - patientsQuery.setHospitalId(usersService.getUsers(predictedStatisticsRequest.getOperatorId()).getOrgId().toString()); + patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(predictedStatisticsRequest.getOperatorId())); if (!StringUtils.isEmpty(doctorId)) { patientsQuery.setLastCheckEmployeeId(doctorId); }