From d0b9005ff5b5c34fb0dd1ad7eb050a4846972df5 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 15 Jun 2018 17:12:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E6=A3=80=E6=9F=A5=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntExRecordFacade.java | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) 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 e73851b..15ef2bc 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 @@ -668,7 +668,7 @@ public class AntExRecordFacade { List currentRiskList = oneRecord.gethRisk(); List beforeRiskList = twoRecord.gethRisk(); - if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) + if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && getConditionRisk(request.getRiskFactorId(),currentRiskList)) { ids.add(oneRecord.getId()); incriskMap.put(oneRecord.getId(), currentRiskList); @@ -683,7 +683,7 @@ public class AntExRecordFacade { incrHrisk.add(riskId); } } - if (CollectionUtils.isNotEmpty(incrHrisk)) + if (CollectionUtils.isNotEmpty(incrHrisk) && getConditionRisk(request.getRiskFactorId(),incrHrisk)) { ids.add(oneRecord.getId()); incriskMap.put(oneRecord.getId(), incrHrisk); @@ -711,7 +711,7 @@ public class AntExRecordFacade { List currentRiskList = oneRecord.gethRisk(); List beforeRiskList = twoRecord.gethRisk(); - if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) + if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && getConditionRisk(request.getRiskFactorId(),currentRiskList)) { ids.add(oneRecord.getId()); incriskMap.put(oneRecord.getId(), currentRiskList); @@ -726,7 +726,7 @@ public class AntExRecordFacade { incrHrisk.add(String.valueOf(riskId)); } } - if (CollectionUtils.isNotEmpty(incrHrisk)) + if (CollectionUtils.isNotEmpty(incrHrisk) && getConditionRisk(request.getRiskFactorId(),incrHrisk)) { ids.add(oneRecord.getId()); incriskMap.put(oneRecord.getId(), incrHrisk); @@ -737,11 +737,10 @@ public class AntExRecordFacade { } } - if (CollectionUtils.isEmpty(ids) || !incriskMap.containsValue(request.getRiskFactorId())) + if (CollectionUtils.isEmpty(ids)) { return null; } - pageAntExRecordsQuery.setNeed("true"); pageAntExRecordsQuery.setPage(request.getPage()); pageAntExRecordsQuery.setLimit(request.getLimit()); @@ -761,6 +760,15 @@ public class AntExRecordFacade { return pageAntExRecords; } + private boolean getConditionRisk(String riskId,List incrHrisk) + { + if (StringUtils.isEmpty(riskId)) + { + return true; + } + return incrHrisk.contains(riskId); + } + /** * 把同一个人的产检记录放入集合 -- 1.8.3.1