jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ea75f64c012910aceae7f8ee282b4f67f58bc4bc

Authored by yangfei
1 parent d403939533
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

住院统计总数据不受查询条件影响

Showing 1 changed file with 15 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java View file @ ea75f64
... ... @@ -59,11 +59,14 @@
59 59 */
60 60 public BaseResponse reportHospit(PatientMarkRequest patientMarkRequest, Integer id) {
61 61 PatientMarkHospitalQuery query = new PatientMarkHospitalQuery();
62   - query.setMakeStartDate(patientMarkRequest.getMakeStartDate());
63   - query.setMakeEndDate(patientMarkRequest.getMakeEndDate());
64 62 //根据用户id获取医院ID
65 63 String hospitalId = autoMatchFacade.getHospitalId(id);
66 64 query.setHospitalId(hospitalId);
  65 + //总数据
  66 + int count = patientMarkHospitalService.queryPatientMarkHospitalCount(query);
  67 + query.setMakeStartDate(patientMarkRequest.getMakeStartDate());
  68 + query.setMakeEndDate(patientMarkRequest.getMakeEndDate());
  69 +
67 70 PatientsQuery patientsQuery = new PatientsQuery();
68 71 List<Patients> patientses = setPatientIds(patientMarkRequest, patientsQuery, hospitalId);
69 72 if (CollectionUtils.isNotEmpty(patientses)) {
70 73  
... ... @@ -78,10 +81,9 @@
78 81  
79 82 //统计数据
80 83 List<ReportMakeHosptail> reportMakeHosptails = patientMarkHospitalService.reportPatMarkHospByMakeDoctor(query);
81   - //总数据
82   - int count = patientMarkHospitalService.queryPatientMarkHospitalCount(query);
83 84  
84 85  
  86 +
85 87 //列数据
86 88 List<String> legendData = new ArrayList<>();
87 89 List<Map<String, Object>> serData = new ArrayList<>();
88 90  
89 91  
... ... @@ -179,15 +181,16 @@
179 181 public BaseResponse reportBackHospit(PatientMarkRequest patientMarkRequest, Integer id) {
180 182 //根据用户id获取医院ID
181 183 String hospitalId = autoMatchFacade.getHospitalId(id);
182   - PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery();
183 184  
  185 + PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery();
  186 + patientMarkHospQuery.setHospitalId(hospitalId);
184 187 //住院预约总数
185 188 int count = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery);
186 189 patientMarkHospQuery.setBackStatus(1);
187 190 //回院待提醒数
188 191 int waitCount = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery);
189 192  
190   - patientMarkHospQuery.setHospitalId(hospitalId);
  193 +
191 194 patientMarkHospQuery.setBackStartDate(patientMarkRequest.getMakeStartDate());
192 195 patientMarkHospQuery.setBackEndDate(patientMarkRequest.getMakeEndDate());
193 196 PatientsQuery patientsQuery = new PatientsQuery();
... ... @@ -328,6 +331,12 @@
328 331 String hospitalId = autoMatchFacade.getHospitalId(id);
329 332 PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery();
330 333 patientMarkHospQuery.setHospitalId(hospitalId);
  334 + //回院预约成功总数
  335 + int count = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery);
  336 + patientMarkHospQuery.setInHospitStatus(1);
  337 + //待住院提醒总数
  338 + int waitCount = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery);
  339 +
331 340 patientMarkHospQuery.setInHospitStartDate(patientMarkRequest.getMakeStartDate());
332 341 patientMarkHospQuery.setInHospitEndDate(patientMarkRequest.getMakeEndDate());
333 342  
... ... @@ -346,11 +355,6 @@
346 355 //统计数据
347 356 List<ReportMakeHosptail> reportMakeHosptails = patientMarkHospitalService.reportPatMarkHospByInDoctor(patientMarkHospQuery);
348 357 patientMarkHospQuery.setBackResult(1);
349   - //回院预约成功总数
350   - int count = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery);
351   - patientMarkHospQuery.setInHospitStatus(1);
352   - //待住院提醒总数
353   - int waitCount = patientMarkHospitalService.queryPatientMarkHospitalCount(patientMarkHospQuery);
354 358 //列数据
355 359 List<String> legendData = new ArrayList<>();
356 360 List<Map<String, Object>> serData = new ArrayList<>();