diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj index af73d1f81..d7992506c 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj +++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj @@ -6,6 +6,10 @@ 354572d4-9e15-4099-807c-63a2d29ff9f2 default Linux + 1.0.1.001 + 上海展影医疗科技有限公司 + IRC影像系统 (EICS) + 上海展影医疗科技有限公司版权所有 diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 995f3a804..5573d0288 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -1365,11 +1365,11 @@ namespace IRaCIS.Core.Application.Service.Allocation Expression> filterExpression = t => t.TrialId == task.TrialId && t.SubjectId == task.SubjectId && t.TaskState == TaskState.Effect && t.TrialReadingCriterionId == task.TrialReadingCriterionId - && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.DoctorUserId == task.DoctorUserId && t.IsAnalysisCreate == false && t.VisitTaskNum > task.VisitTaskNum; + && t.DoctorUserId == task.DoctorUserId && t.IsAnalysisCreate == false && t.VisitTaskNum > task.VisitTaskNum; - if (task.ReadingCategory == ReadingCategory.Judge && await _visitTaskRepository.AnyAsync(filterExpression.And(t => t.ReadingCategory == ReadingCategory.Global))) + if (task.ReadingCategory == ReadingCategory.Global && await _visitTaskRepository.AnyAsync(filterExpression.And(t => t.ReadingCategory == ReadingCategory.Global))) { //---有序阅片,只允许申请该受试者阅片人最后一次完成全局任务重阅 throw new BusinessValidationFailedException(_localizer["VisitTask_LastReading"]); @@ -1568,8 +1568,6 @@ namespace IRaCIS.Core.Application.Service.Allocation // { // ReReadingApplyState = ReReadingApplyState.Agree // }); - - #endregion // 不管有序 无序 都会 回退访视 @@ -1896,8 +1894,8 @@ namespace IRaCIS.Core.Application.Service.Allocation trakingOrigenalTask?.TaskInfluenceList.Add(new TaskInfluence() { InfluenceTaskId = influenceTask.Id, OptType = ReReadingOrBackOptType.Abandon }); } - // 影响的任务 仅仅访视类别的才生成 - if (influenceTask.ReadingCategory == ReadingCategory.Visit) + // 影响的任务 仅仅访视类别的才生成 或者就是IR 申请的任务 + if (influenceTask.ReadingCategory == ReadingCategory.Visit || influenceTask.Id == origenalTask.Id) { @@ -2060,7 +2058,7 @@ namespace IRaCIS.Core.Application.Service.Allocation } - if (influenceTask.ReadingCategory == ReadingCategory.Visit) + if (influenceTask.ReadingCategory == ReadingCategory.Visit || influenceTask.Id == origenalTask.Id) { await _visitTaskCommonService.AddTaskAsync(new GenerateTaskCommand() {