修改项目配置稽查

IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -113,26 +113,39 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 var type = GetEntityAuditOpt(item);
 
                 var entity = item.Entity as Trial;
-                List<string> trialDics = new List<string>();
-                var dictionaryIds = new List<Guid>();
-                if (entity.TrialDicList == null || entity.TrialDicList.Count == 0)
-                {
-                    dictionaryIds = await this._dbContext.TrialDictionary.Where(x => x.TrialId == entity.Id && x.KeyName == "Criterion").Select(x => x.DictionaryId).ToListAsync();
-                }
-                else
-                {
-                    dictionaryIds = entity.TrialDicList.Select(x => x.DictionaryId).ToList();
-                }
 
-                trialDics = await this._dbContext.Dictionary.Where(x => dictionaryIds.Contains(x.Id)).Select(x => x.ValueCN).ToListAsync();
+                //阅片标准
+                var criterionNameList = await _dbContext.ReadingQuestionCriterionTrial.Where(t => t.TrialId == entity.Id && t.IsConfirm).OrderBy(t => t.ShowOrder).Select(t => t.CriterionName).ToListAsync();
+
+                //临床数据配置
+                var clinicalDataSetNameList = await _dbContext.ClinicalDataTrialSet.Where(t => t.TrialId == entity.Id && t.IsConfirm).Select(t => t.ClinicalDataSetName).ToListAsync();
+
+
+
+                //List<string> trialDics = new List<string>();
+                //var dictionaryIds = new List<Guid>();
+                //if (entity.TrialDicList == null || entity.TrialDicList.Count == 0)
+                //{
+                //    dictionaryIds = await this._dbContext.TrialDictionary.Where(x => x.TrialId == entity.Id && x.KeyName == "Criterion").Select(x => x.DictionaryId).ToListAsync();
+                //}
+                //else
+                //{
+                //    dictionaryIds = entity.TrialDicList.Select(x => x.DictionaryId).ToList();
+                //}
+                //trialDics = await this._dbContext.Dictionary.Where(x => dictionaryIds.Contains(x.Id)).Select(x => x.ValueCN).ToListAsync();
 
                 await InsertInspection<Trial>(item.Entity as Trial, type, x => new InspectionConvertDTO()
                 {
                     TrialId = x.Id,
                 }, new
                 {
-                    TrialDicList = string.Join(",", trialDics)
+                    //TrialDicList = string.Join(",", trialDics)
-                });
+
+                    CriterionNames = criterionNameList.Count() > 0? string.Join(",", criterionNameList):string.Empty,
+
+                    ClinicalDataSetNames = clinicalDataSetNameList.Count() > 0 ? string.Join(",", clinicalDataSetNameList):String.Empty,
+
+                }); ;
             }
 
 
@@ -183,7 +196,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 var isDistinctionInterface = false;
 
                 //设置项目配置 肿瘤学配置 和阅片标准配置
-                if (_userInfo.RequestUrl == "TrialConfig/setOncologySet" || _userInfo.RequestUrl == "TrialConfig/setTrialReadingCriterion"|| _userInfo.RequestUrl== "configTrialBasicInfo/ConfigTrialProcessInfoConfirm")
+                if (_userInfo.RequestUrl == "TrialConfig/setOncologySet" || _userInfo.RequestUrl == "TrialConfig/setTrialReadingCriterion" || _userInfo.RequestUrl == "configTrialBasicInfo/ConfigTrialProcessInfoConfirm"
+                    )
                 {
                     isDistinctionInterface = true;
                 }