diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index afc6535..5e5909f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -11,11 +11,13 @@ import com.lyms.platform.common.enums.OrganizationTypeEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.common.utils.SystemConfig; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.BasicConfig; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -40,6 +42,8 @@ public class OrganizationController extends BaseController { private BasicConfigService basicConfigService; @Autowired private DepartmentsService departmentsService; + @Autowired + private AutoMatchFacade autoMatchFacade; /** @@ -195,8 +199,38 @@ public class OrganizationController extends BaseController { ResultUtils.buildSuccessResultAndWrite(response); } + /** + * 根据当前登录的权限去获取下属的医院 + * + */ + @RequestMapping(value = "/organization1", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public FrontEndResult getOrganization(HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - + String areaId= autoMatchFacade.match(loginState.getId()); + List data =new ArrayList<>(); + if(StringUtils.isNotEmpty(areaId)){ + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setAreaId(areaId); + List list = new ArrayList<>(); + list.add(3); + list.add(4); + organizationQuery.setYn(YnEnums.YES.getId()); + organizationQuery.setTypeList(list); + List organizations = organizationService.queryOrganization(organizationQuery); + if(CollectionUtils.isNotEmpty(organizations)){ + for(Organization organization : organizations){ + Map map = new HashMap<>(); + map.put("id", organization.getId()); + map.put("name", organization.getName()); + data.add(map); + } + } + } + return new FrontEndResult().setData(data).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); + } @@ -269,7 +303,7 @@ public class OrganizationController extends BaseController { organization.setArea(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getAreaId()), falg)); } if(null != organization.getStreetId()) { - organization.setStreet(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getStreetId()),falg)); + organization.setStreet(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getStreetId()), falg)); } Object obj = organization; if(falg){