diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 135cbb369..5ea2722d2 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -2150,7 +2150,7 @@ 新增或修改系统医学审核问题 - + @@ -2178,7 +2178,7 @@ 新增或修改项目医学审核问题 - + diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs index 7f2d205d1..2a0d3d933 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs @@ -66,7 +66,7 @@ namespace IRaCIS.Core.Application.ViewModel public class AssignMedicalReviewTaskCommand { - public Guid Id { get; set; } + public List IdList { get; set; } public Guid? MedicalManagerUserId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs index ff84add3f..225db36d2 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs @@ -211,20 +211,25 @@ namespace IRaCIS.Core.Application.Service public async Task AssignMedicalReviewTask(AssignMedicalReviewTaskCommand command) { - var task = await _taskMedicalReviewRepository.FirstOrDefaultAsync(t => t.Id == command.Id); - - if (command.TaskOptType == MedicalReviewTaskOptType.Assign || command.TaskOptType == MedicalReviewTaskOptType.ReAssign) + foreach (var id in command.IdList) { - task.MedicalManagerUserId = command.MedicalManagerUserId; - task.AllocateTime = DateTime.Now; + var task = await _taskMedicalReviewRepository.FirstOrDefaultAsync(t => t.Id == id); + if (command.TaskOptType == MedicalReviewTaskOptType.Assign || command.TaskOptType == MedicalReviewTaskOptType.ReAssign) + { + task.MedicalManagerUserId = command.MedicalManagerUserId; + task.AllocateTime = DateTime.Now; + + } + + else if (command.TaskOptType == MedicalReviewTaskOptType.CancelAssign) + { + task.MedicalManagerUserId = null; + task.AllocateTime = null; + } } - else if (command.TaskOptType == MedicalReviewTaskOptType.CancelAssign) - { - task.MedicalManagerUserId = null; - task.AllocateTime = null; - } + await _taskMedicalReviewRepository.SaveChangesAsync(); diff --git a/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs b/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs index c07a23129..7a4be464e 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs @@ -19,8 +19,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common public static Dictionary TaskNumDic = new Dictionary() { {ReadingCategory.Visit,0 }, - {ReadingCategory.Global,0.01 }, - {ReadingCategory.Judge,0.001 }, + {ReadingCategory.Global,0.03 }, + {ReadingCategory.Judge,0.02 }, {ReadingCategory.ReReading,0 }, {ReadingCategory.Oncology,0 },