From 67909dfef924996bb26208b214e9ed64fd57d2e5 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 24 Jun 2022 16:59:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B9Id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/DTO/VisitTaskViewModel.cs | 1 + .../Service/Allocation/VisitTaskHelpeService.cs | 4 ++-- IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs index 1915c5b31..5fa4466b4 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs @@ -92,6 +92,7 @@ namespace IRaCIS.Core.Application.ViewModel public class ReReadingTaskView : VisitTaskView { + public ReReadingApplyState ReReadingApplyState { get; set; } public ReadingTaskState ReadingTaskState { get; set; } diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index ce4331f6f..3cf7afd0a 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -328,7 +328,7 @@ namespace IRaCIS.Core.Application.Service }); - var rootReReadingTaskId = await _visitTaskReReadingRepository.Where(t => t.OriginalReReadingTaskId == reReadingVisitTask.Id).Select(u => u.RootReReadingTaskId).FirstOrDefaultAsync(); + var rootReReadingTaskId = await _visitTaskReReadingRepository.Where(t => t.NewReReadingTaskId == reReadingVisitTask.Id).Select(u => u.RootReReadingTaskId).FirstOrDefaultAsync(); @@ -457,7 +457,7 @@ namespace IRaCIS.Core.Application.Service SubjectId = item.SubjectId, IsUrgent = item.IsUrgent, TaskName = item.ReadingName, - ArmEnum = Arm.SingleReadingArm, //特殊 + ArmEnum = Arm.TumorArm, //特殊 Code = currentMaxCodeInt + 1, SouceReadModuleId = item.ReadModuleId, TaskBlindName = item.ReadingName, diff --git a/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs b/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs index e5eaaaccf..9eda82931 100644 --- a/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs +++ b/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs @@ -48,7 +48,9 @@ namespace IRaCIS.Core.Domain.Share DoubleReadingArm2 = 2, - JudgeArm = 3 + JudgeArm = 3, + + TumorArm=4, } ///