hrms-bangkok/hrms-api-exam
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 56s
Details

Browse source
This commit is contained in:
harid 2026-03-02 14:54:04 +07:00
commit 1556479de2
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Controllers/DisableController.cs
View file

@ -2191,8 +2191,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
.Where(x => x.ExamId == examId)
.Join(_context.DisableScores.AsQueryable()
.Include(x => x.ScoreImport),
rc => new { rc.PeriodExam.Year, rc.ExamId },
sc => new { sc.ScoreImport.Year, sc.ExamId },
rc => new { /*rc.PeriodExam.Year,*/ rc.ExamId },
sc => new { /*sc.ScoreImport.Year,*/ sc.ExamId },
(p, sr) => new
{
ExamID = p.ExamId,

8
Controllers/DisableReportController.cs
View file

@ -94,8 +94,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
.Where(x => x.ExamId == examId)
.Join(_context.DisableScores.AsQueryable()
.Include(x => x.ScoreImport),
rc => new { rc.PeriodExam.Year, rc.ExamId },
sc => new { sc.ScoreImport.Year, sc.ExamId },
rc => new { /*rc.PeriodExam.Year,*/ rc.ExamId },
sc => new { /*sc.ScoreImport.Year,*/ sc.ExamId },
(p, sr) => new
{
ExamID = p.ExamId,
@ -168,8 +168,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
.Where(x => x.ExamId == examId)
.Join(_context.DisableScores.AsQueryable()
.Include(x => x.ScoreImport),
rc => new { rc.PeriodExam.Year, rc.ExamId },
sc => new { sc.ScoreImport.Year, sc.ExamId },
rc => new { /*rc.PeriodExam.Year,*/ rc.ExamId },
sc => new { /*sc.ScoreImport.Year,*/ sc.ExamId },
(p, sr) => new
{
ExamId = p.ExamId,