From c6e2af31b4af53d51c91d4576387bd2f8829610a Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Tue, 8 Jan 2019 09:07:26 +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

---
 .../java/com/lyms/platform/pojo/BabyModel.java     | 46 ++++++++++++++++++++++
 .../operate/web/facade/MatDeliverFacade.java       | 12 ++++++
 .../platform/operate/web/facade/ViewFacade.java    | 12 ++++++
 3 files changed, 70 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
index b53c462..4ce55de 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
@@ -382,6 +382,52 @@ public class BabyModel extends BaseModel {
     private String impression;//印象
     private String qzdbh;//亲子带编号
 
+    private String hx;//呼吸
+    private String xt;//心跳
+    private String ys;//颜色
+    private String cjfy;//刺激反应
+    private String zl;//张力
+
+    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() {
         return qzdbh;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index e1916d7..df714ad 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -908,6 +908,12 @@ public class MatDeliverFacade {
                 babyModel1.setImpression(baby.getImpression());
                 babyModel1.setQzdbh(baby.getQzdbh());
 
+                babyModel1.setHx(baby.getHx());
+                babyModel1.setXt(baby.getXt());
+                babyModel1.setYs(baby.getYs());
+                babyModel.setCjfy(baby.getCjfy());
+                babyModel.setZl(baby.getZl());
+
                 babyService.findAndModify(query.convertToQuery(), babyModel1);
             }
             babyList.add(babyModel);
@@ -1089,6 +1095,12 @@ public class MatDeliverFacade {
             babyModel.setImpression(baby1.getImpression());
             babyModel.setQzdbh(baby1.getQzdbh());
 
+            babyModel.setHx(baby1.getHx());
+            babyModel.setXt(baby1.getXt());
+            babyModel.setYs(baby1.getYs());
+            babyModel.setCjfy(baby1.getCjfy());
+            babyModel.setZl(baby1.getZl());
+
 
             //判断妊娠结局是活产才添加数据
             if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) {
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 0bf6089..4d37d21 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
@@ -2788,6 +2788,12 @@ public class ViewFacade {
 
         map.put("ysqk",data.getYsqk());
         map.put("zgnmz",data.getZgnmz());
+        map.put("dlfm",data.getDlfm());
+        map.put("fmzty",data.getFmzty());
+        map.put("zypbfm",data.getZypbfm());
+        map.put("totalOneCxl",data.getTotalOneCxl());
+        map.put("xsebz",data.getXsebz());
+
 
         /*  产后生理  */
         map.put("maternalInfo", data.getMaternalInfo() == null ? "" : CfEnums.getTitle(data.getMaternalInfo()));
@@ -3075,6 +3081,12 @@ public class ViewFacade {
                 babyMap.put("impression",temp.getImpression());
                 babyMap.put("qzdbh",temp.getQzdbh());
 
+                babyMap.put("hx",temp.getHx());
+                babyMap.put("xt",temp.getXt());
+                babyMap.put("ys",temp.getYs());
+                babyMap.put("cjfy",temp.getCjfy());
+                babyMap.put("zl",temp.getZl());
+
                 babyList.add(babyMap);
             }
         }
-- 
1.8.3.1