BMA.EHR.Recruit.Service.csproj.user

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ActiveDebugProfile>https</ActiveDebugProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>

BMA.EHR.Recruit.csproj

@@ -24,8 +24,6 @@
 		<PackageReference Include="CoreAdmin" Version="2.7.0" />
 		<PackageReference Include="EFCore.BulkExtensions.MySql" Version="6.7.16" />
 		<PackageReference Include="EPPlus" Version="6.1.3" />
-		<PackageReference Include="ExcelDataReader" Version="3.8.0" />
-		<PackageReference Include="ExcelDataReader.DataSet" Version="3.8.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.20" />
 		<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.1.2" />
 		<PackageReference Include="Microsoft.IdentityModel.Protocols" Version="7.1.2" />

Controllers/RecruitController.cs

@@ -377,7 +377,6 @@ namespace BMA.EHR.Recruit.Controllers
             try
             {
                 var data = await _context.RecruitImports.AsQueryable()
-                                .AsNoTracking()
                                 .Include(x => x.RecruitImages)
                                 .ThenInclude(x => x.Document)
                                 .Include(x => x.RecruitDocuments)
@@ -718,11 +717,9 @@ namespace BMA.EHR.Recruit.Controllers
                 var doc = await _minioService.UploadFileAsync(file);
                 var import_doc_id = doc.Id.ToString("D");
 
-                // Write file to disk directly from IFormFile instead of downloading back from MinIO
-                using (var stream = new FileStream(importFile, FileMode.Create))
-                {
-                    await file.CopyToAsync(stream);
-                }
+                var fileContent = (await _minioService.DownloadFileAsync(doc.Id)).FileContent;
+                System.IO.File.WriteAllBytes(importFile, fileContent);
+                fileContent = null;
 
                 // สร้างรอบการบรรจุ
                 var imported = new RecruitImport
@@ -934,11 +931,9 @@ namespace BMA.EHR.Recruit.Controllers
                 var doc = await _minioService.UploadFileAsync(file);
                 var import_doc_id = doc.Id.ToString("D");
 
-                // Write file to disk directly from IFormFile instead of downloading back from MinIO
-                using (var stream = new FileStream(importFile, FileMode.Create))
-                {
-                    await file.CopyToAsync(stream);
-                }
+                var fileContent = (await _minioService.DownloadFileAsync(doc.Id)).FileContent;
+                System.IO.File.WriteAllBytes(importFile, fileContent);
+                fileContent = null;
 
                 // Enqueue background job
                 var job = _importJobTracker.CreateJob(new ImportJobInfo
@@ -2010,7 +2005,6 @@ namespace BMA.EHR.Recruit.Controllers
         public async Task<ActionResult<ResponseObject>> ExportExamAsync(Guid id)
         {
             var data = await _context.RecruitImports.AsQueryable()
-                                    .AsNoTracking()
                                     .Include(x => x.Recruits)
                                     .FirstOrDefaultAsync(x => x.Id == id);
 
@@ -2519,7 +2513,6 @@ namespace BMA.EHR.Recruit.Controllers
         public async Task<IActionResult> GetCandidateNewListReportAsync(Guid id)
         {
             var data = await _context.Recruits.AsQueryable()
-                .AsNoTracking()
                 .Include(x => x.RecruitImport)
                 .Where(x => x.RecruitImport.Id == id)
                 .OrderBy(x => x.ExamId)

Data/ApplicationDbContext.cs

@@ -20,7 +20,6 @@ namespace BMA.EHR.Recruit.Data
             modelBuilder.Entity<Models.Recruits.Recruit>().HasMany(x => x.Addresses).WithOne(x => x.Recruit).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<Models.Recruits.Recruit>().HasMany(x => x.Certificates).WithOne(x => x.Recruit).OnDelete(DeleteBehavior.Cascade);
             modelBuilder.Entity<Models.Recruits.Recruit>().HasMany(x => x.Payments).WithOne(x => x.Recruit).OnDelete(DeleteBehavior.Cascade);
-            modelBuilder.Entity<ScoreImport>().HasMany(x => x.Scores).WithOne(x => x.ScoreImport).HasForeignKey(x => x.ScoreImportId).OnDelete(DeleteBehavior.Cascade);
         }
 
         public DbSet<Document> Documents { get; set; }

Dockerfile

@@ -20,9 +20,4 @@ RUN dotnet publish "BMA.EHR.Recruit.csproj" -c Release -o /app/publish /p:UseApp
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-
-# GC configuration for better memory management in containers
-#ENV DOTNET_GCHeapHardLimit=1073741824
-#ENV DOTNET_GCConserveMemory=9
-
 ENTRYPOINT ["dotnet", "BMA.EHR.Recruit.dll"]

Migrations/20260519102256_fix relation.cs

@@ -1,64 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace BMA.EHR.Recruit.Migrations
-{
-    /// <inheritdoc />
-    public partial class fixrelation : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_ScoreImports_Documents_ImportFileId",
-                table: "ScoreImports");
-
-            migrationBuilder.AlterColumn<Guid>(
-                name: "ImportFileId",
-                table: "ScoreImports",
-                type: "char(36)",
-                nullable: true,
-                collation: "ascii_general_ci",
-                oldClrType: typeof(Guid),
-                oldType: "char(36)")
-                .OldAnnotation("Relational:Collation", "ascii_general_ci");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_ScoreImports_Documents_ImportFileId",
-                table: "ScoreImports",
-                column: "ImportFileId",
-                principalTable: "Documents",
-                principalColumn: "Id");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_ScoreImports_Documents_ImportFileId",
-                table: "ScoreImports");
-
-            migrationBuilder.AlterColumn<Guid>(
-                name: "ImportFileId",
-                table: "ScoreImports",
-                type: "char(36)",
-                nullable: false,
-                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
-                collation: "ascii_general_ci",
-                oldClrType: typeof(Guid),
-                oldType: "char(36)",
-                oldNullable: true)
-                .OldAnnotation("Relational:Collation", "ascii_general_ci");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_ScoreImports_Documents_ImportFileId",
-                table: "ScoreImports",
-                column: "ImportFileId",
-                principalTable: "Documents",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Cascade);
-        }
-    }
-}

Migrations/ApplicationDbContextModelSnapshot.cs

@@ -1353,7 +1353,7 @@ namespace BMA.EHR.Recruit.Migrations
                         .HasColumnOrder(101)
                         .HasComment("User Id ที่สร้างข้อมูล");
 
-                    b.Property<Guid?>("ImportFileId")
+                    b.Property<Guid>("ImportFileId")
                         .HasColumnType("char(36)");
 
                     b.Property<string>("LastUpdateFullName")
