diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index 7d2d76bd..43af4a9b 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -1129,7 +1129,8 @@ class Sf_Dashboard_Connect(http.Controller):
                 cur.execute("""
                     SELECT * FROM device_data
                     WHERE device_name = %s
-                    AND time::date = CURRENT_DATE
+                    AND time >= CURRENT_DATE          -- 今日 00:00:00
+                    AND time < CURRENT_DATE + 1      -- 明日 00:00:00
                     AND device_state in ('待机', '警告', '运行中')
                     ORDER BY time ASC
                     LIMIT 1;
@@ -1142,7 +1143,8 @@ class Sf_Dashboard_Connect(http.Controller):
                 cur.execute("""
                     SELECT * FROM device_data
                     WHERE device_name = %s
-                    AND time::date = CURRENT_DATE
+                    AND time >= CURRENT_DATE          -- 今日 00:00:00
+                    AND time < CURRENT_DATE + 1      -- 明日 00:00:00
                     AND device_state in ('待机', '警告', '运行中')
                     ORDER BY time DESC
                     LIMIT 1;