1. 修复bug

src/main/java/com/supervision/police/dto/EvidenceDirectoryDTO.java

@@ -292,13 +292,15 @@ public class EvidenceDirectoryDTO {
     public List<String> getDirectoryPath(String directoryId) {
 
         if (StrUtil.equals(this.id, directoryId)){
-            return Arrays.asList(this.id);
+            return new ArrayList<>(Collections.singletonList(this.directoryName));
         }
         if (CollUtil.isNotEmpty(this.child)){
             for (EvidenceDirectoryDTO directoryDTO : this.child) {
                 List<String> directoryPath = directoryDTO.getDirectoryPath(directoryId);
                 if (CollUtil.isNotEmpty(directoryPath)){
-                    directoryPath.add(0,this.id);
+                    if (StrUtil.isNotEmpty(this.directoryName)){
+                        directoryPath.add(0,this.directoryName);
+                    }
                     return directoryPath;
                 }
             }

src/main/java/com/supervision/police/dto/EvidentIndexResultDTO.java

@@ -64,6 +64,6 @@ public class EvidentIndexResultDTO {
             return;
         }
         List<String> path = directory.getDirectoryPath(this.directoryId);
-        this.directoryPath = StrUtil.join(StrUtil.HTML_GT, path);
+        this.directoryPath = StrUtil.join(">", path);
     }
 }

src/main/java/com/supervision/police/dto/caseScore/CaseScoreDetailBuilder.java

@@ -15,10 +15,7 @@ import lombok.Data;
 import org.springframework.ai.ollama.OllamaChatClient;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -278,7 +275,7 @@ public class CaseScoreDetailBuilder {
         // 数据库查询分类id
         List<String> list = this.indexResultList.stream().flatMap(indexResult -> indexResult.getAtomicResults().stream())
                 .filter(atomicResult -> StrUtil.equals(IndexRuleConstants.OPERAND_TYPE_DB, atomicResult.getIndexSource()))
-                .filter(AtomicResult::resultIsTrue).map(AtomicResult::getCategoryId).toList();
+                .filter(AtomicResult::resultIsTrue).map(AtomicResult::getCategoryId).filter(Objects::nonNull).toList();
 
         List<String> all = new ArrayList<>(categoryList);
         all.addAll(list);

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

@@ -411,14 +411,14 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
         List<CaseEvidence> allEvidence = super.list();
         List<EvidenceFile> allFile = evidenceFileService.list();
 
-        Map<String, String> catagroyMap = Map.of("1", "1",/** 书证**/
+        Map<String, String> catagroyMap = Map.of("1", "1",/*书证*/
-                "2", "3",/** 物证**/
+                "2", "3",/*物证*/
-                "3", "",/** 供述**/
+                "3", "",/*供述*/
-                "4", "2",/** 电子证据**/
+                "4", "2",/*电子证据*/
-                "5", "4",/** 鉴定意见**/
+                "5", "4",/*鉴定意见*/
-                "6", "",/** 证人证言**/
+                "6", "",/*证人证言*/
-                "7", "5",/** 视听资料**/
+                "7", "5",/*视听资料*/
-                "8", "6"/** 勘验笔录**/);
+                "8", "6"/*勘验笔录*/);
 
         Set<String> findCaseIdSet = evidenceDirectoryService.list().stream().map(EvidenceDirectory::getCaseId).collect(Collectors.toSet());
 

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

@@ -74,7 +74,7 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
     @Autowired
     private CaseEvidenceService caseEvidenceService;
 
-    private EvidenceDirectoryService directoryService;
+    private final EvidenceDirectoryService directoryService;
 
     /**
      * 查询列表
@@ -436,7 +436,8 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
                 atomic.judgeWithIndexResult(relationalSymbol);
                 atomic.setSegmentation(nodeRecordSpliteMap);
                 atomic.setRecordIfSegmentationAbsent("无");
-                List<EvidentIndexResultDTO> evidentResult = getEvidentResult(atomicResultList, caseEvidenceList, rootDirectory);
+                List<ModelAtomicResult> filterAtomicResultList = atomicResultList.stream().filter(v -> StrUtil.equals(record.getIndexId(), v.getIndexId())).toList();
+                List<EvidentIndexResultDTO> evidentResult = getEvidentResult(filterAtomicResultList, caseEvidenceList, rootDirectory);
                 atomic.setEvidentResultList(evidentResult);
             }
 
@@ -470,7 +471,7 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
                     if (directory != null){
                         evidentIndexResultDTO.setDirectoryName(directory.getDirectoryName());
                         List<String> directoryPath = rootDirectory.getDirectoryPath(evidentIndexResultDTO.getDirectoryId());
-                        evidentIndexResultDTO.setDirectoryPath(StrUtil.join(StrUtil.HTML_GT, directoryPath));
+                        evidentIndexResultDTO.setDirectoryPath(StrUtil.join(">", directoryPath));
                     }
                     evidentIndexResultDTOS.add(evidentIndexResultDTO);
                 }
@@ -481,20 +482,6 @@ public class ModelCaseServiceImpl extends ServiceImpl<ModelCaseMapper, ModelCase
 
     }
 
-
-    private List<ModelAtomicResult> filterAtomicResultList(String indexId, String atomicIndexId,
-                                                           List<ModelAtomicResult> modelAtomicResultList){
-
-        if (CollUtil.isEmpty(modelAtomicResultList)){
-            return new ArrayList<>();
-        }
-
-        return modelAtomicResultList.stream()
-                .filter(atomic -> StrUtil.equals(atomic.getIndexId(), indexId)
-                        && StrUtil.equals(atomic.getAtomicId(), atomicIndexId)).collect(Collectors.toList());
-
-    }
-
     private Map<String, String> parseLogicMap(String judgeLogic) {
         List<JudgeLogic> judgeLogics = JSONUtil.toList(judgeLogic, JudgeLogic.class);
         Map<String, String> resultMap = new HashMap<>();

src/main/resources/mapper/ModelAtomicIndexMapper.xml

@@ -5,7 +5,7 @@
 
     <select id="selectAll" resultType="com.supervision.police.domain.ModelAtomicIndex">
         select mai.*,np.name as promptName from model_atomic_index mai
-                 left join note_prompt np on mai.category_id = np.evidence_category_id
+                 left join note_prompt np on mai.prompt_id = np.id
         where mai.data_status = '1'
         <if test="index.name != null and index.name != ''">
             and mai.name like concat('%',#{index.name},'%')