diff --git a/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双.xlsx b/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双.xlsx
index a221fcda..6d19f190 100644
Binary files a/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双.xlsx and b/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双.xlsx differ
diff --git a/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双【成果】.xlsx b/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双【成果】.xlsx
index 36cc01d7..ed029647 100644
Binary files a/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双【成果】.xlsx and b/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双【成果】.xlsx differ
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java
index 62e9884a..a7df5243 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java
@@ -81,14 +81,14 @@ public class A1 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getCityOrAreaName(file.getName());
+                String areaName = ru.getAreaName(file.getName());
                 //市州名称
                 //此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
                 String parentPathName = file.getParentFile().getName();
-                String cityName = ru.getCityOrAreaName(parentPathName);
+                String cityName = ru.getCityName(parentPathName);
                 if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
                     parentPathName = file.getParentFile().getParentFile().getName();
-                    cityName = ru.getCityOrAreaName(parentPathName);
+                    cityName = ru.getCityName(parentPathName);
                 }
 
                 if (StrKit.isBlank(cityName)||StrKit.isBlank(areaName)) {
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java
index becb62ae..5b904bd4 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java
@@ -70,7 +70,7 @@ public class A10 {
                 }
                 if (flag) continue;
                 //县区名称
-                String cityName = ru.getCityOrAreaName(file.getName());
+                String cityName = ru.getAreaName(file.getName());
 
                 if (StrKit.isBlank(cityName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java
index 5576d99d..97296ca4 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java
@@ -73,14 +73,14 @@ public class A12 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getCityOrAreaName(file.getName());
+                String areaName = ru.getCityName(file.getName());
                 //市州名称
                 //此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
                 String parentPathName = file.getParentFile().getName();
-                String cityName = ru.getCityOrAreaName(parentPathName);
+                String cityName = ru.getAreaName(parentPathName);
                 if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
                     parentPathName = file.getParentFile().getParentFile().getName();
-                    cityName = ru.getCityOrAreaName(parentPathName);
+                    cityName = ru.getAreaName(parentPathName);
                 }
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java
index 36971f4f..063c00fb 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java
@@ -81,14 +81,14 @@ public class A2 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getCityOrAreaName(file.getName());
+                String areaName = ru.getAreaName(file.getName());
                 //市州名称
                 //此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
                 String parentPathName = file.getParentFile().getName();
-                String cityName = ru.getCityOrAreaName(parentPathName);
+                String cityName = ru.getCityName(parentPathName);
                 if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
                     parentPathName = file.getParentFile().getParentFile().getName();
-                    cityName = ru.getCityOrAreaName(parentPathName);
+                    cityName = ru.getCityName(parentPathName);
                 }
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java
index 50c7eac3..c8b57ccf 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java
@@ -81,14 +81,14 @@ public class A3 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getCityOrAreaName(file.getName());
+                String areaName = ru.getAreaName(file.getName());
                 //市州名称
                 //此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
                 String parentPathName = file.getParentFile().getName();
-                String cityName = ru.getCityOrAreaName(parentPathName);
+                String cityName = ru.getCityName(parentPathName);
                 if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
                     parentPathName = file.getParentFile().getParentFile().getName();
-                    cityName = ru.getCityOrAreaName(parentPathName);
+                    cityName = ru.getCityName(parentPathName);
                 }
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java
index 19978e4e..a6533f2b 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java
@@ -81,14 +81,14 @@ public class A4 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getCityOrAreaName(file.getName());
+                String areaName = ru.getAreaName(file.getName());
                 //市州名称
                 //此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
                 String parentPathName = file.getParentFile().getName();
-                String cityName = ru.getCityOrAreaName(parentPathName);
+                String cityName = ru.getCityName(parentPathName);
                 if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
                     parentPathName = file.getParentFile().getParentFile().getName();
-                    cityName = ru.getCityOrAreaName(parentPathName);
+                    cityName = ru.getCityName(parentPathName);
                 }
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java
index 0a31708a..ee3e6124 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java
@@ -81,14 +81,14 @@ public class A5 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getCityOrAreaName(file.getName());
+                String areaName = ru.getAreaName(file.getName());
                 //市州名称
                 //此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
                 String parentPathName = file.getParentFile().getName();
