From 9f074e663e7224ed6a2481542680aa0871e16562 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 30 Aug 2016 14:36:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/controller/PuerperaManageController.java   | 6 ++++--
 .../java/com/lyms/platform/operate/web/facade/PatientFacade.java    | 5 +++--
 2 files changed, 7 insertions(+), 4 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 cb0e21a..21c52a9 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
@@ -143,8 +143,10 @@ public class PuerperaManageController extends BaseController {
      */
     @RequestMapping(value = "/findp", method = RequestMethod.GET)
     @ResponseBody
-    public BaseResponse getPatent(@Valid PatientQueryRequest request){
-        return patientFacade.findPatient(request);
+    @TokenRequired
+    public BaseResponse getPatent(@Valid PatientQueryRequest request,HttpServletRequest request1){
+        LoginContext loginState = (LoginContext) request1.getAttribute("loginContext");
+        return patientFacade.findPatient(request,loginState.getId());
     }
     /**
      * 发送孕妇指导短信
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 2c88e81..1e3ec0d 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
@@ -235,13 +235,14 @@ public class PatientFacade {
         return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo());
     }
 
-    public BaseResponse findPatient(PatientQueryRequest patientQueryRequest) {
+    public BaseResponse findPatient(PatientQueryRequest patientQueryRequest,Integer userId) {
         PatientsQuery patientsQuery = new PatientsQuery();
         patientsQuery.setPid(patientQueryRequest.getPid());
         patientsQuery.setId(patientQueryRequest.getId());
         patientsQuery.setPhone(patientQueryRequest.getPhone());
         patientsQuery.setCardNo(patientQueryRequest.getCardNo());
-        Patients patients = patientsService.findOnePatientByCardNo(patientsQuery);
+        String hospital = autoMatchFacade.getHospitalId(userId);
+        Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(),null,patientQueryRequest.getId(),hospital,-1,false,patientQueryRequest.getPid());
         PatientBaseResult patientBaseResult = new PatientBaseResult();
         if (null != patients) {
             patientBaseResult.convert(patients);
-- 
1.8.3.1