From 29b531e52e0e97eebb2ede9e9b1a9b2b39cceed3 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Wed, 30 Nov 2016 14:13:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=8C=BB?= =?UTF-8?q?=E9=99=A2=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/PredictedStatisticsFacade.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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); } -- 1.8.3.1