From 331447c4a8ecfa3376c9c4747695098eaa80677f Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Wed, 30 Nov 2016 16:50:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/BabyModelQuery.java | 26 +++++++++++ .../web/controller/BabyBuildController.java | 12 ++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 45 +++++++++++++------ .../operate/web/request/BabyManageRequest.java | 50 ++++++++++++++++++++++ 4 files changed, 121 insertions(+), 12 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 2de8ad6..0247dcb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -130,6 +130,26 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private String areaId; + private String provinceId; + + private String cityId; + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getAreaId() { return areaId; } @@ -396,6 +416,12 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (null != buildType) { condition = condition.and("buildType", buildType, MongoOper.IS); } + if (null != provinceId) { + condition = condition.and("provinceId", provinceId, MongoOper.IS); + } + if (null != cityId) { + condition = condition.and("cityId", cityId, MongoOper.IS); + } if (null != areaId) { condition = condition.and("areaId", areaId, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index aa9e8ff..86b5b59 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -188,7 +188,12 @@ public class BabyBuildController extends BaseController { @RequestParam("page") Integer page, @RequestParam("limit") Integer limit, + @RequestParam(value = "provinceId",required = false) String provinceId, + @RequestParam(value = "cityId",required = false) String cityId, @RequestParam(value = "areaId",required = false) String areaId, + @RequestParam(value = "hospitalProvinceId",required = false) String hospitalProvinceId, + @RequestParam(value = "hospitalCityId",required = false) String hospitalCityId, + @RequestParam(value = "hospitalAreaId",required = false) String hospitalAreaId, @RequestParam(value = "hospitalId",required = false) String hospitalId, @RequestParam(value = "isArea",required = false) String isArea){ LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); @@ -210,9 +215,16 @@ public class BabyBuildController extends BaseController { request.setServiceStatus(serviceStatus); request.setDateRange(dateRange); + // 省 + request.setProvinceId(provinceId); + // 市 + request.setCityId(cityId); // 区/县 request.setAreaId(areaId); // 建档医院 + request.setHospitalProvinceId(hospitalProvinceId); + request.setHospitalCityId(hospitalCityId); + request.setHospitalAreaId(hospitalAreaId); request.setHospitalId(hospitalId); // 是否区域 request.setIsArea(isArea); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 87b77ef..d5b6945 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1437,24 +1437,41 @@ public class BabyBookbuildingFacade { List hospitalIdList = new ArrayList<>(); if(String.valueOf(YnEnums.YES.getId()).equals(request.getIsArea())){ - // 更改原因-从一个医院更改为list - if(request.getHospitalId()==null){ - // 没有传入医院，取所有有权限的医院 - OrganizationQuery organizationQuery = new OrganizationQuery(); - List typeList = new ArrayList<>(); - typeList.add(OrganizationTypeEnum.NY.getId()); - typeList.add(OrganizationTypeEnum.FB.getId()); - typeList.add(OrganizationTypeEnum.JMQY.getId()); - typeList.add(OrganizationTypeEnum.TY.getId()); - organizationQuery.setTypeList(typeList); + + OrganizationQuery organizationQuery = new OrganizationQuery(); + List typeList = new ArrayList<>(); + typeList.add(OrganizationTypeEnum.NY.getId()); + typeList.add(OrganizationTypeEnum.FB.getId()); + typeList.add(OrganizationTypeEnum.JMQY.getId()); + typeList.add(OrganizationTypeEnum.TY.getId()); + organizationQuery.setTypeList(typeList); + if(!StringUtils.isEmpty(request.getHospitalId())){ + hospitalIdList.add(request.getHospitalId()); + }else if(!StringUtils.isEmpty(request.getHospitalAreaId())){ + organizationQuery.setAreaId(request.getAreaId()); + List organizationList = organizationService.queryOrganization(organizationQuery); + for (Organization organization : organizationList) { + hospitalIdList.add(String.valueOf(organization.getId())); + } + }else if(!StringUtils.isEmpty(request.getHospitalCityId())){ + organizationQuery.setCityId(request.getHospitalCityId()); + List organizationList = organizationService.queryOrganization(organizationQuery); + for (Organization organization : organizationList) { + hospitalIdList.add(String.valueOf(organization.getId())); + } + }else if(!StringUtils.isEmpty(request.getProvinceId())){ + organizationQuery.setProvinceId(request.getProvinceId()); List organizationList = organizationService.queryOrganization(organizationQuery); for (Organization organization : organizationList) { hospitalIdList.add(String.valueOf(organization.getId())); } }else{ - // 传入了医院，取传入的医院 - hospitalIdList.add(request.getHospitalId()); + List organizationList = organizationService.queryOrganization(organizationQuery); + for (Organization organization : organizationList) { + hospitalIdList.add(String.valueOf(organization.getId())); + } } + }else{ String hospitalId = ""; //得到当前登录的医院id @@ -1661,6 +1678,10 @@ public class BabyBookbuildingFacade { } } + // 省 + babyQuery.setProvinceId(request.getProvinceId()); + // 市 + babyQuery.setCityId(request.getCityId()); // 区/县 babyQuery.setAreaId(request.getAreaId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index 0884b67..1015d9b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -58,12 +58,62 @@ public class BabyManageRequest extends BaseQuery { private String dateRange; + private String provinceId; + + private String cityId; + private String areaId; + private String hospitalProvinceId; + + private String hospitalCityId; + + private String hospitalAreaId; + private String hospitalId; private String isArea; + public String getHospitalProvinceId() { + return hospitalProvinceId; + } + + public void setHospitalProvinceId(String hospitalProvinceId) { + this.hospitalProvinceId = hospitalProvinceId; + } + + public String getHospitalCityId() { + return hospitalCityId; + } + + public void setHospitalCityId(String hospitalCityId) { + this.hospitalCityId = hospitalCityId; + } + + public String getHospitalAreaId() { + return hospitalAreaId; + } + + public void setHospitalAreaId(String hospitalAreaId) { + this.hospitalAreaId = hospitalAreaId; + } + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + public String getIsArea() { return isArea; } -- 1.8.3.1