diff --git a/Doc/测试方案.md b/Doc/测试方案.md
deleted file mode 100644
index 470787c9..00000000
--- a/Doc/测试方案.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# 按任务发起人分类
-
-### 面向单位的任务
-    ### 一、市级XXX装备管理干事 
-    #### 1、
\ No newline at end of file
diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
index 09c814be..154f00f2 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
@@ -2025,26 +2025,30 @@ public class CollectModel {
 
         //写任务分派表
         List<Record> list = new ArrayList<>();
-        int fill_type_id;
+        int fill_type_id = 1;
 
 
         /**
-         -- 市教育局让 县区教育局 只转不填
-         转发按钮里:
-         (1)县区教育局->单位任务->学校只填写 fill_type_id=1
-         (2)县区教育局->人员任务->学校只转不填 fill_type_id=2
-         (3)单位转给人员时->只填 fill_type_id=1
+         fill_type_id:填报任务类型：1：填报，2：转发，3：填报+转发
 
-         填报任务类型：1：填报，2：转发，3：填报+转发
+         现在在转发的场景下：
+         (1) 县区教育局 + 人员类型任务 target_type_id=2
+         1.1 下一级是单位  fill_type_id=2
+         1.2 下一级是人员  fill_type_id=1
+
+         (2) 县区教育局 + 单位类型任务 target_type_id=1
+         2.1 下一级是单位 fill_type_id=1
+
+         (3) 单位+单位类型任务
+         fill_type_id=1
+
+         (4) 单位+人员类型任务
+         fill_type_id=1
          */
-        if (publish_role_id == 268) {//县区教育局办公室干事
-            if (target_type_id == 1) {//单位
-                fill_type_id = 1;
-            } else {//人员
-                fill_type_id = 2;
-            }
-        } else fill_type_id = 1;
-        if (forPerson) fill_type_id = 1;
+        //县区教育局办公室干事+面向人员填报的任务+下一级不是人员（下一级是单位）
+        if (publish_role_id == 268 && target_type_id == 2 && !forPerson) {
+            fill_type_id = 2;
+        }
 
         for (String s : targetSet) {
             Record record = new Record();
diff --git a/src/main/resource/Sql/Collect.sql b/src/main/resource/Sql/Collect.sql
index f03cdc2a..a569c32f 100644
--- a/src/main/resource/Sql/Collect.sql
+++ b/src/main/resource/Sql/Collect.sql
@@ -7,7 +7,8 @@
         (select count(1) from t_collect_job_sheet as t2 where t2.job_id=t1.job_id and t2.is_check=1) as already_check_sheet,
         (select count(1) from t_collect_job_sheet as t2 where t2.job_id=t1.job_id) as all_sheet,
         (select count(1) from t_collect_job_target as t2 where t2.job_id=t1.job_id and t2.fill_type_id in (2,3)) as forward_count, --转发数量
-        (select count(1) from t_collect_job_target as t2 where t2.job_id=t1.job_id and t2.forward_progress_xiaji=2)  as forward_finish_count --转发完成数量
+        (select count(1) from t_collect_job_target as t2 where t2.job_id=t1.job_id and
+                ((t2.forward_progress_xiaji=2) or(t2.forward_progress_bendanwei=2)))  as forward_finish_count --转发完成数量
         from t_collect_job as t1
         where t1.publish_role_id = #para(publish_role_id) and t1.parent_id=-1 and t1.bureau_id=#para(bureau_id)
         #if(job_name)