From 0accf425b767954723f5078c4b6d508953380ebd Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 18 Jul 2016 14:19:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/pojo/AntExChuModel.java |  9 +++++++++
 .../lyms/platform/operate/web/request/AntExcAddRequest.java | 13 +++++++++++++
 .../lyms/platform/operate/web/result/AntexChuResult.java    | 13 +++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
index 793abe6..f6ca0c0 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
@@ -87,6 +87,15 @@ public class AntExChuModel implements Serializable {
     private String fujian;
     private Date created;
     private String hospitalId;
+    private String bp;
+
+    public String getBp() {
+        return bp;
+    }
+
+    public void setBp(String bp) {
+        this.bp = bp;
+    }
 
     public String getcDueWeek() {
         return cDueWeek;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
index ef653ed..b49e183 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
@@ -93,6 +93,8 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
     private String fuwei;
     //胎数
     private String tireNumber1;
+    //血压
+    private Map bp;
 
     private List<MatDeliverAddRequest.Placenta> placentas;
     /*//心率
@@ -186,6 +188,14 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
     //实验结果
     private String syjg;
 
+    public Map getBp() {
+        return bp;
+    }
+
+    public void setBp(Map bp) {
+        this.bp = bp;
+    }
+
     public String getAbo() {
         return abo;
     }
@@ -876,6 +886,9 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
         antExChuModel.setFuwei(fuwei);
         antExChuModel.setTireNumber1(tireNumber1);
         antExChuModel.setPlacentas(placentas);
+        if(null!=bp){
+            antExChuModel.setBp(JsonUtil.obj2JsonString(bp));
+        }
         if(null!=highrisk){
             antExChuModel.setHighrisk(JsonUtil.array2JsonString(highrisk));
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
index 23d3c48..ae702ff 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
@@ -109,6 +109,8 @@ public class AntexChuResult {
     //附件
     private String fujian;
 
+    private Map bp;
+
     private List<MatDeliverAddRequest.Placenta> placentas;
     /* //心率
      private double heartRate;
@@ -206,6 +208,14 @@ public class AntexChuResult {
     //是否有产筛
     private int hasSieve;
 
+    public Map getBp() {
+        return bp;
+    }
+
+    public void setBp(Map bp) {
+        this.bp = bp;
+    }
+
     public int getHasRefer() {
         return hasRefer;
     }
@@ -866,6 +876,9 @@ public class AntexChuResult {
                 setYsfyHistory(JsonUtil.str2Obj(antExChuModel.getYsfyHistory(), Map.class));
             } catch (Exception e) {
             }
+            if(null!=antExChuModel.getBp()){
+                setBp(JsonUtil.str2Obj(antExChuModel.getBp(),Map.class));
+            }
             setHeart(antExChuModel.getHeart());
             setLungs(antExChuModel.getLungs());
             setVulva(antExChuModel.getVulva());
-- 
1.8.3.1