From 9fbee7e0c97a01b156e9d96482d2bbc99305bda3 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 10 Nov 2025 14:16:06 +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 --- .../Reading/ReadingPeriod/ReadingPeriodSetService.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs index a9e12f96a..1f1ecca50 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs @@ -227,7 +227,8 @@ namespace IRaCIS.Core.Application.Service if (await _visitTaskRepository.AnyAsync(x => x.TrialReadingCriterionId == readingPeriodSet.TrialReadingCriterionId && readModuleIds.Contains(x.SouceReadModuleId ?? default(Guid)) && x.TrialReadingCriterionId == readingPeriodSet.TrialReadingCriterionId - && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect)) + //&& x.ReadingTaskState == ReadingTaskState.HaveSigned + && x.TaskState == TaskState.Effect)) { //---当前标准阅片已生成任务并且阅片完成,撤销失败。 throw new BusinessValidationFailedException(_localizer["ReadingPeriodSet_TaskCompletedCannotRevoke"]); @@ -239,8 +240,9 @@ namespace IRaCIS.Core.Application.Service if ( criterionInfo.IsArbitrationReading&& criterionInfo.ArbitrationRule== ArbitrationRule.Reading && await _visitTaskRepository.AnyAsync(x => x.TrialReadingCriterionId == readingPeriodSet.TrialReadingCriterionId && visitIds.Contains(x.SourceSubjectVisitId ?? default(Guid)) && x.TrialReadingCriterionId == readingPeriodSet.TrialReadingCriterionId - && x.ReadingCategory== ReadingCategory.Judge - && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect) ) + && x.ReadingCategory== ReadingCategory.Judge && + // x.ReadingTaskState == ReadingTaskState.HaveSigned && + x.TaskState == TaskState.Effect) ) { //---当前标准阅片已生成任务并且阅片完成,撤销失败。 throw new BusinessValidationFailedException(_localizer["ReadingPeriodSet_TaskCompletedCannotRevoke"]); @@ -712,8 +714,8 @@ namespace IRaCIS.Core.Application.Service SiteIds = inDto.SiteIds, }); - if (await _readingPeriodSetRepository.AnyAsync(x => x.Id != inDto.TrialReadingCriterionId && x.IsTakeEffect != ReadingPeriodStatus.Revocation - && x.TrialId == inDto.TrialId && x.ReadingPeriodName == inDto.ReadingPeriodName && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId)) + if (await _readingPeriodSetRepository.AnyAsync(x => x.Id != inDto.ReadingPeriodSetId && x.IsTakeEffect != ReadingPeriodStatus.Revocation + && x.TrialId == inDto.TrialId && x.ReadingPeriodName == inDto.ReadingPeriodName && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId)) { throw new BusinessValidationFailedException(_localizer["ReadingPeriodSet_NameDup"]);