fangcheng / regional-platform

Authored by liquanyu almost 9 years ago

Showing 2 changed files with 11 additions and 5 deletions

...	...	@@ -51,13 +51,15 @@
51	51
52	52	/**
53	53	* 返回该医院可选择的录入人
54		- * @param hospitalId 医院Id
	54	+ * @param hospitalId 医院Id 必填
	55	+ * @param deptId 科室id 非必填
55	56	* @return
56	57	*/
57		- @RequestMapping(method = RequestMethod.GET, value = "/queryInPerson/{hospitalId}")
	58	+ @RequestMapping(method = RequestMethod.GET, value = "/queryInPerson")
58	59	@ResponseBody
59		- public BaseResponse queryInPerson(@PathVariable("hospitalId")Integer hospitalId) {
60		- return stopPregnancyFacade.queryInPerson(hospitalId);
	60	+ public BaseResponse queryInPerson( @RequestParam(value = "hospitalId", required = true)Integer hospitalId,
	61	+ @RequestParam(value = "deptId", required = false)Integer deptId) {
	62	+ return stopPregnancyFacade.queryInPerson(hospitalId,deptId);
61	63	}
62	64
63	65	}

...	...	@@ -239,11 +239,15 @@
239	239	* @param hospitalId
240	240	* @return
241	241	*/
242		- public BaseResponse queryInPerson(Integer hospitalId) {
	242	+ public BaseResponse queryInPerson(Integer hospitalId,Integer deptId) {
243	243
244	244	UsersQuery usersQuery = new UsersQuery();
245	245	usersQuery.setYn(YnEnums.YES.getId());
246	246	usersQuery.setOrgId(hospitalId);
	247	+ if (deptId != null)
	248	+ {
	249	+ usersQuery.setDeptId(deptId);
	250	+ }
247	251	List<Users> users = usersService.queryUsers2(usersQuery);
248	252	List<Map> list = new ArrayList<>();
249	253	if (CollectionUtils.isNotEmpty(users))