From b50d4a5ad44bd95a40415df557bd0c1576c53be9 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Tue, 8 Jan 2019 09:59:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E5=88=86=E5=A8=A9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/result/MaternalDeliverResult.java  | 124 +++++++++++++++++++++
 1 file changed, 124 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
index 3e912b7..3825ea0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
@@ -146,6 +146,70 @@ public class MaternalDeliverResult  {
     private String jmkz;//静脉扩张
     private String zyDiagnosis;//主要诊断
 
+    private String ysqk;//羊水情况（0:清；1:Ⅰ度；2:Ⅱ度；3:Ⅲ度）
+    private String zgnmz;//椎管内麻醉(0:未选择；1:已选择)
+    private String dlfm;//导乐分娩(0:未选择；1:已选择)
+    private String fmzty;//分娩镇痛仪(0:未选择；1:已选择)
+    private String zypbfm;//专业陪伴分娩(0:未选择；1:已选择)
+    private String totalOneCxl;//阴道分娩产后1小时总出血量
+    private String xsebz;//新生儿备注
+
+
+    public String getYsqk() {
+        return ysqk;
+    }
+
+    public void setYsqk(String ysqk) {
+        this.ysqk = ysqk;
+    }
+
+    public String getZgnmz() {
+        return zgnmz;
+    }
+
+    public void setZgnmz(String zgnmz) {
+        this.zgnmz = zgnmz;
+    }
+
+    public String getDlfm() {
+        return dlfm;
+    }
+
+    public void setDlfm(String dlfm) {
+        this.dlfm = dlfm;
+    }
+
+    public String getFmzty() {
+        return fmzty;
+    }
+
+    public void setFmzty(String fmzty) {
+        this.fmzty = fmzty;
+    }
+
+    public String getZypbfm() {
+        return zypbfm;
+    }
+
+    public void setZypbfm(String zypbfm) {
+        this.zypbfm = zypbfm;
+    }
+
+    public String getTotalOneCxl() {
+        return totalOneCxl;
+    }
+
+    public void setTotalOneCxl(String totalOneCxl) {
+        this.totalOneCxl = totalOneCxl;
+    }
+
+    public String getXsebz() {
+        return xsebz;
+    }
+
+    public void setXsebz(String xsebz) {
+        this.xsebz = xsebz;
+    }
 
     public String getFhqk() {
         return fhqk;
@@ -473,6 +537,14 @@ public class MaternalDeliverResult  {
         setJmkz(destModel.getJmkz());
         setZyDiagnosis(destModel.getZyDiagnosis());
 
+        setYsqk(destModel.getYsqk());
+        setZgnmz(destModel.getZgnmz());
+        setDlfm(destModel.getDlfm());
+        setFmzty(destModel.getFmzty());
+        setZypbfm(destModel.getZypbfm());
+        setTotalOneCxl(destModel.getTotalOneCxl());
+        setXsebz(destModel.getXsebz());
+
         return this;
     }
 
@@ -686,6 +758,12 @@ public class MaternalDeliverResult  {
         private String impression;//印象
         private String qzdbh;//亲子带编号
 
+        private String hx;//呼吸
+        private String xt;//心跳
+        private String ys;//颜色
+        private String cjfy;//刺激反应
+        private String zl;//张力
+
         public Baby(){}//增加无参构造方法
         public Baby(MaternalDeliverModel.Baby babyModel){
             setId(babyModel.getId());
@@ -793,6 +871,52 @@ public class MaternalDeliverResult  {
             setImpression(babyModel.getImpression());
             setQzdbh(babyModel.getQzdbh());
 
+            setHx(babyModel.getHx());
+            setXt(babyModel.getXt());
+            setYs(babyModel.getYs());
+            setCjfy(babyModel.getCjfy());
+            setZl(babyModel.getZl());
+
+        }
+
+        public String getHx() {
+            return hx;
+        }
+
+        public void setHx(String hx) {
+            this.hx = hx;
+        }
+
+        public String getXt() {
+            return xt;
+        }
+
+        public void setXt(String xt) {
+            this.xt = xt;
+        }
+
+        public String getYs() {
+            return ys;
+        }
+
+        public void setYs(String ys) {
+            this.ys = ys;
+        }
+
+        public String getCjfy() {
+            return cjfy;
+        }
+
+        public void setCjfy(String cjfy) {
+            this.cjfy = cjfy;
+        }
+
+        public String getZl() {
+            return zl;
+        }
+
+        public void setZl(String zl) {
+            this.zl = zl;
         }
 
         public String getQzdbh() {
-- 
1.8.3.1