diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 194ef368f..924e9f834 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -1053,7 +1053,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common if (entity.ParentId != null) { - var question = await _dbContext.QCQuestionConfigure.Where(x => x.Id == entity.ParentId).Select(x => new { x.ShowOrder, x.QuestionName }).FirstOrDefaultAsync(); + var question = await _dbContext.QCQuestionConfigure.Where(x => x.Id == entity.ParentId).Select(x => new { x.Id, x.ShowOrder, x.QuestionName }).FirstOrDefaultAsync(); parentQuestionOrder = question?.ShowOrder; parentQuestionName = question?.QuestionName; @@ -1085,7 +1085,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common if (entity.ParentId != null) { - var question = await _dbContext.TrialQCQuestionConfigure.Where(x => x.Id == entity.ParentId).Select(x => new { x.ShowOrder, x.QuestionName }).FirstOrDefaultAsync(); + var question = entitys.Where(x => x.Entity.GetType() == typeof(TrialQCQuestion)).Select(t => t.Entity as TrialQCQuestion).Select(x => new { x.Id, x.ShowOrder, x.QuestionName }).FirstOrDefault(t => t.Id == entity.ParentId); + + question = question ?? await _dbContext.TrialQCQuestionConfigure.Where(x => x.Id == entity.ParentId).Select(x => new { x.Id, x.ShowOrder, x.QuestionName }).FirstOrDefaultAsync(); + parentQuestionOrder = question?.ShowOrder; parentQuestionName = question?.QuestionName;