1. 修复bug: 案件指标结果中出现一个指标对应多个相同指标数据的问题

src/main/java/com/supervision/police/service/impl/ModelCaseServiceImpl.java

@@ -33,6 +33,7 @@ import com.supervision.police.service.CaseStatusManageService;
 import com.supervision.police.service.ComDictionaryService;
 import com.supervision.police.service.ModelCaseService;
 import com.supervision.police.vo.ModelCaseVO;
+import com.supervision.utils.JudgeLogicUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -357,17 +358,17 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
         iPage = modelCaseMapper.getIndexDetail(iPage, caseId, indexType);
         List<IndexDetail> records = iPage.getRecords();
         for (IndexDetail record : records) {
-            if (StringUtils.isEmpty(record.getAtomicIds())) {
+            String judgeLogic = record.getJudgeLogic();
+            if (StringUtils.isEmpty(judgeLogic)) {
                 continue;
             }
             // 是否是新的结果
             record.setNewFlag(!StrUtil.equals(record.getIndexResult(), record.getPreResult()));
             // 获取原子指标的判断规则
-            String judgeLogic = record.getJudgeLogic();
+
             // 配置的指标的逻辑
             Map<String, String> indexJundgeLogicMap = parseLogicMap(judgeLogic);
-            String[] array = record.getAtomicIds().split(",");
-            List<String> atomicIds = Arrays.asList(array);
+            List<String> atomicIds = JudgeLogicUtil.pickAtomicIndexIds(judgeLogic);
             List<AtomicIndexDTO> atomics = modelCaseMapper.getAtomicDetail(caseId, record.getIndexId(), atomicIds);
             for (AtomicIndexDTO atomic : atomics) {
                 // 需要和原子指标的规则判断是否一致(解决出罪和入罪冲突的问题)

src/main/java/com/supervision/police/service/impl/ModelIndexServiceImpl.java

@@ -267,11 +267,9 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
         ModelCase modelCase = modelCaseService.getById(caseAtomicResultWrapper.getCaseId());
         Assert.notNull(modelCase, "案件不存在！");
         // 设置行为人id
-        List<CasePerson> casePersonList = casePersonMapper.selectList(Wrappers.lambdaQuery(CasePerson.class)
-                .eq(CasePerson::getCaseId, modelCase.getId()).eq(CasePerson::getRoleCode, "1"));
-        Assert.notEmpty(casePersonList, "案件行为人不能为空!");
-        caseAtomicResultWrapper.setActorId(CollUtil.getFirst(casePersonList).getId());
-
+        CasePerson casePerson = casePersonMapper.selectOne(Wrappers.lambdaQuery(CasePerson.class)
+                .eq(CasePerson::getCaseId, modelCase.getId()).eq(CasePerson::getRoleCode, "1").eq(CasePerson::getCaseActorFlag, 1));
+        caseAtomicResultWrapper.setActorId(casePerson.getId());
 
         //清空人工评估结果
         removeCaseAtomicResult(caseAtomicResultWrapper.getCaseId(), modelCase.getCaseType(),
@@ -333,11 +331,11 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
      */
     private void removeCaseAtomicResult(String caseId, String caseType, String actorId, String indexSource) {
         List<ModelAtomicIndex> modelAtomicIndexList = modelAtomicIndexService.listCaseAtomicIndex(null, caseType, indexSource);
-        List<String> automicIndexIds = modelAtomicIndexList.stream().map(ModelAtomicIndex::getId).distinct().toList();
+        List<String> atomicIndexIds = modelAtomicIndexList.stream().map(ModelAtomicIndex::getId).distinct().toList();
         modelAtomicResultMapper.delete(Wrappers.lambdaQuery(ModelAtomicResult.class)
                 .eq(ModelAtomicResult::getCaseId, caseId)
                 .eq(ModelAtomicResult::getCasePersonId, actorId)
-                .in(CollUtil.isNotEmpty(automicIndexIds), ModelAtomicResult::getAtomicId, automicIndexIds));
+                .in(CollUtil.isNotEmpty(atomicIndexIds), ModelAtomicResult::getAtomicId, atomicIndexIds));
     }