From cef2463ea6e2f1dabb6dd59a641ca7ceb1bcd2ba Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 8 Aug 2016 09:35:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?=
 =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/PuerperaManageController.java     | 20 +++++++++++---------
 .../platform/operate/web/facade/PatientFacade.java   |  3 ++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
index 77c6b7a..e6d4923 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
@@ -32,9 +32,6 @@ import java.util.Map;
 @Controller
 public class PuerperaManageController extends BaseController {
 
-
-    @Autowired
-    private PuerperaManagerFacade puerperaManagerFacade;
     @Autowired
     private BasicConfigFacade basicConfigFacade;
     @Autowired
@@ -91,8 +88,10 @@ public class PuerperaManageController extends BaseController {
      */
     @RequestMapping(value = "/hPuer", method = RequestMethod.GET)
     @ResponseBody
-    public BaseResponse queryHighRiskPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest) {
-        return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1);
+    @TokenRequired
+    public BaseResponse queryHighRiskPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) {
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1,loginState.getId());
     }
     /**
      *全部孕妇管理
@@ -102,8 +101,10 @@ public class PuerperaManageController extends BaseController {
      */
     @RequestMapping(value = "/aPuer", method = RequestMethod.GET)
     @ResponseBody
-    public BaseResponse queryAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest) {
-        return  patientFacade.queryHighRisk(patientsQueryRequest,null,1);
+    @TokenRequired
+    public BaseResponse queryAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) {
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        return  patientFacade.queryHighRisk(patientsQueryRequest,null,1,loginState.getId());
     }
 
     /**
@@ -113,8 +114,9 @@ public class PuerperaManageController extends BaseController {
      */
     @RequestMapping(value = "/apatients", method = RequestMethod.GET)
     @ResponseBody
-    public BaseResponse queryAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest){
-        return  patientFacade.queryHighRisk(patientsQueryRequest, null, 3);
+    public BaseResponse queryAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        return  patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId());
     }
 
     @RequestMapping(value = "/apatients/enums", method = RequestMethod.GET)
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 fe8f036..bb8b8a9 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
@@ -191,7 +191,7 @@ public class PatientFacade {
      * @param type                     控制类型 1孕妇  3产妇
      * @return
      */
-    public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type) {
+    public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type,Integer userId) {
         PatientsQuery patientsQuery = new PatientsQuery();
         patientsQuery.setPhone(riskPatientsQueryRequest.getPhone());
         patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo());
@@ -210,6 +210,7 @@ public class PatientFacade {
         patientsQuery.setServiceStatus(riskPatientsQueryRequest.getServiceStatus());
         patientsQuery.setYn(YnEnums.YES.getId());
         patientsQuery.setBuildType(1);
+        patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(userId));
         //查询符合条件的孕妇
         List<Patients> patientses = patientsService.queryPatient(patientsQuery);
         List data = new ArrayList<>();
-- 
1.8.3.1