From 32187c727fa367226f1b011053b622cb2de15880 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 28 Jun 2022 10:14:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.API/Program.cs                     |  2 +-
 .../Service/Allocation/VisitTaskService.cs     |  4 ++--
 .../Service/ImageAndDoc/DicomArchiveService.cs | 18 ++++++++++++------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.API/Program.cs b/IRaCIS.Core.API/Program.cs
index 63c08ae0b..866d33353 100644
--- a/IRaCIS.Core.API/Program.cs
+++ b/IRaCIS.Core.API/Program.cs
@@ -138,7 +138,7 @@ namespace IRaCIS.Core.API
         {
             var _mediator = host.Services.GetService(typeof(IMediator)) as IMediator;
 
-            //await _mediator.Send(new AnonymizeCacheRequest());
+            await _mediator.Send(new AnonymizeCacheRequest());
 
             await _mediator.Send(new TrialStateCacheRequest());
         }     
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 2dfc2947a..4cbdf3213 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -207,7 +207,7 @@ namespace IRaCIS.Core.Application.Service
 
             var visitTaskQueryable = _visitTaskReReadingRepository
                 .Where(t => t.NewReReadingTask.TrialId == queryVisitTask.TrialId)
-                 .WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId)
+                 .WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId || t.OriginalReReadingTaskId== queryVisitTask.RootReReadingTaskId)
 
                 .WhereIf(queryVisitTask.SiteId != null, t => t.NewReReadingTask.Subject.SiteId == queryVisitTask.SiteId)
                 .WhereIf(queryVisitTask.SubjectId != null, t => t.NewReReadingTask.SubjectId == queryVisitTask.SubjectId)
@@ -354,7 +354,7 @@ namespace IRaCIS.Core.Application.Service
             var visitTaskQueryable = _visitTaskReReadingRepository
                 .Where(t => t.NewReReadingTask.DoctorUserId == _userInfo.Id)
                 .Where(t => t.NewReReadingTask.TrialId == queryVisitTask.TrialId)
-                .WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId)
+                .WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId || t.OriginalReReadingTaskId == queryVisitTask.RootReReadingTaskId)
                 .WhereIf(queryVisitTask.SiteId != null, t => t.NewReReadingTask.Subject.SiteId == queryVisitTask.SiteId)
                 .WhereIf(queryVisitTask.SubjectId != null, t => t.NewReReadingTask.SubjectId == queryVisitTask.SubjectId)
                 .WhereIf(queryVisitTask.IsUrgent != null, t => t.NewReReadingTask.IsUrgent == queryVisitTask.IsUrgent)
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs
index e91142df4..8492fb466 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs
@@ -8,6 +8,7 @@ using System.Text;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Helper;
 using Microsoft.AspNetCore.Hosting;
+using IRaCIS.Core.Infrastructure;
 
 namespace IRaCIS.Core.Application.Services
 {
@@ -66,14 +67,19 @@ namespace IRaCIS.Core.Application.Services
             }
 
 
-            var anonymize_AddFixedFiledList = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_AddFixedFiled).Value;
-            var anonymize_AddIRCInfoFiled = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_AddIRCInfoFiled).Value;
-            var anonymize_FixedField = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_FixedField).Value;
-            var anonymize_IRCInfoField = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_IRCInfoField).Value;
+            var anonymize_AddFixedFiledList = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_AddFixedFiled).Value ??new List<SystemAnonymization>();
+            var anonymize_AddIRCInfoFiledList = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_AddIRCInfoFiled).Value ??new List<SystemAnonymization>();
+            var anonymize_FixedFieldList = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_FixedField).Value ?? new List<SystemAnonymization>();
+            var anonymize_IRCInfoFieldList = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_IRCInfoField).Value ?? new List<SystemAnonymization>();
 
 
+            if(anonymize_AddFixedFiledList.Union(anonymize_AddIRCInfoFiledList).Union(anonymize_FixedFieldList).Union(anonymize_IRCInfoFieldList) .Count()==0)
+            {
+                throw new BusinessValidationFailedException("未取到缓存匿名化配置数据，上传停止,请联系开发人员核实");
+            }
 
-            foreach (var item in anonymize_AddFixedFiledList.Union(anonymize_FixedField))
+
+            foreach (var item in anonymize_AddFixedFiledList.Union(anonymize_FixedFieldList))
             {
 
                 var dicomTag = new DicomTag(Convert.ToUInt16(item.Group, 16), Convert.ToUInt16(item.Element, 16));
@@ -81,7 +87,7 @@ namespace IRaCIS.Core.Application.Services
                 dataset.AddOrUpdate(dicomTag, item.ReplaceValue);
             }
 
-            foreach (var item in anonymize_AddIRCInfoFiled.Union(anonymize_IRCInfoField))
+            foreach (var item in anonymize_AddIRCInfoFiledList.Union(anonymize_IRCInfoFieldList))
             {
 
                 var dicomTag = new DicomTag(Convert.ToUInt16(item.Group, 16), Convert.ToUInt16(item.Element, 16));