Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

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>();

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; }

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; }
+
     }
 
 

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,
 

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;