From c38912916795d4b27bcf14026df7201bc86919e2 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 23 Jun 2016 18:01:44 +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

---
 .../java/com/lyms/platform/pojo/AntExChuModel.java | 25 +++++++++++++++-------
 .../operate/web/result/AntexChuResult.java         | 11 ++++++++++
 2 files changed, 28 insertions(+), 8 deletions(-)

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 bbc5a08..50e34c4 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
@@ -68,16 +68,25 @@ public class AntExChuModel implements Serializable {
     private String fuwei;
     //胎数
     private int tireNumber1;
-
+    private String syjg;
     private List placentas;
+
+    public String getSyjg() {
+        return syjg;
+    }
+
+    public void setSyjg(String syjg) {
+        this.syjg = syjg;
+    }
+
     /*//心率
-    private double heartRate;
-    //胎方位
-    private String fetalPosition;
-    //胎先露
-    private String fetalPresentation;
-    // 衔接
-    private String join;*/
+        private double heartRate;
+        //胎方位
+        private String fetalPosition;
+        //胎先露
+        private String fetalPresentation;
+        // 衔接
+        private String join;*/
     //高危因素
     private String 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 76a47ac..6726e86 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
@@ -186,7 +186,16 @@ public class AntexChuResult {
     private Map ydfmw;
     //  阴道清洁度
     private String ydqjd;
+    //实验结果
+    private String syjg;
 
+    public String getSyjg() {
+        return syjg;
+    }
+
+    public void setSyjg(String syjg) {
+        this.syjg = syjg;
+    }
 
     public String getAbo() {
         return abo;
@@ -761,6 +770,7 @@ public class AntexChuResult {
                 setYsfyHistory(JsonUtil.str2Obj(antExChuModel.getYsfyHistory(), Map.class));
             } catch (Exception e) {
             }
+            setYghxkt(antExChuModel.getYghxkt());
             setPregnancyTimes(antExChuModel.getPregnancyTimes());
             setProdTime(antExChuModel.getProdTime());
             setDelivery(antExChuModel.getDelivery());
@@ -796,6 +806,7 @@ public class AntexChuResult {
             } catch (Exception e) {
 
             }
+            setSyjg(antExChuModel.getSyjg());
             setAbo(antExChuModel.getAbortion());
             setAlbumin(antExChuModel.getAbortion());
             setXhdb(antExChuModel.getXhdb());
-- 
1.8.3.1