diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java index 61b3a20..f1acb87 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java @@ -51,13 +51,15 @@ public class StopPregnancyController extends BaseController { /** * 返回该医院可选择的录入人 - * @param hospitalId 医院Id + * @param hospitalId 医院Id 必填 + * @param deptId 科室id 非必填 * @return */ - @RequestMapping(method = RequestMethod.GET, value = "/queryInPerson/{hospitalId}") + @RequestMapping(method = RequestMethod.GET, value = "/queryInPerson") @ResponseBody - public BaseResponse queryInPerson(@PathVariable("hospitalId")Integer hospitalId) { - return stopPregnancyFacade.queryInPerson(hospitalId); + public BaseResponse queryInPerson( @RequestParam(value = "hospitalId", required = true)Integer hospitalId, + @RequestParam(value = "deptId", required = false)Integer deptId) { + return stopPregnancyFacade.queryInPerson(hospitalId,deptId); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index 496d58d..7138100 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -239,11 +239,15 @@ public class StopPregnancyFacade { * @param hospitalId * @return */ - public BaseResponse queryInPerson(Integer hospitalId) { + public BaseResponse queryInPerson(Integer hospitalId,Integer deptId) { UsersQuery usersQuery = new UsersQuery(); usersQuery.setYn(YnEnums.YES.getId()); usersQuery.setOrgId(hospitalId); + if (deptId != null) + { + usersQuery.setDeptId(deptId); + } List users = usersService.queryUsers2(usersQuery); List list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(users))