diff --git a/FrontendWebApi/ApiControllers/BuildController.cs b/FrontendWebApi/ApiControllers/BuildController.cs
index d134ce1..14ae6a9 100644
--- a/FrontendWebApi/ApiControllers/BuildController.cs
+++ b/FrontendWebApi/ApiControllers/BuildController.cs
@@ -60,14 +60,14 @@ namespace FrontendWebApi.ApiControllers
 	                        (
 		                        SELECT w.get_value
 		                        FROM api_weateher w
-		                        WHERE w.weather_type = '溫度' AND @DateNow >= w.start_time
+		                        WHERE w.weather_type = '溫度' AND @DateNow BETWEEN w.start_time AND DATE_ADD(w.start_time, INTERVAL 1 HOUR)
                                 order by created_at desc, id desc
                                 limit 1
 	                        ) AS Temp,
 	                        (
 		                        SELECT w.get_value
 		                        FROM api_weateher w
-		                        WHERE w.weather_type = '相對濕度' AND @DateNow >= w.start_time
+		                        WHERE w.weather_type = '相對濕度' AND @DateNow BETWEEN w.start_time AND DATE_ADD(w.start_time, INTERVAL 1 HOUR)
                                 order by created_at desc, id desc
                                 limit 1
 	                        ) AS RH
diff --git a/FrontendWebApi/Models/Build.cs b/FrontendWebApi/Models/Build.cs
index 00ce67d..aa6ed14 100644
--- a/FrontendWebApi/Models/Build.cs
+++ b/FrontendWebApi/Models/Build.cs
@@ -9,8 +9,8 @@ namespace FrontendWebApi.Models
     {
         public string WxText { get; set; }
         public string Wx { get; set; }
-        public int Temp { get; set; }
-        public int RH { get; set; }
+        public int? Temp { get; set; }
+        public int? RH { get; set; }
     }
 
     public class DefaultBuilding