diff --git a/Services/RecruitService.cs b/Services/RecruitService.cs index fe65902..43e3905 100644 --- a/Services/RecruitService.cs +++ b/Services/RecruitService.cs @@ -184,7 +184,7 @@ namespace BMA.EHR.Recruit.Service.Services Round = recruitImport.Order == null ? "" : recruitImport.Order.ToString(), Year = (int)(recruitImport.Year == null ? 0 : recruitImport.Year), Number = await _context.Recruits.AsQueryable().Where(x => x.RecruitImport == recruitImport).CountAsync(), - PlacementType = await _contextMetadata.PlacementTypes.FirstOrDefaultAsync(x => x.Name.Trim().ToUpper().Contains("ผู้พิการ")) == null ? await _contextMetadata.PlacementTypes.FirstOrDefaultAsync() : await _contextMetadata.PlacementTypes.FirstOrDefaultAsync(x => x.Name.Trim().ToUpper().Contains("ผู้พิการ")), + PlacementType = await _contextMetadata.PlacementTypes.FirstOrDefaultAsync(x => x.Name.Trim().ToUpper().Contains("สอบแข่งขัน")) == null ? await _contextMetadata.PlacementTypes.FirstOrDefaultAsync() : await _contextMetadata.PlacementTypes.FirstOrDefaultAsync(x => x.Name.Trim().ToUpper().Contains("สอบแข่งขัน")), StartDate = DateTime.Now, EndDate = DateTime.Now.AddYears(2).AddDays(-1), CreatedAt = DateTime.Now, @@ -217,7 +217,10 @@ namespace BMA.EHR.Recruit.Service.Services var recruitScore = await _context.RecruitScores.AsQueryable() .Where(x => x.ScoreImport == scoreImport) .Where(x => x.ExamId == candidate.ExamId) + .Where(x => x.ExamStatus == "ผ่าน") .FirstOrDefaultAsync(x => x.ExamId == candidate.ExamId && x.ScoreImport == scoreImport); + if (recruitScore == null) + continue; var placementProfile = new PlacementProfile { Placement = placement,