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 2d305e8..0f7861c 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 @@ -506,7 +506,7 @@ public class PatientFacade { patientsQuery.setFmDateStart(DateUtil.parseYMD(dates[0])); if (dates.length == 2) { - patientsQuery.setFmDateEnd(DateUtil.parseYMDHMS(dates[1]+" 23:59:59")); + patientsQuery.setFmDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); } } @@ -520,7 +520,7 @@ public class PatientFacade { if (riskPatientsQueryRequest.getFmWeekEnd() != null) { int end = org.apache.commons.lang.math.NumberUtils.toInt(riskPatientsQueryRequest.getFmWeekEnd(), 0)+1; - end = 7; + end = end * 7; patientsQuery.setFmWeekEnd(end); }