diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/PointDataResponse.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PointDataResponse.java
index d8ca59d..392117b 100644
--- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/PointDataResponse.java
+++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PointDataResponse.java
@@ -12,7 +12,7 @@ public class PointDataResponse{
     private BigDecimal gridPower;
     /** 负载功率  */
     private BigDecimal loadPower;
-    /** 储能功率-secondary_total_active_power(METE) */
+    /** 储能功率-total_active_power(METE) */
     private BigDecimal storagePower;
     /** 光伏功率-total_active_power(METEGT) */
     private BigDecimal pvPower;
diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/PowerStatisListVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PowerStatisListVo.java
index 5bd7671..f7a6b1c 100644
--- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/PowerStatisListVo.java
+++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PowerStatisListVo.java
@@ -22,7 +22,7 @@ public class PowerStatisListVo {
     private BigDecimal loadPower;
 
     /**
-     * 储能功率-secondary_total_active_power(METE)
+     * 储能功率-total_active_power(METE)
      */
     private BigDecimal storagePower;
 
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java
index 0b6b5f3..2cf1a3e 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java
@@ -577,15 +577,18 @@ public class EmsStatsReportServiceImpl implements IEmsStatsReportService
             BigDecimal pvPower = powerStatisListVo.getPvPower() == null ? BigDecimal.ZERO : powerStatisListVo.getPvPower();
             BigDecimal loadPower = new BigDecimal(0);
 
-            // 电动所：负荷功率=电网功率+光伏功率-储能功率
-            if (SiteEnum.DDS.getCode().equals(siteId)){
-                loadPower = gridPower.add(pvPower).subtract(storagePower);
-                powerStatisListVo.setLoadPower(loadPower);
-            } else if (SiteEnum.FX.getCode().equals(siteId)){
-                // 奉贤：负荷功率=电网功率-储能功率；
-                loadPower = gridPower.subtract(storagePower);
-                powerStatisListVo.setLoadPower(loadPower);
-            }
+            // 负荷功率=电网功率+光伏功率-储能功率
+            loadPower = gridPower.add(pvPower).subtract(storagePower);
+            powerStatisListVo.setLoadPower(loadPower);
+//            // 电动所：负荷功率=电网功率+光伏功率-储能功率
+//            if (SiteEnum.DDS.getCode().equals(siteId)){
+//                loadPower = gridPower.add(pvPower).subtract(storagePower);
+//                powerStatisListVo.setLoadPower(loadPower);
+//            } else if (SiteEnum.FX.getCode().equals(siteId)){
+//                // 奉贤：负荷功率=电网功率-储能功率；
+//                loadPower = gridPower.subtract(storagePower);
+//                powerStatisListVo.setLoadPower(loadPower);
+//            }
         }
     }
 
diff --git a/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml
index f679965..8b1c6e8 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml
@@ -977,7 +977,7 @@
     </select>
 
     <sql id="powerFilter">
-            MAX(CASE WHEN t.device_id = 'METE' THEN t.secondary_total_active_power END) AS storagePower,
+            MAX(CASE WHEN t.device_id = 'METE' THEN t.total_active_power END) AS storagePower,
 			MAX(CASE WHEN t.device_id = 'LOAD' THEN t.total_active_power END) AS gridPower,
 			MAX(CASE WHEN t.device_id = 'METEGF' THEN t.total_active_power END) AS pvPower
     </sql>