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 5f95fe1..31a5469 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 @@ -991,12 +991,12 @@ public class PatientFacade { PatientsQuery patientsQuery = new PatientsQuery(); - if (patientManagerRequest.getBuildWeekStart() != null) { - patientsQuery.setBuildDaysStart(patientManagerRequest.getBuildWeekStart() * 7); + if (patientManagerRequest.getBuildWeekEnd() != null) { + patientsQuery.setBookbuildingDateStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(patientManagerRequest.getBuildWeekEnd() * 7) - 6)); } - if (patientManagerRequest.getBuildWeekEnd() != null) { - patientsQuery.setBuildDaysEnd((patientManagerRequest.getBuildWeekEnd() + 1) * 7 - 1); + if (patientManagerRequest.getBuildWeekStart() != null) { + patientsQuery.setBookbuildingDateEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(patientManagerRequest.getBuildWeekStart() * 7))); } patientsQuery.setYn(YnEnums.YES.getId());