Commit 3a75282a74c77f5ab4ee564681098dbecdc6d481
1 parent
5eeb1956c2
Exists in
master
and in
6 other branches
区域围产儿统计
Showing 2 changed files with 17 additions and 20 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
3a75282
| ... | ... | @@ -3598,16 +3598,7 @@ |
| 3598 | 3598 | List<String> ncParentIds = getPatientIdByPreType(hospitalId, NC, null, null); |
| 3599 | 3599 | |
| 3600 | 3600 | List<Map<String,String>> list = new ArrayList<>(); |
| 3601 | - //死胎，死产 | |
| 3602 | - //城镇 | |
| 3603 | - String czs = getNoBaby(hospitalId,CZ,dates,czParentIds); | |
| 3604 | - String ncs = getNoBaby(hospitalId,NC,dates,ncParentIds); | |
| 3605 | 3601 | |
| 3606 | - Map<String,String> map = new LinkedHashMap<>(); | |
| 3607 | - map.put("czs",czs); | |
| 3608 | - map.put("ncs", ncs); | |
| 3609 | - list.add(map); | |
| 3610 | - | |
| 3611 | 3602 | //缺陷 |
| 3612 | 3603 | String czqx = getQueXianBaby(hospitalId,dates,czParentIds); |
| 3613 | 3604 | String ncqx = getQueXianBaby(hospitalId,dates,ncParentIds); |
| 3614 | 3605 | |
| ... | ... | @@ -3617,14 +3608,24 @@ |
| 3617 | 3608 | map1.put("ncqx", ncqx); |
| 3618 | 3609 | list.add(map1); |
| 3619 | 3610 | |
| 3611 | + //死胎，死产 | |
| 3612 | + //城镇 | |
| 3613 | + String czs = getNoBaby(hospitalId, CZ, dates, czParentIds); | |
| 3614 | + String ncs = getNoBaby(hospitalId, NC, dates, ncParentIds); | |
| 3615 | + | |
| 3616 | + Map<String,String> map = new LinkedHashMap<>(); | |
| 3617 | + map.put("czs",czs); | |
| 3618 | + map.put("ncs", ncs); | |
| 3619 | + list.add(map); | |
| 3620 | + | |
| 3620 | 3621 | Map<String,String> map2 = new LinkedHashMap<>(); |
| 3621 | 3622 | map2.put("czqtsw","-"); |
| 3622 | 3623 | map2.put("ncqtsw", "-"); |
| 3623 | 3624 | list.add(map2); |
| 3624 | 3625 | |
| 3625 | 3626 | Map<String,String> map3 = new LinkedHashMap<>(); |
| 3626 | - map3.put("czqtsw", czs + czqx); | |
| 3627 | - map3.put("ncqtsw", ncs + ncqx); | |
| 3627 | + map3.put("czwchj", czs ); | |
| 3628 | + map3.put("ncwchj", ncs); | |
| 3628 | 3629 | list.add(map3); |
| 3629 | 3630 | |
| 3630 | 3631 | String czst = getTsBaby( hospitalId,dates,czParentIds,2); |
| ... | ... | @@ -3645,8 +3646,8 @@ |
| 3645 | 3646 | list.add(map5); |
| 3646 | 3647 | |
| 3647 | 3648 | Map<String,String> map6 = new LinkedHashMap<>(); |
| 3648 | - map6.put("czhj", czs+czqx+czst+czdt); | |
| 3649 | - map6.put("nchj", ncs+ncqx+ncst+ncdt); | |
| 3649 | + map6.put("czhj", String.valueOf(Integer.parseInt(czs)+Integer.parseInt(czqx)+Integer.parseInt(czst)+Integer.parseInt(czdt))); | |
| 3650 | + map6.put("nchj", String.valueOf(Integer.parseInt(ncs)+Integer.parseInt(ncqx)+Integer.parseInt(ncst)+Integer.parseInt(ncdt))); | |
| 3650 | 3651 | list.add(map6); |
| 3651 | 3652 | |
| 3652 | 3653 | return list; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
3a75282
| ... | ... | @@ -5103,14 +5103,10 @@ |
| 5103 | 5103 | MaternalDeliverModel data = datas.get(0); |
| 5104 | 5104 | |
| 5105 | 5105 | String place = ""; //1 "住院" : "其他 |
| 5106 | - if (data.getFmType() != null && "1".equals(data.getFmType())) { | |
| 5107 | - if (fmHospital.contains("妇幼")) { | |
| 5108 | - place = "妇幼保健院"; | |
| 5109 | - } else { | |
| 5110 | - place = "医院"; | |
| 5111 | - } | |
| 5106 | + if (fmHospital != null && fmHospital.contains("妇幼")) { | |
| 5107 | + place = "妇幼保健院"; | |
| 5112 | 5108 | } else { |
| 5113 | - place = "其他"; | |
| 5109 | + place = "医院"; | |
| 5114 | 5110 | } |
| 5115 | 5111 | |
| 5116 | 5112 | patientMap.put("place", place);//出生地点分类 |