From 34f2b70f69501f5e9030051eb7a3a9559dd80a84 Mon Sep 17 00:00:00 2001
From: "DESKTOP-DDTUS3E\\yaxin" <daixiaoyi0622@gmail.com>
Date: Tue, 5 Nov 2024 17:34:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=A0=87=E7=BB=93=E6=9E=9C=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=8E=9F=E5=AD=90=E6=8C=87=E6=A0=87=E7=9A=84=E8=AF=81?=
 =?UTF-8?q?=E6=8D=AE=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=8E=9F=E5=AD=90=E6=8C=87=E6=A0=87ID=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../police/service/impl/ModelCaseServiceImpl.java           | 6 +++---
 src/main/java/com/supervision/utils/IndexRuleUtil.java      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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<ModelCaseMapper, ModelCase
             for (AtomicIndexDTO atomic : atomics) {
                 // 获取原子指标的判断规则
                 // 配置的指标的逻辑
-                Map<String, String> indexJundgeLogicMap = IndexRuleUtil.getIndexJundgeLogicMap(record.getIndexRule());
+                Map<String, String> 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<ModelAtomicResult> filterAtomicResultList = atomicResultList.stream().filter(v -> StrUtil.equals(record.getIndexId(), v.getIndexId())).toList();
+                List<ModelAtomicResult> filterAtomicResultList = atomicResultList.stream().filter(v -> StrUtil.equals(atomic.getAtomicIndexId(), v.getAtomicId())).toList();
                 List<EvidentIndexResultDTO> 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<String, String> getIndexJundgeLogicMap(String indexRule) {
+    public static Map<String, String> getIndexJudgeLogicMap(String indexRule) {
         Map<String, String> indexJundgeLogicMap = new HashMap<>();
         Gson gson = new Gson();
         IndexRule rule = gson.fromJson(indexRule, IndexRule.class);