From a52adf97235617502692d5929f8cf81d9dc285ee Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 17 Feb 2023 16:37:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E9=85=8D=E7=BD=AE=E7=A8=BD=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Document/TrialEmailNoticeConfigService.cs |  2 +-
 .../Common/AuditingData.cs                    | 60 +++++++++++++------
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index 670ae8b4a..3f2aa475a 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -854,7 +854,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<List<TrialEmailNoticeConfigView>> GetTrialEmailNoticeConfigList(TrialEmailNoticeConfigQuery inQuery)
         {
-
+          await  SyncSystemEmainCofigDocListAsync(inQuery.TrialId);
 
             var trialEmailNoticeConfigQueryable = _trialEmailNoticeConfigRepository.Where(t => t.TrialId == inQuery.TrialId)
               .WhereIf(inQuery.IsDistinguishCriteria == false, t => t.TrialReadingCriterionId == null)
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index 045589a8a..7b1a2767c 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -114,6 +114,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 var entity = item.Entity as Trial;
 
+                var extraIdentification = string.Empty;
+
                 //阅片标准
                 var criterionNameList = await _dbContext.ReadingQuestionCriterionTrial.Where(t => t.TrialId == entity.Id && t.IsConfirm).OrderBy(t => t.ShowOrder).Select(t => t.CriterionName).ToListAsync();
 
@@ -134,9 +136,32 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 //}
                 //trialDics = await this._dbContext.Dictionary.Where(x => dictionaryIds.Contains(x.Id)).Select(x => x.ValueCN).ToListAsync();
 
+
+               
+                Guid id = entity.Id;
+                var oldentity = await _dbContext.Trial.Where(x => x.Id == id).Select(t => new { t.IsTrialBasicLogicConfirmed, t.IsTrialProcessConfirmed,
+                    t.IsTrialUrgentConfirmed ,t.IsConfigureEmail}).FirstOrDefaultAsync();
+                switch (_userInfo.RequestUrl)
+                {
+                    case "configTrialBasicInfo/ConfigTrialBasicInfoConfirm":
+                        extraIdentification= $"/{oldentity.IsTrialBasicLogicConfirmed.ToString()}";
+                        break;
+
+                    case "configTrialBasicInfo/ConfigTrialUrgentInfoConfirm":
+                        extraIdentification = $"/{oldentity.IsTrialUrgentConfirmed.ToString()}";
+                        break;
+
+                    case "TrialEmailNoticeConfig/setTrialEmail":
+
+                        extraIdentification = oldentity.IsConfigureEmail? "/EmailUpdate" : "/EmailSave";
+                        break;
+                }
+
+
                 await InsertInspection<Trial>(item.Entity as Trial, type, x => new InspectionConvertDTO()
                 {
                     TrialId = x.Id,
+                    ExtraIndentification= extraIdentification,
                 }, new
                 {
                     //TrialDicList = string.Join(",", trialDics)
@@ -145,6 +170,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                     ClinicalDataSetNames = clinicalDataSetNameList.Count() > 0 ? string.Join(",", clinicalDataSetNameList) : String.Empty,
 
+
                 }); ;
             }
 
@@ -2560,23 +2586,23 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     type = type + (basicData.ParentId == null ? "/parent" : string.Empty);
                     break;
 
-                case nameof(Trial):
-                    var trial = entityObj as Trial;
-                    Guid id = trial.Id;
-                    var oldentity = await _dbContext.Trial.Where(x => x.Id == id).Select(t => new { t.IsTrialBasicLogicConfirmed, t.IsTrialProcessConfirmed, t.IsTrialUrgentConfirmed }).FirstOrDefaultAsync();
-                    switch (_userInfo.RequestUrl.ToLower())
-                    {
-                        case "configtrialbasicinfo/configtrialbasicinfoconfirm":
-                            type = type + "/" + oldentity.IsTrialBasicLogicConfirmed.ToString();
-                            break;
-                        //case "configtrialbasicinfo/configtrialprocessinfoconfirm":
-                        //    type = type + "/" + oldentity.IsTrialProcessConfirmed.ToString();
-                        //    break;
-                        case "configtrialbasicinfo/configtrialurgentinfoconfirm":
-                            type = type + "/" + oldentity.IsTrialUrgentConfirmed.ToString();
-                            break;
-                    }
-                    break;
+                //case nameof(Trial):
+                //    var trial = entityObj as Trial;
+                //    Guid id = trial.Id;
+                //    var oldentity = await _dbContext.Trial.Where(x => x.Id == id).Select(t => new { t.IsTrialBasicLogicConfirmed, t.IsTrialProcessConfirmed, t.IsTrialUrgentConfirmed }).FirstOrDefaultAsync();
+                //    switch (_userInfo.RequestUrl.ToLower())
+                //    {
+                //        case "configtrialbasicinfo/configtrialbasicinfoconfirm":
+                //            type = type + "/" + oldentity.IsTrialBasicLogicConfirmed.ToString();
+                //            break;
+                //        //case "configtrialbasicinfo/configtrialprocessinfoconfirm":
+                //        //    type = type + "/" + oldentity.IsTrialProcessConfirmed.ToString();
+                //        //    break;
+                //        case "configtrialbasicinfo/configtrialurgentinfoconfirm":
+                //            type = type + "/" + oldentity.IsTrialUrgentConfirmed.ToString();
+                //            break;
+                //    }
+                //    break;
 
                 //case nameof(ReadingQuestionTrial):