-                String cityName = ru.getCityOrAreaName(parentPathName);
+                String cityName = ru.getCityName(parentPathName);
                 if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
                     parentPathName = file.getParentFile().getParentFile().getName();
-                    cityName = ru.getCityOrAreaName(parentPathName);
+                    cityName = ru.getCityName(parentPathName);
                 }
 
                 if (StrKit.isBlank(cityName)||StrKit.isBlank(areaName)) {
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java
index 055cf0d6..d5174abd 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java
@@ -81,14 +81,14 @@ public class A6 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getCityOrAreaName(file.getName());
+                String areaName = ru.getAreaName(file.getName());
                 //市州名称
                 //此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
                 String parentPathName = file.getParentFile().getName();
-                String cityName = ru.getCityOrAreaName(parentPathName);
+                String cityName = ru.getCityName(parentPathName);
                 if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
                     parentPathName = file.getParentFile().getParentFile().getName();
-                    cityName = ru.getCityOrAreaName(parentPathName);
+                    cityName = ru.getCityName(parentPathName);
                 }
                 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java
index f29c69e0..4d561088 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java
@@ -81,14 +81,14 @@ public class A7 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getCityOrAreaName(file.getName());
+                String areaName = ru.getAreaName(file.getName());
                 //市州名称
                 //此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
                 String parentPathName = file.getParentFile().getName();
-                String cityName = ru.getCityOrAreaName(parentPathName);
+                String cityName = ru.getCityName(parentPathName);
                 if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
                     parentPathName = file.getParentFile().getParentFile().getName();
-                    cityName = ru.getCityOrAreaName(parentPathName);
+                    cityName = ru.getCityName(parentPathName);
                 }
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java
index 4d0c3ce6..2160a617 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java
@@ -75,14 +75,14 @@ public class A8 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getCityOrAreaName(file.getName());
+                String areaName = ru.getAreaName(file.getName());
                 //市州名称
                 //此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
                 String parentPathName = file.getParentFile().getName();
-                String cityName = ru.getCityOrAreaName(parentPathName);
+                String cityName = ru.getCityName(parentPathName);
                 if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
                     parentPathName = file.getParentFile().getParentFile().getName();
-                    cityName = ru.getCityOrAreaName(parentPathName);
+                    cityName = ru.getCityName(parentPathName);
                 }
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java
index ac1c0e94..ed6a2a11 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java
@@ -73,14 +73,14 @@ public class A9 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getCityOrAreaName(file.getName());
+                String areaName = ru.getAreaName(file.getName());
                 //市州名称
                 //此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
                 String parentPathName = file.getParentFile().getName();
-                String cityName = ru.getCityOrAreaName(parentPathName);
+                String cityName = ru.getCityName(parentPathName);
                 if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
                     parentPathName = file.getParentFile().getParentFile().getName();
