diff --git a/WebRoot/Excel/195a29f0-120d-41d2-beec-e227cedf065f.xlsx b/WebRoot/Excel/195a29f0-120d-41d2-beec-e227cedf065f.xlsx
new file mode 100644
index 00000000..cdb0f5a0
Binary files /dev/null and b/WebRoot/Excel/195a29f0-120d-41d2-beec-e227cedf065f.xlsx differ
diff --git a/WebRoot/Excel/33032d27-5181-4b78-8ea9-3168363c6a04.xlsx b/WebRoot/Excel/33032d27-5181-4b78-8ea9-3168363c6a04.xlsx
new file mode 100644
index 00000000..a0e61917
Binary files /dev/null and b/WebRoot/Excel/33032d27-5181-4b78-8ea9-3168363c6a04.xlsx differ
diff --git a/WebRoot/Excel/7881ba60-78cb-41ee-902d-b8e7417dba95.xlsx b/WebRoot/Excel/7881ba60-78cb-41ee-902d-b8e7417dba95.xlsx
new file mode 100644
index 00000000..fcfc2c37
Binary files /dev/null and b/WebRoot/Excel/7881ba60-78cb-41ee-902d-b8e7417dba95.xlsx differ
diff --git a/WebRoot/Excel/8892f417-d116-4323-b581-2cb0fd4e9742.xlsx b/WebRoot/Excel/8892f417-d116-4323-b581-2cb0fd4e9742.xlsx
new file mode 100644
index 00000000..d91f97a3
Binary files /dev/null and b/WebRoot/Excel/8892f417-d116-4323-b581-2cb0fd4e9742.xlsx differ
diff --git a/WebRoot/Excel/a60e34b9-f539-4b15-9ebc-f72b41e13ec9.xlsx b/WebRoot/Excel/a60e34b9-f539-4b15-9ebc-f72b41e13ec9.xlsx
new file mode 100644
index 00000000..de5c5a09
Binary files /dev/null and b/WebRoot/Excel/a60e34b9-f539-4b15-9ebc-f72b41e13ec9.xlsx differ
diff --git a/WebRoot/Excel/b36ca195-10fd-4511-a47c-86af7537faf3.xlsx b/WebRoot/Excel/b36ca195-10fd-4511-a47c-86af7537faf3.xlsx
new file mode 100644
index 00000000..d63ddb18
Binary files /dev/null and b/WebRoot/Excel/b36ca195-10fd-4511-a47c-86af7537faf3.xlsx differ
diff --git a/WebRoot/Excel/dd0dfae6-9b8f-4a78-a140-bb8b15ecd34d.xlsx b/WebRoot/Excel/dd0dfae6-9b8f-4a78-a140-bb8b15ecd34d.xlsx
new file mode 100644
index 00000000..9997c845
Binary files /dev/null and b/WebRoot/Excel/dd0dfae6-9b8f-4a78-a140-bb8b15ecd34d.xlsx differ
diff --git a/WebRoot/Excel/e513c09a-d1ec-4ff4-a67c-14f77d5e955c.xlsx b/WebRoot/Excel/e513c09a-d1ec-4ff4-a67c-14f77d5e955c.xlsx
new file mode 100644
index 00000000..7b94d435
Binary files /dev/null and b/WebRoot/Excel/e513c09a-d1ec-4ff4-a67c-14f77d5e955c.xlsx differ
diff --git a/src/main/java/UnitTest/FixDataError.java b/src/main/java/UnitTest/FixDataError.java
new file mode 100644
index 00000000..ea7d33e5
--- /dev/null
+++ b/src/main/java/UnitTest/FixDataError.java
@@ -0,0 +1,27 @@
+package UnitTest;
+
+import com.YunXiao.Util.SyncUtil;
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Record;
+
+import java.util.List;
+
+public class FixDataError {
+    public static void main(String[] args) {
+        //初始化
+        SyncUtil.init();
+
+        String sql = "select form_table_name from t_collect_job where form_table_name is not null";
+        List<Record> list = Db.find(sql);
+
+        for (Record record : list) {
+            String tableName = record.getStr("form_table_name");
+            sql = "select area_name from " + tableName + " where area_name ='忻州市'";
+            List<Record> list2 = Db.find(sql);
+            for (Record r1 : list2) {
+                System.out.println(tableName);
+                System.out.println(r1.getStr("area_name"));
+            }
+        }
+    }
+}
\ 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 30d7a698..bc3b1dcb 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
@@ -515,8 +515,19 @@ public class CollectModel {
      * @return
      */
     public Record getBureauAreaInfo(String bureau_id) {
-        String sql = "select t1.area_id,t2.area_name  from t_base_organization as t1 inner join t_dm_area as t2 on t1.area_id=t2.area_id where t1.org_id=?";
-        return Db.findFirst(sql, bureau_id);
+        String sql = "select t1.area_id  from t_base_organization as t1 where t1.org_id=?";
+        String area_id = Db.findFirst(sql, bureau_id).getStr("area_id");
+        Record record = new Record();
+        if (area_id.equals("00000000-0000-0000-0000-000000000000")) {
+            record.set("area_id", area_id);
+            record.set("area_name", "");
+        } else {
+            sql = "select area_name  from t_dm_area where area_id=?";
+            String area_name = Db.findFirst(sql, area_id).getStr("area_name");
+            record.set("area_id", area_id);
+            record.set("area_name", area_name);
+        }
+        return record;
     }
 
     /**
diff --git a/Doc/自定义上报的后续设计思路/2_学生健康体温监测周报卡(一页两张）(1).xlsx b/src/main/resource/Excel/已完成的模块/2_学生健康体温监测周报卡(一页两张）(1).xlsx
similarity index 100%
rename from Doc/自定义上报的后续设计思路/2_学生健康体温监测周报卡(一页两张）(1).xlsx
rename to src/main/resource/Excel/已完成的模块/2_学生健康体温监测周报卡(一页两张）(1).xlsx
diff --git a/Doc/自定义上报的后续设计思路/交响乐报名表.jpg b/src/main/resource/Excel/已完成的模块/交响乐报名表.jpg
similarity index 100%
rename from Doc/自定义上报的后续设计思路/交响乐报名表.jpg
rename to src/main/resource/Excel/已完成的模块/交响乐报名表.jpg
diff --git a/Doc/自定义上报的后续设计思路/疾病情况统计表.jpg b/src/main/resource/Excel/已完成的模块/疾病情况统计表.jpg
similarity index 100%
rename from Doc/自定义上报的后续设计思路/疾病情况统计表.jpg
rename to src/main/resource/Excel/已完成的模块/疾病情况统计表.jpg
diff --git a/Doc/自定义上报的后续设计思路/附件二：学校报名表.xlsx b/src/main/resource/Excel/已完成的模块/附件二：学校报名表.xlsx
similarity index 100%
rename from Doc/自定义上报的后续设计思路/附件二：学校报名表.xlsx
rename to src/main/resource/Excel/已完成的模块/附件二：学校报名表.xlsx
diff --git a/src/main/resource/Excel/未来扩展的模块/党建.jpg b/src/main/resource/Excel/未来扩展的模块/党建.jpg
new file mode 100644
index 00000000..86295900
Binary files /dev/null and b/src/main/resource/Excel/未来扩展的模块/党建.jpg differ
diff --git a/src/main/resource/Excel/未来扩展的模块/杨浦学校幼儿报名.jpg b/src/main/resource/Excel/未来扩展的模块/杨浦学校幼儿报名.jpg
new file mode 100644
index 00000000..5a52da9a
Binary files /dev/null and b/src/main/resource/Excel/未来扩展的模块/杨浦学校幼儿报名.jpg differ
diff --git a/src/main/resource/Excel/未来扩展的模块/职称投票.jpg b/src/main/resource/Excel/未来扩展的模块/职称投票.jpg
new file mode 100644
index 00000000..663a1ae3
Binary files /dev/null and b/src/main/resource/Excel/未来扩展的模块/职称投票.jpg differ
diff --git a/src/main/resource/Excel/未来扩展的模块/郑州103中学学生信息完善.jpg b/src/main/resource/Excel/未来扩展的模块/郑州103中学学生信息完善.jpg
new file mode 100644
index 00000000..6e8cf1c3
Binary files /dev/null and b/src/main/resource/Excel/未来扩展的模块/郑州103中学学生信息完善.jpg differ
diff --git a/src/main/resource/Excel/特色.txt b/src/main/resource/Excel/特色.txt
new file mode 100644
index 00000000..c52a0cf6
--- /dev/null
+++ b/src/main/resource/Excel/特色.txt
@@ -0,0 +1,14 @@
+特色：
+1、支持自定义EXCEL格式上报
+2、支持自定义表单上报
+3、支持市、县（区）、校三级任务发放，分级发放，逐级反馈
+4、上报结果自动汇总
+
+意义：
+1、完成了教育数据的原始积累，为大数据分析奠定基础
+2、让现实中的统计工作一体化，一套软件解决市县校三级管理难题，直击痛点。
+3、配合BI、大屏、报表等平台，让软件公司对专题上报的统计分析汇总工作能够在一个工作日内快速反应。
+
+TODO
+1、支持在线考试，类似于党建知识问题，快速出成绩
+2、支持投票选举等常见功能定义，快速出结果
\ No newline at end of file
diff --git a/Doc/自定义上报的后续设计思路/发布到人的设计思路.txt b/src/main/resource/Excel/自定义上报的后续设计思路/发布到人的设计思路.txt
similarity index 100%
rename from Doc/自定义上报的后续设计思路/发布到人的设计思路.txt
rename to src/main/resource/Excel/自定义上报的后续设计思路/发布到人的设计思路.txt
diff --git a/Doc/自定义上报的后续设计思路/填报系统填报流程设计.eddx b/src/main/resource/Excel/自定义上报的后续设计思路/填报系统填报流程设计.eddx
similarity index 100%
rename from Doc/自定义上报的后续设计思路/填报系统填报流程设计.eddx
rename to src/main/resource/Excel/自定义上报的后续设计思路/填报系统填报流程设计.eddx
diff --git a/Doc/自定义上报的后续设计思路/学生-汇总-区级.xlsx b/src/main/resource/Excel/自定义上报的后续设计思路/学生-汇总-区级.xlsx
similarity index 100%
rename from Doc/自定义上报的后续设计思路/学生-汇总-区级.xlsx
rename to src/main/resource/Excel/自定义上报的后续设计思路/学生-汇总-区级.xlsx
diff --git a/Doc/自定义上报的后续设计思路/学生-汇总-市级.xlsx b/src/main/resource/Excel/自定义上报的后续设计思路/学生-汇总-市级.xlsx
similarity index 100%
rename from Doc/自定义上报的后续设计思路/学生-汇总-市级.xlsx
rename to src/main/resource/Excel/自定义上报的后续设计思路/学生-汇总-市级.xlsx
diff --git a/Doc/自定义上报的后续设计思路/学生-汇总-校级.xlsx b/src/main/resource/Excel/自定义上报的后续设计思路/学生-汇总-校级.xlsx
similarity index 100%
rename from Doc/自定义上报的后续设计思路/学生-汇总-校级.xlsx
rename to src/main/resource/Excel/自定义上报的后续设计思路/学生-汇总-校级.xlsx
diff --git a/Doc/自定义上报的后续设计思路/学生-汇总-班级.xlsx b/src/main/resource/Excel/自定义上报的后续设计思路/学生-汇总-班级.xlsx
similarity index 100%
rename from Doc/自定义上报的后续设计思路/学生-汇总-班级.xlsx
rename to src/main/resource/Excel/自定义上报的后续设计思路/学生-汇总-班级.xlsx
diff --git a/Doc/自定义上报的后续设计思路/学生-统计-区级.xlsx b/src/main/resource/Excel/自定义上报的后续设计思路/学生-统计-区级.xlsx
similarity index 100%
rename from Doc/自定义上报的后续设计思路/学生-统计-区级.xlsx
rename to src/main/resource/Excel/自定义上报的后续设计思路/学生-统计-区级.xlsx
diff --git a/Doc/自定义上报的后续设计思路/学生-统计-市级.xlsx b/src/main/resource/Excel/自定义上报的后续设计思路/学生-统计-市级.xlsx
similarity index 100%
rename from Doc/自定义上报的后续设计思路/学生-统计-市级.xlsx
rename to src/main/resource/Excel/自定义上报的后续设计思路/学生-统计-市级.xlsx
diff --git a/Doc/自定义上报的后续设计思路/学生-统计-校级.xlsx b/src/main/resource/Excel/自定义上报的后续设计思路/学生-统计-校级.xlsx
similarity index 100%
rename from Doc/自定义上报的后续设计思路/学生-统计-校级.xlsx
rename to src/main/resource/Excel/自定义上报的后续设计思路/学生-统计-校级.xlsx
diff --git a/Doc/自定义上报的后续设计思路/学生-统计-班级.xlsx b/src/main/resource/Excel/自定义上报的后续设计思路/学生-统计-班级.xlsx
similarity index 100%
rename from Doc/自定义上报的后续设计思路/学生-统计-班级.xlsx
rename to src/main/resource/Excel/自定义上报的后续设计思路/学生-统计-班级.xlsx
diff --git a/Doc/自定义上报的后续设计思路/总结.txt b/src/main/resource/Excel/自定义上报的后续设计思路/总结.txt
similarity index 100%
rename from Doc/自定义上报的后续设计思路/总结.txt
rename to src/main/resource/Excel/自定义上报的后续设计思路/总结.txt
diff --git a/Doc/自定义上报的后续设计思路/统一认证.txt b/src/main/resource/Excel/自定义上报的后续设计思路/统一认证.txt
similarity index 100%
rename from Doc/自定义上报的后续设计思路/统一认证.txt
rename to src/main/resource/Excel/自定义上报的后续设计思路/统一认证.txt