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 patientses = setPatientIds(patientMarkRequest, patientsQuery, hospitalId); if (CollectionUtils.isNotEmpty(patientses)) { @@ -78,8 +81,7 @@ public class PatientMarkHospServiceFacade { //统计数据 List 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 reportMakeHosptails = patientMarkHospitalService.reportPatMarkHospByInDoctor(patientMarkHospQuery); patientMarkHospQuery.setBackResult(1); - //回院预约成功总数 - int count = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery); - patientMarkHospQuery.setInHospitStatus(1); - //待住院提醒总数 - int waitCount = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery); //列数据 List legendData = new ArrayList<>(); List> serData = new ArrayList<>();