From 0f8d8c58c2fe9aac1a80291e5675c36fbf7240d6 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 23 Jun 2016 13:17:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/result/AntenatalExaminationResult.java     | 39 +++++++++++++---------
 1 file changed, 24 insertions(+), 15 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 0085e68..5a0e396 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
@@ -3,7 +3,6 @@ package com.lyms.platform.operate.web.result;
 import com.lyms.platform.common.base.IBasicResultConvert;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.pojo.AntenatalExaminationModel;
-import com.lyms.platform.pojo.PuerperaModel;
 
 import java.util.List;
 import java.util.Map;
@@ -13,7 +12,7 @@ import java.util.Map;
  * <p>
  * Created by Administrator on 2016/6/15 0015.
  */
-public class AntenatalExaminationResult  implements IBasicResultConvert<AntenatalExaminationResult, AntenatalExaminationModel> {
+public class AntenatalExaminationResult implements IBasicResultConvert<AntenatalExaminationResult, AntenatalExaminationModel> {
 
     private String id;
 
@@ -25,7 +24,7 @@ public class AntenatalExaminationResult  implements IBasicResultConvert<Antenata
     //重量
     private Double weight;
     //血压
-    private String bp;
+    private java.util.Map bp;
     //宫高
     private String gongGao;
     //腹围
@@ -53,7 +52,7 @@ public class AntenatalExaminationResult  implements IBasicResultConvert<Antenata
     //  高危评分
     private String riskScore;
     //其他高危
-    private String otherRisk;
+    private Map otherRisk;
     //诊断
     private String diagnosis;
     //分类
@@ -79,7 +78,12 @@ public class AntenatalExaminationResult  implements IBasicResultConvert<Antenata
         setAbdominalCircumference(destModel.getAbdominalCircumference());
         setbChao(destModel.getbChao());
         setBloodSugar(destModel.getBloodSugar());
-        setBp(destModel.getBp());
+        try {
+
+            setBp(JsonUtil.str2Obj(destModel.getBp(), java.util.Map.class));
+        } catch (Exception e) {
+            
+        }
         setChiefComplaint(destModel.getChiefComplaint());
         setCheckDate(destModel.getCheckDate());
         setCheckDoctor(destModel.getCheckDoctor());
@@ -87,13 +91,25 @@ public class AntenatalExaminationResult  implements IBasicResultConvert<Antenata
         setGuide(destModel.getGuide());
         setHemoglobin(destModel.getHemoglobin());
         setId(destModel.getId());
-        setOtherRisk(destModel.getOtherRisk());
+        try {
+            setOtherRisk(JsonUtil.str2Obj(destModel.getOtherRisk(), Map.class));
+        } catch (Exception e) {
+        }
+
         setTireNumber(destModel.getTireNumber());
         setTireData(destModel.getTireData());
         setType(destModel.getType());
         return this;
     }
 
+    public Map getBp() {
+        return bp;
+    }
+
+    public void setBp(Map bp) {
+        this.bp = bp;
+    }
+
     public String getAbdominalCircumference() {
         return abdominalCircumference;
     }
@@ -118,13 +134,6 @@ public class AntenatalExaminationResult  implements IBasicResultConvert<Antenata
         this.bloodSugar = bloodSugar;
     }
 
-    public String getBp() {
-        return bp;
-    }
-
-    public void setBp(String bp) {
-        this.bp = bp;
-    }
 
     public String getCheckDate() {
         return checkDate;
@@ -214,11 +223,11 @@ public class AntenatalExaminationResult  implements IBasicResultConvert<Antenata
         this.nextCheckDate = nextCheckDate;
     }
 
-    public String getOtherRisk() {
+    public Map getOtherRisk() {
         return otherRisk;
     }
 
-    public void setOtherRisk(String otherRisk) {
+    public void setOtherRisk(Map otherRisk) {
         this.otherRisk = otherRisk;
     }
 
-- 
1.8.3.1