diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollCommunityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollCommunityServiceImpl.java
index 6cd619a2fd..2ed9e35483 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollCommunityServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollCommunityServiceImpl.java
@@ -26,6 +26,7 @@ import java.math.RoundingMode;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -143,7 +144,8 @@ public class IndexCollCommunityServiceImpl implements IndexCollCommunityService
 				entity.setClosedProjectRatio(BigDecimal.ZERO);
 			}
 			//办结效率
-			entity.setHandleProjectRatio(efficiencyMap.get(entity.getAgencyId()));
+			entity.setHandleProjectRatio(Optional.ofNullable(efficiencyMap.get(entity.getAgencyId())).orElse(BigDecimal.ZERO));
+
 		});
 
 		factIndexGovrnAblityOrgMonthlyService.deleteByCustomer(customerId, dimId.getMonthId(), OrgTypeConstant.COMMUNITY);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollStreetServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollStreetServiceImpl.java
index 896d2d47bd..256ac5b76f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollStreetServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollStreetServiceImpl.java
@@ -26,6 +26,7 @@ import java.math.RoundingMode;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -125,14 +126,16 @@ public class IndexCollStreetServiceImpl implements IndexCollStreetService {
 			BigDecimal element = new BigDecimal(entity.getClosedProjectCount());
 			//分母，即机关参与过的项目数（去重）
 			Integer denominator = agencyParticipatedCount.get(entity.getAgencyId());
-			if (agencyParticipatedCount.get(entity.getAgencyId()) != NumConstant.ZERO) {
+			if (null != denominator && denominator != NumConstant.ZERO) {
 				//办结率
 				entity.setClosedProjectRatio(
 						element.divide(new BigDecimal(denominator), NumConstant.SIX, RoundingMode.HALF_UP)
 				);
+			}else{
+				entity.setClosedProjectRatio(BigDecimal.ZERO);
 			}
 			//办结效率
-			entity.setHandleProjectRatio(efficiencyMap.get(entity.getAgencyId()));
+			entity.setHandleProjectRatio(Optional.ofNullable(efficiencyMap.get(entity.getAgencyId())).orElse(BigDecimal.ZERO));
 		});
 
 		factIndexGovrnAblityOrgMonthlyService.deleteByCustomer(customerId, dimId.getMonthId(), OrgTypeConstant.STREET);