diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java
index 9544964..154a0d1 100644
--- a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java
+++ b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java
@@ -361,12 +361,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("受到行政处罚")
+                    .tags(List.of("受到" + wfrwfxxList.size() + "个行政处罚"))
+                    .score(score)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员涉及" + wfrwfxxList.size() + "个行政处罚，案件编号为：“" + context + "”")
                     .build();
-            toInsert.add(createClue(task.getModelId(), score, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.ADMINISTRATIVEPUNISHMENT);
@@ -409,12 +410,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("受到刑事处罚")
+                    .tags(List.of("受到" + wfrwfxxList.size() + "个刑事处罚"))
+                    .score(score)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员涉及" + wfrwfxxList.size() + "个刑事案件，案件编号为：“" + context + "”")
                     .build();
-            toInsert.add(createClue(task.getModelId(), score, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.CRIMINALPUNISHMENT);
@@ -451,12 +453,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("父母婚姻变故")
+                    .tags(List.of("父母离婚"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员父母离婚")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.PARENTSDIVORCE);
@@ -513,12 +516,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("父亲是否健在")
+                    .tags(List.of("父亲死亡"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员父亲死亡")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.FATHERDIE);
@@ -575,12 +579,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("母亲是否健在")
+                    .tags(List.of("母亲死亡"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员母亲死亡")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.MOTHERDIE);
@@ -628,12 +633,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("家人患严重疾病")
+                    .tags(List.of("家人患严重疾病"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员的家人有重大疾病")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.FAMILYSERIOUSILLNESS);
@@ -670,12 +676,13 @@ public class PointServiceImpl implements PointService {
                     .name(person.getName())
                     .id(person.getId().toString())
                     .idCode(person.getIdCode())
-                    .tag("本人患严重疾病")
+                    .tags(List.of("患严重疾病"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(person.getId())
                     .sourceData("发现该人员有过就诊记录，诊断病名为“" + idMap.get(person.getIdCode()).getDiseaseName() + "”，该人员患严重疾病")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.SERIOUSILLNESS);
@@ -699,7 +706,6 @@ public class PointServiceImpl implements PointService {
         log.info("模型129开始查询");
         List<WdpcGrjdJsbry> list1 = jsbryRepository.getBaseMapper().selectByIdNos();
         List<WdpcJZJLB> list2 = jZJLBRepository.getBaseMapper().selectForModel129();
-        ;
         List<WdpcXdry> list3 = xdryRepository.getBaseMapper().selectXIDU();
         List<WdpcSqjzry> list4 = sqjzryRepository.getBaseMapper().selectByIdNos();
         List<WdpcXmsfry> list5 = xmsfryRepository.getBaseMapper().selectByIdNos();
@@ -718,12 +724,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("是否特殊人群")
+                    .tags(List.of("特殊人群"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员为精神障碍患者，是特殊人群")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         for (WdpcJZJLB domicileType : list2) {
             RiskPersonal personal = personalMap.get(domicileType.getIdCode());
@@ -737,12 +744,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("是否特殊人群")
+                    .tags(List.of("特殊人群"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员为艾滋人员，是特殊人群")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         for (WdpcXdry domicileType : list3) {
             RiskPersonal personal = personalMap.get(domicileType.getSfzh());
@@ -756,12 +764,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("是否特殊人群")
+                    .tags(List.of("特殊人群"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员为吸毒人员，是特殊人群")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         for (WdpcSqjzry domicileType : list4) {
             RiskPersonal personal = personalMap.get(domicileType.getIdCode());
@@ -775,12 +784,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("是否特殊人群")
+                    .tags(List.of("特殊人群"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员为社区矫正人员，是特殊人群")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         for (WdpcXmsfry domicileType : list5) {
             RiskPersonal personal = personalMap.get(domicileType.getIdCode());
@@ -794,12 +804,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("是否特殊人群")
+                    .tags(List.of("特殊人群"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员为刑释解教人员，是特殊人群")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.ISSPECIALPEOPLE);
@@ -842,13 +853,14 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("特殊人群类型")
+                    .tags(List.of("精神障碍患者"))
+                    .score(1)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员于" + getDateString(domicileType.getActualTime())
                             + "确诊为为“" + domicileType.getActualId() + "”精神障碍患者")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 1, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         for (WdpcJZJLB domicileType : list2) {
             RiskPersonal personal = personalMap.get(domicileType.getIdCode());
@@ -862,12 +874,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("特殊人群类型")
+                    .tags(List.of("艾滋人员"))
+                    .score(2)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员为艾滋人员")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 2, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         for (WdpcXdry domicileType : list3) {
             RiskPersonal personal = personalMap.get(domicileType.getSfzh());
@@ -881,12 +894,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("特殊人群类型")
+                    .tags(List.of("吸毒人员"))
+                    .score(3)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员为吸毒人员")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 3, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         for (WdpcSqjzry domicileType : list4) {
             RiskPersonal personal = personalMap.get(domicileType.getIdCode());
@@ -916,12 +930,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("特殊人群类型")
+                    .tags(List.of("社区矫正人员"))
+                    .score(4)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员为社区矫正人员" + context)
                     .build();
-            toInsert.add(createClue(task.getModelId(), 4, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         for (WdpcXmsfry domicileType : list5) {
             RiskPersonal personal = personalMap.get(domicileType.getIdCode());
@@ -951,12 +966,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("特殊人群类型")
+                    .tags(List.of("刑释解教人员"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员为刑释解教人员" + context)
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.SPECIALPEOPLETYPE);
@@ -1006,14 +1022,15 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("精神疾病患者驾照未注销")
+                    .tags(List.of("未注销驾照的精神疾病患者"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员为精神疾病患者，但驾照未注销" + context
                             + "，驾照有效期为“" + getDateString(domicileType.getYxqs()) + "至"
                             + getDateString(domicileType.getYxqz()) + "”")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.MENTALDISEASEDRIVER);
@@ -1052,12 +1069,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("父母关系状况")
+                    .tags(List.of("父母关系不佳"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员父母关系状况不佳，关联接警单单号为" + domicileType.get("jjdbh"))
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.PARENTSRELATIONSHIP);
@@ -1116,12 +1134,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("吸食毒品")
+                    .tags(List.of("吸毒"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员吸食毒品" + dataString)
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.DRUG);
@@ -1156,12 +1175,13 @@ public class PointServiceImpl implements PointService {
                     .name(person.getName())
                     .id(person.getId().toString())
                     .idCode(person.getIdCode())
-                    .tag("医疗压力")
+                    .tags(List.of("有医疗压力"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(person.getId())
                     .sourceData("发现该人员近三年没有医保缴纳信息，存在医疗压力")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.MEDICALPRESSURE);
@@ -1200,14 +1220,15 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("上访诉求内容")
+                    .tags(List.of("上访" + domicileType.getCountNum() + "次"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员上访过" + domicileType.getCountNum()
                             + "次，上访内容为" + domicileType.getDetail()
                             + "，为涉退、涉迁、涉军等重点管控群体")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         for (WdpcXfsjCsDetail domicileType : list3) {
             RiskPersonal personal = personalMap.get(domicileType.getIdCode());
@@ -1220,14 +1241,15 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("上访诉求内容")
+                    .tags(List.of("上访" + domicileType.getCountNum() + "次"))
+                    .score(3)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员上访过" + domicileType.getCountNum()
                             + "次，上访内容为" + domicileType.getDetail()
                             + "，为投诉、举报等诉求")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 3, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         for (WdpcXfsjCsDetail domicileType : list2) {
             RiskPersonal personal = personalMap.get(domicileType.getIdCode());
@@ -1240,14 +1262,15 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("上访诉求内容")
+                    .tags(List.of("上访" + domicileType.getCountNum() + "次"))
+                    .score(2)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员上访过" + domicileType.getCountNum()
                             + "次，上访内容为" + domicileType.getDetail()
                             + "，为待遇不公、房屋交房等诉求")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 2, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.PETITIONCONTENT);
@@ -1291,13 +1314,14 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("与子女关系")
+                    .tags(List.of("与子女关系不和"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员于" + getDateMinuteString(domicileType.getBjsj())
                             + "报警，关联接警单单号" + domicileType.getJjdbh() + content)
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.FILIATION);
@@ -1345,12 +1369,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("行为人子女数")
+                    .tags(List.of(domicileType.getScore() + "个子女"))
+                    .score(realScore)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员子女数为" + domicileType.getScore())
                     .build();
-            toInsert.add(createClue(task.getModelId(), realScore, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.CHILDNO);
@@ -1407,12 +1432,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("亲近家人死亡")
+                    .tags(List.of("亲近家人死亡"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员亲近家人死亡")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.FAMILYDIE);
@@ -1454,12 +1480,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("户籍类型")
+                    .tags(List.of("非城镇户籍"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员户籍类型为" + domicileType.getHlxmc())
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.DOMICILETYPE);
@@ -1496,12 +1523,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("父亲文化程度")
+                    .tags(List.of("父亲文化程度低"))
+                    .score(eduScore)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员父亲文化程度为" + fatherEducation.getFatherEducation())
                     .build();
-            toInsert.add(createClue(task.getModelId(), eduScore, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.FATHER_EDUCATION);
@@ -1538,12 +1566,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("母亲文化程度")
+                    .tags(List.of("母亲文化程度低"))
+                    .score(eduScore)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员母亲文化程度为" + motherEducation.getMotherEducation())
                     .build();
-            toInsert.add(createClue(task.getModelId(), eduScore, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.MOTHER_EDUCATION);
@@ -1600,12 +1629,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("上访是否满意解决")
+                    .tags(List.of("上访未满意解决"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员有过上访经历，且上访没有满意解决")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.PETITIONDISSATISFIED);
@@ -1643,12 +1673,13 @@ public class PointServiceImpl implements PointService {
                     .name(personal.getName())
                     .id(personal.getId().toString())
                     .idCode(personal.getIdCode())
-                    .tag("上访人员")
+                    .tags(List.of("有上访经历"))
+                    .score(5)
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
                     .sourceData("发现该人员有过上访经历")
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(DataUtil.createClueData(task, data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.IS_PETITION);