jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 12 additions and 4 deletions

...	...	@@ -84,9 +84,9 @@
84	84	@ResponseBody
85	85	@TokenRequired
86	86	@RequestMapping(value = "/querySievePatientInfo",method = RequestMethod.GET)
87		- public BaseResponse querySievePatientInfo(@RequestParam("cardNo")String cardNo,HttpServletRequest request) {
	87	+ public BaseResponse querySievePatientInfo(@RequestParam("cardNo")String cardNo,@RequestParam("vcCardNo")String vcCardNo,HttpServletRequest request) {
88	88	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
89		- return sieveFacade.querySievePatientInfo(cardNo, loginState.getId());
	89	+ return sieveFacade.querySievePatientInfo(cardNo, vcCardNo,loginState.getId());
90	90	}
91	91
92	92

...	...	@@ -577,14 +577,22 @@
577	577	* @param userId
578	578	* @return
579	579	*/
580		- public BaseResponse querySievePatientInfo(String cardNo, Integer userId) {
	580	+ public BaseResponse querySievePatientInfo(String cardNo,String vcCardNo, Integer userId) {
581	581
582	582	String hospitalId = autoMatchFacade.getHospitalId(userId);
583	583
584	584	PatientsQuery patientsQuery = new PatientsQuery();
585	585	patientsQuery.setHospitalId(hospitalId);
586	586	patientsQuery.setYn(YnEnums.YES.getId());
587		- patientsQuery.setPhoneOrCert(cardNo);
	587	+ if (StringUtils.isNotEmpty(cardNo))
	588	+ {
	589	+ patientsQuery.setPhoneOrCert(cardNo);
	590	+ }
	591	+ else if (StringUtils.isNotEmpty(vcCardNo))
	592	+ {
	593	+ patientsQuery.setVcCardNo(vcCardNo);
	594	+ }
	595	+
588	596
589	597	List<Patients> localPatients = patientsService.queryPatient(patientsQuery);
590	598	Patients pat = null;