From 07cade676be0e21a1285c59eff0a9d132b2590aa Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 17 May 2016 17:09:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/result/BabyVisitResult.java        | 42 ++++++++++++++++------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java
index f81907e..c2d056e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java
@@ -743,18 +743,38 @@ public class BabyVisitResult implements IBasicResultConvert<BabyVisitResult, Pue
             setNeonatalAsphyxia(destModel.getNeonatalAsphyxia());
             setDeformity(JsonUtil.str2Obj(destModel.getDeformity(), Map.class));
             setDays(destModel.getDays());
-            setHearing(destModel.getHearing());
+            if(null!=destModel.getHearing()){
+                setHearing(destModel.getHearing());
+            }
             setDisease(JsonUtil.str2Obj(destModel.getDisease(), Map.class));
-            setBirthWeight(destModel.getBirthWeight());
-            setWeight(destModel.getWeight());
-            setHeight(destModel.getHeight());
-            setFeedType(destModel.getFeedType());
-            setEatMilk(destModel.getEatMilk());
-            setEatTime(destModel.getEatTime());
-            setEmesis(destModel.getEmesis());
+            if(null!=destModel.getBirthWeight()){
+                setBirthWeight(destModel.getBirthWeight());
+            }
+            if(null!=destModel.getWeight()) {
+                setWeight(destModel.getWeight());
+            }
+            if(null!=destModel.getHeight()) {
+                setHeight(destModel.getHeight());
+            }
+            if(null!=destModel.getFeedType()) {
+                setFeedType(destModel.getFeedType());
+            }
+            if(null!=destModel.getEatTime()){
+                setEatTime(destModel.getEatTime());
+            }
+            if(null!=destModel.getEatMilk()){
+                setEatMilk(destModel.getEatMilk());
+            }
+            if(null!=destModel.getEmesis()){
+                setEmesis(destModel.getEmesis());
+            }
             setEarAppearance(JsonUtil.str2Obj(destModel.getEarAppearance(), Map.class));
-            setShit(destModel.getShit());
-            setShitTimes(destModel.getShitTimes());
+            if(null!=destModel.getShit()) {
+                setShit(destModel.getShit());
+            }
+            if(null!=destModel.getShitTimes()){
+                setShitTimes(destModel.getShitTimes());
+            }
             setSkin(JsonUtil.str2Obj(destModel.getSkin(), Map.class));
             setNose(JsonUtil.str2Obj(destModel.getNose(), Map.class));
             setNextVisitAddr(destModel.getNextVisitAddr());
@@ -787,6 +807,8 @@ public class BabyVisitResult implements IBasicResultConvert<BabyVisitResult, Pue
         }
     }
 
+
+
     @Override
     public BabyVisitResult convertToResult(PuerperaModel destModel) {
         setAge(destModel.getAge());
-- 
1.8.3.1