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 f1acb87..5d9ce68 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 @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.StopPregnancyFacade; @@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; /** @@ -51,15 +53,13 @@ public class StopPregnancyController extends BaseController { /** * 返回该医院可选择的录入人 - * @param hospitalId 医院Id 必填 - * @param deptId 科室id 非必填 * @return */ @RequestMapping(method = RequestMethod.GET, value = "/queryInPerson") @ResponseBody - public BaseResponse queryInPerson( @RequestParam(value = "hospitalId", required = true)Integer hospitalId, - @RequestParam(value = "deptId", required = false)Integer deptId) { - return stopPregnancyFacade.queryInPerson(hospitalId,deptId); + public BaseResponse queryInPerson(HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return stopPregnancyFacade.queryInPerson(loginState.getId()); } } 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 7138100..313b403 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 @@ -4,6 +4,7 @@ import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.StopPregEnums; import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.enums.ZhiChenEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; @@ -236,30 +237,39 @@ public class StopPregnancyFacade { /** * 返回该医院可选择的录入人 - * @param hospitalId * @return */ - 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); + public BaseResponse queryInPerson(Integer id) { List list = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(users)) + if (id != null) { - for(Users user : users) + Users dbuser = usersService.getUsers(id); + + if (dbuser != null) { - Map pmap = new HashMap(); - pmap.put("id",user.getId()); - pmap.put("name",user.getName()); - list.add(pmap); + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setYn(YnEnums.YES.getId()); + usersQuery.setOrgId(dbuser.getOrgId()); + if (dbuser != null && dbuser.getZhiChenId() == ZhiChenEnums.DOCTOR.getId() && dbuser.getDeptId() != null) + { + usersQuery.setDeptId(dbuser.getDeptId()); + } + List users = usersService.queryUsers2(usersQuery); + + if (CollectionUtils.isNotEmpty(users)) + { + for(Users user : users) + { + Map pmap = new HashMap(); + pmap.put("id",user.getId()); + pmap.put("name",user.getName()); + list.add(pmap); + } + } } + } + BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(list); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);