@@ -1550,7 +1550,9 @@ namespace BMA.EHR.Recruit.Migrations
                 {
                     b.HasOne("BMA.EHR.Recruit.Models.Documents.Document", "ImportFile")
                         .WithMany()
-                        .HasForeignKey("ImportFileId");
+                        .HasForeignKey("ImportFileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
                     b.HasOne("BMA.EHR.Recruit.Models.Recruits.RecruitImport", "RecruitImport")
                         .WithOne("ScoreImport")

Models/Recruits/RecruitScore.cs

@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace BMA.EHR.Recruit.Models.Recruits
 {
@@ -84,9 +83,6 @@ namespace BMA.EHR.Recruit.Models.Recruits
         [MaxLength(50), Comment("สถานะคัดกรองคุณสมบัติ")]
         public string ExamAttribute { get; set; } = string.Empty;
 
-        [ForeignKey("ScoreImport")]
-        public Guid ScoreImportId { get; set; }
-
         public ScoreImport ScoreImport { get; set; }
 	}
 }

Models/Recruits/ScoreImport.cs

@@ -7,9 +7,7 @@ namespace BMA.EHR.Recruit.Models.Recruits
 	{
 		public int Year { get; set; }
 
-		public Guid? ImportFileId { get; set; }
-
-		public Document ImportFile { get; set; }
+		public Document ImportFile { get; set; } = new Document();
 
 		public virtual List<RecruitScore> Scores { get; set; } = new List<RecruitScore>();
 

Services/ImportBackgroundService.cs

@@ -4,13 +4,13 @@ using BMA.EHR.Recruit.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
+using OfficeOpenXml;
 using System.Net.Http.Headers;
 using BMA.EHR.Recruit.Data;
-using BMA.EHR.Recruit.Extensions;
 using EFCore.BulkExtensions;
+using BMA.EHR.Recruit.Extensions;
 using BMA.EHR.Recruit.Models.Recruits;
 using BMA.EHR.Recruit.Requests.Recruits;
-using ExcelDataReader;
 
 namespace BMA.EHR.Recruit.Services;
 
@@ -41,63 +41,64 @@ public class ImportBackgroundService : BackgroundService
         {
             var job = await _queue.DequeueAsync(stoppingToken);
 
-            using var scope = _scopeFactory.CreateScope();
-            var context = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
-            var minioService = scope.ServiceProvider.GetRequiredService<MinIOService>();
-            var recruitService = scope.ServiceProvider.GetRequiredService<RecruitService>();
-            var notificationService = scope.ServiceProvider.GetRequiredService<NotificationService>();
-            var webHostEnv = scope.ServiceProvider.GetRequiredService<IWebHostEnvironment>();
-            var logger = scope.ServiceProvider.GetRequiredService<ILogger<ImportBackgroundService>>();
-
-            try
+            _ = Task.Run(async () =>
             {
-                _tracker.UpdateStatus(job.JobId, ImportJobStatus.Running);
+                using var scope = _scopeFactory.CreateScope();
+                var context = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
+                var minioService = scope.ServiceProvider.GetRequiredService<MinIOService>();
+                var recruitService = scope.ServiceProvider.GetRequiredService<RecruitService>();
+                var notificationService = scope.ServiceProvider.GetRequiredService<NotificationService>();
+                var webHostEnv = scope.ServiceProvider.GetRequiredService<IWebHostEnvironment>();
+                var logger = scope.ServiceProvider.GetRequiredService<ILogger<ImportBackgroundService>>();
 
-                switch (job.JobType)
-                {
-                    case ImportJobType.CandidateFile:
-                        await ProcessCandidateFileAsync(context, minioService, webHostEnv, job);
-                        break;
-                    case ImportJobType.CandidateFileById:
-                        await ProcessCandidateFileByIdAsync(context, minioService, recruitService, webHostEnv, job);
-                        break;
-                    case ImportJobType.ScoreFile:
-                        await ProcessScoreFileAsync(context, minioService, recruitService, job);
-                        break;
-                    case ImportJobType.ResultFile:
-                        await ProcessResultFileAsync(context, recruitService, job);
-                        break;
-                }
-
-                _tracker.UpdateStatus(job.JobId, ImportJobStatus.Completed, job.TotalCount);
-
-                await notificationService.SendImportNotificationAsync(job.Token, false, "ระบบนำเข้าข้อมูลสำเร็จ");
-                job.Token = null; // Clear token after notification sent
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Import job {JobId} failed: {Message}", job.JobId, ex.Message);
-                _tracker.UpdateStatus(job.JobId, ImportJobStatus.Failed, 0, ex.Message);
-
-                try { await notificationService.SendImportNotificationAsync(job.Token, true, ex.Message); } catch { }
-                job.Token = null; // Clear token after notification sent
-
-                // cleanup minio file on failure
-                if (!string.IsNullOrEmpty(job.ImportDocId))
-                {
-                    try { await minioService.DeleteFileAsync(Guid.Parse(job.ImportDocId)); } catch { }
-                }
-            }
-            finally
-            {
-                // cleanup temp file
                 try
                 {
-                    if (System.IO.File.Exists(job.ImportFile))
-                        System.IO.File.Delete(job.ImportFile);
+                    _tracker.UpdateStatus(job.JobId, ImportJobStatus.Running);
+
+                    switch (job.JobType)
+                    {
+                        case ImportJobType.CandidateFile:
+                            await ProcessCandidateFileAsync(context, minioService, webHostEnv, job);
+                            break;
+                        case ImportJobType.CandidateFileById:
+                            await ProcessCandidateFileByIdAsync(context, minioService, recruitService, webHostEnv, job);
+                            break;
+                        case ImportJobType.ScoreFile:
+                            await ProcessScoreFileAsync(context, minioService, recruitService, job);
+                            break;
+                        case ImportJobType.ResultFile:
+                            await ProcessResultFileAsync(context, recruitService, job);
+                            break;
+                    }
+
+                    _tracker.UpdateStatus(job.JobId, ImportJobStatus.Completed, job.TotalCount);
+
+                    await notificationService.SendImportNotificationAsync(job.Token, false, "ระบบนำเข้าข้อมูลสำเร็จ");
                 }
-                catch { }
-            }
+                catch (Exception ex)
+                {
+                    logger.LogError(ex, "Import job {JobId} failed: {Message}", job.JobId, ex.Message);
+                    _tracker.UpdateStatus(job.JobId, ImportJobStatus.Failed, 0, ex.Message);
+
+                    await notificationService.SendImportNotificationAsync(job.Token, true, ex.Message);
+
+                    // cleanup minio file on failure
+                    if (!string.IsNullOrEmpty(job.ImportDocId))
+                    {
+                        try { await minioService.DeleteFileAsync(Guid.Parse(job.ImportDocId)); } catch { }
+                    }
+                }
+                finally
+                {
+                    // cleanup temp file
+                    try
+                    {
+                        if (System.IO.File.Exists(job.ImportFile))
+                            System.IO.File.Delete(job.ImportFile);
+                    }
+                    catch { }
+                }
+            }, stoppingToken);
         }
     }
 
@@ -108,18 +109,14 @@ public class ImportBackgroundService : BackgroundService
         var imported = await _context.RecruitImports.FindAsync(job.RecruitImportId);
         if (imported == null) throw new Exception("RecruitImport not found");
 
-        System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
-        using var stream = System.IO.File.OpenRead(job.ImportFile);
-        using var reader = ExcelReaderFactory.CreateReader(stream);
-
-        do
+        using var c_package = new ExcelPackage(new FileInfo(job.ImportFile));
+        for (int i = 0; i < c_package.Workbook.Worksheets.Count; i++)
         {
-            // Read header row (row 1) to build column index map
-            if (!reader.Read()) continue;
-            var cols = new string[reader.FieldCount];
-            for (int c = 0; c < reader.FieldCount; c++)
-                cols[c] = reader.GetValue(c)?.ToString() ?? "";
+            var workSheet = c_package.Workbook.Worksheets[i];
+            var totalRows = workSheet.Dimension.Rows;
+            var cols = workSheet.GetHeaderColumns();
 
+            int row = 2;
             int batchCount = 0;
             const int batchSize = 500;
             int totalProcessed = 0;
@@ -131,105 +128,105 @@ public class ImportBackgroundService : BackgroundService
             var batchPayments = new List<RecruitPayment>();
             var batchCertificates = new List<RecruitCertificate>();
 
-            while (reader.Read())
+            while (row <= totalRows)
             {
-                var cell1 = reader.GetValue(0)?.ToString();
-                if (string.IsNullOrEmpty(cell1)) break;
+                var cell1 = workSheet?.Cells[row, 1]?.GetValue<string>();
+                if (cell1 == "" || cell1 == null) break;
 
                 var r = new Models.Recruits.Recruit();
-                r.ExamId = GetCellValue(reader, cols, CandidateFileHeader.ExamID);
-                r.CitizenId = GetCellValue(reader, cols, CandidateFileHeader.PersonalID);
-                r.Prefix = GetCellValue(reader, cols, CandidateFileHeader.Prefix);
-                r.FirstName = GetCellValue(reader, cols, CandidateFileHeader.FirstName);
-                r.LastName = GetCellValue(reader, cols, CandidateFileHeader.LastName);
-                r.Gendor = GetCellValue(reader, cols, CandidateFileHeader.Gender);
-                r.National = GetCellValue(reader, cols, CandidateFileHeader.National).IsNull("");
-                r.Race = GetCellValue(reader, cols, CandidateFileHeader.Race).IsNull("");
-                r.Religion = GetCellValue(reader, cols, CandidateFileHeader.Religion).IsNull("");
-                r.DateOfBirth = Convert.ToDateTime(GetCellValue(reader, cols, CandidateFileHeader.DateOfBirth).ToDateTime(DateTimeFormat.Ymd, "-"));
-                r.Marry = GetCellValue(reader, cols, CandidateFileHeader.Marry);
+                r.ExamId = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.ExamID)]?.GetValue<string>();
+                r.CitizenId = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.PersonalID)]?.GetValue<string>();
+                r.Prefix = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Prefix)]?.GetValue<string>();
+                r.FirstName = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.FirstName)]?.GetValue<string>();
+                r.LastName = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.LastName)]?.GetValue<string>();
+                r.Gendor = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Gender)]?.GetValue<string>();
+                r.National = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.National)]?.GetValue<string>().IsNull("");
+                r.Race = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Race)]?.GetValue<string>().IsNull("");
+                r.Religion = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Religion)]?.GetValue<string>().IsNull("");
+                r.DateOfBirth = Convert.ToDateTime(workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.DateOfBirth)]?.GetValue<string>().ToDateTime(DateTimeFormat.Ymd, "-"));
+                r.Marry = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Marry)]?.GetValue<string>();
                 r.Isspecial = "N";
