From 265c3f8e2a8f9c8f918b501d9c5b685383334014 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Sun, 18 Sep 2016 15:20:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/pojo/MaternalDeliverModel.java   | 35 +++++++++++-----------
 .../platform/operate/web/facade/PatientFacade.java |  3 ++
 .../operate/web/request/MatDeliverAddRequest.java  | 24 +++++++--------
 3 files changed, 33 insertions(+), 29 deletions(-)

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 5591ea7..4dc7236 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
@@ -67,13 +67,13 @@ public class MaternalDeliverModel {
     // 脉搏
     private String pulse;
     // 一小时失血量
-    private Integer oHloseBloodL;
+    private Double oHloseBloodL;
     //二小时失血量
-    private Integer tHloseBloodL;
+    private Double tHloseBloodL;
     //二十四小时失血量
-    private Integer rHloseBloodL;
+    private Double rHloseBloodL;
     //第3产层+产后失血量
-    private Integer sHloseBloodL;
+    private Double sHloseBloodL;
     //失血原因
     private String loseBloodCause;
     //产科并发症
@@ -568,30 +568,38 @@ public class MaternalDeliverModel {
         this.pulse = pulse;
     }
 
-    public Integer getoHloseBloodL() {
+    public Double getoHloseBloodL() {
         return oHloseBloodL;
     }
 
-    public void setoHloseBloodL(Integer oHloseBloodL) {
+    public void setoHloseBloodL(Double oHloseBloodL) {
         this.oHloseBloodL = oHloseBloodL;
     }
 
-    public Integer getrHloseBloodL() {
+    public Double getrHloseBloodL() {
         return rHloseBloodL;
     }
 
-    public void setrHloseBloodL(Integer rHloseBloodL) {
+    public void setrHloseBloodL(Double rHloseBloodL) {
         this.rHloseBloodL = rHloseBloodL;
     }
 
-    public Integer getsHloseBloodL() {
+    public Double getsHloseBloodL() {
         return sHloseBloodL;
     }
 
-    public void setsHloseBloodL(Integer sHloseBloodL) {
+    public void setsHloseBloodL(Double sHloseBloodL) {
         this.sHloseBloodL = sHloseBloodL;
     }
 
+    public Double gettHloseBloodL() {
+        return tHloseBloodL;
+    }
+
+    public void settHloseBloodL(Double tHloseBloodL) {
+        this.tHloseBloodL = tHloseBloodL;
+    }
+
     public Integer getSiLielevel() {
         return siLielevel;
     }
@@ -600,13 +608,6 @@ public class MaternalDeliverModel {
         this.siLielevel = siLielevel;
     }
 
-    public Integer gettHloseBloodL() {
-        return tHloseBloodL;
-    }
-
-    public void settHloseBloodL(Integer tHloseBloodL) {
-        this.tHloseBloodL = tHloseBloodL;
-    }
 
     public Integer getTireNumber() {
         return tireNumber;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 82928a2..d12e498 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -619,6 +619,7 @@ public class PatientFacade {
                         data.put("checkDoctor", rp.getCheckDoctor());
                         data.put("lName", rp.getlName());
                         data.put("phone", rp.getPhone());
+                        datas.add(data);
                     }
                     cnames.put("name", "姓名");
                     cnames.put("age", "当前年龄");
@@ -651,6 +652,7 @@ public class PatientFacade {
                         data.put("checkDoctor", rp.getCheckDoctor());
                         data.put("lName", rp.getlName());
                         data.put("phone", rp.getPhone());
+                        datas.add(data);
                     }
                     cnames.put("name", "姓名");
                     cnames.put("age", "当前年龄");
@@ -680,6 +682,7 @@ public class PatientFacade {
                         data.put("checkDoctor", rp.getCheckDoctor());
                         data.put("lName", rp.getlName());
                         data.put("phone", rp.getPhone());
+                        datas.add(data);
                     }
                     cnames.put("name", "姓名");
                     cnames.put("age", "分娩年龄");
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 adbe44d..fb658fb 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
@@ -64,13 +64,13 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
     // 脉搏
     private String pulse;
     // 一小时失血量
-    private Integer oHloseBloodL;
+    private Double oHloseBloodL;
     //二小时失血量
-    private Integer tHloseBloodL;
+    private Double tHloseBloodL;
     //二十四小时失血量
-    private Integer rHloseBloodL;
+    private Double rHloseBloodL;
     //第3产层+产后失血量
-    private Integer sHloseBloodL;
+    private Double sHloseBloodL;
     //失血原因
     private java.util.Map loseBloodCause;
     //产科并发症
@@ -99,35 +99,35 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
         this.extPlacentas = extPlacentas;
     }
 
-    public Integer getoHloseBloodL() {
+    public Double getoHloseBloodL() {
         return oHloseBloodL;
     }
 
-    public void setoHloseBloodL(Integer oHloseBloodL) {
+    public void setoHloseBloodL(Double oHloseBloodL) {
         this.oHloseBloodL = oHloseBloodL;
     }
 
-    public Integer getrHloseBloodL() {
+    public Double getrHloseBloodL() {
         return rHloseBloodL;
     }
 
-    public void setrHloseBloodL(Integer rHloseBloodL) {
+    public void setrHloseBloodL(Double rHloseBloodL) {
         this.rHloseBloodL = rHloseBloodL;
     }
 
-    public Integer getsHloseBloodL() {
+    public Double getsHloseBloodL() {
         return sHloseBloodL;
     }
 
-    public void setsHloseBloodL(Integer sHloseBloodL) {
+    public void setsHloseBloodL(Double sHloseBloodL) {
         this.sHloseBloodL = sHloseBloodL;
     }
 
-    public Integer gettHloseBloodL() {
+    public Double gettHloseBloodL() {
         return tHloseBloodL;
     }
 
-    public void settHloseBloodL(Integer tHloseBloodL) {
+    public void settHloseBloodL(Double tHloseBloodL) {
         this.tHloseBloodL = tHloseBloodL;
     }
 
-- 
1.8.3.1