From ea3785d0283e9a092a7839d6c3742c28c85ab6ea Mon Sep 17 00:00:00 2001
From: hujiaqi <hujiaqi@lymsh.com>
Date: Fri, 16 Dec 2016 11:22:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/MatDeliverController.java      |  2 ++
 .../platform/operate/web/facade/MatDeliverFacade.java     |  1 +
 .../operate/web/result/NewBabyManagerQueryModel.java      | 15 +++++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
index 7691ebb..89e81a7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
@@ -137,6 +137,7 @@ public class MatDeliverController extends BaseController{
         return baseListResponse;
     }
 
+    @TokenRequired
     @RequestMapping(value = "childbirthManagerExcel", method = RequestMethod.POST)
     public void childbirthManagerExcel(HttpServletRequest httpServletRequest, @RequestBody ChildbirthManagerRequest childbirthManagerRequest, HttpServletResponse httpServletResponse) {
         try {
@@ -194,6 +195,7 @@ public class MatDeliverController extends BaseController{
         return baseListResponse;
     }
 
+    @TokenRequired
     @RequestMapping(value = "newBabyManagerExcel", method = RequestMethod.POST)
     public void newBabyManagerExcel(HttpServletRequest httpServletRequest, @RequestBody NewBabyManagerRequest newBabyManagerRequest, HttpServletResponse httpServletResponse) {
         try {
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 b61c056..07e858c 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
@@ -1207,6 +1207,7 @@ public class MatDeliverFacade {
                     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());
                     }
                 } 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 24f609f..20b140e 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
@@ -9,6 +9,13 @@ public class NewBabyManagerQueryModel {
 
     /**
      * @auther HuJiaqi
+     * @createTime 2016年12月16日 10时35分
+     * @discription
+     */
+    private String parentId;
+
+    /**
+     * @auther HuJiaqi
      * @createTime 2016年12月08日 10时51分
      * @discription 分娩日期
      */
@@ -231,4 +238,12 @@ public class NewBabyManagerQueryModel {
     public void setDeliverDoctor(String deliverDoctor) {
         this.deliverDoctor = deliverDoctor;
     }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
 }
-- 
1.8.3.1