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 f148e3d83e..5bb89adff4 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
@@ -674,7 +674,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                     partition.forEach(publish -> {
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         publish.forEach(c -> {
-                            c.setParentId(customerAgencyDao.selectAgencyId(form.getCustomerAreaCode()));
+//                            c.setParentId(customerAgencyDao.selectAgencyId(form.getCustomerAreaCode()));
                             pid.put(c.getAgencyId(),c.getParentId());
                             SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
                             index1SampleValues.add(s);
@@ -754,7 +754,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                     governAvg.forEach(avg -> {
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         avg.forEach(c -> {
-                            c.setParentId(customerAgencyDao.selectAgencyId(form.getCustomerAreaCode()));
+//                            c.setParentId(customerAgencyDao.selectAgencyId(form.getCustomerAreaCode()));
                             pid.put(c.getAgencyId(),c.getParentId());
                             SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
                             index1SampleValues.add(s);
@@ -835,7 +835,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                         BigDecimalScoreCalculator sc1 = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         serviceAvg.forEach(c -> {
-                            c.setParentId(customerAgencyDao.selectAgencyId(form.getCustomerAreaCode()));
+//                            c.setParentId(customerAgencyDao.selectAgencyId(form.getCustomerAreaCode()));
                             pid.put(c.getAgencyId(),c.getParentId());
                             SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
                             index1SampleValues.add(s);
@@ -932,6 +932,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         orgIds.forEach(org -> {
             SubCommunityAvgResultDTO s = new SubCommunityAvgResultDTO();
             s.setAgencyId(org.getOrgId());
+            s.setParentId(org.getPid());
             subAvgScores.add(s);
         });
         // 把除去孔村镇的数据赋值，孔村在下边单独处理
@@ -983,7 +984,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         if (!CollectionUtils.isEmpty(kongCunGovernAbility)){
             kongCunGovernAbility.forEach(k -> {
                 k.put("AGENCY_ID",k.get("AGENCY_ID"));
-                k.put("PARENT_ID",NumConstant.ZERO_STR);
+                k.put("PARENT_ID",k.get("PARENT_ID"));
             });
         }
         if (!CollectionUtils.isEmpty(communityGovernAbility)){
@@ -1012,7 +1013,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
         if (!CollectionUtils.isEmpty(kongCunActivityCountList)){
             kongCunActivityCountList.forEach(k -> {
                 k.put("AGENCY_ID",k.get("AGENCY_ID"));
-                k.put("PARENT_ID",NumConstant.ZERO_STR);
+                k.put("PARENT_ID",k.get("PARENT_ID"));
             });
         }
         if (!CollectionUtils.isEmpty(ActivityCountList)){
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml
index d1db2b9588..76ab745264 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml
@@ -288,7 +288,7 @@
     <select id="selectCommunityGovernAbilityIsKongCunNew" resultType="java.util.Map">
         SELECT
             sca.AGENCY_ID,
-            sca.pid AS PARENT_ID,
+            IF(sca.PID = '0',(SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0),sca.PID) AS PARENT_ID,
             #{monthId} AS MONTH_ID,
             #{quarterId} AS QUARTER_ID,
             #{yearId} AS YEAR_ID,
@@ -317,7 +317,7 @@
     <select id="selectStreetGovernAbilityExistsSubNotSelfNew" resultType="java.util.Map">
         SELECT
             sca.AGENCY_ID,
-            sca.PID AS PARENT_ID,
+            IF(sca.PID = '0',(SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0),sca.PID) AS PARENT_ID,
             #{monthId} AS MONTH_ID,
             #{quarterId} AS QUARTER_ID,
             #{yearId} AS YEAR_ID,
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyDao.xml
index 016cd62b24..1c0941a04b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyDao.xml
@@ -176,7 +176,7 @@
     <select id="selectPublishArticleCountMapExistSubStreetNew" resultType="java.util.Map">
         SELECT
             sca.AGENCY_ID,
-            sca.pid AS PARENT_ID,
+            IF(sca.PID = '0',(SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0),sca.PID) AS PARENT_ID,
             #{monthId} AS MONTH_ID,
             #{quarterId} AS QUARTER_ID,
             #{yearId} AS YEAR_ID,
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityOrgMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityOrgMonthlyDao.xml
index b070adb978..bebe7d6194 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityOrgMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityOrgMonthlyDao.xml
@@ -199,7 +199,7 @@
     <select id="selectActivityCountMapExistsSubNew" resultType="java.util.Map">
         SELECT
             sca.AGENCY_ID,
-            sca.PID AS PARENT_ID,
+            IF(sca.PID = '0',(SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0),sca.PID) AS PARENT_ID,
             #{monthId} AS MONTH_ID,
             #{quarterId} AS QUARTER_ID,
             #{yearId} AS YEAR_ID,
@@ -222,7 +222,7 @@
     <select id="selectActivityCountMapIsKongCunNew" resultType="java.util.Map">
         SELECT
             sca.AGENCY_ID,
-            sca.PID AS PARENT_ID,
+            IF(sca.PID = '0',(SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0),sca.PID) AS PARENT_ID,
             #{monthId} AS MONTH_ID,
             #{quarterId} AS QUARTER_ID,
             #{yearId} AS YEAR_ID,
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
index b60f152f95..1b6d972783 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
@@ -396,8 +396,8 @@
         SELECT
             sca.CUSTOMER_ID,
             sca.AGENCY_ID AS orgId,
-            sca.PID,
-            sca.PIDS,
+            IF(sca.PID = '0',(SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0),sca.PID) AS PID,
+            IF(sca.PIDS = '0',(SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0),sca.PIDS) AS PIDS,
             sca.`LEVEL` AS orgType,
             sca.AREA_CODE
         FROM screen_customer_agency sca