fix แสดงจำนวนผู้ที่สอบผ่าน

Controllers/RecruitController.cs

@@ -480,6 +480,7 @@ namespace BMA.EHR.Recruit.Controllers
                     PaymentEndDate = req.PaymentEndDate,
                     Note = req.Note,
                     AnnouncementDate = req.AnnouncementDate,
+                    ScoreExpireDate = req.ScoreExpireDate,
                     OrganizationId = req.rootDnaId,
                     CreatedAt = DateTime.Now,
                     CreatedUserId = UserId ?? "",
@@ -561,6 +562,8 @@ namespace BMA.EHR.Recruit.Controllers
                 data.ExamDate = req.ExamDate;
                 data.Note = req.Note;
                 data.AnnouncementDate = req.AnnouncementDate;
+                if (req.ScoreExpireDate.HasValue)
+                    data.ScoreExpireDate = req.ScoreExpireDate;
                 data.LastUpdatedAt = DateTime.Now;
                 data.LastUpdateUserId = UserId ?? "";
                 data.LastUpdateFullName = FullName ?? "System Administrator";
@@ -686,7 +689,7 @@ namespace BMA.EHR.Recruit.Controllers
                                                 ImportYear = x.ScoreImport.Year,
                                                 ImportDate = x.CreatedAt.Date.ToThaiShortDate(),
                                                 ScoreCount = x.ScoreImport.Scores.Count(),
-                                                ResultCount = x.ScoreImport.Scores.Count(x => !string.IsNullOrEmpty(x.Number))
+                                                ResultCount = x.ScoreImport.Scores.Count(x => x.ExamStatus == "ผ่าน" && !string.IsNullOrEmpty(x.Number))
                                             },
                                     x.CreatedUserId,
                                 })
@@ -1537,6 +1540,9 @@ namespace BMA.EHR.Recruit.Controllers
                         case "notpass":
                             queryWithScores = queryWithScores.Where(x => x.score != null && x.score.ExamStatus == "ไม่ผ่าน");
                             break;
+                        case "other":
+                            queryWithScores = queryWithScores.Where(x => x.score != null && !new[] { "ขส.", "ผ่าน", "ไม่ผ่าน" }.Contains(x.score.ExamStatus));
+                            break;
                     }
                 }
 
@@ -1820,11 +1826,15 @@ namespace BMA.EHR.Recruit.Controllers
                     Score = score == null ? 0.0 : score.TotalScore,
                     Number = score == null ? "" : score.Number,
                     ExamCount = _recruitService.GetExamCount(recruit.CitizenId),
-                    ScoreExpire = recruit.RecruitImport.AnnouncementDate == null
+                    // เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
+                    //ScoreExpire = recruit.RecruitImport.AnnouncementDate == null
+                    //    ? ""
+                    //    : recruit.RecruitImport.AnnouncementDate != DateTime.MinValue
+                    //        ? recruit.RecruitImport.AnnouncementDate.Value.AddYears(2).ToThaiShortDate()
+                    //        : "",
+                    ScoreExpire = recruit.RecruitImport.ScoreExpireDate == null
                         ? ""
-                        : recruit.RecruitImport.AnnouncementDate != DateTime.MinValue
+                        : recruit.RecruitImport.ScoreExpireDate.Value.ToThaiShortDate(),
-                            ? recruit.RecruitImport.AnnouncementDate.Value.AddYears(2).ToThaiShortDate()
-                            : "",
                     typeTest = recruit.typeTest,
                     ScoreResult = score == null ? null : new
                     {
@@ -2651,11 +2661,15 @@ namespace BMA.EHR.Recruit.Controllers
                     T = score != null && score.TotalScore != null ? score.TotalScore.ToString().ToThaiNumber() : "",
                     Result = score == null ? "" : score.ExamStatus,
                     Number = score != null && score.Number != null ? score.Number.ToString().ToThaiNumber() : "",
-                    Expire = recruit.RecruitImport.AnnouncementDate == null
+                    // เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
+                    //Expire = recruit.RecruitImport.AnnouncementDate == null
+                    //    ? ""
+                    //    : recruit.RecruitImport.AnnouncementDate != DateTime.MinValue
+                    //        ? recruit.RecruitImport.AnnouncementDate.Value.AddYears(2).ToThaiShortDate().ToString().ToThaiNumber()
+                    //        : "",
+                    Expire = recruit.RecruitImport.ScoreExpireDate == null
                         ? ""
-                        : recruit.RecruitImport.AnnouncementDate != DateTime.MinValue
+                        : recruit.RecruitImport.ScoreExpireDate.Value.ToThaiShortDate().ToString().ToThaiNumber(),
-                            ? recruit.RecruitImport.AnnouncementDate.Value.AddYears(2).ToThaiShortDate().ToString().ToThaiNumber()
-                            : "",
                 };
 
                 var result = new

Migrations/20260701102418_update_RecruitImport_add_ScoreExpireDate.cs

@@ -0,0 +1,31 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Recruit.Migrations
+{
+    /// <inheritdoc />
+    public partial class update_RecruitImport_add_ScoreExpireDate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "ScoreExpireDate",
+                table: "RecruitImports",
+                type: "datetime(6)",
+                nullable: true,
+                comment: "วันหมดอายุบัญชี")
+                .Annotation("Relational:ColumnOrder", 15);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ScoreExpireDate",
+                table: "RecruitImports");
+        }
+    }
+}

Migrations/ApplicationDbContextModelSnapshot.cs

@@ -728,6 +728,11 @@ namespace BMA.EHR.Recruit.Migrations
                         .HasColumnOrder(10)
                         .HasComment("วันเริ่มสมัครสอบ");
 
+                    b.Property<DateTime?>("ScoreExpireDate")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(15)
+                        .HasComment("วันหมดอายุบัญชี");
+
                     b.Property<int>("Year")
                         .HasColumnType("int")
                         .HasColumnOrder(1)

Models/Recruits/RecruitImport.cs

@@ -49,6 +49,9 @@ namespace BMA.EHR.Recruit.Models.Recruits
 		[Column(Order = 14), Comment("วันที่ประกาศผลสอบ")]
 		public DateTime? AnnouncementDate { get; set; }
 
+		[Column(Order = 15), Comment("วันหมดอายุบัญชี")]
+		public DateTime? ScoreExpireDate { get; set; }
+
 		public Document ImportFile { get; set; } = new Document();
 
 		public List<Recruit> Recruits { get; set; } = new List<Recruit>();

Requests/Recruits/PostRecruitImportRequest.cs

@@ -83,6 +83,11 @@ namespace BMA.EHR.Recruit.Requests.Recruits
 		/// </summary>
 		public DateTime? AnnouncementDate { get; set; }
 
+		/// <summary>
+		/// วันหมดอายุบัญชี
+		/// </summary>
+		public DateTime? ScoreExpireDate { get; set; }
+
 		/// <summary>
         /// รหัส DNA หน่วยงาน
         /// </summary>