shiyang / regional-platform

Authored by jiangjiazhi over 8 years ago

Exists in master

Showing 2 changed files with 7 additions and 5 deletions

...	...	@@ -176,9 +176,12 @@
176	176	*
177	177	* @return
178	178	*/
179		- public BaseResponse findAntEx(@Valid AntExManagerQueryRequest antExManagerQueryRequest){
180		-
181		- return null;
	179	+ @RequestMapping(method = RequestMethod.GET, value = "/antex/antexrecordlist")
	180	+ @ResponseBody
	181	+ @TokenRequired
	182	+ public BaseResponse findAntEx(@Valid AntExManagerQueryRequest antExManagerQueryRequest,HttpServletRequest request){
	183	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	184	+ return antExRecordFacade.findList(antExManagerQueryRequest,loginState.getId());
182	185	}
183	186	}

...	...	@@ -60,7 +60,6 @@
60	60	* @return
61	61	*/
62	62	public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId) {
63		-
64	63	String hospitalId = autoMatchFacade.getHospitalId(userId);
65	64	AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
66	65	antExRecordQuery.setHospitalId(hospitalId);
67	66
...	...	@@ -70,13 +69,13 @@
70	69	antExRecordQuery.setName(antExManagerQueryRequest.getName());
71	70	antExRecordQuery.setPhone(antExManagerQueryRequest.getPhone());
72	71
73		-
74	72	List<AntExManagerResult> data =new ArrayList<>();
75	73	List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery);
76	74	if (CollectionUtils.isNotEmpty(antExRecordModelList)) {
77	75	for (AntExRecordModel e : antExRecordModelList) {
78	76	AntExManagerResult antExManagerResult = new AntExManagerResult();
79	77	antExManagerResult.convertToResult(e);
	78	+ data.add(antExManagerResult);
80	79	}
81	80	}
82	81	return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");