From 9fcb82f5b8c194dabc5274347fc11b08ace54e0f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 29 May 2018 17:16:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java | 6 ++++-- .../com/lyms/platform/operate/web/result/MaternalDeliverResult.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java index 5184e1c..8520340 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java @@ -1057,7 +1057,7 @@ public class QhdfyFmService { // if(baby_Asphyxiam!=null){ // baby.setAsphyxiaM(baby_Asphyxiam); //窒息分钟 // } -// baby.setDeformity((fmItem.getJx()==null?0:1)); //畸形 0非畸形 1畸形 +// //baby.setDeformity((fmItem.getJx()==null?0:1)); //畸形 0非畸形 1畸形 // // String baby_Pregnancy_Out = fmItem.getCcqk(); // if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){ @@ -1111,10 +1111,12 @@ public class QhdfyFmService { fmItem1.setFmfs("剖宫产"); fmItem1.setTpmcfs("自然产出"); fmItem1.setYeqk("正常"); + fmItem1.setJx("无"); duoTaiList.add(fmItem1); FmItem fmItem2 = new FmItem(); + fmItem2.setJx("无"); fmItem2.setSyxh("10019988"); fmItem2.setJlrq("2017011217:52:00"); fmItem2.setSsj("2"); @@ -1241,7 +1243,7 @@ public class QhdfyFmService { if(baby_Asphyxiam!=null){ baby.setAsphyxiaM(baby_Asphyxiam); //窒息分钟 } - baby.setDeformity((fmItem.getJx()==null?0:1)); //畸形 0非畸形 1畸形 + //baby.setDeformity((fmItem.getJx()==null?0:1)); //畸形 0非畸形 1畸形 String baby_Pregnancy_Out = fmItem.getCcqk(); if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java index 6b39d5c..d8140da 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java @@ -124,7 +124,7 @@ public class MaternalDeliverResult { setDeliveryMode(JsonUtil.jkstr2Obj(destModel.getDeliveryMode(), Map.class)); setOperationCause(destModel.getOperationCause()); - setProdprocess(JsonUtil.jkstr2Obj(destModel.getProdprocess(), Map.class)); + setProdprocess(destModel.getProdprocess() == null ? null : JsonUtil.jkstr2Obj(destModel.getProdprocess(), Map.class)); setTotalprocess(JsonUtil.jkstr2Obj(destModel.getTotalprocess(), Map.class)); setPerinealCondition(destModel.getPerinealCondition()); setSiLielevel(destModel.getSiLielevel()); -- 1.8.3.1