diff --git a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs
index 386a1ff..39c05fc 100644
--- a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs
+++ b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs
@@ -6,6 +6,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using NPOI.SS.Formula.Functions;
 using Quartz;
 using Repository.BackendRepository.Interface;
 using Repository.Helper;
@@ -140,7 +141,7 @@ namespace BackendWorkerService.Quartz.Jobs
                     {
                         try
                         {
-                            
+
                             await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Day", "水電表天任務開始");
                             var preDay = now.AddDays(-1); //取得前一天
                             var dbDateName = preDay.Year.ToString().PadLeft(4, '0') + preDay.Month.ToString().PadLeft(2, '0');
@@ -674,7 +675,7 @@ namespace BackendWorkerService.Quartz.Jobs
                                     }
                                 }
                             }
-                            await task_Detail.InsertWorkTime_End("ArchiveElectricMeterDayJob", "Day", "任務完成");
+                            await task_Detail.InsertWorkTime_End("ArchiveElectricMeterDayJob", "Day", "水電表天任務完成");
                         }
                         catch (Exception exception)
                         {
@@ -1102,9 +1103,9 @@ namespace BackendWorkerService.Quartz.Jobs
                             var preDay = now.AddDays(-1); //取得前一天
 
                             var dayInMonth = DateTime.DaysInMonth(preDay.Year, preDay.Month);
-                            var FirstDay = preDay.AddDays(- dayInMonth + 1);
+                            var FirstDay = new DateTime(preDay.Year, preDay.Month, 1);
                             //var LastDay = now.AddMonths(1).AddDays(-now.AddMonths(1).Day);  // 這是抓到該月最後一天
-                            var LastDay = FirstDay.AddMonths(1);  //但實際應該抓隔月第一天
+                            var LastDay = now;
 
 
 
@@ -1600,7 +1601,7 @@ namespace BackendWorkerService.Quartz.Jobs
                                     await backgroundServiceMsSqlRepository.ExecuteSql(mySql, waterArchiveMonthRawDatas);
                                 }
                             }
-                            await task_Detail.InsertWorkTime_End("ArchiveElectricMeterDayJob", "Month", "任務完成");
+                            await task_Detail.InsertWorkTime_End("ArchiveElectricMeterDayJob", "Month", "水電表月任務完成");
                         }
                         catch (Exception exception)
                         {