-                    cityName = ru.getCityOrAreaName(parentPathName);
+                    cityName = ru.getCityName(parentPathName);
                 }
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java
index 2affc72a..92ce09e9 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java
@@ -53,7 +53,7 @@ public class C1 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityOrAreaName(file.getName());
+                String cityName = ru.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java
index 531e7742..598e0392 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java
@@ -59,7 +59,7 @@ public class C10 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityOrAreaName(file.getName());
+                String cityName = ru.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java
index 818c410a..fd67c095 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java
@@ -58,7 +58,7 @@ public class C11 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityOrAreaName(file.getName());
+                String cityName = ru.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java
index 7d2be0c7..f7be842e 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java
@@ -59,7 +59,7 @@ public class C2 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityOrAreaName(file.getName());
+                String cityName = ru.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java
index ff9afe17..0b83fe5d 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java
@@ -63,7 +63,7 @@ public class C3 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityOrAreaName(file.getName());
+                String cityName = ru.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java
index b9a02133..20f26ced 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java
@@ -68,7 +68,7 @@ public class C4 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityOrAreaName(file.getName());
+                String cityName = ru.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java
index b71751f9..a8a30758 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java
@@ -58,7 +58,7 @@ public class C5 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityOrAreaName(file.getName());
+                String cityName = ru.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java
index adc5ec95..292c442c 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java
@@ -58,7 +58,7 @@ public class C6 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityOrAreaName(file.getName());
+                String cityName = ru.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java
index dfbd2029..61cf8833 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java
@@ -127,7 +127,7 @@ public class C7 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityOrAreaName(file.getName());
+                String cityName = ru.getCityName(file.getName());
                 if (StrKit.isBlank(cityName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
                     System.exit(0);
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java
index 466d7982..50cfdc89 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java
@@ -58,7 +58,7 @@ public class C8 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityOrAreaName(file.getName());
+                String cityName = ru.getCityName(file.getName());
                 if (StrKit.isBlank(cityName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
                     System.exit(0);
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java
index fa34faa7..d532d4b4 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java
@@ -60,7 +60,7 @@ public class C9 {
                 //判断是否为docx文件
                 if (fileName.endsWith(".docx") && !fileName.startsWith("~")) {
                     //城市名称
-                    String cityName = ru.getCityOrAreaName(file.getName());
+                    String cityName = ru.getCityName(file.getName());
                     if (StrKit.isBlank(cityName)) {
                         System.out.println("文件名无法解析为城市：" + fileName);
                         System.exit(0);
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Test/TestBadExcel.java b/src/main/java/com/dsideal/base/Tools/FillData/Test/TestBadExcel.java
index dbaf102b..27847505 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Test/TestBadExcel.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Test/TestBadExcel.java
@@ -44,7 +44,7 @@ public class TestBadExcel {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityOrAreaName(file.getName());
+                String cityName = ru.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/Step4_ReaderWord.java b/src/main/java/com/dsideal/base/Tools/Step4_ReaderWord.java
index b0611389..7c394990 100644
--- a/src/main/java/com/dsideal/base/Tools/Step4_ReaderWord.java
+++ b/src/main/java/com/dsideal/base/Tools/Step4_ReaderWord.java
@@ -33,7 +33,7 @@ public class Step4_ReaderWord {
                 String extension = file.getName().substring(file.getName().lastIndexOf(".") + 1);
                 if (!extension.equals("docx")) continue;
                 //城市名称
-                String cityName = ru.getCityOrAreaName(file.getName());
+                String cityName = ru.getCityName(file.getName());
                 if(cityName!=null && cityName.equals("迪庆藏族自治州")){
                     ru.doOne(file, cityName, excelDir);
                 }
diff --git a/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java b/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java
index b99ee94c..80404766 100644
--- a/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java
+++ b/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java
@@ -42,17 +42,9 @@ public class ReadDocxUtil {
      * @param fileName
      * @return
      */
-    public String getCityOrAreaName(String fileName) {
+    public String getCityName(String fileName) {
         //云南省下所有城市
         List<String> listCity = getCityNameList();
-        List<Record> listAreaRecord = dm.getProvinceArea(privinceName);
-        List<String> listArea = new ArrayList<>();
-        for (Record record : listAreaRecord) {
-            listArea.add(record.getStr("area_name"));
-        }
-        //合并下listArea,listCity
-        listCity.addAll(listArea);
-
         //城市名称的前两位一样就视为一样
         String top2= fileName.substring(0,2);
 
@@ -72,6 +64,36 @@ public class ReadDocxUtil {
         return cityName;
     }
 
+    /**
+     * 根据文件名获取县区名称
+     * @param fileName
+     * @return
+     */
+    public String getAreaName(String fileName) {
+        List<Record> listAreaRecord = dm.getProvinceArea(privinceName);
+        List<String> listCity = new ArrayList<>();
+        for (Record record : listAreaRecord) {
+            listCity.add(record.getStr("area_name"));
+        }
+        //城市名称的前两位一样就视为一样
+        String top2= fileName.substring(0,2);
+
+        //判断是哪个城市
+        boolean found = false;
+        String areaName = "";
+        for (String s : listCity) {
+            if (s.startsWith(top2)) {
+                found = true;
+                areaName = s;
+            }
+        }
+        if (!found) {
+            System.out.println(fileName + "未找到匹配的县区");
+            return null;
+        }
+        return areaName;
+    }
+
     /**
      * 解析word文档，提取其中的图表表格，并保存为excel文件
      *