-                r.CitizenCardIssuer = GetCellValue(reader, cols, CandidateFileHeader.PersonalCardIssue);
-                r.CitizenCardExpireDate = Convert.ToDateTime(GetCellValue(reader, cols, CandidateFileHeader.PersonalCardExpireDate).ToDateTime(DateTimeFormat.Ymd, "-"));
-                r.ApplyDate = GetCellDateTime(reader, cols, CandidateFileHeader.ApplyDate) ?? DateTime.MinValue;
-                r.PositionName = GetCellValue(reader, cols, CandidateFileHeader.PositionName).IsNull("");
-                r.PositionType = GetCellValue(reader, cols, CandidateFileHeader.PositionType).IsNull("");
-                r.PositionLevel = GetCellValue(reader, cols, CandidateFileHeader.PositionLevel).IsNull("");
+                r.CitizenCardIssuer = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.PersonalCardIssue)]?.GetValue<string>();
+                r.CitizenCardExpireDate = Convert.ToDateTime(workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.PersonalCardExpireDate)]?.GetValue<string>().ToDateTime(DateTimeFormat.Ymd, "-"));
+                r.ApplyDate = (DateTime)workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.ApplyDate)]?.GetValue<DateTime>();
+                r.PositionName = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.PositionName)]?.GetValue<string>().IsNull("");
+                r.PositionType = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.PositionType)]?.GetValue<string>().IsNull("");
+                r.PositionLevel = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.PositionLevel)]?.GetValue<string>().IsNull("");
 
                 // address
                 var address = new RecruitAddress()
                 {
-                    Address = GetCellValue(reader, cols, CandidateFileHeader.Address),
-                    Moo = GetCellValue(reader, cols, CandidateFileHeader.Moo),
-                    Soi = GetCellValue(reader, cols, CandidateFileHeader.Soi),
-                    Road = GetCellValue(reader, cols, CandidateFileHeader.Road),
-                    District = GetCellValue(reader, cols, CandidateFileHeader.District),
-                    Amphur = GetCellValue(reader, cols, CandidateFileHeader.Amphur),
-                    Province = GetCellValue(reader, cols, CandidateFileHeader.Province),
-                    ZipCode = GetCellValue(reader, cols, CandidateFileHeader.ZipCode),
-                    Telephone = GetCellValue(reader, cols, CandidateFileHeader.Telephone),
-                    Mobile = GetCellValue(reader, cols, CandidateFileHeader.Mobile),
-                    Address1 = GetCellValue(reader, cols, CandidateFileHeader.Address1),
-                    Moo1 = GetCellValue(reader, cols, CandidateFileHeader.Moo1),
-                    Soi1 = GetCellValue(reader, cols, CandidateFileHeader.Soi1),
-                    Road1 = GetCellValue(reader, cols, CandidateFileHeader.Road1),
-                    District1 = GetCellValue(reader, cols, CandidateFileHeader.District1),
-                    Amphur1 = GetCellValue(reader, cols, CandidateFileHeader.Amphur1),
-                    Province1 = GetCellValue(reader, cols, CandidateFileHeader.Province1),
-                    ZipCode1 = GetCellValue(reader, cols, CandidateFileHeader.ZipCode1),
+                    Address = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Address)]?.GetValue<string>() ?? "",
+                    Moo = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Moo)]?.GetValue<string>() ?? "",
+                    Soi = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Soi)]?.GetValue<string>() ?? "",
+                    Road = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Road)]?.GetValue<string>() ?? "",
+                    District = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.District)]?.GetValue<string>() ?? "",
+                    Amphur = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Amphur)]?.GetValue<string>() ?? "",
+                    Province = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Province)]?.GetValue<string>() ?? "",
+                    ZipCode = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.ZipCode)]?.GetValue<string>() ?? "",
+                    Telephone = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Telephone)]?.GetValue<string>() ?? "",
+                    Mobile = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Mobile)]?.GetValue<string>() ?? "",
+                    Address1 = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Address1)]?.GetValue<string>() ?? "",
+                    Moo1 = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Moo1)]?.GetValue<string>() ?? "",
+                    Soi1 = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Soi1)]?.GetValue<string>() ?? "",
+                    Road1 = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Road1)]?.GetValue<string>() ?? "",
+                    District1 = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.District1)]?.GetValue<string>() ?? "",
+                    Amphur1 = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Amphur1)]?.GetValue<string>() ?? "",
+                    Province1 = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Province1)]?.GetValue<string>() ?? "",
+                    ZipCode1 = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.ZipCode1)]?.GetValue<string>() ?? "",
                 };
 
                 // payment
                 var payment = new RecruitPayment()
                 {
-                    PaymentId = GetCellValue(reader, cols, CandidateFileHeader.PaymentID),
-                    CompanyCode = GetCellValue(reader, cols, CandidateFileHeader.CompanyCode),
-                    TextFile = GetCellValue(reader, cols, CandidateFileHeader.TextFile),
-                    BankCode = GetCellValue(reader, cols, CandidateFileHeader.BankCode),
-                    AccountNumber = GetCellValue(reader, cols, CandidateFileHeader.AccouontNumer),
-                    TransDate = GetCellValue(reader, cols, CandidateFileHeader.TransDate),
-                    TransTime = GetCellValue(reader, cols, CandidateFileHeader.TransTime),
-                    CustomerName = GetCellValue(reader, cols, CandidateFileHeader.CustomerName),
-                    RefNo1 = GetCellValue(reader, cols, CandidateFileHeader.RefNo1),
-                    TermBranch = GetCellValue(reader, cols, CandidateFileHeader.TermBranch),
-                    TellerId = GetCellValue(reader, cols, CandidateFileHeader.TellerID),
-                    CreditDebit = GetCellValue(reader, cols, CandidateFileHeader.CreditDebit),
-                    PaymentType = GetCellValue(reader, cols, CandidateFileHeader.Type),
-                    ChequeNo = GetCellValue(reader, cols, CandidateFileHeader.ChequeNo),
-                    Amount = GetCellDecimal(reader, cols, CandidateFileHeader.Amount),
-                    ChqueBankCode = GetCellValue(reader, cols, CandidateFileHeader.ChqBankCode)
+                    PaymentId = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.PaymentID)]?.GetValue<string>() ?? "",
+                    CompanyCode = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.CompanyCode)]?.GetValue<string>() ?? "",
+                    TextFile = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.TextFile)]?.GetValue<string>() ?? "",
+                    BankCode = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.BankCode)]?.GetValue<string>() ?? "",
+                    AccountNumber = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.AccouontNumer)]?.GetValue<string>() ?? "",
+                    TransDate = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.TransDate)]?.GetValue<string>() ?? "",
+                    TransTime = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.TransTime)]?.GetValue<string>() ?? "",
+                    CustomerName = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.CustomerName)]?.GetValue<string>() ?? "",
+                    RefNo1 = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.RefNo1)]?.GetValue<string>() ?? "",
+                    TermBranch = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.TermBranch)]?.GetValue<string>() ?? "",
+                    TellerId = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.TellerID)]?.GetValue<string>() ?? "",
+                    CreditDebit = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.CreditDebit)]?.GetValue<string>() ?? "",
+                    PaymentType = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Type)]?.GetValue<string>(),
+                    ChequeNo = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.ChequeNo)]?.GetValue<string>() ?? "",
+                    Amount = (decimal)workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Amount)]?.GetValue<decimal>(),
+                    ChqueBankCode = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.ChqBankCode)]?.GetValue<string>() ?? ""
                 };
 
                 // occupation
                 var occupation = new RecruitOccupation()
                 {
-                    Occupation = GetCellValue(reader, cols, CandidateFileHeader.Occupation),
-                    Position = GetCellValue(reader, cols, CandidateFileHeader.Position),
-                    Workplace = GetCellValue(reader, cols, CandidateFileHeader.Workplace),
-                    Telephone = GetCellValue(reader, cols, CandidateFileHeader.WorkplaceTelephone),
-                    WorkAge = GetCellValue(reader, cols, CandidateFileHeader.WorkAge),
+                    Occupation = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Occupation)]?.GetValue<string>() ?? "",
+                    Position = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Position)]?.GetValue<string>() ?? "",
+                    Workplace = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Workplace)]?.GetValue<string>() ?? "",
+                    Telephone = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.WorkplaceTelephone)]?.GetValue<string>() ?? "",
+                    WorkAge = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.WorkAge)]?.GetValue<string>() ?? "",
                 };
 
                 // certificate
                 var certificate = new RecruitCertificate()
                 {
-                    CertificateNo = GetCellValue(reader, cols, CandidateFileHeader.CertificateNo),
-                    Description = GetCellValue(reader, cols, CandidateFileHeader.CertificateDesc),
-                    IssueDate = Convert.ToDateTime(GetCellValue(reader, cols, CandidateFileHeader.CertificateIssueDate).ToDateTime(DateTimeFormat.Ymd, "-")),
-                    ExpiredDate = Convert.ToDateTime(GetCellValue(reader, cols, CandidateFileHeader.CertificateExpireDate).ToDateTime(DateTimeFormat.Ymd, "-"))
+                    CertificateNo = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.CertificateNo)]?.GetValue<string>() ?? "",
+                    Description = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.CertificateDesc)]?.GetValue<string>() ?? "",
+                    IssueDate = Convert.ToDateTime(workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.CertificateIssueDate)]?.GetValue<string>().ToDateTime(DateTimeFormat.Ymd, "-")),
+                    ExpiredDate = Convert.ToDateTime(workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.CertificateExpireDate)]?.GetValue<string>().ToDateTime(DateTimeFormat.Ymd, "-"))
                 };
 
                 var education = new RecruitEducation()
                 {
-                    Degree = GetCellValue(reader, cols, CandidateFileHeader.Degree),
-                    Major = GetCellValue(reader, cols, CandidateFileHeader.Major),
-                    MajorGroupId = GetCellValue(reader, cols, CandidateFileHeader.MajorGroupID),
-                    MajorGroupName = GetCellValue(reader, cols, CandidateFileHeader.MajorGroupName),
-                    University = GetCellValue(reader, cols, CandidateFileHeader.University),
-                    GPA = GetCellDouble(reader, cols, CandidateFileHeader.GPA),
-                    Specialist = GetCellValue(reader, cols, CandidateFileHeader.SpecialList),
-                    HighDegree = GetCellValue(reader, cols, CandidateFileHeader.HighDegree),
-                    BachelorDate = Convert.ToDateTime(GetCellValue(reader, cols, CandidateFileHeader.BachelorDate).ToDateTime(DateTimeFormat.Ymd, "-"))
+                    Degree = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Degree)]?.GetValue<string>() ?? "",
+                    Major = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.Major)]?.GetValue<string>() ?? "",
+                    MajorGroupId = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.MajorGroupID)]?.GetValue<string>() ?? "",
+                    MajorGroupName = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.MajorGroupName)]?.GetValue<string>() ?? "",
+                    University = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.University)]?.GetValue<string>() ?? "",
+                    GPA = (double)workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.GPA)]?.GetValue<double>(),
+                    Specialist = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.SpecialList)]?.GetValue<string>() ?? "",
+                    HighDegree = workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.HighDegree)]?.GetValue<string>() ?? "",
+                    BachelorDate = Convert.ToDateTime(workSheet?.Cells[row, GetColumnIndex(cols, CandidateFileHeader.BachelorDate)]?.GetValue<string>().ToDateTime(DateTimeFormat.Ymd, "-"))
                 };
 
                 r.Addresses.Add(address);
