diff --git a/Frontend/_historyData.html b/Frontend/_historyData.html
index 09798f0..2f876b8 100644
--- a/Frontend/_historyData.html
+++ b/Frontend/_historyData.html
@@ -259,20 +259,8 @@
 
             $('#devPointsList').html(strHtml);
 
-			if (!hisFirst) {
-				let start = new Date($('#his_startdate').val());
-				let end = new Date(new Date().setDate(new Date($('#his_enddate input').val()).getDate() + 1));
-
-				if (pageAct.dateType == "today" || pageAct.dateType == "day" || pageAct.dateType == "ytd")
-					end = new Date(new Date(start.valueOf()).setDate(start.getDate() + 1));
-				else if (pageAct.dateType == "month") {
-					start = new Date($('#getmonth').val());
-					end = new Date(new Date(start.valueOf()).setDate(start.getDate() + 30));
-				}
-				else if (pageAct.dateType != "range")
-					return;
-
-				getData(formatDate(start, "date", true), formatDate(end, "date", true));
+            if (!hisFirst) {
+                searchDate();
 			}
         }
         ytAjax = new YourTeam.Ajax(url, objSendData, success, null, "POST").send();
@@ -283,8 +271,8 @@
 		$(loadEle).Loading("start");
 		var sdt = new Date();
 		var edt = new Date(new Date().setDate(sdt.getDate() + 1));
-		start = start ?? sdt.toLocaleDateString();
-		end = end ?? edt.toLocaleDateString();
+		start = start + " 00:00:00" ?? sdt.toLocaleDateString();
+		end = end + " 23:59:59"?? edt.toLocaleDateString();
 		// callBackFromHistory();
 		getHistoryDataByBaja(pageAct.deviceNumber + "_" + pageAct.deviceItem,
 			new Date(start).getTime(),
@@ -317,20 +305,8 @@
         else if (deviceItem != null && deviceItem != undefined) {
             pageAct.devicePoiName = $(elem).text();
             pageAct.deviceItem = deviceItem;
-            
-            let start = new Date($('#his_startdate').val());
-            let end = new Date(new Date().setDate(new Date($('#his_enddate input').val()).getDate() + 1));
 
-            if (pageAct.dateType == "today" || pageAct.dateType == "day" || pageAct.dateType == "ytd")
-                end = new Date(new Date(start.valueOf()).setDate(start.getDate() + 1));
-            else if (pageAct.dateType == "month") {
-                start = new Date($('#getmonth').val());
-                end = new Date(new Date(start.valueOf()).setDate(start.getDate() + 30));
-            }
-            else if (pageAct.dateType != "range")
-                return;
-            
-            getData(formatDate(start, "date", true), formatDate(end, "date", true));
+            searchDate();
         }
     }
 
@@ -389,13 +365,14 @@
 
 	function searchDate() {
 		let start = new Date($('#his_startdate').val());
-		let end = new Date(new Date().setDate(new Date($('#his_enddate input').val()).getDate() + 1));
+		let end = new Date($('#his_enddate input').val());
 
 		if (pageAct.dateType == "today" || pageAct.dateType == "day" || pageAct.dateType == "ytd")
-			end = new Date(new Date(start.valueOf()).setDate(start.getDate() + 1));
+			end = start;
 		else if (pageAct.dateType == "month") {
 			start = new Date($('#getmonth').val());
-			end = new Date(new Date(start.valueOf()).setDate(start.getDate() + 30));
+			end = new Date(start.valueOf()).setMonth(start.getMonth() + 1);
+			end = new Date(new Date(end).setDate(new Date(end).getDate() - 1));
 		}
 		else if (pageAct.dateType != "range")
 			return;
@@ -473,7 +450,10 @@
 		v.starttime = pageAct.hisStartDate;
 		v.endtime = pageAct.hisEndDate;
 		v.dateType = pageAct.dateType;
-		v.device_number = pageAct.deviceNumber;
+        v.device_number = pageAct.deviceNumber;
+		v.device_item = pageAct.deviceItem;
+        v.deviceComName = pageAct.deviceComName;
+		v.building_tag = pageAct.buiTag;
 		objSendData.Data = v;
 
 		$.ajax({
diff --git a/FrontendWebApi/ApiControllers/HistoryController.cs b/FrontendWebApi/ApiControllers/HistoryController.cs
index e0f72e9..e65d2cf 100644
--- a/FrontendWebApi/ApiControllers/HistoryController.cs
+++ b/FrontendWebApi/ApiControllers/HistoryController.cs
@@ -74,10 +74,9 @@ namespace FrontendWebApi.ApiControllers
                 #endregion 取得obix 設定
                 #region get device and device_item(point)
                 var device = backendRepository.GetAllAsync<Device>($"select * from device where deleted = 0 and is_link = 1 and device_number = '{lhe.device_number}'").Result;
-                var devicePoint = backendRepository.GetAllAsync<Device_item>($"select * from device_item where deleted = 0 and is_link = 1 and is_show_history = 1 and device_building_tag = '{lhe.building_tag}' and points = '{lhe.device_item}'").Result;
+                var devicePoint = backendRepository.GetAllAsync<Device_item>($"select * from device_item where deleted = 0 and is_link = 1 and is_show_history = 1 and device_building_tag = '{lhe.building_tag}'").Result;
                 #endregion
                 #region get data from niagara
-                lhe.endtime = lhe.dateType == "today" ? lhe.starttime : lhe.dateType == "month" ? lhe.starttime.AddMonths(1) : lhe.endtime;
                 var startTimestamp = string.Format("{0}T00:00:00.000+08:00", lhe.starttime.ToString("yyyy-MM-dd"));
                 var endTimestamp = string.Format("{0}T23:59:59.000+08:00", lhe.endtime?.ToString("yyyy-MM-dd"));
                 var historyQueryFilter = $@"<obj is='obix: HistoryFilter'>