diff --git a/FrontendWebApi/ApiControllers/HistoryController.cs b/FrontendWebApi/ApiControllers/HistoryController.cs
index e332d13..f61b19d 100644
--- a/FrontendWebApi/ApiControllers/HistoryController.cs
+++ b/FrontendWebApi/ApiControllers/HistoryController.cs
@@ -1318,7 +1318,8 @@ namespace FrontendWebApi.ApiControllers
                 {
                     var device_number = hi.Device_number_point.Split(":")[0];
                     var point = hi.Device_number_point.Split(":")[1];
-                    var tableName = await backgroundServiceMsSqlRepository.GetOneAsync<string>($"select table_name from INFORMATION_SCHEMA.TABLES where table_name like '%{device_number}_{point}%'");
+                    var stationName = await backendRepository.GetOneAsync<string>($"select distinct parent_path from import_niagara_item_history where device_building_tag = '{device_number.Split('_')[0]}' limit 1");
+                    var tableName = await backgroundServiceMsSqlRepository.GetOneAsync<string>($"select table_name from INFORMATION_SCHEMA.TABLES where table_name like '%{stationName}_{device_number}_{point}%'");
                     if (!string.IsNullOrEmpty(tableName))
                     {
                         var device_item_infos = await frontendRepository.GetAllAsync<DeviceItemInfo>(sqlDeviceItemInfo, new { Device_number = device_number });
@@ -1329,7 +1330,7 @@ namespace FrontendWebApi.ApiControllers
                                             '{device_item_info.Sub_system_name}' as Sub_system_name, '{device_item_info.Device_number}' as Device_number, 
                                             '{device_item_info.Device_name}' as Device_name, '{device_item_info.Item_name}' as Item_name, '{device_item_info.Points}' as Points,
                                             '{device_item_info.Unit}' as Unit, timestamp as Timestamp, round(value, 2) as Value
-                                    from FIC_CENTER_{device_number}_{point}
+                                    from {tableName}
                                     where replace(convert(varchar, [timestamp], 111), '/', '-') >= @startTime 
                                         and replace(convert(varchar, [timestamp], 111), '/', '-') <= @endTime order by timestamp";
                         apiResult.Data.AddRange(