diff --git a/FrontendWebApi/ApiControllers/DeviceManageController.cs b/FrontendWebApi/ApiControllers/DeviceManageController.cs
index ad7739f..78a9d8a 100644
--- a/FrontendWebApi/ApiControllers/DeviceManageController.cs
+++ b/FrontendWebApi/ApiControllers/DeviceManageController.cs
@@ -182,12 +182,15 @@ namespace FrontendWebApi.ApiControllers
                 foreach (var f in fl)
                 {
                     List<DeviceLists> dl = new List<DeviceLists>();
-                    sqlString = $@"select d.device_guid, d.full_name, d.device_coordinate, dk.device_image, d.device_number, dk.device_normal_flashing, dk.device_close_flashing, dk.device_error_flashing
+                    sqlString = $@"select d.device_guid, d.full_name, d.device_coordinate, dk.device_image, d.device_number, 
+				                                   dk.device_normal_point_id, dk.device_normal_point_guid, dk.device_normal_point_col, dk.device_normal_point_value, dk.device_normal_flashing, 
+				                                   dk.device_close_point_id, dk.device_close_point_guid, dk.device_close_point_col, dk.device_close_point_value, dk.device_close_flashing, 
+				                                   dk.device_error_point_id, dk.device_error_point_guid, dk.device_error_point_col, dk.device_error_point_value, dk.device_error_flashing
                                    from device d
                                    left join device_kind dk on d.device_building_tag = dk.device_building_tag and d.device_system_tag = dk.device_system_tag
-					                                   and d.device_name_tag = dk.device_name_tag
+			                                   and d.device_name_tag = dk.device_name_tag
                                    where d.deleted = 0 and d.device_name_tag = @sub_system_tag and d.device_building_tag = @building_tag and d.device_floor_tag = ifnull(@floor_tag, d.device_floor_tag)";
-                    var dlParam = new { @sub_system_tag = fd.sub_system_tag, @building_tag = fd.building_tag, @floor_tag = fd.floor_tag };
+                    var dlParam = new { @main_system_tag = fd.main_system_tag, @building_tag = fd.building_tag, @floor_tag = fd.floor_tag };
                     dl = await backendRepository.GetAllAsync<DeviceLists>(sqlString, dlParam);
                     f.device_list = dl;
                 }
diff --git a/FrontendWebApi/Models/Device.cs b/FrontendWebApi/Models/Device.cs
index ec8c44f..f8054b3 100644
--- a/FrontendWebApi/Models/Device.cs
+++ b/FrontendWebApi/Models/Device.cs
@@ -50,8 +50,20 @@ namespace FrontendWebApi.Models
             }
         }
         public string device_image { get; set; }
+        public string device_normal_point_id { get; set; }
+        public string device_normal_point_guid { get; set; }
+        public string device_normal_point_col { get; set; }
+        public string device_normal_point_value { get; set; }
         public string device_normal_flashing { get; set; }
+        public string device_close_point_id { get; set; }
+        public string device_close_point_guid { get; set; }
+        public string device_close_point_col { get; set; }
+        public string device_close_point_value { get; set; }
         public string device_close_flashing { get; set; }
+        public string device_error_point_id { get; set; }
+        public string device_error_point_guid { get; set; }
+        public string device_error_point_col { get; set; }
+        public string device_error_point_value { get; set; }
         public string device_error_flashing { get; set; }
     }