diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexOriginExtractController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexOriginExtractController.java
index f4fba2d6d5..1f2b86020a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexOriginExtractController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexOriginExtractController.java
@@ -1,8 +1,8 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.extract.form.ExtractFormDTO;
-import com.epmet.service.evaluationindex.extract.FactOriginExtractService;
+import com.epmet.dto.extract.form.ExtractIndexFormDTO;
+import com.epmet.service.evaluationindex.extract.dataToIndex.IndexOriginExtractService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("indexorigin")
 public class IndexOriginExtractController {
     @Autowired
-    private FactOriginExtractService factOriginExtractService;
+    private IndexOriginExtractService indexOriginExtractService;
 
 
     /**
@@ -30,8 +30,8 @@ public class IndexOriginExtractController {
      * @return
      */
     @PostMapping("extractall")
-    public Result extractAll(@RequestBody ExtractFormDTO extractFormDTO) {
-        factOriginExtractService.extractAll(extractFormDTO);
+    public Result extractAll(@RequestBody ExtractIndexFormDTO extractFormDTO) {
+        indexOriginExtractService.indexOriginExtractAll(extractFormDTO);
         return new Result();
     }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/AgencySubScoreEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/AgencySubScoreEntity.java
index d5ca30dc0e..8b87b26a4e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/AgencySubScoreEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/AgencySubScoreEntity.java
@@ -62,25 +62,30 @@ public class AgencySubScoreEntity extends BaseEpmetEntity {
 	 */
 	private String quarterId;
 
-	/**
-	 * 月维度Id: yyyyMM
-	 */
-	private String monthId;
-
-	/**
-	 * 1：总分；0不是；默认0
-	 */
-	private String isTotal;
-
-	/**
-	 * 分值
-	 */
-	private BigDecimal score;
-
-	/**
-	 * 党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；街道相关：jiedaoxiangguan；全区相关:quanquxiangguan
-	 */
-	private String indexCode;
+    /**
+     * 月维度Id: yyyyMM
+     */
+    private String monthId;
+
+    /**
+     * 1：总分；0不是；默认0
+     */
+    private String isTotal;
+
+    /**
+     * 计算指标时的原始值 字符串类型
+     */
+    private String originValue;
+
+    /**
+     * 分值
+     */
+    private BigDecimal score;
+
+    /**
+     * 党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；街道相关：jiedaoxiangguan；全区相关:quanquxiangguan
+     */
+    private String indexCode;
 
 	/**
 	 * 数据类型 district  ：全区；street：街道
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/CpcSubScoreEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/CpcSubScoreEntity.java
index f1c79068a5..d140aca767 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/CpcSubScoreEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/CpcSubScoreEntity.java
@@ -68,6 +68,11 @@ public class CpcSubScoreEntity extends BaseEpmetEntity {
 	 */
 	private String userId;
 
+	/**
+	 * 计算指标时的原始值 字符串类型
+	 */
+	private String originValue;
+
 	/**
 	 * 分值
 	 */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/DeptSubScoreEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/DeptSubScoreEntity.java
index 191ffb0157..c75fc82847 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/DeptSubScoreEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/DeptSubScoreEntity.java
@@ -67,6 +67,11 @@ public class DeptSubScoreEntity extends BaseEpmetEntity {
      */
     private String monthId;
 
+    /**
+     * 计算指标时的原始值 字符串类型
+     */
+    private String originValue;
+
     /**
      * 分值
      */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/FactIndexCommunitySubScoreEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/FactIndexCommunitySubScoreEntity.java
index d8938d9018..82f8b0ae74 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/FactIndexCommunitySubScoreEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/FactIndexCommunitySubScoreEntity.java
@@ -48,6 +48,11 @@ public class FactIndexCommunitySubScoreEntity extends BaseEpmetEntity {
      */
     private String monthId;
 
+    /**
+     * 计算指标时的原始值 字符串类型
+     */
+    private String originValue;
+
     /**
      * 分值
      */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridSubScoreEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridSubScoreEntity.java
index 3404fda77d..fa88df4ba7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridSubScoreEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridSubScoreEntity.java
@@ -77,6 +77,11 @@ public class GridSubScoreEntity extends BaseEpmetEntity {
 	 */
 	private String isTotal;
 
+	/**
+	 * 计算指标时的原始值 字符串类型
+	 */
+	private String originValue;
+
 	/**
 	 * 分值
 	 */
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
index de984c0133..040d81d6b5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
@@ -58,13 +58,14 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
         List<String> customerIds = new ArrayList<>();
         if (StringUtils.isNotBlank(customerId)) {
             customerIds.add(customerId);
-        }
-        int pageNo = NumConstant.ONE;
-        int pageSize = NumConstant.ONE_HUNDRED;
-        customerIds = dimCustomerService.selectCustomerIdPage(pageNo, pageSize);
-        if (CollectionUtils.isEmpty(customerIds)) {
-            log.error("indexOriginExtractAll 获取客户Id为空");
-            return;
+        } else {
+            int pageNo = NumConstant.ONE;
+            int pageSize = NumConstant.ONE_HUNDRED;
+            customerIds = dimCustomerService.selectCustomerIdPage(pageNo, pageSize);
+            if (CollectionUtils.isEmpty(customerIds)) {
+                log.error("indexOriginExtractAll 获取客户Id为空");
+                return;
+            }
         }
 
         String finalMonthId = monthId;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencySubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencySubScoreDao.xml
index 37b2450690..42e77b47a2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencySubScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencySubScoreDao.xml
@@ -5,7 +5,7 @@
 
     <!-- 【街道】中间表插入 -->
     <insert id="insertStreetRecord">
-        INSERT INTO fact_index_agency_sub_score (ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, DATA_TYPE, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE,
+        INSERT INTO fact_index_agency_sub_score (ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, DATA_TYPE, ORIGIN_VALUE, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE,
         WEIGHT,DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
         <foreach collection="lists" item="item" separator=",">
@@ -18,6 +18,7 @@
             #{item.quarterId},
             #{item.monthId},
             #{item.dataType},
+            #{item.originValue},
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunitySubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunitySubScoreDao.xml
index bdf1146ae7..6a3b2da17f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunitySubScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunitySubScoreDao.xml
@@ -5,7 +5,7 @@
 
     <!-- 党建能力【社区】中间表插入 -->
     <insert id="insertCommunityPartyRecord">
-        INSERT INTO fact_index_community_sub_score ( ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE,
+        INSERT INTO fact_index_community_sub_score ( ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, ORIGIN_VALUE, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE,
         WEIGHT,DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
         <foreach collection="lists" item="item" separator=",">
@@ -17,6 +17,7 @@
             #{item.yearId},
             #{item.quarterId},
             #{item.monthId},
+            #{item.originValue},
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcSubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcSubScoreDao.xml
index 848323447a..ac0154854f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcSubScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcSubScoreDao.xml
@@ -14,24 +14,9 @@
             </if>
     </delete>
 
-    <resultMap type="com.epmet.entity.evaluationindex.indexcal.CpcScoreEntity" id="cpcScoreMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="agencyId" column="AGENCY_ID"/>
-        <result property="gridId" column="GRID_ID"/>
-        <result property="userId" column="USER_ID"/>
-        <result property="monthId" column="MONTH_ID"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
     <select id="getPartScore" resultType="com.epmet.entity.evaluationindex.indexcal.CpcScoreEntity">
         select
-            CUSTOMER_ID,AGENCY_ID,GRID_ID,YEAR_ID,MONTH_ID,USER_ID,SCORE,INDEX_CODE FROM fact_index_cpc_sub_score
+            CUSTOMER_ID,AGENCY_ID,GRID_ID,YEAR_ID,MONTH_ID,USER_ID,ORIGIN_VALUE,SCORE,INDEX_CODE FROM fact_index_cpc_sub_score
         WHERE
             CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
             and MONTH_ID = #{monthId,jdbcType=VARCHAR}
@@ -110,6 +95,7 @@
         `YEAR_ID`,
         `MONTH_ID`,
         `USER_ID`,
+        `ORIGIN_VALUE`,
         `SCORE`,
         `INDEX_CODE`,
         `ALL_PARENT_INDEX_CODE`,
@@ -131,6 +117,7 @@
             #{item.yearId},
             #{item.monthId},
             #{item.userId},
+            #{item.originValue},
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptSubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptSubScoreDao.xml
index b9715ead72..8a035e4d2e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptSubScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptSubScoreDao.xml
@@ -13,6 +13,7 @@
         QUARTER_ID,
         YEAR_ID,
         MONTH_ID,
+        ORIGIN_VALUE,
         SCORE,
         INDEX_CODE,
         ALL_PARENT_INDEX_CODE,
@@ -33,6 +34,7 @@
             #{item.quarterId},
             #{item.yearId},
             #{item.monthId},
+            #{item.originValue},
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml
index 536f834564..e0707ee17b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml
@@ -14,6 +14,7 @@
         `QUARTER_ID`,
         `YEAR_ID`,
         `MONTH_ID`,
+        `ORIGIN_VALUE`,
         `SCORE`,
         `INDEX_CODE`,
          ALL_PARENT_INDEX_CODE,
@@ -36,6 +37,7 @@
             #{item.quarterId},
             #{item.yearId},
             #{item.monthId},
+            #{item.originValue},
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},