@@ -246,6 +243,7 @@ public class ImportBackgroundService : BackgroundService
                 batchCertificates.Add(certificate);
                 batchEducations.Add(education);
 
+                row++;
                 batchCount++;
                 totalProcessed++;
 
@@ -268,8 +266,6 @@ public class ImportBackgroundService : BackgroundService
                     await _context.BulkInsertAsync(batchCertificates);
                     await _context.BulkInsertAsync(batchEducations);
 
-                    _context.ChangeTracker.Clear();
-
                     batchRecruits.Clear();
                     batchAddresses.Clear();
                     batchPayments.Clear();
@@ -300,10 +296,8 @@ public class ImportBackgroundService : BackgroundService
                 await _context.BulkInsertAsync(batchOccupations);
                 await _context.BulkInsertAsync(batchCertificates);
                 await _context.BulkInsertAsync(batchEducations);
-
-                _context.ChangeTracker.Clear();
             }
-        } while (reader.NextResult());
+        }
 
         job.TotalCount = _tracker.GetJob(job.JobId)?.ProcessedCount ?? 0;
     }
@@ -334,14 +328,11 @@ public class ImportBackgroundService : BackgroundService
         var importId = imported.Id;
         var importRef = _context.Attach(new RecruitImport { Id = importId }).Entity;
 
