Merge branch 'develop' into dev
This commit is contained in:
commit
501dbadde3
1 changed files with 2 additions and 2 deletions
|
|
@ -2187,8 +2187,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
|
||||||
.Where(x => x.ExamId == examId)
|
.Where(x => x.ExamId == examId)
|
||||||
.Join(_context.DisableScores.AsQueryable()
|
.Join(_context.DisableScores.AsQueryable()
|
||||||
.Include(x => x.ScoreImport),
|
.Include(x => x.ScoreImport),
|
||||||
rc => new { /*rc.PeriodExam.Year,*/ rc.ExamId },
|
rc => new { PeriodExamId = rc.PeriodExam.Id, rc.ExamId },
|
||||||
sc => new { /*sc.ScoreImport.Year,*/ sc.ExamId },
|
sc => new { PeriodExamId = sc.ScoreImport.PeriodExamId, sc.ExamId },
|
||||||
(p, sr) => new
|
(p, sr) => new
|
||||||
{
|
{
|
||||||
ExamID = p.ExamId,
|
ExamID = p.ExamId,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue