From c70ee0412dfb9b3996f74b3be0506b6d055b719f Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 23 Feb 2023 18:04:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/DTO/VisitTaskViewModel.cs | 1 + IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs | 1 + .../Service/Reading/Dto/ReadingImageTaskViewModel.cs | 2 ++ .../Reading/ReadingImageTask/ReadingImageTaskService.cs | 3 +++ 4 files changed, 7 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs index bc957e8f7..462e238d1 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs @@ -289,6 +289,7 @@ namespace IRaCIS.Core.Application.ViewModel public string TaskBlindName { get; set; } + public Arm ArmEnum { get; set; } public Guid? VisistId { get; set; } public DateTime? SuggesteFinishedTime { get; set; } diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 15028cfd5..34ec95891 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -1033,6 +1033,7 @@ namespace IRaCIS.Core.Application.Service.Allocation SuggesteFinishedTime = u.SuggesteFinishedTime, ReadingCategory = u.ReadingCategory, IsAnalysisCreate = u.IsAnalysisCreate, + ArmEnum= u.ArmEnum, TrialReadingCriterionId = u.TrialReadingCriterionId, IsNeedClinicalDataSign =u.IsNeedClinicalDataSign, IsClinicalDataSign=u.IsClinicalDataSign, diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index c89077615..71ed7d21d 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1232,6 +1232,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid VisitTaskId { get; set; } public Guid VisistId { get; set; } + public Arm ArmEnum { get; set; } + public bool IsExistsClinicalData { get; set; } public bool IsNeedReadClinicalData { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 5c6d9b225..14e27de3d 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1843,6 +1843,7 @@ namespace IRaCIS.Application.Services TaskBlindName = x.TaskBlindName, SubjectId = x.SubjectId, ReadingCategory = x.ReadingCategory, + ArmEnum = x.ArmEnum, VisistId = x.SourceSubjectVisitId != null ? x.SourceSubjectVisitId.Value : default(Guid), VisitNum = x.VisitTaskNum, TrialReadingCriterionId = x.TrialReadingCriterionId, @@ -1883,6 +1884,7 @@ namespace IRaCIS.Application.Services SubjectId = currentSubject.SubjectId, TaskBlindName = x.TaskBlindName, VisitNum = x.VisitNum, + ArmEnum = x.ArmEnum, VisistId = x.VisistId ?? default(Guid), VisitTaskId = x.Id, TrialReadingCriterionId = x.TrialReadingCriterionId, @@ -1898,6 +1900,7 @@ namespace IRaCIS.Application.Services && x.TaskState == TaskState.Effect).Select(x => new GetReadingTaskDto() { VisitTaskId = x.Id, + ArmEnum= x.ArmEnum, TaskBlindName = x.TaskBlindName, ReadingCategory = x.ReadingCategory, VisistId = x.SourceSubjectVisitId != null ? x.SourceSubjectVisitId.Value : x.ReadModule == null ? default(Guid) : x.ReadModule.SubjectVisitId,