指标关联原子指标数量问题修复

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

@@ -112,18 +112,17 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
             index.setCaseTypeName(comDictionaryService.getName(dicts, "case_type", index.getCaseType()));
             //原子指标
             String judgeLogic = index.getJudgeLogic();
-            List<String> ids = new ArrayList<>();
+            Set<String> ids = new HashSet<>();
             IndexRule indexRule = index.getIndexRule();
             if (indexRule != null) {
-                Set<String> idSet = new HashSet<>();
                 List<RuleConditionGroup> ruleConditionGroupList = indexRule.getRuleConditionGroupList();
                 for (RuleConditionGroup ruleConditionGroup : ruleConditionGroupList) {
                     List<RuleCondition> ruleConditionList = ruleConditionGroup.getRuleConditionList();
                     for (RuleCondition ruleCondition : ruleConditionList) {
-                        idSet.add(ruleCondition.getAtomicIndexId());
+                        ids.add(ruleCondition.getAtomicIndexId());
                     }
                 }
-                List<ModelAtomicIndex> atomicIndexList = modelAtomicIndexService.selectBatchIds(idSet.stream().toList());
+                List<ModelAtomicIndex> atomicIndexList = modelAtomicIndexService.selectBatchIds(ids.stream().toList());
                 index.setAtomicIndexList(atomicIndexList);
             } else if (StringUtils.isNotEmpty(judgeLogic)) {
                 List<JudgeLogic> logic = JSONUtil.toList(judgeLogic, JudgeLogic.class);
@@ -133,7 +132,7 @@ public class ModelIndexServiceImpl extends ServiceImpl<ModelIndexMapper, ModelIn
                         ids.add(atomic.getAtomicIndex());
                     }
                 }
-                List<ModelAtomicIndex> atomicIndexList = modelAtomicIndexService.selectBatchIds(ids);
+                List<ModelAtomicIndex> atomicIndexList = modelAtomicIndexService.selectBatchIds(ids.stream().toList());
                 index.setAtomicIndexList(atomicIndexList);
             }
             index.setAtomicIndexNum(ids.size());