From 8df0e5c0bb76bbfe0fc89e6a433f201ff544fd62 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 6 Jul 2016 18:15:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/request/MatDeliverAddRequest.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
index 4c72c73..6323634 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
@@ -451,13 +451,18 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
             babyModel.setYn(YnEnums.YES.getId());
             babyModel.setVisitstatus(VisitStatusEnums.UNVISIT.getId());
             babyModel.setAsphyxiaM(asphyxiaM);
-            babyModel.setSex(Integer.valueOf(babyGender));
+            if(null!=babyGender){
+                babyModel.setSex(Integer.valueOf(babyGender));
+            }
+            if(null!=apgarScore){
+                babyModel.setApgarScore(JsonUtil.obj2JsonString(apgarScore));
+            }
             babyModel.setModified(new Date());
             babyModel.setBabyHealthy(babyHealthy);
             babyModel.setBabyWeight(babyWeight);
             babyModel.setBabyHeight(babyHeight);
             babyModel.setMalformation(deformity);
-            babyModel.setApgarScore(JsonUtil.obj2JsonString(apgarScore));
+
             babyModel.setPregnancyOut(pregnancyOut);
             babyModel.setContactM(contactM);
             babyModel.setContactStartM(contactStartM);
-- 
1.8.3.1