diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index cbd9521..a161fb0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -1,7 +1,6 @@ package com.lyms.platform.operate.web.facade; -import com.lyms.platform.beans.AddressBean; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; @@ -162,83 +161,6 @@ public class AreaCountFacade { } - public boolean hasPermissions(String id,Integer addType,List permissionsModels) - { - - if (CollectionUtils.isNotEmpty(permissionsModels) && StringUtils.isNotEmpty(permissionsModels.get(0).getAreaPermission())) - { - List addressBeanList = JsonUtil.toList(permissionsModels.get(0).getAreaPermission(), AddressBean.class); - if (CollectionUtils.isEmpty(addressBeanList)) - { - return false; - } - - for (AddressBean bean : addressBeanList) - { - if (addType == 1) { - if (id != null && id.equals(bean.getC())) { - return true; - } - } - else if (addType == 2) - { - if (id != null && id.equals(bean.getA())) - { - return true; - } - } - else if (addType == 3) - { - if (id != null && id.equals(bean.getS())) - { - return true; - } - } - } - } - return false; - } - - - - public boolean hasPermissions2(String id,Integer addType,List permissionsModels) - { - - if (CollectionUtils.isNotEmpty(permissionsModels) && StringUtils.isNotEmpty(permissionsModels.get(0).getAreaPermission())) - { - List addressBeanList = JsonUtil.toList(permissionsModels.get(0).getAreaPermission(), AddressBean.class); - if (CollectionUtils.isEmpty(addressBeanList)) - { - return false; - } - - for (AddressBean bean : addressBeanList) - { - if (addType == 1) { - if (id != null && id.equals(bean.getP())) { - return true; - } - } - else if (addType == 2) - { - if (id != null && id.equals(bean.getC())) - { - return true; - } - } - else if (addType == 3) - { - if (id != null && id.equals(bean.getA())) - { - return true; - } - } - } - } - return false; - } - - /** * 产检节点统计 * @@ -290,12 +212,12 @@ public class AreaCountFacade { end = hospitalIds.size(); } CheckPointCountWorker checkPointCountWorker = new CheckPointCountWorker( patientsService, - antenatalExaminationService, - organizationService, - basicConfigService, - hospitalIds.subList(i,end), - startTime, - endTime, + antenatalExaminationService, + organizationService, + basicConfigService, + hospitalIds.subList(i,end), + startTime, + endTime, pointType,recordService); listFuture.add(commonThreadPool.submit(checkPointCountWorker)); } @@ -506,7 +428,7 @@ public class AreaCountFacade { patientsQuery.setPage(page); patientsQuery.setLimit(limit); List> list = getCheckPointList( time, hospitalId, - provinceId, cityId, areaId, userId,patientsQuery); + provinceId, cityId, areaId, userId,patientsQuery); return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setPageInfo(patientsQuery.getPageInfo()); } @@ -592,7 +514,7 @@ public class AreaCountFacade { String addressRegister = CommonsHelper.getResidence(pat.getProvinceRegisterId(), pat.getCityRegisterId(), pat.getAreaRegisterId(), pat.getStreetRegisterId(), pat.getAddressRegister(), basicConfigService); map.put("HOME_ADDR", addressRegister); - + map.put("NAME", pat.getUsername()); map.put("TEL_NO", pat.getPhone()); @@ -665,8 +587,8 @@ public class AreaCountFacade { antExRecordQuery.setLimit(limit); antExRecordQuery.setNeed("true"); List results = getCheckDetailData( nodeType, time, hospitalId, - provinceId, cityId, areaId, - userId, nodeName, antExRecordQuery); + provinceId, cityId, areaId, + userId, nodeName, antExRecordQuery); return new BaseListResponse().setData(results).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setPageInfo(antExRecordQuery.getPageInfo()); } @@ -888,8 +810,8 @@ public class AreaCountFacade { AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); List ticketList = getCheckDetailData( nodeType, time, hospitalId, - provinceId, cityId, areaId, - userId, nodeName,antExRecordQuery); + provinceId, cityId, areaId, + userId, nodeName,antExRecordQuery); List> results = new ArrayList<>(); if (CollectionUtils.isNotEmpty(ticketList)) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 7601859..f671f1a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -1,6 +1,5 @@ package com.lyms.platform.operate.web.facade; -import com.lyms.platform.beans.AddressBean; import com.lyms.platform.beans.MsgRequest; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; @@ -1120,7 +1119,7 @@ public class SieveFacade { String[] dates = null; if (StringUtils.isNotEmpty(cqSieveQueryRequest.getTime())) { - dates = cqSieveQueryRequest.getTime().split(" - "); + dates = cqSieveQueryRequest.getTime().split(" - "); } BasicConfigQuery basicQuery = new BasicConfigQuery(); @@ -1144,20 +1143,12 @@ public class SieveFacade { //x轴标题数据 List xAxis = new ArrayList<>(); - List configList = new ArrayList<>(); - - DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); - dataPermissionsModelQuery.setUserId(userId); - List permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery); //获取地址列表 - List dataConfigs = basicConfigService.queryBasicConfig(basicQuery); - if (CollectionUtils.isNotEmpty(dataConfigs)) { - for (BasicConfig addr : dataConfigs) { - if (areaCountFacade.hasPermissions(addr.getId(),addrType,permissionsModels)) - { - configList.add(addr); - xAxis.add(addr.getName()); - } + List configList = basicConfigService.queryBasicConfig(basicQuery); + + if (CollectionUtils.isNotEmpty(configList)) { + for (BasicConfig addr : configList) { + xAxis.add(addr.getName()); } } @@ -1299,6 +1290,7 @@ public class SieveFacade { diagnosisQuery1.setResultDateEnd(DateUtil.parseYMDHMS(dates[1])); } } + System.out.println("diagnosisQuery1==="+diagnosisQuery1.convertToQuery().convertToMongoQuery()); int diagnosisCountAll = diagnosisService.queryDiagnosisCount(diagnosisQuery1); items.add(String.valueOf(diagnosisCountAll)); } @@ -1334,13 +1326,12 @@ public class SieveFacade { @Autowired private BasicConfigService basicConfigService; - @Autowired - private DataPermissionService dataPermissionService; + @Autowired private AreaCountFacade areaCountFacade; - private List> getSieveDatas(List hospitalIds,String[] dates,String cityId,Integer userId) + private List> getSieveDatas(List hospitalIds,String[] dates,String cityId) { List> list = new ArrayList<>(); @@ -1350,22 +1341,10 @@ public class SieveFacade { basicQuery.setTypeId("b7ea005c-dfac-4c2a-bdae-25239b3f44fd"); basicQuery.setParentId(cityId); - List configList = new ArrayList<>(); - DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); - dataPermissionsModelQuery.setUserId(userId); - List permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery); - //获取地址列表 - List dataConfigs = basicConfigService.queryBasicConfig(basicQuery); - if (CollectionUtils.isNotEmpty(dataConfigs)) { - for (BasicConfig addr : dataConfigs) { - if (areaCountFacade.hasPermissions(addr.getId(),2,permissionsModels)) - { - configList.add(addr); - } - } - } + //获取地址列表 + List configList = basicConfigService.queryBasicConfig(basicQuery); for (BasicConfig bc : configList) { int ySieveCount = 0; @@ -1620,11 +1599,11 @@ public class SieveFacade { dates = cqSieveQueryRequest.getTime().split(" - "); titleName+=cqSieveQueryRequest.getTime(); } - List> list = getSieveDatas(currentUserHospPermissions, dates, cqSieveQueryRequest.getCityId(),userId); + List> list = getSieveDatas(currentUserHospPermissions,dates,cqSieveQueryRequest.getCityId()); response.setContentType("application/force-download"); response.setHeader("Content-Disposition", "attachment;filename=" + new String(("孕妇产前筛查和诊断情况月报表.xls").getBytes("UTF-8"), "ISO-8859-1")); String path = this.getClass().getResource("/").getPath()+ "whfy_sieve.xls"; - ExcelUtil.writeWhSieveExclFile(path, response.getOutputStream(), list, titleName); + ExcelUtil.writeWhSieveExclFile(path, response.getOutputStream(), list,titleName); } catch (Exception e) { ExceptionUtils.catchException(e, "exportSieveReportExcl error"); @@ -1646,40 +1625,9 @@ public class SieveFacade { } //获取用户权限医院和筛选条件的交集 - List areaHospitalIds = new ArrayList<>(); - - DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); - dataPermissionsModelQuery.setUserId(userId); - List permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery); - if (CollectionUtils.isNotEmpty(permissionsModels)) - { - for (DataPermissionsModel permissionsModel : permissionsModels) - { - if (StringUtils.isNotEmpty(permissionsModel.getAreaPermission())) - { - - List addressBeanList = JsonUtil.toList(permissionsModels.get(0).getAreaPermission(), AddressBean.class); - if (CollectionUtils.isEmpty(addressBeanList)) - { - continue; - } - - for (AddressBean bean : addressBeanList) - { - areaHospitalIds.addAll(areaCountFacade.getCurrentUserHospPermissions(userId, bean.getP(), - bean.getC(), bean.getA())); - } - } - } - } - - List> list = new ArrayList<>(); - //获取用户权限医院和筛选条件的交集 List currentUserHospPermissions = areaCountFacade.getCurrentUserHospPermissions(userId, cqSieveQueryRequest.getProvinceId(), cqSieveQueryRequest.getCityId(), cqSieveQueryRequest.getAreaId()); - - currentUserHospPermissions.retainAll(areaHospitalIds); - list = getDiaDatas(currentUserHospPermissions, dates); + List> list = getDiaDatas(currentUserHospPermissions, dates); response.setContentType("application/force-download"); response.setHeader("Content-Disposition", "attachment;filename=" + new String(("产前诊断及新生儿疾病筛查工作情况表.xls").getBytes("UTF-8"), "ISO-8859-1")); String path = this.getClass().getResource("/").getPath()+ "whfy_diagnosis.xls"; @@ -2076,5 +2024,4 @@ public class SieveFacade { list.add(dataMap); } - } \ No newline at end of file