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 bbcdff3736..896c1fca36 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
@@ -240,12 +240,9 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                     subPartyAvgList.forEach(party -> {
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         party.forEach(c -> {
-                            if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-//                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
-                                pid.put(c.getParentId(), agencyMap.get(c.getParentId()));
-                                SampleValue s = new SampleValue(c.getParentId(), c.getScore());
-                                index1SampleValues.add(s);
-                            }
+                            pid.put(c.getAgencyId(), c.getParentId());
+                            SampleValue s = new SampleValue(c.getParentId(), c.getScore());
+                            index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
                         IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc);
@@ -337,12 +334,9 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                     governAvg.forEach(avg -> {
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         avg.forEach(c -> {
-                            if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-//                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
-                                pid.put(c.getParentId(), agencyMap.get(c.getParentId()));
-                                SampleValue s = new SampleValue(c.getParentId(), c.getScore());
-                                index1SampleValues.add(s);
-                            }
+                            pid.put(c.getAgencyId(), c.getParentId());
+                            SampleValue s = new SampleValue(c.getParentId(), c.getScore());
+                            index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
                         IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc);
@@ -434,12 +428,9 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         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 -> {
-                            if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-//                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
-                                pid.put(c.getParentId(), agencyMap.get(c.getParentId()));
-                                SampleValue s = new SampleValue(c.getParentId(), c.getScore());
-                                index1SampleValues.add(s);
-                            }
+                            pid.put(c.getAgencyId(), c.getParentId());
+                            SampleValue s = new SampleValue(c.getParentId(), c.getScore());
+                            index1SampleValues.add(s);
                         });
                         IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc1);
                         indexInputVOS.add(index1VO);