diff --git a/FrontendWebApi/ApiControllers/HydroMeterController.cs b/FrontendWebApi/ApiControllers/HydroMeterController.cs
index 34b4c2c..f6302d6 100644
--- a/FrontendWebApi/ApiControllers/HydroMeterController.cs
+++ b/FrontendWebApi/ApiControllers/HydroMeterController.cs
@@ -98,10 +98,10 @@ namespace FrontendWebApi.ApiControllers
                 if (input.tableType == "year")
                 {
                     sqlGroup = $@" group by year(start_timestamp), year(end_timestamp), device_number ";
-                    sqlAvgRawData = " round(avg(avg_rawdata), 2) as avg_rawdata, year(start_timestamp) as start_timestamp, year(end_timestamp) as end_timestamp ";
+                    sqlAvgRawData = " round(avg(kwh_result), 2) as avg_rawdata, year(start_timestamp) as start_timestamp, year(end_timestamp) as end_timestamp ";
                 }
                 else
-                    sqlAvgRawData = " round(avg_rawdata, 2) as avg_rawdata, start_timestamp, end_timestamp ";
+                    sqlAvgRawData = " round(kwh_result, 2) as avg_rawdata, start_timestamp, end_timestamp ";
 
                 var table = input.tableType == "year" ? "archive_electric_meter_month" : "archive_electric_meter_" + input.tableType + (input.tableType == "day" ? "_" + dbDateName : "");
                 var schema = await backendRepository.GetOneAsync<string>($"select system_value from variable where system_type = 'project_name'");
@@ -142,6 +142,7 @@ namespace FrontendWebApi.ApiControllers
                                     {sqlWhere} {sqlGroup}
                             ) aemm on aemm.start_timestamp >= {aemmStaDate} and aemm.end_timestamp < {aemmEndDate} and aemm.device_number = fd.device_number
                             order by fd.device_number, fd.date";
+                Logger.LogInformation("SQL = " + sql + " startTime=" + startTime + " endTime=" + endTime + " building=" + input.building_tag + " floor_tag = " + input.floor_tag);
                 var rawData = await backendRepository.GetAllAsync<HydroMeterRawDataOutput>(sql,
                                 new { startTime = startTime, endtime = endTime, building_tag = input.building_tag, dateFormat = dateFormat });