Merge branch 'develop-Br!ght' into dev

2026-07-02 09:42:35 +07:00 · 2026-07-02 09:42:35 +07:00 · 3987f24ec5
commit 3987f24ec5
parent 564a9a8a8d c45627f575
2 changed files with 9 additions and 0 deletions
--- 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";
--- 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>