diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index 4ad5942..ee4be76 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -357,6 +357,11 @@ public class MatDeliverController extends BaseController{ map.put("cc",antExChuModel.getProdTime() == null ? "" : antExChuModel.getProdTime()); } + else + { + map.put("yc",""); + map.put("cc",""); + } map.put("week",queryModel.getDueWeek()); HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); //妊娠期高危因素 @@ -382,11 +387,11 @@ public class MatDeliverController extends BaseController{ map.put("deliveryMode2", ""); map.put("deliveryMode3", reslult2); map.put("deliveryMode4",""); - map.put("thloseBloodL",queryModel.getThloseBloodL()); + map.put("thloseBloodL",queryModel.getThloseBloodL() == null ? "" : queryModel.getThloseBloodL()); map.put("sex",queryModel.getSex()); map.put("height",queryModel.getBabyHeight()); map.put("weight",queryModel.getBabyWeight()); - map.put("malformation",queryModel.getMalformation()); + map.put("malformation",queryModel.getMalformation() == null ? "" : queryModel.getMalformation()); //queryModel.getTireNumber()-queryModel.getLivingNumber() map.put("sc","-");//死产 map.put("jzsx","-");//皮肤接触及早吸吮≥30分钟