Commit cbcd40ca249d77fba8861718682888ccc0b7ad7b
1 parent
10603d30ee
Exists in
master
and in
6 other branches
还原
Showing 1 changed file with 7 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
cbcd40c
... | ... | @@ -990,14 +990,20 @@ |
990 | 990 | PatientManagerResult patientManagerResult = new PatientManagerResult(); |
991 | 991 | |
992 | 992 | PatientsQuery patientsQuery = new PatientsQuery(); |
993 | + if (patientManagerRequest.getBuildWeekStart() != null) { | |
994 | + patientsQuery.setBuildDaysStart(patientManagerRequest.getBuildWeekStart() * 7); | |
995 | + } | |
993 | 996 | |
994 | 997 | if (patientManagerRequest.getBuildWeekEnd() != null) { |
998 | + patientsQuery.setBuildDaysEnd((patientManagerRequest.getBuildWeekEnd() + 1) * 7 - 1); | |
999 | + } | |
1000 | + /* if (patientManagerRequest.getBuildWeekEnd() != null) { | |
995 | 1001 | patientsQuery.setBookbuildingDateStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(patientManagerRequest.getBuildWeekEnd() * 7) - 6)); |
996 | 1002 | } |
997 | 1003 | |
998 | 1004 | if (patientManagerRequest.getBuildWeekStart() != null) { |
999 | 1005 | patientsQuery.setBookbuildingDateEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(patientManagerRequest.getBuildWeekStart() * 7))); |
1000 | - } | |
1006 | + }*/ | |
1001 | 1007 | |
1002 | 1008 | patientsQuery.setYn(YnEnums.YES.getId()); |
1003 | 1009 | if (!patientManagerRequest.isExcel()) { |