-        System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
-        using var stream = System.IO.File.OpenRead(job.ImportFile);
-        using var reader = ExcelReaderFactory.CreateReader(stream);
-
-        do
+        using var c_package = new ExcelPackage(new FileInfo(job.ImportFile));
+        for (int i = 0; i < c_package.Workbook.Worksheets.Count; i++)
         {
-            // Skip header row
-            if (!reader.Read()) continue;
+            var workSheet = c_package.Workbook.Worksheets[i];
+            var totalRows = workSheet.Dimension.Rows;
 
             int row = 2;
             int batchCount = 0;
@@ -354,33 +345,33 @@ public class ImportBackgroundService : BackgroundService
             var batchAddresses = new List<RecruitAddress>();
             var batchPayments = new List<RecruitPayment>();
 
-            while (reader.Read())
+            while (row <= totalRows)
             {
-                var cell1 = reader.GetValue(0)?.ToString();
-                if (string.IsNullOrEmpty(cell1)) break;
+                var cell1 = workSheet?.Cells[row, 1]?.GetValue<string>();
+                if (cell1 == "" || cell1 == null) break;
 
                 try
                 {
                     var r = new Models.Recruits.Recruit();
                     r.Id = Guid.NewGuid();
-                    r.ExamId = reader.GetValue(0)?.ToString() ?? "";
-                    r.PositionName = reader.GetValue(2)?.ToString() ?? "";
-                    r.HddPosition = reader.GetValue(3)?.ToString() ?? "";
-                    r.Prefix = reader.GetValue(4)?.ToString() == "อื่น ๆ" ? reader.GetValue(5)?.ToString() ?? "" : reader.GetValue(4)?.ToString() ?? "";
-                    r.FirstName = reader.GetValue(6)?.ToString() ?? "";
-                    r.LastName = reader.GetValue(7)?.ToString() ?? "";
-                    r.Gendor = reader.GetValue(97)?.ToString() ?? "";
-                    r.National = reader.GetValue(8)?.ToString() ?? "";
+                    r.ExamId = workSheet?.Cells[row, 1]?.GetValue<string>() ?? "";
+                    r.PositionName = workSheet?.Cells[row, 3]?.GetValue<string>() ?? "";
+                    r.HddPosition = workSheet?.Cells[row, 4]?.GetValue<string>() ?? "";
+                    r.Prefix = workSheet?.Cells[row, 5]?.GetValue<string>() == "อื่น ๆ" ? workSheet?.Cells[row, 6]?.GetValue<string>() ?? "" : workSheet?.Cells[row, 5]?.GetValue<string>() ?? "";
+                    r.FirstName = workSheet?.Cells[row, 7]?.GetValue<string>() ?? "";
+                    r.LastName = workSheet?.Cells[row, 8]?.GetValue<string>() ?? "";
+                    r.Gendor = workSheet?.Cells[row, 98]?.GetValue<string>() ?? "";
+                    r.National = workSheet?.Cells[row, 9]?.GetValue<string>() ?? "";
                     r.Race = "";
-                    r.Religion = reader.GetValue(9)?.ToString() ?? "";
-                    r.DateOfBirth = !string.IsNullOrWhiteSpace(reader.GetValue(10)?.ToString()) ? _recruitService.CheckDateTime(reader.GetValue(10)?.ToString() ?? "", "dd/MM/yyyy") : null;
-                    r.CitizenId = reader.GetValue(11)?.ToString() ?? "";
-                    r.typeTest = reader.GetValue(12)?.ToString() ?? "";
+                    r.Religion = workSheet?.Cells[row, 10]?.GetValue<string>() ?? "";
+                    r.DateOfBirth = !string.IsNullOrWhiteSpace(workSheet?.Cells[row, 11]?.GetValue<string>()) ? _recruitService.CheckDateTime(workSheet?.Cells[row, 11]?.GetValue<string>() ?? "", "dd/MM/yyyy") : null;
+                    r.CitizenId = workSheet?.Cells[row, 12]?.GetValue<string>() ?? "";
+                    r.typeTest = workSheet?.Cells[row, 13]?.GetValue<string>() ?? "";
                     r.Marry = "";
                     r.Isspecial = "N";
                     r.CitizenCardExpireDate = null;
                     r.ModifiedDate = null;
-                    r.ApplyDate = !string.IsNullOrWhiteSpace(reader.GetValue(86)?.ToString()) ? _recruitService.CheckDateTime(reader.GetValue(86)?.ToString() ?? "", "dd/MM/yyyy") : null;
+                    r.ApplyDate = !string.IsNullOrWhiteSpace(workSheet?.Cells[row, 87]?.GetValue<string>()) ? _recruitService.CheckDateTime(workSheet?.Cells[row, 87]?.GetValue<string>() ?? "", "dd/MM/yyyy") : null;
                     r.PositionType = "";
                     r.PositionLevel = "";
                     r.CreatedAt = DateTime.Now;
@@ -395,15 +386,15 @@ public class ImportBackgroundService : BackgroundService
                     var education = new RecruitEducation()
                     {
                         Id = Guid.NewGuid(),
-                        Degree = reader.GetValue(17)?.ToString() ?? "",
-                        Major = reader.GetValue(18)?.ToString() == "อื่น ๆ" ? reader.GetValue(19)?.ToString() ?? "" : reader.GetValue(18)?.ToString() ?? "",
+                        Degree = workSheet?.Cells[row, 18]?.GetValue<string>() ?? "",
+                        Major = workSheet?.Cells[row, 19]?.GetValue<string>() == "อื่น ๆ" ? workSheet?.Cells[row, 20]?.GetValue<string>() ?? "" : workSheet?.Cells[row, 19]?.GetValue<string>() ?? "",
                         MajorGroupId = "",
                         MajorGroupName = "",
-                        University = reader.GetValue(20)?.ToString() == "อื่น ๆ" ? reader.GetValue(21)?.ToString() ?? "" : reader.GetValue(20)?.ToString() ?? "",
-                        GPA = GetReaderDouble(reader, 25),
+                        University = workSheet?.Cells[row, 21]?.GetValue<string>() == "อื่น ๆ" ? workSheet?.Cells[row, 22]?.GetValue<string>() ?? "" : workSheet?.Cells[row, 21]?.GetValue<string>() ?? "",
+                        GPA = (double)workSheet?.Cells[row, 26]?.GetValue<double>(),
                         Specialist = "",
-                        HighDegree = reader.GetValue(26)?.ToString() ?? "",
-                        BachelorDate = !string.IsNullOrWhiteSpace(reader.GetValue(24)?.ToString()) ? _recruitService.CheckDateTime(reader.GetValue(24)?.ToString() ?? "", "dd/MM/yyyy") : null,
+                        HighDegree = workSheet?.Cells[row, 27]?.GetValue<string>() ?? "",
+                        BachelorDate = !string.IsNullOrWhiteSpace(workSheet?.Cells[row, 25]?.GetValue<string>()) ? _recruitService.CheckDateTime(workSheet?.Cells[row, 25]?.GetValue<string>() ?? "", "dd/MM/yyyy") : null,
                         Recruit = r,
                         CreatedAt = DateTime.Now,
                         CreatedUserId = job.UserId ?? "",
@@ -416,11 +407,11 @@ public class ImportBackgroundService : BackgroundService
                     var occupation = new RecruitOccupation()
                     {
                         Id = Guid.NewGuid(),
-                        Occupation = reader.GetValue(32)?.ToString() == "อื่น ๆ" ? reader.GetValue(33)?.ToString() ?? "" : reader.GetValue(32)?.ToString() ?? "",
-                        Position = reader.GetValue(36)?.ToString() ?? "",
-                        Workplace = $"{(reader.GetValue(35)?.ToString() ?? "")} {(reader.GetValue(34)?.ToString() ?? "")}",
-                        Telephone = "",
-                        WorkAge = "",
+                        Occupation = workSheet?.Cells[row, 33]?.GetValue<string>() == "อื่น ๆ" ? workSheet?.Cells[row, 34]?.GetValue<string>() ?? "" : workSheet?.Cells[row, 33]?.GetValue<string>() ?? "",
+                        Position = workSheet?.Cells[row, 37]?.GetValue<string>() ?? "",
+                        Workplace = $"{(workSheet?.Cells[row, 36]?.GetValue<string>() ?? "")} {(workSheet?.Cells[row, 35]?.GetValue<string>() ?? "")}",
+                        Telephone = workSheet?.Cells[row, 9999]?.GetValue<string>() ?? "",
+                        WorkAge = workSheet?.Cells[row, 9999]?.GetValue<string>() ?? "",
                         Recruit = r,
                         CreatedAt = DateTime.Now,
                         CreatedUserId = job.UserId ?? "",
@@ -433,24 +424,24 @@ public class ImportBackgroundService : BackgroundService
                     var address = new RecruitAddress()
                     {
                         Id = Guid.NewGuid(),
-                        Address = $"{(reader.GetValue(48)?.ToString() ?? "")} {(reader.GetValue(49)?.ToString() ?? "")}",
-                        Moo = reader.GetValue(50)?.ToString() ?? "",
-                        Soi = reader.GetValue(51)?.ToString() ?? "",
-                        Road = reader.GetValue(52)?.ToString() ?? "",
-                        District = reader.GetValue(53)?.ToString() ?? "",
-                        Amphur = reader.GetValue(54)?.ToString() ?? "",
-                        Province = reader.GetValue(55)?.ToString() ?? "",
-                        ZipCode = (reader.GetValue(56)?.ToString() ?? "").Trim(),
-                        Telephone = reader.GetValue(57)?.ToString() ?? "",
+                        Address = $"{(workSheet?.Cells[row, 49]?.GetValue<string>() ?? "")} {(workSheet?.Cells[row, 50]?.GetValue<string>() ?? "")}",
+                        Moo = workSheet?.Cells[row, 51]?.GetValue<string>() ?? "",
+                        Soi = workSheet?.Cells[row, 52]?.GetValue<string>() ?? "",
+                        Road = workSheet?.Cells[row, 53]?.GetValue<string>() ?? "",
+                        District = workSheet?.Cells[row, 54]?.GetValue<string>() ?? "",
+                        Amphur = workSheet?.Cells[row, 55]?.GetValue<string>() ?? "",
+                        Province = workSheet?.Cells[row, 56]?.GetValue<string>() ?? "",
+                        ZipCode = (workSheet?.Cells[row, 57]?.GetValue<string>() ?? "").Trim(),
+                        Telephone = workSheet?.Cells[row, 58]?.GetValue<string>() ?? "",
                         Mobile = "",
-                        Address1 = $"{(reader.GetValue(60)?.ToString() ?? "")} {(reader.GetValue(61)?.ToString() ?? "")}",
-                        Moo1 = reader.GetValue(62)?.ToString() ?? "",
-                        Soi1 = reader.GetValue(63)?.ToString() ?? "",
-                        Road1 = reader.GetValue(64)?.ToString() ?? "",
-                        District1 = reader.GetValue(65)?.ToString() ?? "",
-                        Amphur1 = reader.GetValue(66)?.ToString() ?? "",
-                        Province1 = reader.GetValue(67)?.ToString() ?? "",
-                        ZipCode1 = (reader.GetValue(68)?.ToString() ?? "").Trim(),
+                        Address1 = $"{(workSheet?.Cells[row, 61]?.GetValue<string>() ?? "")} {(workSheet?.Cells[row, 62]?.GetValue<string>() ?? "")}",
+                        Moo1 = workSheet?.Cells[row, 63]?.GetValue<string>() ?? "",
+                        Soi1 = workSheet?.Cells[row, 64]?.GetValue<string>() ?? "",
+                        Road1 = workSheet?.Cells[row, 65]?.GetValue<string>() ?? "",
+                        District1 = workSheet?.Cells[row, 66]?.GetValue<string>() ?? "",
+                        Amphur1 = workSheet?.Cells[row, 67]?.GetValue<string>() ?? "",
+                        Province1 = workSheet?.Cells[row, 68]?.GetValue<string>() ?? "",
+                        ZipCode1 = (workSheet?.Cells[row, 69]?.GetValue<string>() ?? "").Trim(),
                         Recruit = r,
                         CreatedAt = DateTime.Now,
                         CreatedUserId = job.UserId ?? "",
@@ -463,22 +454,22 @@ public class ImportBackgroundService : BackgroundService
                     var payment = new RecruitPayment()
                     {
                         Id = Guid.NewGuid(),
-                        PaymentId = reader.GetValue(103)?.ToString() ?? "",
-                        CompanyCode = reader.GetValue(104)?.ToString() ?? "",
-                        TextFile = reader.GetValue(105)?.ToString() ?? "",
-                        BankCode = reader.GetValue(106)?.ToString() ?? "",
-                        AccountNumber = reader.GetValue(107)?.ToString() ?? "",
-                        TransDate = reader.GetValue(108)?.ToString() ?? "",
-                        TransTime = reader.GetValue(109)?.ToString() ?? "",
-                        CustomerName = reader.GetValue(110)?.ToString() ?? "",
-                        RefNo1 = reader.GetValue(111)?.ToString() ?? "",
-                        TermBranch = reader.GetValue(112)?.ToString() ?? "",
-                        TellerId = reader.GetValue(113)?.ToString() ?? "",
-                        CreditDebit = reader.GetValue(114)?.ToString() ?? "",
-                        PaymentType = reader.GetValue(115)?.ToString() ?? "",
-                        ChequeNo = reader.GetValue(116)?.ToString() ?? "",
-                        Amount = GetReaderDecimal(reader, 117),
-                        ChqueBankCode = reader.GetValue(118)?.ToString() ?? "",
+                        PaymentId = workSheet?.Cells[row, 104]?.GetValue<string>() ?? "",
+                        CompanyCode = workSheet?.Cells[row, 105]?.GetValue<string>() ?? "",
+                        TextFile = workSheet?.Cells[row, 106]?.GetValue<string>() ?? "",
+                        BankCode = workSheet?.Cells[row, 107]?.GetValue<string>() ?? "",
+                        AccountNumber = workSheet?.Cells[row, 108]?.GetValue<string>() ?? "",
+                        TransDate = workSheet?.Cells[row, 109]?.GetValue<string>() ?? "",
+                        TransTime = workSheet?.Cells[row, 110]?.GetValue<string>() ?? "",
+                        CustomerName = workSheet?.Cells[row, 111]?.GetValue<string>() ?? "",
+                        RefNo1 = workSheet?.Cells[row, 112]?.GetValue<string>() ?? "",
+                        TermBranch = workSheet?.Cells[row, 113]?.GetValue<string>() ?? "",
+                        TellerId = workSheet?.Cells[row, 114]?.GetValue<string>() ?? "",
+                        CreditDebit = workSheet?.Cells[row, 115]?.GetValue<string>() ?? "",
+                        PaymentType = workSheet?.Cells[row, 116]?.GetValue<string>() ?? "",
+                        ChequeNo = workSheet?.Cells[row, 117]?.GetValue<string>() ?? "",
+                        Amount = (decimal)workSheet?.Cells[row, 118]?.GetValue<decimal>(),
+                        ChqueBankCode = workSheet?.Cells[row, 119]?.GetValue<string>() ?? "",
                         Recruit = r,
                         CreatedAt = DateTime.Now,
                         CreatedUserId = job.UserId ?? "",
@@ -519,8 +510,6 @@ public class ImportBackgroundService : BackgroundService
                         throw new Exception($"BulkInsert failed (rows {batchStartRow}-{row - 1}, {batchRecruits.Count} records): {ex.InnerException?.Message ?? ex.Message}", ex);
                     }
 
-                    _context.ChangeTracker.Clear();
-
                     // Clear all lists for next batch
                     batchRecruits.Clear();
                     batchEducations.Clear();
@@ -548,10 +537,8 @@ public class ImportBackgroundService : BackgroundService
                     var batchStartRow = row - batchCount + 1;
                     throw new Exception($"BulkInsert failed (rows {batchStartRow}-{row - 1}, {batchRecruits.Count} records): {ex.InnerException?.Message ?? ex.Message}", ex);
                 }
-
-                _context.ChangeTracker.Clear();
             }
-        } while (reader.NextResult());
+        }
 
         job.TotalCount = _tracker.GetJob(job.JobId)?.ProcessedCount ?? 0;
     }
@@ -570,30 +557,12 @@ public class ImportBackgroundService : BackgroundService
 
         if (rec_import == null) throw new Exception("RecruitImport not found");
 
-        var rec_import_id = rec_import.Id;
-        var rec_import_year = rec_import.Year;
-        var existingScoreImport = rec_import.ScoreImport;
-
-        if (existingScoreImport != null)
+        if (rec_import.ScoreImport != null && rec_import.ScoreImport.Scores != null)
         {
-            var existingScores = existingScoreImport.Scores?.ToList() ?? new List<RecruitScore>();
-            if (existingScores.Count > 0)
-                await _context.BulkDeleteAsync(existingScores);
-            // Also delete the ScoreImport row itself (has unique index on RecruitImportId)
-            // Use Remove+SaveChanges instead of BulkDelete since BulkDelete fails with detached entities
-            var scoreImportToDelete = existingScoreImport;
-            _context.ChangeTracker.Clear();
-            var deleteStub = new ScoreImport { Id = scoreImportToDelete.Id };
-            _context.ScoreImports.Attach(deleteStub);
-            _context.ScoreImports.Remove(deleteStub);
-            await _context.SaveChangesAsync();
+            await _context.BulkDeleteAsync(rec_import.ScoreImport.Scores.ToList());
         }
 
-        // Clear tracker to avoid stale references after BulkDelete (which bypasses EF tracking)
-        _context.ChangeTracker.Clear();
-
-        // Add history record — set FK shadow property directly to avoid Attach side-effects
-        var historyEntry = _context.RecruitImportHistories.Add(new RecruitImportHistory
+        rec_import.ImportHostories.Add(new RecruitImportHistory
         {
             Description = "นำเข้าข้อมูลผลคะแนนสอบ",
             CreatedAt = DateTime.Now,
@@ -603,124 +572,107 @@ public class ImportBackgroundService : BackgroundService
             LastUpdateUserId = job.UserId ?? "",
             LastUpdateFullName = job.FullName ?? "System Administrator",
         });
-        historyEntry.Property("RecruitImportId").CurrentValue = rec_import_id;
 
-        // get doc from minio (MinIOService already saves Document to its own context)
+        // get doc from minio
         var doc = await _minioService.UploadFileAsync(new DummyFormFile(job.ImportFile));
-        var scoreImport_id = Guid.NewGuid(); // Pre-generate Id to use as FK
-        var imported = new ScoreImport();
-        imported.Id = scoreImport_id;
-        imported.Year = rec_import_year;
-        imported.RecruitImportId = rec_import_id;
-        imported.CreatedAt = DateTime.Now;
-        imported.CreatedUserId = job.UserId ?? "";
-        imported.CreatedFullName = job.FullName ?? "System Administrator";
-        imported.LastUpdatedAt = DateTime.Now;
-        imported.LastUpdateUserId = job.UserId ?? "";
-        imported.LastUpdateFullName = job.FullName ?? "System Administrator";
-        imported.Scores = new List<RecruitScore>();
+        var imported = new ScoreImport
+        {
+            Year = rec_import.Year,
+            ImportFile = doc,
+            CreatedAt = DateTime.Now,
+            CreatedUserId = job.UserId ?? "",
+            CreatedFullName = job.FullName ?? "System Administrator",
+            LastUpdatedAt = DateTime.Now,
+            LastUpdateUserId = job.UserId ?? "",
+            LastUpdateFullName = job.FullName ?? "System Administrator",
+            Scores = new List<RecruitScore>()
+        };
 
-        // Save ScoreImport — set ImportFileId FK directly (explicit property, not shadow)
-        imported.ImportFileId = doc.Id;
-        _context.ScoreImports.Add(imported);
+        // Save ScoreImport parent first to get its Id
+        rec_import.ScoreImport = imported;
         await _context.SaveChangesAsync();
         _context.ChangeTracker.Clear();
 
-        // preload recruits using AsNoTracking to avoid EF tracking overhead
+        // preload recruits (lightweight - only ExamId)
         var recruitsDict = await _context.Recruits
-            .AsNoTracking()
             .Where(x => x.RecruitImport.Id == rec_import.Id)
             .GroupBy(x => x.ExamId)
             .Where(g => g.Count() == 1)
             .Select(g => g.First())
             .ToDictionaryAsync(x => x.ExamId, x => x);
 
-        System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
-        using var stream = System.IO.File.OpenRead(job.ImportFile);
-        using var reader = ExcelReaderFactory.CreateReader(stream);
-
-        do
+        using var c_package = new ExcelPackage(new FileInfo(job.ImportFile));
+        for (int i = 0; i < c_package.Workbook.Worksheets.Count; i++)
         {
-            // Read header rows (rows 1-7), then data starts at row 8
-            // Skip 7 rows: first 7 are header/metadata
-            for (int skip = 0; skip < 7; skip++)
-            {
-                if (!reader.Read()) break;
-            }
-
-            var cols = new string[reader.FieldCount];
-            // Use current row (row 7) as header reference — not actually used for ScoreFile column mapping
-            // ScoreFile uses hardcoded column indices
-
+            var workSheet = c_package.Workbook.Worksheets[i];
+            var cols = workSheet.GetHeaderColumns();
+            int row = 8;
             int batchCount = 0;
             const int batchSize = 500;
             int totalProcessed = 0;
+            var endRow = workSheet.Dimension.End.Row;
 
             var batchScores = new List<RecruitScore>();
 
-            while (reader.Read())
+            while (row <= endRow)
             {
-                var cell1 = reader.GetValue(0)?.ToString();
-                if (string.IsNullOrEmpty(cell1)) break;
+                var cell1 = workSheet?.Cells[row, 1]?.GetValue<string>();
+                if (cell1 == "" || cell1 == null) break;
 
                 var r = new RecruitScore();
-                r.Id = Guid.NewGuid();
-                r.ExamId = reader.GetValue(1)?.ToString();
+                r.ExamId = workSheet?.Cells[row, 2]?.GetValue<string>();
 
                 if (!string.IsNullOrEmpty(r.ExamId) && recruitsDict.TryGetValue(r.ExamId, out var recruit))
                 {
-                    r.CitizenId = reader.GetValue(2)?.ToString()?.Trim();
+                    r.CitizenId = workSheet?.Cells[row, 3]?.GetValue<string>()?.Trim();
                     r.FullA = 200;
-                    r.SumA = string.IsNullOrWhiteSpace(reader.GetValue(4)?.ToString()) ? 0.00 : Math.Round(Convert.ToDouble(reader.GetValue(4)), 2);
-                    r.PercentageA = string.IsNullOrWhiteSpace(reader.GetValue(5)?.ToString()) ? 0.00 : Math.Round(Convert.ToDouble(reader.GetValue(5)), 2);
-                    r.AStatus = string.IsNullOrWhiteSpace(reader.GetValue(6)?.ToString()) ? "" : reader.GetValue(6)?.ToString();
-                    r.SumAB = string.IsNullOrWhiteSpace(reader.GetValue(4)?.ToString()) ? 0.00 : Math.Round(Convert.ToDouble(reader.GetValue(4)), 2);
-                    r.ABStatus = string.IsNullOrWhiteSpace(reader.GetValue(6)?.ToString()) ? "" : reader.GetValue(6)?.ToString();
+                    r.SumA = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 5]?.GetValue<string>()) ? 0.00 : Math.Round(workSheet.Cells[row, 5].GetValue<double>(), 2);
+                    r.PercentageA = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 6]?.GetValue<string>()) ? 0.00 : Math.Round(workSheet.Cells[row, 6].GetValue<double>(), 2);
+                    r.AStatus = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 7]?.GetValue<string>()) ? "" : workSheet?.Cells[row, 7]?.GetValue<string>();
+                    r.SumAB = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 5]?.GetValue<string>()) ? 0.00 : Math.Round(workSheet.Cells[row, 5].GetValue<double>(), 2);
+                    r.ABStatus = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 7]?.GetValue<string>()) ? "" : workSheet?.Cells[row, 7]?.GetValue<string>();
                     r.FullC = 50;
