diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index 8f3a931..c9e652b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -768,15 +768,15 @@ public class RiskReportFacade { int e = 0; if (countRequest.getAgeRange() == 1) { s = 0; - e = 20; + e = 21; } else if (countRequest.getAgeRange() == 2) { - s = 21; - e = 30; + s = 22; + e = 31; } else if (countRequest.getAgeRange() == 3) { - s = 31; - e = 40; + s = 32; + e = 41; } else if (countRequest.getAgeRange() == 4) { - s = 41; + s = 42; e = 100; } @@ -785,7 +785,7 @@ public class RiskReportFacade { System.out.println(DateUtil.getyyyy_MM_dd(start)); Date end = DateUtil.addYear(currentDate, -e); patientsQuery.setBirthStart(DateUtil.addDay(end,1)); - System.out.println(DateUtil.getyyyy_MM_dd(end)); + System.out.println(DateUtil.getyyyy_MM_dd(DateUtil.addDay(end,1))); }