diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 2b953b00..d5f029c4 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -154,6 +154,21 @@ namespace IRaCIS.Core.Infra.EFCore.Common } var entity = item.Entity as Trial; + List trials = new List(); + var trialids =new List(); + if (entity.TrialDicList == null|| entity.TrialDicList.Count==0) + { + trialids = await this._dbContext.TrialDictionary.Where(x => x.TrialId == entity.Id&&x.KeyName== "Criterion").Select(x => x.DictionaryId).ToListAsync(); + + } + else + { + trialids = entity.TrialDicList.Select(x => x.DictionaryId).ToList(); + + } + + trials = await this._dbContext.Dictionary.Where(x => trialids.Contains(x.Id)).Select(x => x.ValueCN).ToListAsync(); + await InsertInspection(item, type, x => new DataInspection() { TrialId = x.Id, @@ -161,7 +176,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common ResearchProgramNo=x.ResearchProgramNo, GeneralId = x.Id, },new { - TrialDicList= string.Join(",",entity.TrialDicList.Select(x => x.KeyName).ToList()) + TrialDicList= string.Join(",", trials) }); } diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index 5797c6d0..7c861226 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -224,6 +224,9 @@ namespace IRaCIS.Core.Infra.EFCore #region Trial public virtual DbSet Trial { get; set; } + + + public virtual DbSet TrialDictionary { get; set; } public virtual DbSet TrialDetail { get; set; } public virtual DbSet UserTrial { get; set; }