-                    r.SumC = string.IsNullOrWhiteSpace(reader.GetValue(7)?.ToString()) ? 0.00 : Math.Round(Convert.ToDouble(reader.GetValue(7)), 2);
+                    r.SumC = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 8]?.GetValue<string>()) ? 0.00 : Math.Round(workSheet.Cells[row, 8].GetValue<double>(), 2);
                     r.FullD = 50;
-                    r.SumD = string.IsNullOrWhiteSpace(reader.GetValue(8)?.ToString()) ? 0.00 : Math.Round(Convert.ToDouble(reader.GetValue(8)), 2);
-                    r.SumCD = string.IsNullOrWhiteSpace(reader.GetValue(9)?.ToString()) ? 0.00 : Math.Round(Convert.ToDouble(reader.GetValue(9)), 2);
-                    r.PercentageC = string.IsNullOrWhiteSpace(reader.GetValue(10)?.ToString()) ? 0.00 : Math.Round(Convert.ToDouble(reader.GetValue(10)), 2);
-                    r.CStatus = string.IsNullOrWhiteSpace(reader.GetValue(11)?.ToString()) ? "" : reader.GetValue(11)?.ToString();
+                    r.SumD = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 9]?.GetValue<string>()) ? 0.00 : Math.Round(workSheet.Cells[row, 9].GetValue<double>(), 2);
+                    r.SumCD = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 10]?.GetValue<string>()) ? 0.00 : Math.Round(workSheet.Cells[row, 10].GetValue<double>(), 2);
+                    r.PercentageC = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 11]?.GetValue<string>()) ? 0.00 : Math.Round(workSheet.Cells[row, 11].GetValue<double>(), 2);
+                    r.CStatus = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 12]?.GetValue<string>()) ? "" : workSheet?.Cells[row, 12]?.GetValue<string>();
                     r.FullScore = 300;
