diff --git a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java index 5b4837e..fcde009 100644 --- a/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java @@ -428,13 +428,13 @@ public class ModelCaseServiceImpl extends ServiceImpl indexJundgeLogicMap = IndexRuleUtil.getIndexJundgeLogicMap(record.getIndexRule()); + Map indexJudgeLogicMap = IndexRuleUtil.getIndexJudgeLogicMap(record.getIndexRule()); // 需要和原子指标的规则判断是否一致(解决出罪和入罪冲突的问题) - String relationalSymbol = indexJundgeLogicMap.get(atomic.getAtomicIndexId()); + String relationalSymbol = indexJudgeLogicMap.get(atomic.getAtomicIndexId()); atomic.judgeWithIndexResult(relationalSymbol); atomic.setSegmentation(nodeRecordSpliteMap); atomic.setRecordIfSegmentationAbsent("无"); - List filterAtomicResultList = atomicResultList.stream().filter(v -> StrUtil.equals(record.getIndexId(), v.getIndexId())).toList(); + List filterAtomicResultList = atomicResultList.stream().filter(v -> StrUtil.equals(atomic.getAtomicIndexId(), v.getAtomicId())).toList(); List evidentResult = getEvidentResult(filterAtomicResultList, caseEvidenceList, rootDirectory); atomic.setEvidentResultList(evidentResult); diff --git a/src/main/java/com/supervision/utils/IndexRuleUtil.java b/src/main/java/com/supervision/utils/IndexRuleUtil.java index a256c26..4c7baa7 100644 --- a/src/main/java/com/supervision/utils/IndexRuleUtil.java +++ b/src/main/java/com/supervision/utils/IndexRuleUtil.java @@ -21,7 +21,7 @@ public class IndexRuleUtil { return atomicIndexIds; } - public static Map getIndexJundgeLogicMap(String indexRule) { + public static Map getIndexJudgeLogicMap(String indexRule) { Map indexJundgeLogicMap = new HashMap<>(); Gson gson = new Gson(); IndexRule rule = gson.fromJson(indexRule, IndexRule.class);