diff --git a/timescaledb/composite_queries.py b/timescaledb/composite_queries.py
index 907be83..57155c5 100644
--- a/timescaledb/composite_queries.py
+++ b/timescaledb/composite_queries.py
@@ -320,10 +320,13 @@ class CompositeQueries:
         data_field = "cleaned_value" if use_cleaned else "monitored_value"
 
         # 保证 device_id 以列表形式传递
-        return await ScadaRepository.get_scada_field_by_id_time_range(
+        res = await ScadaRepository.get_scada_field_by_id_time_range(
             timescale_conn, [device_id], start_time, end_time, data_field
         )
 
+        # 将 device_id 替换为 element_id 返回
+        return {element_id: res.get(device_id, [])}
+
     @staticmethod
     async def clean_scada_data(
         timescale_conn: AsyncConnection,