diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 3e4a7a7..8417395 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -1,7 +1,6 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; -import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.RiskDefaultTypeEnum; import com.lyms.platform.common.enums.YnEnums; @@ -177,23 +176,23 @@ public class AntExRecordFacade { //区域范围内孕妇 if (isRegion) { List hospitalList = null; - //王平说的 必须要给区域医院权限，不然他就是蠢逼 201611124 16:41 - hospitalList = new ArrayList<>(); - String hospital = autoMatchFacade.getHospitalId(userId); - if (null != hospital) { - hospitalList.add(hospital); + //王平说的 必须要给区域医院权限，不然他就是蠢逼 201611124 16:41 + hospitalList = new ArrayList<>(); + String hospital = autoMatchFacade.getHospitalId(userId); + if (null != hospital) { + hospitalList.add(hospital); + } + DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); + dataPermissionsModelQuery.setUserId(userId); + List permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery); + if (CollectionUtils.isNotEmpty(permissionsModels)) { + Set set = permissionsModels.get(0).getData().keySet(); + Iterator it = set.iterator(); + while (it.hasNext()) { + String id = it.next(); + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id) && !hospitalList.contains(id)) { + hospitalList.add(id); } - DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); - dataPermissionsModelQuery.setUserId(userId); - List permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery); - if (CollectionUtils.isNotEmpty(permissionsModels)) { - Set set = permissionsModels.get(0).getData().keySet(); - Iterator it = set.iterator(); - while (it.hasNext()) { - String id = it.next(); - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id) && !hospitalList.contains(id)) { - hospitalList.add(id); - } } } @@ -626,8 +625,8 @@ public class AntExRecordFacade { } //antExRecordQuery.setLevelId(antExManagerQueryRequest.getLevel()); - List antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created"); - System.out.println("antExRecordModelList====================" + antExRecordModelList.size()); + List antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC,"created"); + System.out.println("antExRecordModelList===================="+antExRecordModelList.size()); Map> map = handleAntexRecord(antExRecordModelList); AntExRecordQuery pageAntExRecordsQuery = new AntExRecordQuery(); @@ -645,7 +644,7 @@ public class AntExRecordFacade { { initBasicData(); - List> ids = new ArrayList<>(); + List ids = new ArrayList<>(); Map> incriskMap = new HashMap<>(); if (map.size() > 0) @@ -674,7 +673,7 @@ public class AntExRecordFacade { public Map call() { Map result = new HashMap(); if (CollectionUtils.isNotEmpty(tempList)) { - List> ids = new ArrayList<>(); + List ids = new ArrayList<>(); Map> incriskMap = new HashMap<>(); AntExRecordQuery beforeRecordQuery = new AntExRecordQuery(); for (String patientId : tempList) { @@ -696,10 +695,7 @@ public class AntExRecordFacade { if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && getConditionRisk(request.getRiskFactorId(), currentRiskList, request.getLevel())) { - Map objMap = new HashMap(); - objMap.put("id",oneRecord.getId()); - objMap.put("time",oneRecord.getCheckTime()); - ids.add(objMap); + ids.add(oneRecord.getId()); incriskMap.put(oneRecord.getId(), currentRiskList); } else if (CollectionUtils.isNotEmpty(beforeRiskList)) { List incrHrisk = new ArrayList(); @@ -709,20 +705,14 @@ public class AntExRecordFacade { } } if (CollectionUtils.isNotEmpty(incrHrisk) && getConditionRisk(request.getRiskFactorId(), incrHrisk, request.getLevel())) { - Map objMap = new HashMap(); - objMap.put("id",oneRecord.getId()); - objMap.put("time",oneRecord.getCheckTime()); - ids.add(objMap); + ids.add(oneRecord.getId()); incriskMap.put(oneRecord.getId(), incrHrisk); } } } else { if (CollectionUtils.isNotEmpty(oneRecord.gethRisk()) && getConditionRisk(request.getRiskFactorId(), oneRecord.gethRisk(), request.getLevel())) { - Map objMap = new HashMap(); - objMap.put("id",oneRecord.getId()); - objMap.put("time",oneRecord.getCheckTime()); - ids.add(objMap); + ids.add(oneRecord.getId()); incriskMap.put(oneRecord.getId(), oneRecord.gethRisk()); } } @@ -750,10 +740,7 @@ public class AntExRecordFacade { if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && getConditionRisk(request.getRiskFactorId(), currentRiskList, request.getLevel())) { - Map objMap = new HashMap(); - objMap.put("id",oneRecord.getId()); - objMap.put("time",oneRecord.getCheckTime()); - ids.add(objMap); + ids.add(oneRecord.getId()); incriskMap.put(oneRecord.getId(), currentRiskList); } else if (CollectionUtils.isNotEmpty(beforeRiskList)) { List incrHrisk = new ArrayList(); @@ -764,10 +751,7 @@ public class AntExRecordFacade { } if (CollectionUtils.isNotEmpty(incrHrisk) && getConditionRisk(request.getRiskFactorId(), incrHrisk, request.getLevel())) { - Map objMap = new HashMap(); - objMap.put("id",oneRecord.getId()); - objMap.put("time",oneRecord.getCheckTime()); - ids.add(objMap); + ids.add(oneRecord.getId()); incriskMap.put(oneRecord.getId(), incrHrisk); } } @@ -783,7 +767,7 @@ public class AntExRecordFacade { for (Future f : listFuture) { try { - Map fmap = (Map) f.get(30, TimeUnit.SECONDS); + Map fmap = (Map) f.get(30, TimeUnit.SECONDS); if (fmap.get("ids") != null) { ids.addAll((List)fmap.get("ids")); @@ -799,54 +783,18 @@ public class AntExRecordFacade { } } riskBasicMap.clear(); - - } - System.out.println("ids ============ " + ids.size()); - if (CollectionUtils.isEmpty(ids)) - { - return null; } if (CollectionUtils.isEmpty(ids)) { - Collections.sort(ids, new Comparator>() { - @Override - public int compare(Map o1, Map o2) { - Object d1 = o1.get("time"); - Object d2 = o2.get("time"); - if (d1 != null && d1 != null) - { - return ((Date)d1).compareTo((Date)d2); - } - return 0; - } - }); - } - - int index = request.getPage() * request.getLimit() - request.getLimit(); - int from = request.getPage() * request.getLimit(); - System.out.println("index = " + index + " from = " + from); - - List> pages = ids.subList(index,from); - if (CollectionUtils.isEmpty(pages)) - { return null; } - - List recordIds = new ArrayList<>(); - for (Map item : pages) - { - recordIds.add(String.valueOf(item.get("id"))); - } - pageAntExRecordsQuery.setNeed("true"); pageAntExRecordsQuery.setPage(request.getPage()); pageAntExRecordsQuery.setLimit(request.getLimit()); - pageAntExRecordsQuery.setIds(recordIds); + pageAntExRecordsQuery.setIds(ids); pageAntExRecordsQuery.setLevelId(request.getLevel()); - System.out.println("ids = " + ids.size()); - pageAntExRecordsQuery.mysqlBuild(ids.size()); List pageAntExRecords = recordService.queryAntExRecords(pageAntExRecordsQuery); if (CollectionUtils.isNotEmpty(pageAntExRecords)) @@ -873,20 +821,6 @@ public class AntExRecordFacade { return false; } return true; - -// if (StringUtils.isNotEmpty(level)) -// { -// BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); -// basicConfigQuery.setIds(incrHrisk); -// basicConfigQuery.setParentId(level); -// List configs = basicConfigService.queryBasicConfig(basicConfigQuery); -// if (CollectionUtils.isNotEmpty(configs)) -// { -// return true; -// } -// return false; -// } -// return true; } private Map> riskBasicMap = new HashMap<>(); @@ -920,7 +854,7 @@ public class AntExRecordFacade { { return isExistsLevel(level,incrHrisk); } - return incrHrisk.contains(riskId) && isExistsLevel(level,incrHrisk); + return incrHrisk.contains(riskId) && isExistsLevel(level,incrHrisk); }