From c45627f575d3fbc3b8d375d1a9b512ff87452e3b Mon Sep 17 00:00:00 2001
From: harid <harid_pr61@live.rmutl.com>
Date: Thu, 2 Jul 2026 09:42:29 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B8=9F=E0=B8=B4=E0=B8=A5=E0=B8=94?=
 =?UTF-8?q?=E0=B9=8C=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B8=AB=E0=B8=A1=E0=B8=81?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=B2=E0=B8=A2=E0=B8=B8=E0=B8=9A=E0=B8=B1=E0=B8=8D?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=B5=20=E0=B8=A3=E0=B8=AD=E0=B8=9A=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=94=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B8=AD=E0=B8=81?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=B7=E0=B9=88=E0=B8=99=E0=B9=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Controllers/DisableController.cs             | 4 ++++
 Request/Disables/PostDisableImportRequest.cs | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/Controllers/DisableController.cs b/Controllers/DisableController.cs
index 164c0fe..481a3dc 100644
--- a/Controllers/DisableController.cs
+++ b/Controllers/DisableController.cs
@@ -487,6 +487,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                     PaymentEndDate = req.PaymentEndDate,
                     Note = req.Note,
                     AnnouncementDate = req.AnnouncementDate,
+                    ScoreExpireDate = req.ScoreExpireDate,
                     CheckDisability = true,
                     OrganizationId = req.rootDnaId,
                     CreatedAt = DateTime.Now,
@@ -570,6 +571,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                 data.ExamDate = req.ExamDate;
                 data.Note = req.Note;
                 data.AnnouncementDate = req.AnnouncementDate;
+                // ScoreExpireDate อัปเดตเฉพาะเมื่อ FE ส่งค่ามาเท่านั้น (ไม่บังคับส่ง)
+                if (req.ScoreExpireDate.HasValue)
+                    data.ScoreExpireDate = req.ScoreExpireDate;
                 data.LastUpdatedAt = DateTime.Now;
                 data.LastUpdateUserId = UserId ?? "";
                 data.LastUpdateFullName = FullName ?? "System Administrator";
diff --git a/Request/Disables/PostDisableImportRequest.cs b/Request/Disables/PostDisableImportRequest.cs
index c62d148..b88dd73 100644
--- a/Request/Disables/PostDisableImportRequest.cs
+++ b/Request/Disables/PostDisableImportRequest.cs
@@ -83,6 +83,11 @@ namespace BMA.EHR.Recurit.Exam.Service.Request.Disables
         /// </summary>
         public DateTime AnnouncementDate { get; set; }
 
+        /// <summary>
+        /// วันหมดอายุบัญชี (ไม่บังคับส่ง)
+        /// </summary>
+        public DateTime? ScoreExpireDate { get; set; }
+
         /// <summary>
         /// รหัส DNA หน่วยงาน
         /// </summary>