From 3c56cf65bb537661fca3cc7d4bfa37b42c9e81a5 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 2 Feb 2018 17:39:23 +0800 Subject: [PATCH] 1 --- .../operate/web/facade/RiskReportFacade.java | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) 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 c9e652b..6c5023f 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 @@ -766,26 +766,31 @@ public class RiskReportFacade { if (countRequest.getAgeRange() != null && countRequest.getAgeRange() != 0) { int s = 0; int e = 0; + int d=0; if (countRequest.getAgeRange() == 1) { s = 0; e = 21; + d=1; } else if (countRequest.getAgeRange() == 2) { - s = 22; - e = 31; + s = 21; + e = 30; + d=0; } else if (countRequest.getAgeRange() == 3) { - s = 32; + s = 30; e = 41; + d=1; } else if (countRequest.getAgeRange() == 4) { - s = 42; + s = 41; e = 100; + d=0; } Date start = DateUtil.addYear(currentDate, -s); - patientsQuery.setBirthEnd(start); - System.out.println(DateUtil.getyyyy_MM_dd(start)); + patientsQuery.setBirthEnd(DateUtil.addDay(start,d)); + System.out.println(DateUtil.getyyyy_MM_dd(DateUtil.addDay(start,d))); Date end = DateUtil.addYear(currentDate, -e); - patientsQuery.setBirthStart(DateUtil.addDay(end,1)); - System.out.println(DateUtil.getyyyy_MM_dd(DateUtil.addDay(end,1))); + patientsQuery.setBirthStart(DateUtil.addDay(end,d)); + System.out.println(DateUtil.getyyyy_MM_dd(DateUtil.addDay(end,d))); } -- 1.8.3.1