From 8768fe0437ca7d1e69d0b76e1aa0cd0d86e3b84d Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 30 Sep 2024 10:21:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=98=85=E7=89=87=E4=BB=BB=E5=8A=A1=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=EF=BC=8C=E5=B7=B2=E9=98=85=E7=89=87=E7=9A=84=E4=B8=8D?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.API/Progranm.cs                                 | 1 +
 .../Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs         | 6 +++++-
 .../Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs          | 2 ++
 .../Service/ImageAndDoc/DownloadAndUploadService.cs         | 2 ++
 IRaCIS.Core.Application/TestService.cs                      | 2 +-
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.API/Progranm.cs b/IRaCIS.Core.API/Progranm.cs
index 89c40314f..808a5edec 100644
--- a/IRaCIS.Core.API/Progranm.cs
+++ b/IRaCIS.Core.API/Progranm.cs
@@ -147,6 +147,7 @@ builder.Services.AddJWTAuthSetup(_configuration);
 
 #region MassTransit
 //masstransit组件 也支持MediatR 中介者模式，但是支持分布式，考虑后续，所以在次替代MediatR
+//参考链接：https://masstransit.io/documentation/concepts/mediator#scoped-mediator
 builder.Services.AddMediator(cfg =>
 {
     cfg.AddConsumer<ConsistencyCheckConsumer>();
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs
index 977f0c618..59a74aaf3 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs
@@ -1,4 +1,6 @@
-namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
+using IRaCIS.Core.Domain.Share;
+
+namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
 {
     public class SubjectImageUploadDTO
     {
@@ -19,6 +21,8 @@
 
         public Guid? SourceSubjectVisitId { get; set; }
 
+        public ReadingTaskState ReadingTaskState { get; set; }
+
         public List<StudyBasicInfo> OrginalStudyList { get; set; }
 
         public List<StudyBasicInfo> UploadStudyList { get; set; }
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
index 79dc28127..86e5a0d65 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
@@ -498,6 +498,8 @@ namespace IRaCIS.Core.Application.Contracts
         public string TaskName { get; set; }
         public Guid? SourceSubjectVisitId { get; set; }
 
+        public ReadingTaskState ReadingTaskState { get; set; }
+
     }
 
 
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index 4f1695a86..cbfc3db7f 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -171,6 +171,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                     SubjectCode = u.IsAnalysisCreate == true ? u.BlindSubjectCode : u.Subject.Code,
                     TaskBlindName = u.TaskBlindName,
                     TaskName = u.TaskName,
+                    ReadingTaskState = u.ReadingTaskState,
 
                     SourceSubjectVisitId = u.SourceSubjectVisitId,
 
@@ -688,6 +689,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                             SubjectCode = u.IsSelfAnalysis == true ? u.BlindSubjectCode : u.Subject.Code,
                             TaskBlindName = u.TaskBlindName,
                             TaskName = u.TaskName,
+                            ReadingTaskState=u.ReadingTaskState,
                             SourceSubjectVisitId = u.SourceSubjectVisitId,
                             VisitTaskId = u.Id,
 
diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs
index 244937a70..998e3b66c 100644
--- a/IRaCIS.Core.Application/TestService.cs
+++ b/IRaCIS.Core.Application/TestService.cs
@@ -126,7 +126,7 @@ namespace IRaCIS.Core.Application.Service
         }
 
         //My project is a monolithic project,And the efcore context repository is scoped registered.
-        public async Task<IResponseOutput> TestMasstransitMeditor([FromServices] IMediator _mediator, [FromServices] IRepository<TestLength> _testLengthRepository)
+        public async Task<IResponseOutput> TestMasstransitMeditor([FromServices] IScopedMediator _mediator, [FromServices] IRepository<TestLength> _testLengthRepository)
         {
 
             var dbContext = _testLengthRepository._dbContext;