From 376037805fc61685b1e754758e48fb4094edb5e3 Mon Sep 17 00:00:00 2001
From: hujiaqi <hujiaqi@lymsh.com>
Date: Fri, 16 Dec 2016 14:05:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A3=8E=E9=99=A9=E5=9B=A0?=
 =?UTF-8?q?=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/MatDeliverFacade.java       |  7 +++--
 .../web/result/NewBabyManagerQueryModel.java       | 35 +++++++++++++++-------
 2 files changed, 30 insertions(+), 12 deletions(-)

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 07e858c..20c55cc 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
@@ -1206,8 +1206,11 @@ public class MatDeliverFacade {
                     matDeliverQuery.setParentId(babyModel.getParentId());
                     List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
                     if (maternalDeliverModelList != null && maternalDeliverModelList.size() == 1) {
-                        newBabyManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModelList.get(0).getDeliverDoctor())).getName());
-                        newBabyManagerQueryModel.setParentId(maternalDeliverModelList.get(0).getParentId());
+                        MaternalDeliverModel maternalDeliverModel = maternalDeliverModelList.get(0);
+                        newBabyManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName());
+                        newBabyManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId());
+                        newBabyManagerQueryModel.setPatientId(maternalDeliverModel.getParentId());
+                        newBabyManagerQueryModel.setpId(maternalDeliverModel.getPid());
                     }
                 } catch (Exception e) {
                     // 什么都不干，这么干是为了避开原始数据的问题
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java
index 20b140e..695a447 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java
@@ -7,12 +7,11 @@ package com.lyms.platform.operate.web.result;
  */
 public class NewBabyManagerQueryModel {
 
-    /**
-     * @auther HuJiaqi
-     * @createTime 2016年12月16日 10时35分
-     * @discription
-     */
-    private String parentId;
+    private String maternalDeliverId;
+
+    private String patientId;
+
+    private String pId;
 
     /**
      * @auther HuJiaqi
@@ -119,6 +118,22 @@ public class NewBabyManagerQueryModel {
      */
     private String deliverDoctor;
 
+    public String getMaternalDeliverId() {
+        return maternalDeliverId;
+    }
+
+    public void setMaternalDeliverId(String maternalDeliverId) {
+        this.maternalDeliverId = maternalDeliverId;
+    }
+
+    public String getpId() {
+        return pId;
+    }
+
+    public void setpId(String pId) {
+        this.pId = pId;
+    }
+
     public String getBirthYMD() {
         return birthYMD;
     }
@@ -239,11 +254,11 @@ public class NewBabyManagerQueryModel {
         this.deliverDoctor = deliverDoctor;
     }
 
-    public String getParentId() {
-        return parentId;
+    public String getPatientId() {
+        return patientId;
     }
 
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
+    public void setPatientId(String patientId) {
+        this.patientId = patientId;
     }
 }
-- 
1.8.3.1