-                    r.TotalScore = string.IsNullOrWhiteSpace(reader.GetValue(12)?.ToString()) ? 0.00 : Math.Round(Convert.ToDouble(reader.GetValue(12)), 2);
+                    r.TotalScore = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 13]?.GetValue<string>()) ? 0.00 : Math.Round(workSheet.Cells[row, 13].GetValue<double>(), 2);
 
-                    var examStatusCol7 = reader.GetValue(6)?.ToString()?.Trim();
-                    var examStatusCol14 = reader.GetValue(13)?.ToString()?.Trim();
+                    var examStatusCol7 = workSheet?.Cells[row, 7]?.GetValue<string>()?.Trim();
+                    var examStatusCol14 = workSheet?.Cells[row, 14]?.GetValue<string>()?.Trim();
                     r.ExamStatus =
                         examStatusCol7 == "ขาดสอบ" ? "ขส." :
                         examStatusCol14 == "ได้" ? "ผ่าน" :
                         examStatusCol14 == "ตก" ? "ไม่ผ่าน" : "-";
 
-                    r.RemarkScore = string.IsNullOrWhiteSpace(reader.GetValue(14)?.ToString()) ? string.Empty : reader.GetValue(14)?.ToString();
+                    r.RemarkScore = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 15]?.GetValue<string>()) ? string.Empty : workSheet?.Cells[row, 15]?.GetValue<string>();
 
-                    var examAttr = reader.GetValue(15)?.ToString()?.Trim();
+                    var examAttr = workSheet?.Cells[row, 16]?.GetValue<string>()?.Trim();
                     r.ExamAttribute =
                         examAttr == "ผ่าน" ? "มีคุณสมบัติ" :
                         examAttr == "ไม่ผ่าน" ? "ไม่มีคุณสมบัติ" : "";
 
-                    r.Major = reader.Name; // worksheet name
+                    r.Major = workSheet.Name;
                     r.CreatedAt = DateTime.Now;
                     r.CreatedUserId = job.UserId ?? "";
                     r.CreatedFullName = job.FullName ?? "System Administrator";
                     r.LastUpdatedAt = DateTime.Now;
                     r.LastUpdateUserId = job.UserId ?? "";
                     r.LastUpdateFullName = job.FullName ?? "System Administrator";
+                    r.ScoreImport = imported;
 
                     batchScores.Add(r);
                 }
 
+                row++;
                 batchCount++;
                 totalProcessed++;
 
                 if (batchCount >= batchSize)
                 {
-                    // Set ScoreImportId FK for all scores in batch
-                    foreach (var score in batchScores)
-                    {
-                        score.ScoreImportId = scoreImport_id;
-                    }
                     await _context.BulkInsertAsync(batchScores);
                     batchScores.Clear();
                     batchCount = 0;
@@ -731,13 +683,9 @@ public class ImportBackgroundService : BackgroundService
             // Process remaining records
             if (batchScores.Count > 0)
             {
-                foreach (var score in batchScores)
-                {
-                    score.ScoreImportId = scoreImport_id;
-                }
                 await _context.BulkInsertAsync(batchScores);
             }
-        } while (reader.NextResult());
+        }
 
         job.TotalCount = _tracker.GetJob(job.JobId)?.ProcessedCount ?? 0;
     }
@@ -786,9 +734,8 @@ public class ImportBackgroundService : BackgroundService
         await _context.SaveChangesAsync();
         _context.ChangeTracker.Clear();
 
-        // preload scores using AsNoTracking to avoid EF tracking overhead
+        // preload scores - re-query from DB to avoid tracking issues
         var scoreList = await _context.RecruitScores
-            .AsNoTracking()
             .Where(s => s.ScoreImport.RecruitImportId == rec_import.Id && !string.IsNullOrEmpty(s.ExamId))
             .GroupBy(x => x.ExamId)
             .Where(g => g.Count() == 1)
@@ -796,34 +743,31 @@ public class ImportBackgroundService : BackgroundService
             .ToListAsync();
         var score = scoreList.ToDictionary(s => s.ExamId!, s => s);
 
-        System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
+        // Read from saved file (ResultFile uses stream from Form, but we saved to disk)
         using var stream = System.IO.File.OpenRead(job.ImportFile);
-        using var reader = ExcelReaderFactory.CreateReader(stream);
+        using var c_package = new ExcelPackage(stream);
 
-        do
+        foreach (var workSheet in c_package.Workbook.Worksheets)
         {
-            // Skip 6 header rows, data starts at row 7
-            for (int skip = 0; skip < 6; skip++)
-            {
-                if (!reader.Read()) break;
-            }
-
+            int row = 7;
             int batchCount = 0;
             const int batchSize = 500;
+            var endRow = workSheet.Dimension.End.Row;
             var batchUpdates = new List<RecruitScore>();
 
-            while (reader.Read())
+            while (row <= endRow)
             {
-                var examId = reader.GetValue(1)?.ToString();
+                var examId = workSheet?.Cells[row, 2]?.GetValue<string>();
                 if (string.IsNullOrWhiteSpace(examId))
                 {
+                    row++;
                     continue;
                 }
 
                 if (score.TryGetValue(examId, out var existingScore))
                 {
-                    existingScore.Number = reader.GetValue(0)?.ToString();
-                    existingScore.RemarkExamOrder = reader.GetValue(3)?.ToString() ?? string.Empty;
+                    existingScore.Number = workSheet?.Cells[row, 1]?.GetValue<string>();
+                    existingScore.RemarkExamOrder = workSheet?.Cells[row, 4]?.GetValue<string>() ?? string.Empty;
                     existingScore.LastUpdatedAt = DateTime.Now;
                     existingScore.LastUpdateUserId = job.UserId ?? "";
                     existingScore.LastUpdateFullName = job.FullName ?? "System Administrator";
@@ -831,6 +775,8 @@ public class ImportBackgroundService : BackgroundService
                     batchCount++;
                 }
 
+                row++;
+
                 if (batchCount >= batchSize)
                 {
                     await _context.BulkUpdateAsync(batchUpdates);
@@ -844,7 +790,7 @@ public class ImportBackgroundService : BackgroundService
             {
                 await _context.BulkUpdateAsync(batchUpdates);
             }
-        } while (reader.NextResult());
+        }
     }
 
     #endregion
@@ -866,81 +812,6 @@ public class ImportBackgroundService : BackgroundService
         }
     }
 
-    /// <summary>
-    /// Get string value from ExcelDataReader by header column name
-    /// </summary>
-    private static string GetCellValue(IExcelDataReader reader, string[] cols, string headerName)
-    {
-        var idx = GetColumnIndex(cols, headerName);
-        if (idx <= 0 || idx > reader.FieldCount) return "";
-        return reader.GetValue(idx - 1)?.ToString() ?? "";
-    }
-
-    /// <summary>
-    /// Get DateTime value from ExcelDataReader by header column name
-    /// </summary>
-    private static DateTime? GetCellDateTime(IExcelDataReader reader, string[] cols, string headerName)
-    {
-        var idx = GetColumnIndex(cols, headerName);
-        if (idx <= 0 || idx > reader.FieldCount) return null;
-        var val = reader.GetValue(idx - 1);
-        if (val is DateTime dt) return dt;
-        if (val != null && DateTime.TryParse(val.ToString(), out var parsed)) return parsed;
-        return null;
-    }
-
-    /// <summary>
-    /// Get double value from ExcelDataReader by header column name
-    /// </summary>
-    private static double GetCellDouble(IExcelDataReader reader, string[] cols, string headerName)
-    {
-        var idx = GetColumnIndex(cols, headerName);
-        if (idx <= 0 || idx > reader.FieldCount) return 0.0;
-        var val = reader.GetValue(idx - 1);
-        if (val is double d) return d;
-        if (val != null && double.TryParse(val.ToString(), out var parsed)) return parsed;
-        return 0.0;
-    }
-
-    /// <summary>
-    /// Get decimal value from ExcelDataReader by header column name
-    /// </summary>
-    private static decimal GetCellDecimal(IExcelDataReader reader, string[] cols, string headerName)
-    {
-        var idx = GetColumnIndex(cols, headerName);
-        if (idx <= 0 || idx > reader.FieldCount) return 0m;
-        var val = reader.GetValue(idx - 1);
-        if (val is decimal dec) return dec;
-        if (val is double dbl) return (decimal)dbl;
-        if (val != null && decimal.TryParse(val.ToString(), out var parsed)) return parsed;
-        return 0m;
-    }
-
-    /// <summary>
-    /// Get double value from ExcelDataReader by 0-based column index
-    /// </summary>
-    private static double GetReaderDouble(IExcelDataReader reader, int index)
-    {
-        if (index < 0 || index >= reader.FieldCount) return 0.0;
-        var val = reader.GetValue(index);
-        if (val is double d) return d;
-        if (val != null && double.TryParse(val.ToString(), out var parsed)) return parsed;
-        return 0.0;
-    }
-
-    /// <summary>
-    /// Get decimal value from ExcelDataReader by 0-based column index
-    /// </summary>
-    private static decimal GetReaderDecimal(IExcelDataReader reader, int index)
-    {
-        if (index < 0 || index >= reader.FieldCount) return 0m;
-        var val = reader.GetValue(index);
-        if (val is decimal dec) return dec;
-        if (val is double dbl) return (decimal)dbl;
-        if (val != null && decimal.TryParse(val.ToString(), out var parsed)) return parsed;
-        return 0m;
-    }
-
     #endregion
 }
 

