From 4140720238329bf16eee413d5cb5b41bcce8b8ef Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 21 Jun 2018 13:46:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/SieveController.java | 4 ++-- .../com/lyms/platform/operate/web/facade/SieveFacade.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index 0a6bfe4..6feb12c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -84,9 +84,9 @@ public class SieveController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(value = "/querySievePatientInfo",method = RequestMethod.GET) - public BaseResponse querySievePatientInfo(@RequestParam("cardNo")String cardNo,HttpServletRequest request) { + public BaseResponse querySievePatientInfo(@RequestParam("cardNo")String cardNo,@RequestParam("vcCardNo")String vcCardNo,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return sieveFacade.querySievePatientInfo(cardNo, loginState.getId()); + return sieveFacade.querySievePatientInfo(cardNo, vcCardNo,loginState.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 7b6fa28..4347611 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -577,14 +577,22 @@ public class SieveFacade { * @param userId * @return */ - public BaseResponse querySievePatientInfo(String cardNo, Integer userId) { + public BaseResponse querySievePatientInfo(String cardNo,String vcCardNo, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setHospitalId(hospitalId); patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setPhoneOrCert(cardNo); + if (StringUtils.isNotEmpty(cardNo)) + { + patientsQuery.setPhoneOrCert(cardNo); + } + else if (StringUtils.isNotEmpty(vcCardNo)) + { + patientsQuery.setVcCardNo(vcCardNo); + } + List localPatients = patientsService.queryPatient(patientsQuery); Patients pat = null; -- 1.8.3.1