diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java
index d0f1ab08df..05ed692454 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java
@@ -94,7 +94,7 @@ public interface AgencyScoreDao extends BaseDao<AgencyScoreEntity> {
      * @date 2021/1/18 上午9:09
      */
     List<SubAgencyScoreAvgResultDTO> selectAgencyScoreAvgExistsSub(@Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("areaCode")String areaCode);
-    List<SubAgencyScoreAvgResultDTO> selectAgencyScoreAvgExistsSubNew(@Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
+    List<SubAgencyScoreAvgResultDTO> selectAgencyScoreAvgExistsSubNew(@Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId,@Param("customerId")String customerId);
     List<SubAgencyScoreAvgResultDTO> selectAgencyScoreAvgByOrgIds(@Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("orgIds")List<String> orgIds);
 
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
index 9c8e1579d9..1a40acf7aa 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
@@ -649,10 +649,10 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
         indexDetailList.forEach(detail -> {
             if (IndexCodeEnum.QU_XIA_JI_JIE_DDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
-                List<SubAgencyScoreAvgResultDTO> subGridPartyAvgScore = agencyScoreDao.selectAgencyScoreAvgExistsSubNew(monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId);
+                List<SubAgencyScoreAvgResultDTO> subGridPartyAvgScore = agencyScoreDao.selectAgencyScoreAvgExistsSubNew(monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId,customerId);
                 log.info("subGridPartyAvgScore:::"+subGridPartyAvgScore.toString());
                 subGridPartyAvgScore.forEach(s -> {
-                    gridPartyScoreSampleCountMap.put(s.getAgencyId().concat(":").concat(IndexCodeEnum.QU_XIA_JI_JIE_DDJNLHZPJZ.getCode()), s.getSampleCount());
+                    gridPartyScoreSampleCountMap.put(s.getParentId().concat(":").concat(IndexCodeEnum.QU_XIA_JI_JIE_DDJNLHZPJZ.getCode()), s.getSampleCount());
                 });
                 if (CollectionUtils.isEmpty(subGridPartyAvgScore)) {
                     log.warn(IndexCalConstant.DISTRICT_PARTY_AVG_NULL);
@@ -745,10 +745,10 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode().equals(detail.getIndexCode())) {
                 // 治理能力平均值
-                List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSubNew(monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId);
+                List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSubNew(monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId,customerId);
                 log.info("districtGovernAvgList:::"+districtGovernAvgList.toString());
                 districtGovernAvgList.forEach(s -> {
-                    gridPartyScoreSampleCountMap.put(s.getAgencyId().concat(":").concat(IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode()), s.getSampleCount());
+                    gridPartyScoreSampleCountMap.put(s.getParentId().concat(":").concat(IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode()), s.getSampleCount());
                 });
                 for (int i = 0; i < districtGovernAvgList.size(); i++) {
                     if (districtGovernAvgList.get(i).getAgencyId().equals(NumConstant.ZERO_STR)){
@@ -790,6 +790,9 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                 if (CollectionUtils.isEmpty(deptScoreAvgList)) {
                     log.warn("查询所有直属部门治理能力平均值集合为空");
                 } else{
+                    deptScoreAvgList.forEach(d -> {
+                        gridPartyScoreSampleCountMap.put(d.getAgencyId().concat(":").concat(IndexCodeEnum.SUO_YOU_ZHI_SHU_BMZLNLPJZ.getCode()), d.getSampleCount());
+                    });
                     MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(deptScoreAvgList.stream().map(o -> o.getScore()).collect(Collectors.toList()));
                     List<List<SubAgencyScoreAvgResultDTO>> governAvg = ListUtils.partition(deptScoreAvgList, IndexCalConstant.PAGE_SIZE);
                     governAvg.forEach(avg -> {
@@ -845,10 +848,10 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         detailListByParentCode.forEach(detail -> {
             String indexCode = detail.getIndexCode();
             if (IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode().equals(indexCode)) {
-                List<SubAgencyScoreAvgResultDTO> subStreetAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSubNew(monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId);
+                List<SubAgencyScoreAvgResultDTO> subStreetAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSubNew(monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId,customerId);
                 log.info("subStreetAvgList:::"+subStreetAvgList.toString());
                 subStreetAvgList.forEach(s -> {
-                    gridPartyScoreSampleCountMap.put(s.getAgencyId().concat(":").concat(IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode()), s.getSampleCount());
+                    gridPartyScoreSampleCountMap.put(s.getParentId().concat(":").concat(IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode()), s.getSampleCount());
                 });
                 for (int i = 0; i < subStreetAvgList.size(); i++) {
                     if (subStreetAvgList.get(i).getAgencyId().equals(NumConstant.ZERO_STR)){
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 bdcd026d07..961970fc9b 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
@@ -667,7 +667,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 List<SubCommunityAvgResultDTO> dispose = communityScoreDao.selectSubCommAvgScoreExistSubNotSelfNew(monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId);
                 // 数据处理
                 List<SubCommunityAvgResultDTO> subCommPartyAvgScore = disposeSubAvg(dispose, form);
-                dispose.forEach(s -> {
+                subCommPartyAvgScore.forEach(s -> {
                     gridPartyScoreSampleCountMap.put(s.getAgencyId().concat(":").concat(IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQDJNLHZPJZ.getCode()), s.getSampleCount());
                 });
                 if (CollectionUtils.isEmpty(subCommPartyAvgScore)) {
@@ -970,6 +970,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 avgScore.forEach(avg -> {
                     if (subScore.getAgencyId().equals(avg.getParentId())){
                         subScore.setScore(avg.getScore());
+                        subScore.setSampleCount(avg.getSampleCount());
                         avg.setScoreStatus(true);
                     }
                 });
@@ -990,6 +991,8 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                 // 孔村单独处理
                 if (s.getAgencyId().equals(PingYinConstant.KONG_CUN_AGENCY_ID)){
                     s.setScore(divide);
+                    // 党总支数量求平均数
+                    s.setSampleCount(subAvgResultDTOS.size());
                 }
             });
         }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml
index 9cceffc4df..10868e075f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml
@@ -263,7 +263,9 @@
         (fics.agency_id = sca.agency_id
             AND fics.del_flag = '0'
             AND fics.month_id = #{monthId}
-            AND fics.index_code = #{indexCode})
+            AND fics.index_code = #{indexCode}
+            AND fics.CUSTOMER_ID = #{customerId}
+            )
         WHERE sca.DEL_FLAG = '0'
           AND sca.PARENT_AREA_CODE = #{areaCode}
         GROUP BY parentId