diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java
index 32e073cea3..71b6af63d1 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java
@@ -116,7 +116,6 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
     }
 
     private void calculateSelfSubScore(CalculateCommonFormDTO formDTO) {
-        //todo 指标添加缓存
         List<IndexGroupDetailEntity> indexList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(),
                 IndexCodeEnum.QU_ZHI_BU_MEN.getCode());
         if (CollectionUtils.isEmpty(indexList)) {
@@ -143,7 +142,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
             Map<String, BigDecimal> weightMap = new HashMap<>();
             selfSubIndexList.forEach(o -> {
                 //找出自身 和下级的指标
-                if (o.getAllIndexCodePath().indexOf(ProjectConstant.XIA_JI) > -1) {
+                if (o.getAllIndexCodePath().contains(ProjectConstant.XIA_JI)) {
                     selfSubParentMap.get(ProjectConstant.XIA_JI).add(o.getIndexCode());
                     weightMap.put(ProjectConstant.XIA_JI, weightMap.getOrDefault(ProjectConstant.XIA_JI, new BigDecimal(0)).add(o.getWeight()));
                 } else {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
index 86da0df973..e99f35a569 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
@@ -132,7 +132,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
             Map<String, BigDecimal> weightMap = new HashMap<>();
             selfSubIndexList.forEach(o -> {
                 //找出自身 和下级的指标
-                if (o.getAllIndexCodePath().indexOf(ProjectConstant.XIA_JI) > -1) {
+                if (o.getAllIndexCodePath().contains(ProjectConstant.XIA_JI)) {
                     selfSubParentMap.get(ProjectConstant.XIA_JI).add(o.getIndexCode());
                     weightMap.put(ProjectConstant.XIA_JI, weightMap.getOrDefault(ProjectConstant.XIA_JI, new BigDecimal(0)).add(o.getWeight()));
                 } else {
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 1f279c4076..82fe83bb3c 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
@@ -165,7 +165,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
             Map<String, BigDecimal> weightMap = new HashMap<>();
             selfSubIndexList.forEach(o -> {
                 //找出自身 和下级的指标
-                if (o.getAllIndexCodePath().indexOf(ProjectConstant.XIA_JI) > -1) {
+                if (o.getAllIndexCodePath().contains(ProjectConstant.XIA_JI)) {
                     selfSubParentMap.get(ProjectConstant.XIA_JI).add(o.getIndexCode());
                     weightMap.put(ProjectConstant.XIA_JI, weightMap.getOrDefault(ProjectConstant.XIA_JI, new BigDecimal(0)).add(o.getWeight()));
                 } else {
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 dcec17a0c8..988fc7e118 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
@@ -163,7 +163,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             Map<String, BigDecimal> weightMap = new HashMap<>();
             selfSubIndexList.forEach(o -> {
                 //找出自身 和下级的指标
-                if (o.getAllIndexCodePath().indexOf(ProjectConstant.XIA_JI) > -1) {
+                if (o.getAllIndexCodePath().contains(ProjectConstant.XIA_JI)) {
                     selfSubParentMap.get(ProjectConstant.XIA_JI).add(o.getIndexCode());
                     weightMap.put(ProjectConstant.XIA_JI, weightMap.getOrDefault(ProjectConstant.XIA_JI, new BigDecimal(0)).add(o.getWeight()));
                 } else {
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 011694dbb8..bf251be59f 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
@@ -168,7 +168,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
             Map<String, BigDecimal> weightMap = new HashMap<>();
             selfSubIndexList.forEach(o -> {
                 //找出自身 和下级的指标
-                if (o.getAllIndexCodePath().indexOf(ProjectConstant.XIA_JI) > -1) {
+                if (o.getAllIndexCodePath().contains(ProjectConstant.XIA_JI)) {
                     selfSubParentMap.get(ProjectConstant.XIA_JI).add(o.getIndexCode());
                     weightMap.put(ProjectConstant.XIA_JI, weightMap.getOrDefault(ProjectConstant.XIA_JI, new BigDecimal(0)).add(o.getWeight()));
                 } else {