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
///
public DateTime AnnouncementDate { get; set; }
+ ///
+ /// วันหมดอายุบัญชี (ไม่บังคับส่ง)
+ ///
+ public DateTime? ScoreExpireDate { get; set; }
+
///
/// รหัส DNA หน่วยงาน
///