From d39940737d82a2f0d413a521f5cde29ff022b358 Mon Sep 17 00:00:00 2001 From: Administrator <184677810@qq.com> Date: Tue, 17 Sep 2019 16:09:23 +0800 Subject: [PATCH] update14 --- .../web/controller/HearDiagnManageController.java | 83 ++++++++++++---------- .../HighriskChangeHospitalController.java | 31 ++++---- 2 files changed, 61 insertions(+), 53 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java index 34d899d..0be72fa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java @@ -1289,7 +1289,7 @@ public class HearDiagnManageController extends BaseController { hospitalIds.add(hdReq.getHospitalId()); } else { //获取用户拥有的权限医院和条件筛选的医院交集 - hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), hdReq.getOrgProvinceId(), hdReq.getOrgCityId(), hdReq.getAreaId()); + hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), hdReq.getOrgProvinceId(), hdReq.getOrgCityId(), hdReq.getOrgAreaId()); } //当前登录人医院Id // String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); @@ -1316,21 +1316,23 @@ public class HearDiagnManageController extends BaseController { query.setConfirmEndTime(hdReq.getConfirmEndTime()); } - //省市区查询儿童列表信息 - BabyModelQuery modelQuery = new BabyModelQuery(); - modelQuery.setProvinceId(hdReq.getProvinceId()); - modelQuery.setCityId(hdReq.getCityId()); - modelQuery.setAreaId(hdReq.getAreaId()); - modelQuery.setStreetId(hdReq.getStreetId()); - modelQuery.setAreaId(hdReq.getAreaId()); - List babyModels = babyService.queryBabyWithQuery(modelQuery); List list = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(babyModels)) { - for (BabyModel babyModel : babyModels) { - list.add(babyModel.getId()); + if (StringUtils.isNotEmpty(hdReq.getProvinceId())) { + //省市区查询儿童列表信息 + BabyModelQuery modelQuery = new BabyModelQuery(); + modelQuery.setProvinceId(hdReq.getProvinceId()); + modelQuery.setCityId(hdReq.getCityId()); + modelQuery.setAreaId(hdReq.getAreaId()); + modelQuery.setStreetId(hdReq.getStreetId()); + modelQuery.setAreaId(hdReq.getAreaId()); + List babyModels = babyService.queryBabyWithQuery(modelQuery); + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyModel babyModel : babyModels) { + list.add(babyModel.getId()); + } } - } + } BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); babyQuery.setQueryNo(hdReq.getKeyWord()); babyQuery.setBirthStart(hdReq.getBirthStartTime()); @@ -1488,27 +1490,29 @@ public class HearDiagnManageController extends BaseController { hospitalIds.add(model.getHospitalId()); } else { //获取用户拥有的权限医院和条件筛选的医院交集 - hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), model.getOrgProvinceId(), model.getOrgCityId(), model.getAreaId()); + hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), model.getOrgProvinceId(), model.getOrgCityId(), model.getOrgAreaId()); } //当前登录人医院Id //String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); List babyIds = new ArrayList<>(); - //省市区查询儿童列表信息 - BabyModelQuery modelQuery = new BabyModelQuery(); - modelQuery.setProvinceId(model.getProvinceId()); - modelQuery.setCityId(model.getCityId()); - modelQuery.setAreaId(model.getAreaId()); - modelQuery.setStreetId(model.getStreetId()); - modelQuery.setAreaId(model.getAreaId()); - List babyModels = babyService.queryBabyWithQuery(modelQuery); List list = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(babyModels)) { - for (BabyModel babyModel : babyModels) { - list.add(babyModel.getId()); + if (StringUtils.isNotEmpty(model.getProvinceId())) { + //省市区查询儿童列表信息 + BabyModelQuery modelQuery = new BabyModelQuery(); + modelQuery.setProvinceId(model.getProvinceId()); + modelQuery.setCityId(model.getCityId()); + modelQuery.setAreaId(model.getAreaId()); + modelQuery.setStreetId(model.getStreetId()); + modelQuery.setAreaId(model.getAreaId()); + List babyModels = babyService.queryBabyWithQuery(modelQuery); + + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyModel babyModel : babyModels) { + list.add(babyModel.getId()); + } } } - BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); babyQuery.setQueryNo(model.getKeyWord()); babyQuery.setBirthStart(model.getBirthStartTime()); @@ -1678,7 +1682,7 @@ public class HearDiagnManageController extends BaseController { hospitalIds.add(model.getHospitalId()); } else { //获取用户拥有的权限医院和条件筛选的医院交集 - hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), model.getOrgProvinceId(), model.getOrgCityId(), model.getAreaId()); + hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), model.getOrgProvinceId(), model.getOrgCityId(), model.getOrgAreaId()); } @@ -1737,18 +1741,21 @@ public class HearDiagnManageController extends BaseController { babyQuery.setBirthStart(end); } - //省市区查询儿童列表信息 - BabyModelQuery modelQuery = new BabyModelQuery(); - modelQuery.setProvinceId(model.getProvinceId()); - modelQuery.setCityId(model.getCityId()); - modelQuery.setAreaId(model.getAreaId()); - modelQuery.setStreetId(model.getStreetId()); - modelQuery.setAreaId(model.getAreaId()); - List baby = babyService.queryBabyWithQuery(modelQuery); List list = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(baby)) { - for (BabyModel babyModel : baby) { - list.add(babyModel.getId()); + if (StringUtils.isNotEmpty(model.getProvinceId())) { + //省市区查询儿童列表信息 + BabyModelQuery modelQuery = new BabyModelQuery(); + modelQuery.setProvinceId(model.getProvinceId()); + modelQuery.setCityId(model.getCityId()); + modelQuery.setAreaId(model.getAreaId()); + modelQuery.setStreetId(model.getStreetId()); + modelQuery.setAreaId(model.getAreaId()); + List baby = babyService.queryBabyWithQuery(modelQuery); + + if (CollectionUtils.isNotEmpty(baby)) { + for (BabyModel babyModel : baby) { + list.add(babyModel.getId()); + } } } babyQuery.setHospitalIds(hospitalIds.toArray(new String[hospitalIds.size()])); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java index 0e61119..0a668a4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java @@ -626,25 +626,26 @@ public class HighriskChangeHospitalController extends BaseController { hospitalIds.add(query.getHospitalId()); } else { //获取用户拥有的权限医院和条件筛选的医院交集 - hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), query.getOrgProvinceId(), query.getOrgCityId(), query.getAreaId()); + hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), query.getOrgProvinceId(), query.getOrgCityId(), query.getOrgAreaId()); } String[] hospitalIdArry = new String[hospitalIds.size()]; - - //查询省市区 - BabyModelQuery modelQuery = new BabyModelQuery(); - modelQuery.setProvinceId(query.getProvinceId()); - modelQuery.setCityId(query.getCityId()); - modelQuery.setAreaId(query.getAreaId()); - modelQuery.setStreetId(query.getStreetId()); - modelQuery.setAreaId(query.getAreaId()); - List babyModels = babyService.queryBabyWithQuery(modelQuery); List list = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(babyModels)) { - for (BabyModel babyModel : babyModels) { - list.add(babyModel.getId()); + if (StringUtils.isNotEmpty(query.getProvinceId())) { + //查询省市区 + BabyModelQuery modelQuery = new BabyModelQuery(); + modelQuery.setProvinceId(query.getProvinceId()); + modelQuery.setCityId(query.getCityId()); + modelQuery.setAreaId(query.getAreaId()); + modelQuery.setStreetId(query.getStreetId()); + modelQuery.setAreaId(query.getAreaId()); + List babyModels = babyService.queryBabyWithQuery(modelQuery); + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyModel babyModel : babyModels) { + list.add(babyModel.getId()); + } } - } + } if (type != null && type == 1) {//转出 query.setOutOrgidArry(hospitalIds.toArray(hospitalIdArry)); } else if (type != null && type == 0) {//转入儿童 @@ -663,7 +664,7 @@ public class HighriskChangeHospitalController extends BaseController { if (type != null && type == 1) {//转出 babyQuery.setHospitalIds(hospitalIds.toArray(hospitalIdArry)); } - babyQuery.setBabyPatientIds(list.toArray(new String[babyModels.size()])); + babyQuery.setBabyPatientIds(list.toArray(new String[list.size()])); List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); //查询建档记录 if (CollectionUtils.isNotEmpty(models)) { -- 1.8.3.1