From de73724271bd2284466b7a6c55e96fb92e64ae70 Mon Sep 17 00:00:00 2001
From: hujiaqi <hujiaqi@lymsh.com>
Date: Tue, 20 Dec 2016 09:39:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/MatDeliverFacade.java       |  3 +++
 .../web/result/ChildbirthManagerQueryModel.java    | 30 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)

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 5961672..7be85aa 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
@@ -953,6 +953,9 @@ public class MatDeliverFacade {
                     ChildbirthManagerQueryModel childbirthManagerQueryModel = new ChildbirthManagerQueryModel();
                     BeanUtils.copy(patients, childbirthManagerQueryModel);
                     BeanUtils.copy(maternalDeliverModel, childbirthManagerQueryModel);
+                    // 各种id
+                    childbirthManagerQueryModel.setPatientId(patients.getId());
+                    childbirthManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId());
                     // 查询分娩方式
                     String deliveryModeJson = maternalDeliverModel.getDeliveryMode();
                     Map<String, String> deliveryModeMap = JsonUtil.getMap(deliveryModeJson);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
index dbc9fa9..82c8d97 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java
@@ -8,6 +8,12 @@ package com.lyms.platform.operate.web.result;
  */
 public class ChildbirthManagerQueryModel {
 
+    private String maternalDeliverId;
+
+    private String patientId;
+
+    private String pId;
+
     /**
      * @auther HuJiaqi
      * @createTime 2016年12月07日 16时36分
@@ -386,6 +392,30 @@ public class ChildbirthManagerQueryModel {
     // 院内信息结束
 
 
+    public String getMaternalDeliverId() {
+        return maternalDeliverId;
+    }
+
+    public void setMaternalDeliverId(String maternalDeliverId) {
+        this.maternalDeliverId = maternalDeliverId;
+    }
+
+    public String getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(String patientId) {
+        this.patientId = patientId;
+    }
+
+    public String getpId() {
+        return pId;
+    }
+
+    public void setpId(String pId) {
+        this.pId = pId;
+    }
+
     public String getDueDate() {
         return dueDate;
     }
-- 
1.8.3.1