From 763831feb7095b7b737ff14ac8613c903634da47 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 7 Sep 2021 17:46:48 +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 | 27 ++++++++++++++++++++++ .../operate/web/result/BabyCountResult.java | 6 ++--- 2 files changed, 30 insertions(+), 3 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 5847008..8abacac 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 @@ -4269,6 +4269,33 @@ public class BabyCheckFacade extends BaseServiceImpl { int ets3yx = (int)mongoTemplate.count(Query.query(criteria4), BabyModel.class); result.setEts3yx(ets3yx); + + + + Criteria criteria5 = Criteria.where("hospitalId").is(hospitalId).and("baby.pregnancyOut").is("1").and("baby.babyGender").is("1"); + if (startDate != null) + { + criteria5.and("dueDate1").gte(startDate).lte(endDate); + } + //新生儿死亡数 男 + int xseswnan = (int)mongoTemplate.count(Query.query(criteria5), MaternalDeliverModel.class); + result.setXseswnan(xseswnan); + + + Criteria criteria6 = Criteria.where("hospitalId").is(hospitalId).and("baby.pregnancyOut").is("1").and("baby.babyGender").is("0"); + if (startDate != null) + { + criteria1.and("dueDate1").gte(startDate).lte(endDate); + } + //新生儿死亡数 女 + int xseswnv = (int)mongoTemplate.count(Query.query(criteria6), MaternalDeliverModel.class); + result.setXseswnv(xseswnv); + result.setXseswhj(xseswnan + xseswnv);//新生儿死亡数 合计 + //婴儿死亡数 性别不明 + result.setXseswxbm(0); + result.setXseswlv((double)(xseswnan + xseswnv)/(hcsnan + hcsnv+xseswnan + xseswnv));//新生儿死亡率 + + result.setHospitalId(org.getId()+""); result.setHospitalName(org.getName()); datas.add(result); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCountResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCountResult.java index a403f11..762adb6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCountResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCountResult.java @@ -46,11 +46,11 @@ public class BabyCountResult { private double yeswlv; //新生儿死亡数 合计 private int xseswhj; - //婴儿死亡数 男 + //新生儿死亡数 男 private int xseswnan; - //婴儿死亡数 女 + //新生儿死亡数 女 private int xseswnv; - //婴儿死亡数 性别不明 + //新生儿死亡数 性别不明 private int xseswxbm; //新生儿死亡率 private double xseswlv; -- 1.8.3.1