diff --git a/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java b/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java index 975bd53..4eb1f82 100644 --- a/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java +++ b/src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java @@ -202,7 +202,7 @@ public class CaseScoreDetailBuilder { .flatMap(indexResult -> indexResult.getAtomicResults().stream()).filter(atomicResult -> { JudgeResultEnum instance = JudgeResultEnum.getInstance(atomicResult.getJudgeResult()); return instance == null || !instance.flagIsTrue(); - }).filter(distinctPredicate(AtomicResult::getAtomicId)).count() + }).filter(result->StrUtil.isNotEmpty(result.getAtomicId())).filter(distinctPredicate(AtomicResult::getAtomicId)).count() ); return caseScoreDetailDTO; } diff --git a/src/main/java/com/supervision/police/dto/caseScore/IndexResult.java b/src/main/java/com/supervision/police/dto/caseScore/IndexResult.java index 2967cfd..ab5f3fd 100644 --- a/src/main/java/com/supervision/police/dto/caseScore/IndexResult.java +++ b/src/main/java/com/supervision/police/dto/caseScore/IndexResult.java @@ -73,8 +73,9 @@ public class IndexResult { } // 注意不要有重复值 Map atomicIndexMap = atomicIndexList.stream().collect(Collectors.toMap(ModelAtomicIndex::getId, k -> k, (k1, k2) -> k1)); - this.atomicResults = atomicResultListFilter.stream().map(atomicResult -> new AtomicResult(indexId, - atomicIndexMap.get(atomicResult.getAtomicId()), atomicResult)).toList(); + this.atomicResults = atomicResultListFilter.stream() + .filter(atomicResult -> null != atomicIndexMap.get(atomicResult.getAtomicId())) + .map(atomicResult -> new AtomicResult(indexId, atomicIndexMap.get(atomicResult.getAtomicId()), atomicResult)).toList(); }