Services/ImportJobTracker.cs

@@ -45,11 +45,9 @@ public class ImportJobInfo
 public class ImportJobTracker
 {
     private readonly ConcurrentDictionary<string, ImportJobInfo> _jobs = new();
-    private readonly TimeSpan _evictionAge = TimeSpan.FromHours(1);
 
     public ImportJobInfo CreateJob(ImportJobInfo job)
     {
-        EvictOldJobs();
         _jobs[job.JobId] = job;
         return job;
     }
@@ -68,23 +66,7 @@ public class ImportJobTracker
             if (errorMessage != null)
                 job.ErrorMessage = errorMessage;
             if (status == ImportJobStatus.Completed || status == ImportJobStatus.Failed)
-            {
                 job.CompletedAt = DateTime.Now;
-                // Clear request data to free memory for completed/failed jobs
-                job.Request = null;
-            }
-        }
-    }
-
-    private void EvictOldJobs()
-    {
-        var cutoff = DateTime.Now - _evictionAge;
-        foreach (var kvp in _jobs)
-        {
-            if (kvp.Value.CompletedAt.HasValue && kvp.Value.CompletedAt.Value < cutoff)
-            {
-                _jobs.TryRemove(kvp.Key, out _);
-            }
         }
     }
 }

Services/MinIOService.cs

@@ -72,13 +72,14 @@ namespace BMA.EHR.Recruit.Services
 				{
 					var id = Guid.NewGuid();
 					file.CopyTo(ms);
-					ms.Position = 0; // Reset stream position for reading
+					var fileBytes = ms.ToArray();
+					System.IO.MemoryStream filestream = new System.IO.MemoryStream(fileBytes);
 
 					var request = new PutObjectRequest
 					{
 						BucketName = _bucketName,
 						Key = id.ToString("D"),
-						InputStream = ms,
+						InputStream = filestream,
 						ContentType = file.ContentType,
 						CannedACL = S3CannedACL.PublicRead
 					};

obj/project.assets.json

@@ -289,35 +289,6 @@
           "lib/net7.0/EPPlus.System.Drawing.dll": {}
         }
       },
-      "ExcelDataReader/3.8.0": {
-        "type": "package",
-        "compile": {
-          "lib/netstandard2.1/ExcelDataReader.dll": {
-            "related": ".pdb;.xml"
-          }
-        },
-        "runtime": {
-          "lib/netstandard2.1/ExcelDataReader.dll": {
-            "related": ".pdb;.xml"
-          }
-        }
-      },
-      "ExcelDataReader.DataSet/3.8.0": {
-        "type": "package",
-        "dependencies": {
-          "ExcelDataReader": "3.8.0"
-        },
-        "compile": {
-          "lib/netstandard2.1/ExcelDataReader.DataSet.dll": {
-            "related": ".pdb;.xml"
-          }
-        },
-        "runtime": {
-          "lib/netstandard2.1/ExcelDataReader.DataSet.dll": {
-            "related": ".pdb;.xml"
-          }
-        }
-      },
       "Google.Protobuf/3.19.4": {
         "type": "package",
         "compile": {
@@ -5699,56 +5670,6 @@
         "readme.md"
       ]
     },
-    "ExcelDataReader/3.8.0": {
-      "sha512": "kbUsldc5Fn9IKgzL2nr4VvN/mKqPqn8zGXUZpA7uL6svCA4psF+qMK519EhMvderpU4pAJoqk9DWpiSIkiZtXA==",
-      "type": "package",
-      "path": "exceldatareader/3.8.0",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "ExcelDataReader.png",
-        "README.md",
-        "exceldatareader.3.8.0.nupkg.sha512",
-        "exceldatareader.nuspec",
-        "lib/net462/ExcelDataReader.dll",
-        "lib/net462/ExcelDataReader.pdb",
-        "lib/net462/ExcelDataReader.xml",
-        "lib/net8.0/ExcelDataReader.dll",
-        "lib/net8.0/ExcelDataReader.pdb",
-        "lib/net8.0/ExcelDataReader.xml",
-        "lib/netstandard2.0/ExcelDataReader.dll",
-        "lib/netstandard2.0/ExcelDataReader.pdb",
-        "lib/netstandard2.0/ExcelDataReader.xml",
-        "lib/netstandard2.1/ExcelDataReader.dll",
-        "lib/netstandard2.1/ExcelDataReader.pdb",
-        "lib/netstandard2.1/ExcelDataReader.xml"
-      ]
-    },
-    "ExcelDataReader.DataSet/3.8.0": {
-      "sha512": "+eQg5oinHir7ayE/rF4dedvy8J6FBDG8RDyKFQsS/VZG9ygrnNgW6U8JSlrfGfe3DxYgbVoVwYV9Hbk63JQJFQ==",
-      "type": "package",
-      "path": "exceldatareader.dataset/3.8.0",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "ExcelDataReader.png",
-        "README.md",
-        "exceldatareader.dataset.3.8.0.nupkg.sha512",
-        "exceldatareader.dataset.nuspec",
-        "lib/net462/ExcelDataReader.DataSet.dll",
-        "lib/net462/ExcelDataReader.DataSet.pdb",
-        "lib/net462/ExcelDataReader.DataSet.xml",
-        "lib/net8.0/ExcelDataReader.DataSet.dll",
-        "lib/net8.0/ExcelDataReader.DataSet.pdb",
-        "lib/net8.0/ExcelDataReader.DataSet.xml",
-        "lib/netstandard2.0/ExcelDataReader.DataSet.dll",
-        "lib/netstandard2.0/ExcelDataReader.DataSet.pdb",
-        "lib/netstandard2.0/ExcelDataReader.DataSet.xml",
-        "lib/netstandard2.1/ExcelDataReader.DataSet.dll",
-        "lib/netstandard2.1/ExcelDataReader.DataSet.pdb",
-        "lib/netstandard2.1/ExcelDataReader.DataSet.xml"
-      ]
-    },
     "Google.Protobuf/3.19.4": {
       "sha512": "fd07/ykL4O4FhqrZIELm5lmiyOHfdPg9+o+hWr6tcfRdS7tHXnImg/2wtogLzlW2eEmr0J7j6ZrZvaWOLiJbxQ==",
       "type": "package",
@@ -14075,8 +13996,6 @@
       "CoreAdmin >= 2.7.0",
       "EFCore.BulkExtensions.MySql >= 6.7.16",
       "EPPlus >= 6.1.3",
-      "ExcelDataReader >= 3.8.0",
-      "ExcelDataReader.DataSet >= 3.8.0",
       "Microsoft.AspNetCore.Authentication.JwtBearer >= 7.0.20",
       "Microsoft.AspNetCore.Mvc.NewtonsoftJson >= 7.0.3",
       "Microsoft.AspNetCore.Mvc.Versioning >= 5.0.0",
@@ -14170,14 +14089,6 @@
             "target": "Package",
             "version": "[6.1.3, )"
           },
-          "ExcelDataReader": {
-            "target": "Package",
-            "version": "[3.8.0, )"
-          },
-          "ExcelDataReader.DataSet": {
-            "target": "Package",
-            "version": "[3.8.0, )"
-          },
           "Microsoft.AspNetCore.Authentication.JwtBearer": {
             "target": "Package",
             "version": "[7.0.20, )"

obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "++tptrWNc3M=",
+  "dgSpecHash": "XR3lYvVwNcQ=",
   "success": true,
   "projectFilePath": "/Users/suphonchaip/Develop/hrms/hrms-api-recruit/BMA.EHR.Recruit.csproj",
   "expectedPackageFiles": [
@@ -21,8 +21,6 @@
     "/Users/suphonchaip/.nuget/packages/epplus/6.1.3/epplus.6.1.3.nupkg.sha512",
     "/Users/suphonchaip/.nuget/packages/epplus.interfaces/6.1.1/epplus.interfaces.6.1.1.nupkg.sha512",
     "/Users/suphonchaip/.nuget/packages/epplus.system.drawing/6.1.1/epplus.system.drawing.6.1.1.nupkg.sha512",
-    "/Users/suphonchaip/.nuget/packages/exceldatareader/3.8.0/exceldatareader.3.8.0.nupkg.sha512",
-    "/Users/suphonchaip/.nuget/packages/exceldatareader.dataset/3.8.0/exceldatareader.dataset.3.8.0.nupkg.sha512",
     "/Users/suphonchaip/.nuget/packages/google.protobuf/3.19.4/google.protobuf.3.19.4.nupkg.sha512",
     "/Users/suphonchaip/.nuget/packages/humanizer.core/2.14.1/humanizer.core.2.14.1.nupkg.sha512",
     "/Users/suphonchaip/.nuget/packages/k4os.compression.lz4/1.2.6/k4os.compression.lz4.1.2.6.nupkg.sha512",