diff --git a/src/main/java/com/biutag/supervisiondata/mapper/mine/RiskTestMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/mine/RiskTestMapper.java
index 5b87b18..b441f90 100644
--- a/src/main/java/com/biutag/supervisiondata/mapper/mine/RiskTestMapper.java
+++ b/src/main/java/com/biutag/supervisiondata/mapper/mine/RiskTestMapper.java
@@ -2,6 +2,7 @@ package com.biutag.supervisiondata.mapper.mine;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.biutag.supervisiondata.pojo.entity.mine.RiskTest;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * @author kami on 2024-11-13 16:17:36
@@ -9,4 +10,7 @@ import com.biutag.supervisiondata.pojo.entity.mine.RiskTest;
  * @since 1.8
  */
 public interface RiskTestMapper extends BaseMapper<RiskTest> {
+
+    @Update("truncate table risk_test")
+    int truncateTable();
 }
diff --git a/src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java b/src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java
index d735278..108eac9 100644
--- a/src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java
+++ b/src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java
@@ -32,8 +32,6 @@ public class Default {
 
     public static final String BIG_TAG_TRUBO = "涉矛盾纠纷";
 
-    public static final String FIGHT_BORN = "成长地区暴力警情高于平均水平";
-
     public static final String FIGHT_MUCH = "多次矛盾纠纷";
 
     public static final String POINT_POEPLE = "重点人员";
@@ -42,21 +40,43 @@ public class Default {
 
     public static final String CALL_REDIS = "call:point";
 
-    public static final String TAG_IMPORT = "特殊职业";
+    public static final String BASIC = "基础信息";
 
-    public static final String BAD_HABBIT = "不良嗜好";
+    public static final String MUCH_CALL = "重点人员报警异常";
 
-    public static final String MARRAY = "感情失意";
+    // ***********因素*************
+    public static final String AGE_IG = "年龄因素";
 
-    public static final String NO_CONTROLLER ="管控不到位";
+    public static final String GENDER_IG = "性别因素";
 
-    public static final String VIOLENCE ="暴力人员";
+    public static final String EDU_IG = "学历因素";
 
-    public static final String KILL_SELF = "扬言滋事、自杀等行为";
+    public static final String WFR_IG = "犯罪前科因素";
 
-    public static final String BASIC = "基础信息";
+    public static final String IMPORT_IG = "特种职业因素";
 
-    public static final String MUCH_CALL = "重点人员报警异常";
+    public static final String TRUBO_IG = "涉矛盾纠纷因素";
+
+    public static final String HABBIT_IG = "不良嗜好因素";
+
+    public static final String FIGHT_IG = "民风习俗因素";
+
+    public static final String POINT_IG = "重点对象因素";
+
+    public static final String VIOLENCE_IG ="暴力伤害行为因素";
+
+    public static final String CONTROLLER_IG ="重点对象日常管控不到位因素";
+
+    public static final String CONTROLLER2_IG ="风险人员排查不到位因素";
+
+    public static final String KILL_IG = "个人极端因素";
+
+    public static final String MAIL_IG = "诉求不满或长期未化解因素";
+
+    public static final String FIGHT_MUCH_IG = "高频矛盾纠纷因素";
+
+    public static final String MARRAY_IG = "婚姻因素";
 
+    public static final String NO_LOVE_IG = "感情失意因素";
 
 }
diff --git a/src/main/java/com/biutag/supervisiondata/pojo/enums/Dispute.java b/src/main/java/com/biutag/supervisiondata/pojo/enums/Dispute.java
index 838e6f3..698cb44 100644
--- a/src/main/java/com/biutag/supervisiondata/pojo/enums/Dispute.java
+++ b/src/main/java/com/biutag/supervisiondata/pojo/enums/Dispute.java
@@ -22,7 +22,7 @@ public enum Dispute {
     TUDI("土地", "涉土地纠纷"),
     MONEY2("劳资", "涉劳资纠纷"),
     HOME("家庭暴力", "涉家庭暴力纠纷"),
-    NEIBER("邻里纠纷", "涉邻里纠纷纠纷");
+    NEIBER("邻里纠纷", "涉邻里纠纷");
 
     private final String title;
 
diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseBAServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseBAServiceImpl.java
index 65db8db..5d83515 100644
--- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseBAServiceImpl.java
+++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseBAServiceImpl.java
@@ -66,7 +66,6 @@ public class GBaseBAServiceImpl implements GBaseBAService {
 
         Map<String, List<GBaseBAXX>> map = xxList.stream().collect(Collectors.groupingBy(GBaseBAXX::getSfzhm));
         Map<String, RiskPersonal> personMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (oldValue, newValue) -> newValue));
-        log.info("开干");
         for (Map.Entry<String, List<GBaseBAXX>> entry : map.entrySet()) {
             GBaseBAXX tmp = entry.getValue().getFirst();
             if (tmp.getRyztdm() == null) {
@@ -129,7 +128,7 @@ public class GBaseBAServiceImpl implements GBaseBAService {
         log.info("数据库操作阶段");
         // 新增
         if (!toInsert.isEmpty()) {
-            riskModelTaskClueService.saveClues(toInsert, Default.TAG_IMPORT);
+            riskModelTaskClueService.saveClues(toInsert, Default.IMPORT_IG);
         }
         // 修改
         if (!toUpdate.isEmpty()) {
diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/HabitServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/HabitServiceImpl.java
index b11cc7c..6e63051 100644
--- a/src/main/java/com/biutag/supervisiondata/service/impl/HabitServiceImpl.java
+++ b/src/main/java/com/biutag/supervisiondata/service/impl/HabitServiceImpl.java
@@ -193,7 +193,7 @@ public class HabitServiceImpl implements HabitService {
         }
         log.info("开始进行数据库操作");
         if(!toInsert.isEmpty()) {
-            riskModelTaskClueService.saveClues(toInsert, Default.TAG_IMPORT);
+            riskModelTaskClueService.saveClues(toInsert, Default.HABBIT_IG);
         }
         if(!toInsertRecord.isEmpty()) {
             controlRecordService.batchInsert(toInsertRecord);
diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/NoControlServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/NoControlServiceImpl.java
index e3edbd5..2af11ea 100644
--- a/src/main/java/com/biutag/supervisiondata/service/impl/NoControlServiceImpl.java
+++ b/src/main/java/com/biutag/supervisiondata/service/impl/NoControlServiceImpl.java
@@ -106,7 +106,7 @@ public class NoControlServiceImpl implements NoControlService {
             personalRepository.updateBatchById(toUpdate);
         }
         if(!clues.isEmpty()) {
-            clueService.saveClues(clues, Default.NO_CONTROLLER);
+            clueService.saveClues(clues, Default.CONTROLLER2_IG);
         }
         RiskTask updateTask = new RiskTask();
         updateTask.setId(task.getId());
diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java
index 7dd44fe..abc998d 100644
--- a/src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java
+++ b/src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java
@@ -467,7 +467,7 @@ public class PetitionServiceImpl implements PetitionService {
             }
         }
         if(!toInsert.isEmpty()) {
-            riskModelTaskClueService.saveClues(toInsert, Default.BIG_TAG_PETITION);
+            riskModelTaskClueService.saveClues(toInsert, Default.MAIL_IG);
         }
 
         if(!toUpdates.isEmpty()) {
diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PoliceServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PoliceServiceImpl.java
index 61f0d9a..9d799a7 100644
--- a/src/main/java/com/biutag/supervisiondata/service/impl/PoliceServiceImpl.java
+++ b/src/main/java/com/biutag/supervisiondata/service/impl/PoliceServiceImpl.java
@@ -121,7 +121,7 @@ public class PoliceServiceImpl implements PoliceService {
                 }
             }
             if(insert) {
-                toInsert.add(createClue(task, 1, person, "涉纠纷警情-"+jjd.getJqxzmc(), jjd, "通过对近12个月的警情筛查，发现该人员涉及："+jjd.getJqxzmc()+"的警情，接警单编号为："+jjd.getJjdbh()+"，该警情属于矛盾纠纷，增加风险分1分（发生一起增加1分，最高10分）"));
+                toInsert.add(createClue(task, 1, person, Dispute.contains(jjd.getJqxzmc()), jjd, "通过对近12个月的警情筛查，发现该人员涉及："+jjd.getJqxzmc()+"的警情，接警单编号为："+jjd.getJjdbh()+"，该警情属于矛盾纠纷，增加风险分1分（发生一起增加1分，最高10分）"));
                 RiskPersonalControlRecord tmpRecord = createControlRecord(person, jjd, toInsert.getLast().getRiskReason());
                 controlRecords.add(tmpRecord);
                 if(person.getControlTime() == null || tmpRecord.getControlTime().isAfter(person.getControlTime())) {
@@ -133,7 +133,7 @@ public class PoliceServiceImpl implements PoliceService {
         }
         if(!toInsert.isEmpty()) {
             log.info("新增线索：{}",toInsert.size());
-            riskModelTaskClueService.saveClues(toInsert, Default.BIG_TAG_TRUBO);
+            riskModelTaskClueService.saveClues(toInsert, Default.TRUBO_IG);
         }
         if(!controlRecords.isEmpty()) {
             log.info("新增管控记录：{}",controlRecords.size());
@@ -144,10 +144,10 @@ public class PoliceServiceImpl implements PoliceService {
             riskPersonalRepository.updateBatchById(toUpdatePerson, 5000);
         }
 
-        if(!toInsertTags.isEmpty()) {
-            log.info("操作新增标签数据：{}",toInsertTags.size());
-            tagService.saveBatchTag(toInsertTags, Default.BIG_TAG_TRUBO);
-        }
+//        if(!toInsertTags.isEmpty()) {
+//            log.info("操作新增标签数据：{}",toInsertTags.size());
+//            tagService.saveBatchTag(toInsertTags, Default.BIG_TAG_TRUBO);
+//        }
 
         if(!updateClueList.isEmpty()) {
             taskClueRepository.updateBatchById(updateClueList, 10000);
diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/RiskModelTaskClueServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/RiskModelTaskClueServiceImpl.java
index edfa072..b350df6 100644
--- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskModelTaskClueServiceImpl.java
+++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskModelTaskClueServiceImpl.java
@@ -54,7 +54,7 @@ public class RiskModelTaskClueServiceImpl implements RiskModelTaskClueService {
                 .collect(Collectors.toList());
         for (List<RiskModelTaskClue> record : control) {
             try {
-                batchInsert(record);
+                batchInsert(record, bigTag);
             } catch (Exception e) {
                 log.error("", e);
             }
@@ -113,7 +113,7 @@ public class RiskModelTaskClueServiceImpl implements RiskModelTaskClueService {
 
     final String sql = "INSERT INTO risk_model_task_clue(model_id, name, id_code, task_id, source_id, risk_reason, data, score, event_time, create_time, update_time, case_ids) VALUES(?,?,?,?,?,?,?,?,?,?,?,?)";
 
-    public void batchInsert(List<RiskModelTaskClue> alliances) {
+    public void batchInsert(List<RiskModelTaskClue> alliances, String bigTag) {
         try (Connection connection = getConnection();
              PreparedStatement prepareStatement = connection.prepareStatement(sql)) {
             connection.setAutoCommit(false);
@@ -124,7 +124,7 @@ public class RiskModelTaskClueServiceImpl implements RiskModelTaskClueService {
                     prepareStatement.setObject(3, Optional.ofNullable(it.getIdCode()).orElse(""));
                     prepareStatement.setObject(4, it.getTaskId());
                     prepareStatement.setObject(5, it.getSourceId());
-                    prepareStatement.setObject(6, Optional.ofNullable(it.getRiskReason()).orElse(""));
+                    prepareStatement.setObject(6, bigTag);
                     prepareStatement.setObject(7, Optional.ofNullable(it.getData()).orElse(""));
                     prepareStatement.setObject(8, Optional.ofNullable(it.getScore()).orElse(0));
                     prepareStatement.setObject(9, Optional.ofNullable(it.getEventTime()).map(item -> item.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))).orElse(null));
diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java
index 0bb8f01..30ce798 100644
--- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java
+++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java
@@ -73,8 +73,8 @@ public class RiskTaskServiceImpl implements RiskTaskService {
 
     @Override
     public void infoModelTask(TaskParamDomain domain) {
-        RiskTask ageTask = createTask(domain.getPersons().size(), 33);
         RiskTask genderTask = createTask(domain.getPersons().size(), 32);
+        RiskTask ageTask = createTask(domain.getPersons().size(), 33);
         riskTaskRepository.save(ageTask);
         riskTaskRepository.save(genderTask);
 
@@ -110,10 +110,8 @@ public class RiskTaskServiceImpl implements RiskTaskService {
         genderUpdate.setEndTime(LocalDateTime.now());
         riskTaskRepository.updateById(ageUpdate);
 
-        List<RiskModelTaskClue> clues = new ArrayList<>();
-        clues.addAll(infos[0].getToInsert());
-        clues.addAll(infos[1].getToInsert());
-        riskModelTaskClueService.saveClues(clues, Default.BASIC);
+        riskModelTaskClueService.saveClues(infos[0].getToInsert(), Default.AGE_IG);
+        riskModelTaskClueService.saveClues(infos[1].getToInsert(), Default.GENDER_IG);
         if(!infos[0].getToHidden().isEmpty()) {
             clueRepository.updateBatchById(infos[0].getToHidden());
         }
@@ -190,7 +188,7 @@ public class RiskTaskServiceImpl implements RiskTaskService {
         int size = 0;
         if (!toInsert.isEmpty()) {
             size = toInsert.size();
-            riskModelTaskClueService.saveClues(toInsert, Default.BASIC);
+            riskModelTaskClueService.saveClues(toInsert, Default.EDU_IG);
             log.info("批量新增学历完成");
         }
         eduUpdate.setInsertSize(size);
@@ -372,7 +370,7 @@ public class RiskTaskServiceImpl implements RiskTaskService {
         RiskTask caseUpdate = new RiskTask();
         caseUpdate.setId(caseTask.getId());
         if (!toInsertClue.isEmpty()) {
-            riskModelTaskClueService.saveClues(toInsertClue, Default.BIG_TAG_SHWFR);
+            riskModelTaskClueService.saveClues(toInsertClue, Default.WFR_IG);
         }
         if (!toUpdateClue.isEmpty()) {
             clueRepository.updateBatchById(toUpdateClue);
@@ -565,7 +563,7 @@ public class RiskTaskServiceImpl implements RiskTaskService {
         }
         if(!toInsert.isEmpty()) {
             log.info("开始操作新增项：{}", toInsert.size());
-            riskModelTaskClueService.saveClues(toInsert, Default.FIGHT_BORN);
+            riskModelTaskClueService.saveClues(toInsert, Default.FIGHT_IG);
         }
         RiskTask endTask = endTask(task.getId());
         endTask.setInsertSize(toInsert.size());
@@ -660,7 +658,7 @@ public class RiskTaskServiceImpl implements RiskTaskService {
         }
         if(!toInsert.isEmpty()) {
             log.info("新增线索 | {}", toInsert.size());
-            riskModelTaskClueService.saveClues(toInsert, Default.FIGHT_MUCH);
+            riskModelTaskClueService.saveClues(toInsert, Default.FIGHT_MUCH_IG);
         }
 
         RiskTask endTask = endTask(task.getId());