diff --git a/BMA.EHR.Application/Repositories/RetirementRepository.cs b/BMA.EHR.Application/Repositories/RetirementRepository.cs
index eb25ebd2..4de888e2 100644
--- a/BMA.EHR.Application/Repositories/RetirementRepository.cs
+++ b/BMA.EHR.Application/Repositories/RetirementRepository.cs
@@ -137,7 +137,7 @@ namespace BMA.EHR.Application.Repositories
             await _dbContext.SaveChangesAsync();
         }
 
-        public async Task CommanderApproveRetirementResign(Guid id, string reason, DateTime date)
+        public async Task CommanderApproveRetirementResign(Guid id, string reason, DateTime? date)
         {
             // Get UserId from token
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
@@ -220,7 +220,7 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
-        public async Task CommanderRejectRetirementResign(Guid id, string reason, DateTime date)
+        public async Task CommanderRejectRetirementResign(Guid id, string reason, DateTime? date)
         {
             // Get UserId from token
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
@@ -307,7 +307,7 @@ namespace BMA.EHR.Application.Repositories
 
         }
 
-        public async Task ApproveRetirementResign(Guid id, string reason, DateTime date)
+        public async Task ApproveRetirementResign(Guid id, string reason, DateTime? date)
         {
             // Get UserId from token
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
@@ -387,7 +387,7 @@ namespace BMA.EHR.Application.Repositories
 
         }
 
-        public async Task RejectRetirementResign(Guid id, string reason, DateTime date)
+        public async Task RejectRetirementResign(Guid id, string reason, DateTime? date)
         {
             // Get UserId from token
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
index 4ca0cd89..759a68a3 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -2663,7 +2663,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 // {
                 //     return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
                 // }
-                await _repository.CommanderApproveRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now);
+                await _repository.CommanderApproveRetirementResign(id, req.Reason ?? "", null);
 
                 return Success();
             }
@@ -2697,7 +2697,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 // {
                 //     return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
                 // }
-                await _repository.CommanderRejectRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now);
+                await _repository.CommanderRejectRetirementResign(id, req.Reason ?? "", req.Date);
 
                 return Success();
             }
@@ -2731,7 +2731,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 // {
                 //     return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
                 // }
-                await _repository.ApproveRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now);
+                await _repository.ApproveRetirementResign(id, req.Reason ?? "", null);
 
                 return Success();
             }
@@ -2765,7 +2765,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 // {
                 //     return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
                 // }
-                await _repository.RejectRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now);
+                await _repository.RejectRetirementResign(id, req.Reason ?? "", req.Date);
 
                 return Success();
             }