diff --git a/ems-common/src/main/java/com/xzzn/common/enums/TicketStatus.java b/ems-common/src/main/java/com/xzzn/common/enums/TicketStatus.java
new file mode 100644
index 0000000..caad78d
--- /dev/null
+++ b/ems-common/src/main/java/com/xzzn/common/enums/TicketStatus.java
@@ -0,0 +1,30 @@
+package com.xzzn.common.enums;
+
+/**
+ * ticket - 工单状态
+ * 
+ * @author xzzn
+ */
+public enum TicketStatus
+{
+    WAITING("1", "待处理"), PROCESSING("2", "处理中"),DONE("3", "已处理");
+
+    private final String code;
+    private final String info;
+
+    TicketStatus(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}
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 9e75504..4acb413 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
@@ -387,13 +387,13 @@ public class EmsStatsReportServiceImpl implements IEmsStatsReportService
             String tarteDate = DateUtils.convertToString(targetMinute);
             PowerStatisListVo currentData = dataMap.get(tarteDate);
             if (currentData == null && lastData != null) {
-                BigDecimal pvPower = lastData.getPvPower();
-                BigDecimal storagePower = lastData.getStoragePower();
-                BigDecimal gridPower = lastData.getGridPower();
+                BigDecimal pvPower = lastData.getPvPower()==null?new BigDecimal(0) :lastData.getGridPower();
+                BigDecimal storagePower = lastData.getStoragePower()==null?new BigDecimal(0) :lastData.getGridPower();
+                BigDecimal gridPower = lastData.getGridPower()==null?new BigDecimal(0) :lastData.getGridPower();
                 currentData = new PowerStatisListVo(tarteDate.toString(),gridPower,storagePower,pvPower);
             } else if (currentData == null && lastData == null){
                 // 开头无数据，所有字段设为null
-                currentData = new PowerStatisListVo(tarteDate.toString(), null, null, null);
+                currentData = new PowerStatisListVo(tarteDate.toString(), new BigDecimal(0), new BigDecimal(0), new BigDecimal(0));
             }
             lastData = currentData;
             powerStatisListVoList.add(currentData);
diff --git a/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml
index 862074f..eb67bf4 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml
@@ -965,8 +965,8 @@
     </select>
 
     <sql id="powerFilter">
-            MAX(CASE WHEN t.device_id = 'METE' THEN t.secondary_total_active_power END) AS gridPower,
-			MAX(CASE WHEN t.device_id = 'LOAD' THEN t.total_active_power END) AS storagePower,
+            MAX(CASE WHEN t.device_id = 'METE' THEN t.secondary_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>
 
diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
index 791fab4..302d1a0 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
@@ -383,7 +383,6 @@
                  SELECT p.device_id, MAX(p.data_update_time) AS max_update_time
                  FROM ems_pcs_data p
                  where p.site_id = #{siteId}
-                   and p.data_update_time &lt;= CURDATE()
                  GROUP BY p.device_id
              ) latest inner join ems_pcs_data t ON latest.device_id = t.device_id
             AND latest.max_update_time = t.data_update_time