diff --git a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
index ca41ea0..7ff75a6 100644
--- a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
@@ -903,7 +903,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
     }
 
     private List<NotePromptExtractAttributesDto> mergeExtractAttributes(List<NotePromptExtractAttributesDto> property, List<NotePromptExtractAttributesDto> attributesTemplates) {
-        if (CollUtil.isEmpty(attributesTemplates)){
+        if (CollUtil.isEmpty(attributesTemplates) || CollUtil.isEmpty(property)){
             return attributesTemplates;
         }
         for (NotePromptExtractAttributesDto attributesTemplate : attributesTemplates) {