From 4acc7f6216ffe77baed5b6afb1949af9d8584986 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 15 Sep 2021 09:59:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E7=BB=9F=E8=AE=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BabyCheckFacade.java | 56 ++++++++++++++++------ 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 7e3ed4f..db291cf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -4386,42 +4386,56 @@ public class BabyCheckFacade extends BaseServiceImpl { } int baby42 = getCheckMonthCount(hospitalId, startDate, endDate, 0,2); - datas.add(getMap(baby42, allBaby)); + int babyrc42 = getCheckMonthCountrc(hospitalId, startDate, endDate, 0, 2); + datas.add(getMap(baby42,babyrc42, allBaby)); int baby3 = getCheckMonthCount(hospitalId, startDate, endDate, 3,4); - datas.add(getMap(baby3, allBaby)); + int babyrc3 = getCheckMonthCountrc(hospitalId, startDate, endDate, 3, 4); + datas.add(getMap(baby3,babyrc3, allBaby)); int baby6 = getCheckMonthCount(hospitalId, startDate, endDate, 5,6); - datas.add(getMap(baby6, allBaby)); + int babyrc6 = getCheckMonthCountrc(hospitalId, startDate, endDate, 5, 6); + datas.add(getMap(baby6, babyrc6,allBaby)); int baby8 = getCheckMonthCount(hospitalId, startDate, endDate, 7,9); - datas.add(getMap(baby8,allBaby)); + int babyrc8 = getCheckMonthCountrc(hospitalId, startDate, endDate, 7, 9); + datas.add(getMap(baby8,babyrc8,allBaby)); int baby12 = getCheckMonthCount(hospitalId, startDate, endDate, 10,14); - datas.add(getMap(baby12, allBaby)); + int babyrc12 = getCheckMonthCountrc(hospitalId, startDate, endDate, 10, 14); + datas.add(getMap(baby12,babyrc12, allBaby)); int baby18 = getCheckMonthCount(hospitalId, startDate, endDate, 15,20); - datas.add(getMap(baby18, allBaby)); + int babyrc18 = getCheckMonthCountrc(hospitalId, startDate, endDate, 15, 20); + datas.add(getMap(baby18,babyrc18, allBaby)); int baby24 = getCheckMonthCount(hospitalId, startDate, endDate, 21,28); - datas.add(getMap(baby24, allBaby)); + int babyrc24 = getCheckMonthCountrc(hospitalId, startDate, endDate, 21, 28); + datas.add(getMap(baby24,babyrc24, allBaby)); int baby30 = getCheckMonthCount(hospitalId, startDate, endDate, 29,34); - datas.add(getMap(baby30, allBaby)); + int babyrc30 = getCheckMonthCountrc(hospitalId, startDate, endDate, 29, 34); + datas.add(getMap(baby30,babyrc30, allBaby)); int baby36 = getCheckMonthCount(hospitalId, startDate, endDate, 35,38); - datas.add(getMap(baby36, allBaby)); + int babyrc36 = getCheckMonthCountrc(hospitalId, startDate, endDate, 35, 38); + datas.add(getMap(baby36,babyrc36, allBaby)); int baby40 = getCheckMonthCount(hospitalId, startDate, endDate, 39,48); - datas.add(getMap(baby40, allBaby)); + int babyrc40 = getCheckMonthCountrc(hospitalId, startDate, endDate, 39, 48); + datas.add(getMap(baby40,babyrc40, allBaby)); int baby50 = getCheckMonthCount(hospitalId, startDate, endDate, 49,65); - datas.add(getMap(baby50, allBaby)); + int babyrc50 = getCheckMonthCountrc(hospitalId, startDate, endDate, 49, 65); + datas.add(getMap(baby50,babyrc50, allBaby)); int baby60 = getCheckMonthCount(hospitalId, startDate, endDate, 66,1000); - datas.add(getMap(baby60, allBaby)); + int babyrc60 = getCheckMonthCountrc(hospitalId, startDate, endDate, 66, 1000); + datas.add(getMap(baby60,babyrc60, allBaby)); - datas.add(getMap(baby42+baby3+baby6+baby8+baby12+baby18+baby24+baby30+baby36+baby40+baby50+baby60, allBaby)); + datas.add(getMap(baby42+baby3+baby6+baby8+baby12+baby18+baby24+baby30+baby36+baby40+baby50+baby60, + babyrc42+babyrc3+babyrc6+babyrc8+babyrc12+babyrc18+babyrc24+babyrc30+babyrc36+babyrc40+babyrc50+babyrc60, allBaby)); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setData(datas).setErrormsg("成功"); } - private Map getMap(int num,int total) + private Map getMap(int num,int rc,int total) { Map data4 = new LinkedHashMap(); data4.put("num",num); + data4.put("rc",rc); data4.put("total",total); data4.put("percent",getPercent(num,total)); return data4; @@ -4449,9 +4463,21 @@ public class BabyCheckFacade extends BaseServiceImpl { return outputTypeCount4.getMappedResults().size(); } + + private int getCheckMonthCountrc(String hospitalId, Date start, Date end,Integer startMonth,Integer endMonth) { + + Criteria ca = Criteria.where("hospitalId").is(hospitalId).and("checkDate").gte(start).lte(end).and("yn").is(YnEnums.YES.getId()); + if (startMonth != null) + { + ca.and("checkMonth").gte(startMonth).lte(endMonth); + } + + return (int)mongoTemplate.count(Query.query(ca),BabyCheckModel.class); + } + private int getCheckMonthCount(String hospitalId, Date start, Date end,Integer startMonth,Integer endMonth) { - Criteria ca = Criteria.where("hospitalId").is(hospitalId).and("checkDate").gte(start).lte(end); + Criteria ca = Criteria.where("hospitalId").is(hospitalId).and("checkDate").gte(start).lte(end).and("yn").is(YnEnums.YES.getId()); if (startMonth != null) { ca.and("checkMonth").gte(startMonth).lte(endMonth); -- 1.8.3.1