diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 31a5469..14a5ed2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -990,14 +990,20 @@ public class PatientFacade { PatientManagerResult patientManagerResult = new PatientManagerResult(); PatientsQuery patientsQuery = new PatientsQuery(); + if (patientManagerRequest.getBuildWeekStart() != null) { + patientsQuery.setBuildDaysStart(patientManagerRequest.getBuildWeekStart() * 7); + } if (patientManagerRequest.getBuildWeekEnd() != null) { + patientsQuery.setBuildDaysEnd((patientManagerRequest.getBuildWeekEnd() + 1) * 7 - 1); + } + /* if (patientManagerRequest.getBuildWeekEnd() != null) { patientsQuery.setBookbuildingDateStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(patientManagerRequest.getBuildWeekEnd() * 7) - 6)); } if (patientManagerRequest.getBuildWeekStart() != null) { patientsQuery.setBookbuildingDateEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(patientManagerRequest.getBuildWeekStart() * 7))); - } + }*/ patientsQuery.setYn(YnEnums.YES.getId()); if (!patientManagerRequest.isExcel()) {