From 954ae9a377745b5c74797aaa55d1a2fe15a6a708 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 3 Aug 2016 10:20:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/BabyBookbuildingController.java      |  9 +++++++--
 .../operate/web/facade/BabyBookbuildingFacade.java      | 17 ++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java
index b0287a6..fab338e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java
@@ -1,7 +1,9 @@
 package com.lyms.platform.operate.web.controller;
 
 
+import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
+import com.lyms.platform.common.base.LoginContext;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseObjectResponse;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.io.UnsupportedEncodingException;
 
@@ -97,12 +100,14 @@ public class BabyBookbuildingController extends BaseController {
      */
     @RequestMapping(value = "/queryBabyBuildRecord", method = RequestMethod.GET)
     @ResponseBody
-    public BaseObjectResponse queryBabyBuildRecord(@RequestParam(required = false)String cardNo,@RequestParam(required = false)String vcCardNo,@RequestParam(required = false)String hospitalId){
+    @TokenRequired
+    public BaseObjectResponse queryBabyBuildRecord(HttpServletRequest request,@RequestParam(required = false)String cardNo,@RequestParam(required = false)String vcCardNo,@RequestParam(required = false)String hospitalId){
         BookbuildingQueryRequest param = new BookbuildingQueryRequest();
         param.setCardNo(cardNo);
         param.setVcCardNo(vcCardNo);
         param.setHospitalId(hospitalId);
-        return babyBookbuildingFacade.queryBabyBuildRecord(param);
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        return babyBookbuildingFacade.queryBabyBuildRecord(param,loginState.getId());
     }
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 28680ad..6a0be7f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -11,7 +11,9 @@ import com.lyms.platform.operate.web.request.*;
 import com.lyms.platform.operate.web.result.*;
 import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.model.OrganizationQuery;
+import com.lyms.platform.permission.model.Users;
 import com.lyms.platform.permission.service.OrganizationService;
+import com.lyms.platform.permission.service.UsersService;
 import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.*;
 import org.apache.commons.collections.CollectionUtils;
@@ -62,6 +64,8 @@ public class BabyBookbuildingFacade {
     @Autowired
     private BabyCheckService babyCheckService;
 
+    @Autowired
+    private UsersService usersService;
 
     @Autowired
     private SmsConfigService smsConfigService;
@@ -815,7 +819,18 @@ public class BabyBookbuildingFacade {
      * @param param
      * @return
      */
-    public BaseObjectResponse queryBabyBuildRecord(BookbuildingQueryRequest param) {
+    public BaseObjectResponse queryBabyBuildRecord(BookbuildingQueryRequest param,Integer userId) {
+
+        if (userId != null)
+        {
+            Users dbuser = usersService.getUsers(userId);
+            if (dbuser != null) {
+                Integer hospitalId = dbuser.getOrgId();
+                param.setHospitalId(String.valueOf(hospitalId));
+            }
+        }
+
+
 
         Map<String,Object> map = new HashMap<>();
 
-- 
1.8.3.1