diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/FactIndexCommunityScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunityScoreDao.java
similarity index 96%
rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/FactIndexCommunityScoreDao.java
rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunityScoreDao.java
index 40fd49e6ab..ba236c1192 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/FactIndexCommunityScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunityScoreDao.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dao.evaluationindex.screen;
+package com.epmet.dao.evaluationindex.indexcal;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.indexcal.SubCommunityAvgResultDTO;
@@ -33,7 +33,7 @@ import java.util.List;
  * @since v1.0.0 2020-08-31
  */
 @Mapper
-public interface FactIndexCommunityScoreDao extends BaseDao<FactIndexCommunityScoreEntity> {
+public interface CommunityScoreDao extends BaseDao<FactIndexCommunityScoreEntity> {
 
     /**
      * @Description 【社区】中间表插入
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java
index 2e4a10cde2..b4db5f05f9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java
@@ -20,6 +20,8 @@ package com.epmet.dao.evaluationindex.indexcal;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.dto.indexcal.GridScoreDTO;
+import com.epmet.dto.screen.FactIndexGridScoreDTO;
+import com.epmet.dto.screen.result.SubGridAvgResultDTO;
 import com.epmet.entity.evaluationindex.indexcal.GridScoreEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -66,4 +68,45 @@ public interface GridScoreDao extends BaseDao<GridScoreEntity> {
      * @Date 2020/8/31 16:42
      **/
     List<GridScoreDTO> selectList(CalculateCommonFormDTO formDTO);
+
+    /**
+     * @Description  下属所有网格的平均值
+     * @param customerId
+     * @param monthId
+     * @author zxc
+     * @date 2020/8/28 3:20 下午
+     */
+    List<SubGridAvgResultDTO> selectSubGridAvgScore(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode);
+
+    /**
+     * 根据入参查询  网格相关分值记录
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<com.epmet.dto.screen.FactIndexGridScoreDTO>
+     * @Author zhangyong
+     * @Date 10:43 2020-09-03
+     **/
+    List<FactIndexGridScoreDTO> selectListGridScore(@Param("customerId")String customerId, @Param("monthId")String monthId);
+
+    /**
+     * 根据入参查询  网格id
+     * @param customerId
+     * @param monthId
+     * @return java.util.List<java.util.String>
+     * @Author zhangyong
+     * @Date 10:43 2020-09-03
+     **/
+    List<String> selectListGridId(@Param("customerId")String customerId, @Param("monthId")String monthId);
+
+    /**
+     * 批量插入 网格相关分值表
+     *
+     * @param list
+     * @param customerId
+     * @return void
+     * @Author zhangyong
+     * @Date 11:11 2020-09-04
+     **/
+    void batchInsertGridScoreData(@Param("list") List<FactIndexGridScoreDTO> list,@Param("customerId")String customerId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/FactIndexGridScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/FactIndexGridScoreDao.java
deleted file mode 100644
index 77c3f85366..0000000000
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/FactIndexGridScoreDao.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.epmet.dao.evaluationindex.screen;
-
-import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.screen.FactIndexGridScoreDTO;
-import com.epmet.dto.screen.result.SubGridAvgResultDTO;
-import com.epmet.entity.evaluationindex.screen.FactIndexGridScoreEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 网格相关分值
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-08-28
- */
-@Mapper
-public interface FactIndexGridScoreDao extends BaseDao<FactIndexGridScoreEntity> {
-
-    /**
-     * @Description  下属所有网格的平均值
-     * @param customerId
-     * @param monthId
-     * @author zxc
-     * @date 2020/8/28 3:20 下午
-     */
-    List<SubGridAvgResultDTO> selectSubGridAvgScore(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode);
-
-    /**
-     * 根据入参查询  网格相关分值记录
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<com.epmet.dto.screen.FactIndexGridScoreDTO>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<FactIndexGridScoreDTO> selectListGridScore(@Param("customerId")String customerId, @Param("monthId")String monthId);
-
-    /**
-     * 根据入参查询  网格id
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<java.util.String>
-     * @Author zhangyong
-     * @Date 10:43 2020-09-03
-     **/
-    List<String> selectListGridId(@Param("customerId")String customerId, @Param("monthId")String monthId);
-
-    /**
-     * 批量插入 网格相关分值表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
-     **/
-    void batchInsertGridScoreData(@Param("list") List<FactIndexGridScoreDTO> list,@Param("customerId")String customerId);
-}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
index 50960abf52..07a14db8f4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
@@ -8,11 +8,11 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.IndexCalConstant;
+import com.epmet.dao.evaluationindex.indexcal.CommunityScoreDao;
+import com.epmet.dao.evaluationindex.indexcal.GridScoreDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexServiceAblityOrgMonthlyDao;
-import com.epmet.dao.evaluationindex.screen.FactIndexCommunityScoreDao;
-import com.epmet.dao.evaluationindex.screen.FactIndexGridScoreDao;
 import com.epmet.dto.screen.FactIndexCommunityScoreDTO;
 import com.epmet.dto.screen.result.MaxAndMinBigDecimalResultDTO;
 import com.epmet.dto.screen.result.SubGridAvgResultDTO;
@@ -59,9 +59,9 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
     @Autowired
     private IndexCodeFieldReService indexCodeFieldReService;
     @Autowired
-    private FactIndexCommunityScoreDao factIndexCommunityScoreDao;
+    private CommunityScoreDao factIndexCommunityScoreDao;
     @Autowired
-    private FactIndexGridScoreDao factIndexGridScoreDao;
+    private GridScoreDao factIndexGridScoreDao;
 
     /**
      * @param customerId
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
index 3c024c3ec4..6a672a88c7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
@@ -8,10 +8,10 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.IndexCalConstant;
 import com.epmet.dao.evaluationindex.indexcal.AgencyScoreDao;
+import com.epmet.dao.evaluationindex.indexcal.CommunityScoreDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexServiceAblityOrgMonthlyDao;
-import com.epmet.dao.evaluationindex.screen.FactIndexCommunityScoreDao;
 import com.epmet.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
 import com.epmet.dto.indexcal.AgencyScoreDTO;
 import com.epmet.dto.indexcal.SubCommunityAvgResultDTO;
@@ -59,7 +59,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
     @Autowired
     private IndexCodeFieldReService indexCodeFieldReService;
     @Autowired
-    private FactIndexCommunityScoreDao communityScoreDao;
+    private CommunityScoreDao communityScoreDao;
     @Autowired
     private AgencyScoreDao agencyScoreDao;
     @Autowired
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java
index 02cd42be2a..65e0afbf0d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java
@@ -7,7 +7,9 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dao.evaluationindex.indexcal.AgencyScoreDao;
+import com.epmet.dao.evaluationindex.indexcal.CommunityScoreDao;
 import com.epmet.dao.evaluationindex.indexcal.DeptScoreDao;
+import com.epmet.dao.evaluationindex.indexcal.GridScoreDao;
 import com.epmet.dao.evaluationindex.indexcoll.*;
 import com.epmet.dao.evaluationindex.screen.*;
 import com.epmet.dto.ScreenCustomerGridDTO;
@@ -63,9 +65,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
     @Autowired
     private FactIndexGovrnAblityDeptMonthlyDao factIndexGovrnAblityDeptMonthlyDao;
     @Autowired
-    private FactIndexGridScoreDao factIndexGridScoreDao;
+    private GridScoreDao factIndexGridScoreDao;
     @Autowired
-    private FactIndexCommunityScoreDao factIndexCommunityScoreDao;
+    private CommunityScoreDao factIndexCommunityScoreDao;
     @Autowired
     private DeptScoreDao deptScoreDao;
     @Autowired
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/FactIndexCommunityScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml
similarity index 98%
rename from epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/FactIndexCommunityScoreDao.xml
rename to epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml
index e00f0b2c12..66ea89b140 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/FactIndexCommunityScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.evaluationindex.screen.FactIndexCommunityScoreDao">
+<mapper namespace="com.epmet.dao.evaluationindex.indexcal.CommunityScoreDao">
 
     <!-- 党建能力【社区】中间表插入 -->
     <insert id="insertCommunityPartyRecord">
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml
index e45dcb04ef..d42d063e35 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml
@@ -112,4 +112,105 @@
                 AND m.CUSTOMER_ID =#{customerId}
                 AND m.MONTH_ID =#{monthId}
     </select>
+
+
+
+    <!-- 下属所有网格的平均值 -->
+    <select id="selectSubGridAvgScore" resultType="com.epmet.dto.screen.result.SubGridAvgResultDTO">
+        SELECT
+            figc.agency_id AS agencyId,
+            figc.month_id as monthId,
+            figc.quarter_id as quarterId,
+            figc.year_id as yearId,
+            ROUND(AVG( figc.score ),6) AS score,
+            figc.customer_id as customerId,
+            sca.pid AS parentId
+        FROM
+            fact_index_grid_score figc
+                LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = figc.AGENCY_ID
+        WHERE
+            figc.del_flag = '0'
+          AND sca.DEL_FLAG = 0
+          AND figc.customer_id = #{customerId}
+          AND figc.month_id = #{monthId}
+          AND figc.index_code = #{indexCode}
+        GROUP BY figc.agency_id
+    </select>
+
+    <select id="selectListGridScore" resultType="com.epmet.dto.screen.FactIndexGridScoreDTO">
+        SELECT
+            CUSTOMER_ID customerId,
+            GRID_ID gridId,
+            AGENCY_ID agencyId,
+            YEAR_ID yearId,
+            MONTH_ID monthId,
+            IS_TOTAL isTotal,
+            SCORE score,
+            INDEX_CODE indexCode
+        FROM
+            fact_index_grid_score
+        WHERE
+            DEL_FLAG = '0'
+          AND CUSTOMER_ID = #{customerId}
+          AND MONTH_ID = #{monthId}
+        ORDER BY GRID_ID
+    </select>
+
+    <insert id="batchInsertGridScoreData" parameterType="map">
+        insert into fact_index_grid_score
+        (
+        ID,
+        CUSTOMER_ID,
+        GRID_ID,
+        AGENCY_ID,
+        ALL_PARENT_IDS,
+        QUARTER_ID,
+        YEAR_ID,
+        MONTH_ID,
+        IS_TOTAL,
+        SCORE,
+        INDEX_CODE,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{customerId},
+            #{item.gridId},
+            #{item.agencyId},
+            #{item.allParentIds},
+            #{item.quarterId},
+
+            #{item.yearId},
+            #{item.monthId},
+            #{item.isTotal},
+            #{item.score},
+            #{item.indexCode},
+            #{item.delFlag},
+            0,
+            'APP_USER',
+            now(),
+            'APP_USER',
+            now()
+            )
+        </foreach>
+    </insert>
+
+    <select id="selectListGridId" resultType="String">
+        SELECT
+            GRID_ID gridId
+        FROM
+            fact_index_grid_score
+        WHERE
+            DEL_FLAG = '0'
+          AND CUSTOMER_ID = #{customerId}
+          AND MONTH_ID = #{monthId}
+        ORDER BY GRID_ID
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/FactIndexGridScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/FactIndexGridScoreDao.xml
deleted file mode 100644
index 05ae94667e..0000000000
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/FactIndexGridScoreDao.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.epmet.dao.evaluationindex.screen.FactIndexGridScoreDao">
-
-    <!-- 下属所有网格的平均值 -->
-    <select id="selectSubGridAvgScore" resultType="com.epmet.dto.screen.result.SubGridAvgResultDTO">
-        SELECT
-            figc.agency_id AS agencyId,
-            figc.month_id as monthId,
-            figc.quarter_id as quarterId,
-            figc.year_id as yearId,
-            ROUND(AVG( figc.score ),6) AS score,
-            figc.customer_id as customerId,
-            sca.pid AS parentId
-        FROM
-            fact_index_grid_score figc
-             LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = figc.AGENCY_ID
-        WHERE
-            figc.del_flag = '0'
-          AND sca.DEL_FLAG = 0
-          AND figc.customer_id = #{customerId}
-          AND figc.month_id = #{monthId}
-          AND figc.index_code = #{indexCode}
-        GROUP BY figc.agency_id
-    </select>
-
-    <select id="selectListGridScore" resultType="com.epmet.dto.screen.FactIndexGridScoreDTO">
-        SELECT
-            CUSTOMER_ID customerId,
-            GRID_ID gridId,
-            AGENCY_ID agencyId,
-            YEAR_ID yearId,
-            MONTH_ID monthId,
-            IS_TOTAL isTotal,
-            SCORE score,
-            INDEX_CODE indexCode
-        FROM
-            fact_index_grid_score
-        WHERE
-            DEL_FLAG = '0'
-            AND CUSTOMER_ID = #{customerId}
-            AND MONTH_ID = #{monthId}
-            ORDER BY GRID_ID
-    </select>
-
-    <insert id="batchInsertGridScoreData" parameterType="map">
-        insert into fact_index_grid_score
-        (
-        ID,
-        CUSTOMER_ID,
-        GRID_ID,
-        AGENCY_ID,
-        ALL_PARENT_IDS,
-        QUARTER_ID,
-        YEAR_ID,
-        MONTH_ID,
-        IS_TOTAL,
-        SCORE,
-        INDEX_CODE,
-        DEL_FLAG,
-        REVISION,
-        CREATED_BY,
-        CREATED_TIME,
-        UPDATED_BY,
-        UPDATED_TIME
-        ) values
-        <foreach collection="list" item="item" index="index" separator=",">
-            (
-            (SELECT REPLACE(UUID(), '-', '') AS id),
-            #{customerId},
-            #{item.gridId},
-            #{item.agencyId},
-            #{item.allParentIds},
-            #{item.quarterId},
-
-            #{item.yearId},
-            #{item.monthId},
-            #{item.isTotal},
-            #{item.score},
-            #{item.indexCode},
-            #{item.delFlag},
-            0,
-            'APP_USER',
-            now(),
-            'APP_USER',
-            now()
-            )
-        </foreach>
-    </insert>
-
-    <select id="selectListGridId" resultType="String">
-        SELECT
-            GRID_ID gridId
-        FROM
-            fact_index_grid_score
-        WHERE
-            DEL_FLAG = '0'
-            AND CUSTOMER_ID = #{customerId}
-            AND MONTH_ID = #{monthId}
-            ORDER BY GRID_ID
-    </select>
-</mapper>