From be696809fa92f8031641a8895bd2ede267df431a Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 16 Mar 2023 08:49:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E7=A4=BE=E5=8C=BA=E5=8C=BB?= =?UTF-8?q?=E9=99=A2=E5=86=85=E5=85=A8=E9=83=A8=E5=8C=BB=E9=99=A2=E5=86=85?= =?UTF-8?q?=E5=8F=AA=E5=8C=85=E6=8B=AC=E7=A4=BE=E5=8C=BA=E5=8D=AB=E7=94=9F?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=99=E3=80=81=E5=8D=AB=E7=94=9F=E9=99=A2?= =?UTF-8?q?=E3=80=81=E7=A4=BE=E5=8C=BA=E6=9C=8D=E5=8A=A1=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=8C=BB=E9=99=A2=E3=80=81=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=94=9F=E8=82=B2=E6=9C=8D=E5=8A=A1=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=9C=BA=E6=9E=84=E3=80=82=20=E5=9C=A8?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=A6=87=E5=B9=BC=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E3=80=90=E5=AD=95=E4=BA=A7=E5=A6=87=E7=AE=A1=E7=90=86=E3=80=91?= =?UTF-8?q?--=E5=85=A8=E9=83=A8=E4=BA=A7=E5=A6=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E3=80=90=E5=88=86=E5=A8=A9=E7=AE=A1=E7=90=86=E3=80=91?= =?UTF-8?q?=E3=80=81=E3=80=90=E5=8C=BA=E5=9F=9F=E5=A6=87=E5=B9=BC=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E3=80=91---=E5=BB=BA=E6=A1=A3=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=8D=B7=E7=BB=9F=E8=AE=A1=EF=BC=8C=E4=BB=A5=E4=B8=8A=E4=B8=89?= =?UTF-8?q?=E4=B8=AA=E7=95=8C=E9=9D=A2=E4=B8=AD=EF=BC=8C=E5=88=86=E5=A8=A9?= =?UTF-8?q?=E5=8C=BB=E9=99=A2=E5=AD=97=E6=AE=B5=E5=8E=BB=E6=8E=89=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/OrganizationController.java | 105 ++++++++++++++++----- 1 file changed, 82 insertions(+), 23 deletions(-) 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 c433e04..8efe27a 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 @@ -244,7 +244,7 @@ public class OrganizationController extends BaseController { @ResponseBody @TokenRequired public Map getOrgByAreaId(HttpServletRequest request, - @RequestParam(value = "areaId", required = true) String areaId) { + @RequestParam(value = "areaId", required = true) String areaId) { OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setAreaId(areaId); List organizations = organizationService.queryOrganization(organizationQuery); @@ -257,6 +257,16 @@ public class OrganizationController extends BaseController { /** * 根据当前登录的权限去获取下属的医院 + * @param request + * @param page + * @param limit + * @param keyword + * @param isHospital + * @param isMaternityManagement 秦皇岛特殊页面查询类型区分 + * 1：在区域妇幼管理--【孕产妇管理】--全部产妇管理、【分娩管理】、【区域妇幼统计】---建档优惠卷统计，以上三个界面中，分娩医院字段去掉机构信息 + * 2：建档社区医院内全部医院内只包括社区卫生服务站、卫生院、社区服务中心，去掉医院、计划生育服务中心相关机构 + * @param aId + * @return */ @RequestMapping(value = "/organization1", method = RequestMethod.GET) @ResponseBody @@ -265,6 +275,7 @@ public class OrganizationController extends BaseController { @RequestParam(value = "limit", required = false) Integer limit, @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "isHospital", required = false) String isHospital, + @RequestParam(value = "isMaternityManagement", required = false) String isMaternityManagement, @RequestParam(value = "areaId", required = false) String aId) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); Users users = usersService.getUsers(loginState.getId()); @@ -321,18 +332,15 @@ public class OrganizationController extends BaseController { // organizationQuery.setTypeList(list); organizations = organizationService.queryOrganization(organizationQuery); - if (StringUtils.isNotEmpty(isHospital)) - { + if (StringUtils.isNotEmpty(isHospital)) { List list = new ArrayList<>(); - for (Organization organization : organizations) - { + for (Organization organization : organizations) { String hname = organization.getName(); - if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心")|| hname.contains("卫生院"))) - { + if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) { list.add(organization); } } - organizations = list; + organizations = list; } pageInfo = organizationQuery.getPageInfo(); @@ -401,7 +409,61 @@ public class OrganizationController extends BaseController { if (null != organization.getStreetId()) { organization.setStreet(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getStreetId()), true)); } - + /** + * 秦皇岛需求：：： + * + * 1.在区域妇幼管理--【孕产妇管理】--全部产妇管理、【分娩管理】、【区域妇幼统计】---建档优惠卷统计，以上三个界面中，分娩医院字段去掉机构信息，具体需要去掉哪些机构信息如下： + * 海港区去掉医院秦皇岛市海港区妇幼保健生育服务中心，秦皇岛市骨科医院，秦皇岛市卫生和计划生育委员会，翠岛天成服务站，秦皇岛市海港区卫生和计划生育局和秦皇岛市海港区计划生育服务站。 + * 山海关区去掉秦皇岛市山海关区妇幼保健计划生育服务中心。 + * 北戴河区去掉秦皇岛市北戴河区妇幼保健计划生育服务中心，秦皇岛市北戴河区卫生和计划生育局。 + * 青龙满族自治县去掉 青龙满族自治县生殖保健医院，青龙满族自治县妇幼保健计划生育服务中心，和秦皇岛市青龙满族自治县卫生和计划生育局。 + * 昌黎县去掉昌黎钱庄子门诊部，昌黎犁湾河门诊部，昌黎虹桥门诊部，秦皇岛市昌黎县卫生和计划生育局。 + * 抚宁区去掉 抚宁紫金山医院，秦皇岛天马湖医院，抚宁县第一股份医院，秦皇岛市抚宁区卫生和计划生育局，和秦皇岛市抚宁区妇幼保健院。 + * 卢龙县去掉秦皇岛市卢龙县卫生和计划生育局。 + * 经济技术开发区去掉秦皇岛市经济技术开发区珠江道社区服务中心，秦皇岛经济技术开发区卫生和计划生育局和秦皇岛经济技术开发区第二医院。 + * 北戴河新区去掉秦皇岛北戴河新区卫生和计划生育局，秦皇岛北戴河新区西河南医院。 + */ + if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("1")) { + ArrayList maternityManagementList = new ArrayList() { + { + add("秦皇岛市海港区妇幼保健生育服务中心"); + add("秦皇岛市骨科医院"); + add("秦皇岛市卫生和计划生育委员会"); + add("翠岛天成服务站"); + add("秦皇岛市海港区卫生和计划生育局"); + add("秦皇岛市海港区计划生育服务站"); + add("秦皇岛市山海关区妇幼保健计划生育服务中心"); + add("秦皇岛市北戴河区妇幼保健计划生育服务中心"); + add("秦皇岛市北戴河区卫生和计划生育局"); + add("龙满族自治县生殖保健医院"); + add("青龙满族自治县妇幼保健计划生育服务中心"); + add("秦皇岛市青龙满族自治县卫生和计划生育局"); + add("昌黎钱庄子门诊部"); + add("昌黎犁湾河门诊部"); + add("昌黎虹桥门诊部"); + add("秦皇岛市昌黎县卫生和计划生育局"); + add("抚宁紫金山医院"); + add("秦皇岛天马湖医院"); + add("抚宁县第一股份医院"); + add("秦皇岛市抚宁区卫生和计划生育局"); + add("和秦皇岛市抚宁区妇幼保健院"); + add("秦皇岛市卢龙县卫生和计划生育局"); + add("秦皇岛市经济技术开发区珠江道社区服务中心"); + add("秦皇岛经济技术开发区卫生和计划生育局"); + add("秦皇岛经济技术开发区第二医院"); + add("秦皇岛北戴河新区卫生和计划生育局"); + add("秦皇岛北戴河新区西河南医院"); + } + }; + if (maternityManagementList.contains(organization.getName())){ + continue; + } + } else if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("2")) { + String hname = organization.getName(); + if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) { + continue; + } + } data.add(organization); } } @@ -422,7 +484,7 @@ public class OrganizationController extends BaseController { @ResponseBody @TokenRequired public Map organizationByCityId(HttpServletRequest request, - @RequestParam(value = "cityId", required = false) String cityId) { + @RequestParam(value = "cityId", required = false) String cityId) { OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setCityId(cityId); @@ -431,14 +493,14 @@ public class OrganizationController extends BaseController { if (CollectionUtils.isNotEmpty(organizations)) { for (Organization organization : organizations) { Map data = new HashMap(); - data.put("id",organization.getId()); - data.put("name",organization.getName()); + data.put("id", organization.getId()); + data.put("name", organization.getName()); datas.add(data); } } Map mapqt = new HashMap<>(); - mapqt.put("id","-1"); + mapqt.put("id", "-1"); mapqt.put("name", "其他"); datas.add(mapqt); @@ -446,7 +508,7 @@ public class OrganizationController extends BaseController { map.put("data", datas); map.put("errormsg", "成功"); map.put("errorcode", ErrorCodeConstants.SUCCESS); - return map; + return map; } @@ -581,18 +643,15 @@ public class OrganizationController extends BaseController { organizationQuery.setYn(YnEnums.YES.getId()); organizationQuery.setName(orgName); List organizations = organizationService.queryOrganization(organizationQuery); - if (CollectionUtils.isNotEmpty(organizations)) - { + if (CollectionUtils.isNotEmpty(organizations)) { UsersQuery usersQuery = new UsersQuery(); usersQuery.setOrgId(organizations.get(0).getId()); List users = usersService.queryUsers(usersQuery); - if (CollectionUtils.isNotEmpty(users)) - { - for(Users user : users) - { - Map data = new HashMap(); - data.put("id",user.getId()); - data.put("name",user.getName()); + if (CollectionUtils.isNotEmpty(users)) { + for (Users user : users) { + Map data = new HashMap(); + data.put("id", user.getId()); + data.put("name", user.getName()); datas.add(data); } } -- 1.8.3.1