From 4e3950d3ecbe52ff4385da9a605097f1792432e6 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Tue, 2 Jan 2024 16:59:58 +0800 Subject: [PATCH] =?UTF-8?q?#=E4=BC=98=E5=8C=96=E5=90=AC=E8=AF=BE=E7=8E=87?= =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E4=BA=BA=E6=95=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/CourseFacade.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java index 09368a2..98a3ce6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java @@ -649,19 +649,28 @@ public class CourseFacade { patientsQuery.setBookbuildingDateEnd(DateUtil.parseYMDHMS(endTime + " 23:59:59")); } } - + //时间范围的建档人数 + List patientsList = patientsService.queryPatient(patientsQuery); + //签到数 int signsNum=0; List singsList= patientCourseService.queryPatientCourseList(patientCourseQuery); - if (singsList!=null&&singsList.size()>0){ + if (singsList!=null&&singsList.size()>0&&patientsList!=null&&patientsList.size()>0){ Iterator patientCourseIterator = singsList.iterator(); HashMap params=new HashMap<>(); while (patientCourseIterator.hasNext()) { PatientCourseModel patientCourse = patientCourseIterator.next(); - params.put(patientCourse.getCardNo(),patientCourse); + params.put(patientCourse.getPatientId(),patientCourse); + } + for (int i = 0,j=patientsList.size(); i < j; i++) { + Patients patients= patientsList.get(i); + PatientCourseModel patientCourseModel= params.get(patients.getId()); + if (patientCourseModel!=null){ + signsNum+=1; + } } - signsNum=params.size(); + } - List patientsList = patientsService.queryPatient(patientsQuery); + totalData.put("lessonsRate",patientsList!=null ? signsNum+","+patientsList.size(): "0");//听课率 } -- 1.8.3.1