From 36541f075a925e61db1eebabddfa56736690b591 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Tue, 30 Jul 2024 14:02:02 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=8A=E0=B9=87=E0=B8=84=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=A2=E0=B8=81?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A5=E0=B8=B4=E0=B8=81=E0=B8=82=E0=B8=AD=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BMA.EHR.Application/Repositories/Commands/CommandRepository.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
index 941b27d0..dc62a64e 100644
--- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
+++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
@@ -2751,7 +2751,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 // 2. Query
                 var appointPeople = await _dbContext.Set<RetirementResign>()
                                             .Where(x => !otherCommandReceivers.Contains(x.citizenId))
-                                            .Where(x => x.Status.Trim().ToUpper() == "DONE" || x.Status.Trim().ToUpper() == "DONECANCEL")
+                                            .Where(x => (x.Status.Trim().ToUpper() == "DONE" && x.ActiveDate > DateTime.Now.AddDays(1)) || x.Status.Trim().ToUpper() == "DONECANCEL")
                                             .OrderBy(x => x.citizenId)
                                             .ToListAsync();