From ea75f64c012910aceae7f8ee282b4f67f58bc4bc Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Thu, 19 Oct 2017 16:34:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=8F=E9=99=A2=E7=BB=9F=E8=AE=A1=E6=80=BB?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=8F=97=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/PatientMarkHospServiceFacade.java   | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
index f02a94e..5ad4125 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
@@ -59,11 +59,14 @@ public class PatientMarkHospServiceFacade {
      */
     public BaseResponse reportHospit(PatientMarkRequest patientMarkRequest, Integer id) {
         PatientMarkHospitalQuery query = new PatientMarkHospitalQuery();
-        query.setMakeStartDate(patientMarkRequest.getMakeStartDate());
-        query.setMakeEndDate(patientMarkRequest.getMakeEndDate());
         //根据用户id获取医院ID
         String hospitalId = autoMatchFacade.getHospitalId(id);
         query.setHospitalId(hospitalId);
+        //总数据
+        int count = patientMarkHospitalService.queryPatientMarkHospitalCount(query);
+        query.setMakeStartDate(patientMarkRequest.getMakeStartDate());
+        query.setMakeEndDate(patientMarkRequest.getMakeEndDate());
+
         PatientsQuery patientsQuery = new PatientsQuery();
         List<Patients> patientses = setPatientIds(patientMarkRequest, patientsQuery, hospitalId);
         if (CollectionUtils.isNotEmpty(patientses)) {
@@ -78,8 +81,7 @@ public class PatientMarkHospServiceFacade {
 
         //统计数据
         List<ReportMakeHosptail> reportMakeHosptails = patientMarkHospitalService.reportPatMarkHospByMakeDoctor(query);
-        //总数据
-        int count = patientMarkHospitalService.queryPatientMarkHospitalCount(query);
+
 
 
         //列数据
@@ -179,15 +181,16 @@ public class PatientMarkHospServiceFacade {
     public BaseResponse reportBackHospit(PatientMarkRequest patientMarkRequest, Integer id) {
         //根据用户id获取医院ID
         String hospitalId = autoMatchFacade.getHospitalId(id);
-        PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery();
 
+        PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery();
+        patientMarkHospQuery.setHospitalId(hospitalId);
         //住院预约总数
         int count = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery);
         patientMarkHospQuery.setBackStatus(1);
         //回院待提醒数
         int waitCount = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery);
 
-        patientMarkHospQuery.setHospitalId(hospitalId);
+
         patientMarkHospQuery.setBackStartDate(patientMarkRequest.getMakeStartDate());
         patientMarkHospQuery.setBackEndDate(patientMarkRequest.getMakeEndDate());
         PatientsQuery patientsQuery = new PatientsQuery();
@@ -328,6 +331,12 @@ public class PatientMarkHospServiceFacade {
         String hospitalId = autoMatchFacade.getHospitalId(id);
         PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery();
         patientMarkHospQuery.setHospitalId(hospitalId);
+        //回院预约成功总数
+        int count = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery);
+        patientMarkHospQuery.setInHospitStatus(1);
+        //待住院提醒总数
+        int waitCount = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery);
+
         patientMarkHospQuery.setInHospitStartDate(patientMarkRequest.getMakeStartDate());
         patientMarkHospQuery.setInHospitEndDate(patientMarkRequest.getMakeEndDate());
 
@@ -346,11 +355,6 @@ public class PatientMarkHospServiceFacade {
         //统计数据
         List<ReportMakeHosptail> reportMakeHosptails = patientMarkHospitalService.reportPatMarkHospByInDoctor(patientMarkHospQuery);
         patientMarkHospQuery.setBackResult(1);
-        //回院预约成功总数
-        int count = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery);
-        patientMarkHospQuery.setInHospitStatus(1);
-        //待住院提醒总数
-        int waitCount = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery);
         //列数据
         List<String> legendData = new ArrayList<>();
         List<Map<String, Object>> serData = new ArrayList<>();
-- 
1.8.3.1