diff --git a/influxdb_api.py b/influxdb_api.py
index 724b302..3e63c2d 100644
--- a/influxdb_api.py
+++ b/influxdb_api.py
@@ -1814,11 +1814,15 @@ def query_all_record_by_date_property(query_date: str, type: str, property: str,
 
     # 构建 Flux 查询语句
     flux_query = f'''
-    from(bucket: "{bucket}")
-      |> range(start: {start_time}, stop: {stop_time})
-      |> filter(fn: (r) => r["_measurement"] == "{measurement}")
-      |> filter(fn: (r) => r["date"] == "{query_date}")
-      |> filter(fn: (r) => r["_field"] == "{property}")         
+        from(bucket: "{bucket}")
+            |> range(start: {start_time.isoformat()}, stop: {stop_time.isoformat()})
+            |> filter(fn: (r) => 
+                r._measurement == "{measurement}" and
+                r._field == "{property}"
+            )
+            |> group(columns: ["date"])
+            |> filter(fn: (r) => r.date == "{query_date}")
+            |> keep(columns: ["_time", "_value", "date"])
     '''
     # 执行查询
     tables = query_api.query(flux_query)