From b75366315b9aca7335f7b12e542750135d5ed8cf Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 23 May 2022 10:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 17 ++++++++++++++++-
 .../Context/IRaCISDBContext.cs                  |  3 +++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index 2b953b003..d5f029c4d 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<string> trials = new List<string>();
+                var trialids =new  List<Guid>();
+                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<Trial>(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 5797c6d01..7c861226a 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> Trial { get; set; }
+        
+
+        public virtual DbSet<TrialDictionary> TrialDictionary { get; set; }
         public virtual DbSet<TrialStatusDetail> TrialDetail { get; set; }
         public virtual DbSet<TrialUser> UserTrial { get; set; }