From 34032e642b04efe53199d85be06659ebcaf3e770 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Mon, 17 Dec 2018 16:02:51 +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

---
 .../lyms/platform/pojo/MaternalDeliverModel.java    | 18 ++++++++++++++++++
 .../platform/operate/web/facade/ViewFacade.java     |  2 ++
 .../operate/web/request/MatDeliverAddRequest.java   | 21 +++++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
index 9dc4d6f..dbd8bb0 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
@@ -525,11 +525,29 @@ public class MaternalDeliverModel extends BaseModel {
 
         private String umbilicus;//脐
         private String umXqFy;//脐带血清反应
+        private String skinContact;//皮肤接触及早吮吸>=30分钟
+        private String zhixi;//窒息（0：青紫；1：苍白）
 
         public Baby(){
 
         }
 
+        public String getSkinContact() {
+            return skinContact;
+        }
+
+        public void setSkinContact(String skinContact) {
+            this.skinContact = skinContact;
+        }
+
+        public String getZhixi() {
+            return zhixi;
+        }
+
+        public void setZhixi(String zhixi) {
+            this.zhixi = zhixi;
+        }
+
         public String getUmbilicus() {
             return umbilicus;
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 64ae528..aab52ed 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -3067,6 +3067,8 @@ public class ViewFacade {
                 /********************************/
                 babyMap.put("umbilicus",temp.getUmbilicus());
                 babyMap.put("umXqFy",temp.getUmXqFy());
+                babyMap.put("skinContact",temp.getSkinContact());
+                babyMap.put("zhixi",temp.getZhixi());
 
                 babyList.add(babyMap);
             }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
index ec18487..850e460 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
@@ -309,6 +309,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
         this.gjOther = gjOther;
     }
 
+
     /******威海妇幼新增分娩记录字段******/
     private Integer parity;//胎次
     private String gsqsDate;//宫缩起始时间
@@ -1122,6 +1123,8 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
         /*************新增结束************/
         private String umbilicus;//脐
         private String umXqFy;//脐带血清反应
+        private String skinContact;//皮肤接触及早吮吸>=30分钟
+        private String zhixi;//窒息（0：青紫；1：苍白）
 
         @Override
         public MaternalDeliverModel.Baby convertToDataModel() {
@@ -1231,10 +1234,28 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
 
             baby.setUmbilicus(umbilicus);
             baby.setUmXqFy(umXqFy);
+            baby.setSkinContact(skinContact);
+            baby.setZhixi(zhixi);
 
             return baby;
         }
 
+        public String getSkinContact() {
+            return skinContact;
+        }
+
+        public void setSkinContact(String skinContact) {
+            this.skinContact = skinContact;
+        }
+
+        public String getZhixi() {
+            return zhixi;
+        }
+
+        public void setZhixi(String zhixi) {
+            this.zhixi = zhixi;
+        }
+
         public String getUmbilicus() {
             return umbilicus;
         }
-- 
1.8.3.1