diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index cc26811..fc7a670 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -3598,15 +3598,6 @@ public class BabyBookbuildingFacade { List ncParentIds = getPatientIdByPreType(hospitalId, NC, null, null); List> list = new ArrayList<>(); - //死胎,死产 - //城镇 - String czs = getNoBaby(hospitalId,CZ,dates,czParentIds); - String ncs = getNoBaby(hospitalId,NC,dates,ncParentIds); - - Map map = new LinkedHashMap<>(); - map.put("czs",czs); - map.put("ncs", ncs); - list.add(map); //缺陷 String czqx = getQueXianBaby(hospitalId,dates,czParentIds); @@ -3617,14 +3608,24 @@ public class BabyBookbuildingFacade { map1.put("ncqx", ncqx); list.add(map1); + //死胎,死产 + //城镇 + String czs = getNoBaby(hospitalId, CZ, dates, czParentIds); + String ncs = getNoBaby(hospitalId, NC, dates, ncParentIds); + + Map map = new LinkedHashMap<>(); + map.put("czs",czs); + map.put("ncs", ncs); + list.add(map); + Map map2 = new LinkedHashMap<>(); map2.put("czqtsw","-"); map2.put("ncqtsw", "-"); list.add(map2); Map map3 = new LinkedHashMap<>(); - map3.put("czqtsw", czs + czqx); - map3.put("ncqtsw", ncs + ncqx); + map3.put("czwchj", czs ); + map3.put("ncwchj", ncs); list.add(map3); String czst = getTsBaby( hospitalId,dates,czParentIds,2); @@ -3645,8 +3646,8 @@ public class BabyBookbuildingFacade { list.add(map5); Map map6 = new LinkedHashMap<>(); - map6.put("czhj", czs+czqx+czst+czdt); - map6.put("nchj", ncs+ncqx+ncst+ncdt); + map6.put("czhj", String.valueOf(Integer.parseInt(czs)+Integer.parseInt(czqx)+Integer.parseInt(czst)+Integer.parseInt(czdt))); + map6.put("nchj", String.valueOf(Integer.parseInt(ncs)+Integer.parseInt(ncqx)+Integer.parseInt(ncst)+Integer.parseInt(ncdt))); list.add(map6); return list; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 7fafb65..3356b10 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -5103,14 +5103,10 @@ public class ViewFacade { MaternalDeliverModel data = datas.get(0); String place = ""; //1 "住院" : "其他 - if (data.getFmType() != null && "1".equals(data.getFmType())) { - if (fmHospital.contains("妇幼")) { - place = "妇幼保健院"; - } else { - place = "医院"; - } + if (fmHospital != null && fmHospital.contains("妇幼")) { + place = "妇幼保健院"; } else { - place = "其他"; + place = "医院"; } patientMap.put("place", place);//出生地点分类