From 3f3b73a312013b544cb11709dd326bd83496630b Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 6 Jul 2016 17:33:02 +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

---
 .../operate/web/result/AntenatalExaminationResult.java      | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
index 2e0bae3..40db5c7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
@@ -68,13 +68,13 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     //产检日期
     private String checkDate;
     //下次产检日期
-    private String nextCheckTime;
+    private Map nextCheckTime;
 
-    public String getNextCheckTime() {
+    public Map getNextCheckTime() {
         return nextCheckTime;
     }
 
-    public void setNextCheckTime(String nextCheckTime) {
+    public void setNextCheckTime(Map nextCheckTime) {
         this.nextCheckTime = nextCheckTime;
     }
 
@@ -82,7 +82,7 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
         setEdema(destModel.getEdema());
         setParentId(destModel.getParentId());
-        setNextCheckTime(destModel.getNextCheckTime());
+
         setUrineProtein(destModel.getUrineProtein());
         setTreatmentOpinion(destModel.getTreatmentOpinion());
 
@@ -93,6 +93,11 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
             setBp(JsonUtil.str2Obj(destModel.getBp(), java.util.Map.class));
         } catch (Exception e) {
         }
+        try {
+            setNextCheckTime(JsonUtil.str2Obj(destModel.getNextCheckTime(),Map.class));
+        }catch (Exception e){
+        }
+
         setChiefComplaint(destModel.getChiefComplaint());
         setCheckDate(destModel.getCheckDate());
         setCheckDoctor(destModel.getCheckDoctor());
-- 
1.8.3.1