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(); 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 OrginalStudyList { get; set; } public List 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 TestMasstransitMeditor([FromServices] IMediator _mediator, [FromServices] IRepository _testLengthRepository) + public async Task TestMasstransitMeditor([FromServices] IScopedMediator _mediator, [FromServices] IRepository _testLengthRepository) { var dbContext = _testLengthRepository._dbContext;