From bdb48f93bc36d32f91a502f736b72d416b3f6016 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 2 Jul 2025 14:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pacs=20=20=E7=A8=BD=E6=9F=A5?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrialSiteUser/TrialConfigService.cs       |  5 +++-
 .../TrialSiteUser/TrialDicomAEService.cs      |  1 +
 .../Common/AuditingData.cs                    | 28 +++++++++----------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index 3cc926a75..6461ea27c 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -42,7 +42,7 @@ namespace IRaCIS.Core.Application
         IRepository<SubjectVisit> _subjectVisitRepository,
         IRepository<Enroll> _enrollRepository,
         IRepository<TrialStateChange> _trialStateChangeRepository,
-        IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository,
+        IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository, IRepository<TrialDicomAE> _dicomAERepository,
         IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, ITrialConfigService
     {
 
@@ -1150,6 +1150,9 @@ namespace IRaCIS.Core.Application
             trialInfo.IsPACSConnect = trialConfig.IsPACSConnect;
             trialInfo.IsTrialPACSConfirmed = trialConfig.IsTrialPACSConfirmed;
             trialInfo.UpdateTime = DateTime.Now;
+
+            await _dicomAERepository.DeleteFromQueryAsync(t => t.TrialId == trialConfig.TrialId);
+
             await _trialRepository.SaveChangesAsync();
 
             return ResponseOutput.Ok();
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs
index 2e3f95c93..07adc5752 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs
@@ -102,6 +102,7 @@ namespace IRaCIS.Core.Application.Service
             }
             else
             {
+
                 return ResponseOutput.Ok();
             }
 
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index 7370349ed..f24b3f2b9 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -92,7 +92,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
         /// <param name="unitDataList">单位字典</param>
         /// <param name="answer">答案</param>
         /// <returns></returns>
-        public string Translationunit(string answerType, ValueUnit? unit, string customUnit, List<UnitData> unitDataList,string? answer)
+        public string Translationunit(string answerType, ValueUnit? unit, string customUnit, List<UnitData> unitDataList, string? answer)
         {
             if (answerType == "upload")
             {
@@ -104,7 +104,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 return answer + string.Empty + customUnit;
             }
 
-            return answer +string.Empty +  unitDataList.Where(y => y.Unit == unit).Select(x => x.UnitName).FirstIsNullReturnEmpty();
+            return answer + string.Empty + unitDataList.Where(y => y.Unit == unit).Select(x => x.UnitName).FirstIsNullReturnEmpty();
         }
         public string GetEntityAuditOpt(EntityEntry entityEntry)
         {
@@ -200,22 +200,21 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                         break;
                 }
 
-                var trialDicomAE =await _dbContext.TrialDicomAE.Where(t => t.TrialId == entity.Id).FirstOrDefaultAsync();
+                //var trialDicomAE = await _dbContext.TrialDicomAE.Where(t => t.TrialId == entity.Id).FirstOrDefaultAsync();
 
                 await InsertInspection<Trial>(item.Entity as Trial, type, x => new InspectionConvertDTO()
                 {
                     TrialId = x.Id,
-                    
+
                     ExtraIndentification = extraIdentification,
                 }, new
                 {
                     //TrialDicList = string.Join(",", trialDics)
 
-
-                    CalledAE = trialDicomAE?.CalledAE,
-                    IP = trialDicomAE?.IP,
-                    Port = trialDicomAE?.Port,
-                    IsTestOK = trialDicomAE?.IsTestOK,
+                    //CalledAE = trialDicomAE?.CalledAE,
+                    //IP = trialDicomAE?.IP,
+                    //Port = trialDicomAE?.Port,
+                    //IsTestOK = trialDicomAE?.IsTestOK,
                     ImageFormatListStr = string.Join("|", entity.ImageFormatList),
                     StudyNamesStr = string.Join("|", entity.StudyNameList.Where(x => x.IsChoose).Select(x => _userInfo.IsEn_Us ? x.EnName : x.Name)),
 
@@ -384,6 +383,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 await InsertInspection<TrialDicomAE>(entity, type, x => new InspectionConvertDTO()
                 {
+                    IsDistinctionInterface = false
                 });
             }
 
@@ -3139,7 +3139,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                             (t, u) =>
                             new
                             {
-                                Answer = Translationunit(u.AnswerType, u.Unit,u.CustomUnit, unitDataList, t.Answer),
+                                Answer = Translationunit(u.AnswerType, u.Unit, u.CustomUnit, unitDataList, t.Answer),
                                 u.DictionaryCode,
                                 u.QuestionName,
                                 u.QuestionEnName,
@@ -3247,12 +3247,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 string extraIdentification = string.Empty;
 
-                var readingQuestion = await _dbContext.ReadingQuestionTrial.Where(t => t.Id == entity.QuestionId).Include(x=>x.ReadingQuestionCriterionTrial).FirstNotNullAsync();
+                var readingQuestion = await _dbContext.ReadingQuestionTrial.Where(t => t.Id == entity.QuestionId).Include(x => x.ReadingQuestionCriterionTrial).FirstNotNullAsync();
                 if (readingQuestion.ReadingQuestionCriterionTrial.CriterionGroup == CriterionGroup.Nontumorous)
                 {
                     extraIdentification = "/Nontumorous";
                 }
-               
+
 
 
                 await InsertInspection<ReadingTableAnswerRowInfo>(entity, type, x => new InspectionConvertDTO()
@@ -3676,9 +3676,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                         }
                     }
 
-                    if(entity.TaskBlindName.Contains("Timepoint Ran"))
+                    if (entity.TaskBlindName.Contains("Timepoint Ran"))
                     {
-                        if(_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => !t.TaskBlindName.Contains("Timepoint Ran")))
+                        if (_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => !t.TaskBlindName.Contains("Timepoint Ran")))
                         {
                             isDistinctionInterface = false;
                             extraIdentification = "/TriggerSystemBlindingName";