From 0e137c46d4e960597f9211a81a3157db2909262a Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Fri, 25 Nov 2016 14:22:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=84=BF=E7=AB=A5=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=8F=AA=E6=9C=89=E4=BC=A0?= =?UTF-8?q?=E5=85=A5=E7=89=B9=E5=AE=9A=E7=9A=84=E5=80=BC=E6=89=8D=E4=BC=9A?= =?UTF-8?q?=E6=8C=89=E5=8C=BA=E5=9F=9F=E5=88=92=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/BabyBuildController.java | 5 +- .../operate/web/facade/BabyBookbuildingFacade.java | 81 +++++++++++++--------- .../operate/web/request/BabyManageRequest.java | 10 +++ 3 files changed, 63 insertions(+), 33 deletions(-) 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 1cb30dd..e411128 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 @@ -189,7 +189,8 @@ public class BabyBuildController extends BaseController { @RequestParam("limit") Integer limit, @RequestParam(value = "areaId",required = false) String areaId, - @RequestParam(value = "hospitalId",required = false) String hospitalId){ + @RequestParam(value = "hospitalId",required = false) String hospitalId, + @RequestParam(value = "isArea",required = false) String isArea){ LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); BabyManageRequest request = new BabyManageRequest(); request.setBcardNo(bcardNo); @@ -213,6 +214,8 @@ public class BabyBuildController extends BaseController { request.setAreaId(areaId); // 建档医院 request.setHospitalId(hospitalId); + // 是否区域 + request.setIsArea(isArea); return babyBookbuildingFacade.queryBabyList(request,loginState.getId()); } 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 9ca08dc..89adc93 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 @@ -1435,38 +1435,42 @@ public class BabyBookbuildingFacade { */ public BaseListResponse queryBabyList(BabyManageRequest request, Integer userId) { - // HuJiaqi注释开始 - // String hospitalId = ""; - - - //得到当前登录的医院id - // if (userId != null) { - // Users dbuser = usersService.getUsers(userId); - // if (dbuser != null) { - // hospitalId = String.valueOf(dbuser.getOrgId()); - // } - // } - // HuJiaqi注释结束 - // 更改原因-从一个医院更改为list List hospitalIdList = new ArrayList<>(); - 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); - List organizationList = organizationService.queryOrganization(organizationQuery); - for (Organization organization : organizationList) { - hospitalIdList.add(String.valueOf(organization.getId())); + + if(request.getIsArea().equals(String.valueOf(YnEnums.YES.getId()))){ + // 更改原因-从一个医院更改为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); + List organizationList = organizationService.queryOrganization(organizationQuery); + for (Organization organization : organizationList) { + hospitalIdList.add(String.valueOf(organization.getId())); + } + }else{ + // 传入了医院，取传入的医院 + hospitalIdList.add(request.getHospitalId()); } }else{ - // 传入了医院，取传入的医院 - hospitalIdList.add(request.getHospitalId()); + String hospitalId = ""; + //得到当前登录的医院id + if (userId != null) { + Users dbuser = usersService.getUsers(userId); + if (dbuser != null) { + hospitalId = String.valueOf(dbuser.getOrgId()); + } + } + hospitalIdList.add(hospitalId); } + + + BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setHospitalIdList(hospitalIdList); List models = getBabayListByCondition(request, true, babyQuery); @@ -1496,16 +1500,29 @@ public class BabyBookbuildingFacade { // 开始查询省市区街道 // 省 - String provinceName = basicConfigService.getOneBasicConfigById(model.getProvinceId()).getName(); + BasicConfig provinceName = basicConfigService.getOneBasicConfigById(model.getProvinceId()); // 市 - String cityName = basicConfigService.getOneBasicConfigById(model.getCityId()).getName(); + BasicConfig cityName = basicConfigService.getOneBasicConfigById(model.getCityId()); // 区 - String areaName = basicConfigService.getOneBasicConfigById(model.getAreaId()).getName(); + BasicConfig areaName = basicConfigService.getOneBasicConfigById(model.getAreaId()); // 街道 - String streetName = basicConfigService.getOneBasicConfigById(model.getStreetId()).getName(); + BasicConfig streetName = basicConfigService.getOneBasicConfigById(model.getStreetId()); // 具体 String address = model.getAddress(); - String completeAddress = provinceName+cityName+areaName+streetName+address; + String completeAddress = ""; + if(provinceName!=null){ + completeAddress+=provinceName.getName(); + } + if(cityName!=null){ + completeAddress+=cityName.getName(); + } + if(areaName!=null){ + completeAddress+=areaName.getName(); + } + if(streetName!=null){ + completeAddress+=streetName.getName(); + } + completeAddress+=address; result.setCompleteAddress(completeAddress); String diagnose = ""; 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 121c36e..0884b67 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 @@ -62,6 +62,16 @@ public class BabyManageRequest extends BaseQuery { private String hospitalId; + private String isArea; + + public String getIsArea() { + return isArea; + } + + public void setIsArea(String isArea) { + this.isArea = isArea; + } + public String getDateRange() { return dateRange; } -- 1.8.3.1