diff --git a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs
index c1df8798..e1a25780 100644
--- a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs
@@ -227,6 +227,19 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
             return data;
         }
 
+        public async Task<List<ProcessUserTimeStamp>> GetTimeStampHistoryAsync2(Guid keycloakId, int year)
+        {
+            var fiscalDateStart = new DateTime(year - 1, 10, 1);
+            var fiscalDateEnd = new DateTime(year, 9, 30);
+
+            var data = await _dbContext.Set<ProcessUserTimeStamp>()
+                                .Where(u => u.KeycloakUserId == keycloakId)
+                                .Where(u => u.CheckIn.Date >= fiscalDateStart && u.CheckIn.Date <= fiscalDateEnd)
+                                .OrderByDescending(u => u.CheckIn.Date)
+                                .ToListAsync();
+            return data;
+        }
+
         public async Task<int> GetTimeStampHistoryForAdminCountAsync(DateTime startDate, DateTime endDate)
         {
             var data = await _dbContext.Set<ProcessUserTimeStamp>()
diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index 5bedbae5..d3907e66 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -1762,7 +1762,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             // var test = await _processUserTimeStampRepository.GetTimeStampHistoryAsync(userId, year);
             // return Success(test);
 
-            var data = (await _processUserTimeStampRepository.GetTimeStampHistoryAsync(userId, year, page, pageSize, keyword))
+            var data = (await _processUserTimeStampRepository.GetTimeStampHistoryAsync2(userId, year))
                             .Select(d => new CheckInHistoryDto
                             {
                                 CheckInId = d.Id,