diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 5d5120d..25d82e8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1118,114 +1118,6 @@ public class MatDeliverFacade { return list; } - public List postpartumDeliver(PostpartumFollowMakeRequest postpartumFollowMakeRequest) { - List postpartumFollowResults = new ArrayList<>(); - - PatientsQuery patientsQuery = new PatientsQuery(); - - if (StringUtils.isNotEmpty(postpartumFollowMakeRequest.getBirthDate())) { - patientsQuery.setFmDateStart(DateUtil.getSNDate(postpartumFollowMakeRequest.getBirthDate())[0]); - patientsQuery.setFmDateEnd(DateUtil.getSNDate(postpartumFollowMakeRequest.getBirthDate())[1]); - } - patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setIsAutoFm(YnEnums.NO.getId()); - patientsQuery.setType(3); - // 构造医院id集合 - List hospitalList = new ArrayList<>(); - if (StringUtils.isEmpty(postpartumFollowMakeRequest.getIsArea())) { - // 非区域 - hospitalList.add(postpartumFollowMakeRequest.getHospitalId()); - } else { - // 未传入查询条件 - if (StringUtils.isEmpty(postpartumFollowMakeRequest.getHospitalProvinceId()) && StringUtils.isEmpty(postpartumFollowMakeRequest.getHospitalProvinceId()) && StringUtils.isEmpty(postpartumFollowMakeRequest.getHospitalAreaId()) && StringUtils.isEmpty(postpartumFollowMakeRequest.getHospitalId())) { - - DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); - dataPermissionsModelQuery.setUserId(postpartumFollowMakeRequest.getOperatorId()); - List dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery); - if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) { - Map data = dataPermissionsModelList.get(0).getData(); - for (Object hospitalId : data.keySet()) { - if (StringUtils.isNotEmpty(hospitalId.toString()) && !hospitalList.contains(hospitalId.toString())) { - hospitalList.add(hospitalId.toString()); - } - } - } - } else { - // 传入了查询条件 - OrganizationQuery organizationQuery = new OrganizationQuery(); - organizationQuery.setProvinceId(postpartumFollowMakeRequest.getHospitalProvinceId()); - organizationQuery.setCityId(postpartumFollowMakeRequest.getHospitalCityId()); - organizationQuery.setAreaId(postpartumFollowMakeRequest.getHospitalAreaId()); - organizationQuery.setYn(YnEnums.YES.getId()); - List organizationList = organizationService.queryHospitals(organizationQuery); - if (CollectionUtils.isNotEmpty(organizationList)) { - for (Organization organization : organizationList) { - hospitalList.add(organization.getId().toString()); - } - } - } - } - patientsQuery.setFmHospitalQueryList(hospitalList); - patientsQuery.setLimit(postpartumFollowMakeRequest.getLimit()); - patientsQuery.setPage(postpartumFollowMakeRequest.getPage()); - patientsQuery.setNeed("need"); - patientsQuery.setDesc("fmDate"); - patientsQuery.setSort("fmDate"); - - List patientsList = patientsService.queryPatient(patientsQuery); - List parentIdList = new ArrayList<>(); - if (CollectionUtils.isEmpty(patientsList)) { - // 没有查到,直接抛出 - return postpartumFollowResults; - } - Map patientsMap = new HashMap<>(); - for (Patients patients : patientsList) { - parentIdList.add(patients.getId()); - patientsMap.put(patients.getId(),patients); - } - - - - - MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); - matDeliverQuery.setParentIdList(parentIdList); - matDeliverQuery.setYn(YnEnums.YES.getId()); - List maternalDeliverModelList = matDeliverService.query(matDeliverQuery); - - - for(MaternalDeliverModel deliverModel : maternalDeliverModelList){ - PostpartumFollowResult postpartumFollowResult = new PostpartumFollowResult(); - Patients patients = patientsMap.get(deliverModel.getParentId()); - // 居住地 - postpartumFollowResult.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); - // 电话转换 - postpartumFollowResult.setPhone(patients.getPhone()); - //姓名 - postpartumFollowResult.setName(patients.getUsername()); - // 年龄 - postpartumFollowResult.setAge(DateUtil.getAge(patients.getBirth())); - //机构信息 - Organization organization = organizationService.getOrganization(Integer.valueOf(deliverModel.getFmHospital())); - // 市 - BasicConfig cityName = basicConfigService.getOneBasicConfigById(organization.getCityId()); - // 区 - BasicConfig areaName = basicConfigService.getOneBasicConfigById(organization.getAreaId()); - if (cityName != null) { - postpartumFollowResult.setHospitalCityName(cityName.getName()); - } - if (areaName != null) { - postpartumFollowResult.setHospitalAreaName(areaName.getName()); - } - //分娩医院 - postpartumFollowResult.setFmHospital(organization.getName()); - - - - } - - return null; - } - public ChildbirthManagerResult childbirthManager(ChildbirthManagerRequest childbirthManagerRequest) { ChildbirthManagerResult childbirthManagerResult = new ChildbirthManagerResult(); diff --git a/pom.xml b/pom.xml index ab7ce83..d2359fd 100644 --- a/pom.xml +++ b/pom.xml @@ -561,11 +561,11 @@ commons-dbutils 1.6 - - com.microsoft.sqlserver - sqljdbc4 - 4.0 - + + + + + com.alibaba fastjson