Commit 763831feb7095b7b737ff14ac8613c903634da47
1 parent
7c99ab1607
Exists in
master
and in
6 other branches
儿童统计修改
Showing 2 changed files with 30 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
763831f
| ... | ... | @@ -4269,6 +4269,33 @@ |
| 4269 | 4269 | int ets3yx = (int)mongoTemplate.count(Query.query(criteria4), BabyModel.class); |
| 4270 | 4270 | result.setEts3yx(ets3yx); |
| 4271 | 4271 | |
| 4272 | + | |
| 4273 | + | |
| 4274 | + | |
| 4275 | + Criteria criteria5 = Criteria.where("hospitalId").is(hospitalId).and("baby.pregnancyOut").is("1").and("baby.babyGender").is("1"); | |
| 4276 | + if (startDate != null) | |
| 4277 | + { | |
| 4278 | + criteria5.and("dueDate1").gte(startDate).lte(endDate); | |
| 4279 | + } | |
| 4280 | + //新生儿死亡数 男 | |
| 4281 | + int xseswnan = (int)mongoTemplate.count(Query.query(criteria5), MaternalDeliverModel.class); | |
| 4282 | + result.setXseswnan(xseswnan); | |
| 4283 | + | |
| 4284 | + | |
| 4285 | + Criteria criteria6 = Criteria.where("hospitalId").is(hospitalId).and("baby.pregnancyOut").is("1").and("baby.babyGender").is("0"); | |
| 4286 | + if (startDate != null) | |
| 4287 | + { | |
| 4288 | + criteria1.and("dueDate1").gte(startDate).lte(endDate); | |
| 4289 | + } | |
| 4290 | + //新生儿死亡数 女 | |
| 4291 | + int xseswnv = (int)mongoTemplate.count(Query.query(criteria6), MaternalDeliverModel.class); | |
| 4292 | + result.setXseswnv(xseswnv); | |
| 4293 | + result.setXseswhj(xseswnan + xseswnv);//新生儿死亡数 合计 | |
| 4294 | + //婴儿死亡数 性别不明 | |
| 4295 | + result.setXseswxbm(0); | |
| 4296 | + result.setXseswlv((double)(xseswnan + xseswnv)/(hcsnan + hcsnv+xseswnan + xseswnv));//新生儿死亡率 | |
| 4297 | + | |
| 4298 | + | |
| 4272 | 4299 | result.setHospitalId(org.getId()+""); |
| 4273 | 4300 | result.setHospitalName(org.getName()); |
| 4274 | 4301 | datas.add(result); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCountResult.java
View file @
763831f
| ... | ... | @@ -46,11 +46,11 @@ |
| 46 | 46 | private double yeswlv; |
| 47 | 47 | //新生儿死亡数 合计 |
| 48 | 48 | private int xseswhj; |
| 49 | - //婴儿死亡数 男 | |
| 49 | + //新生儿死亡数 男 | |
| 50 | 50 | private int xseswnan; |
| 51 | - //婴儿死亡数 女 | |
| 51 | + //新生儿死亡数 女 | |
| 52 | 52 | private int xseswnv; |
| 53 | - //婴儿死亡数 性别不明 | |
| 53 | + //新生儿死亡数 性别不明 | |
| 54 | 54 | private int xseswxbm; |
| 55 | 55 | //新生儿死亡率 |
| 56 | 56 | private double xseswlv; |