IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs

@@ -223,8 +223,6 @@ namespace IRaCIS.Core.Application.Service
 
                 List<Guid> readModuleIds = await _readModuleRepository.Where(x => x.ReadingPeriodSetId == indto.Id).Select(x => x.Id).ToListAsync();
 
-                List<Guid> visitIds=await _readingPeriodPlanRepository.Where(x => x.ReadingPeriodSetId == indto.Id).Select(x => x.SubjectVisitId).ToListAsync();
-
                 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))
@@ -233,20 +231,6 @@ namespace IRaCIS.Core.Application.Service
                     throw new BusinessValidationFailedException(_localizer["ReadingPeriodSet_TaskCompletedCannotRevoke"]);
                 }
 
-                var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == readingPeriodSet.TrialReadingCriterionId).FirstNotNullAsync();
-
-                //产生了  阅片期裁判任务 并且完成了
-                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) )
-                {
-                    //---当前标准阅片已生成任务并且阅片完成,撤销失败。
-                    throw new BusinessValidationFailedException(_localizer["ReadingPeriodSet_TaskCompletedCannotRevoke"]);
-                }
-
-
 
                 await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.TrialReadingCriterionId == readingPeriodSet.TrialReadingCriterionId && readModuleIds.Contains(x.SouceReadModuleId ?? default(Guid)), x => new VisitTask()
                 {

IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs

@@ -754,7 +754,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                     tableRowAnswers.ForEach(x =>
                     {
-                        var rowinfo= tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).FirstOrDefault();
                         x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).Select(y => y.Id).FirstOrDefault();
                         x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).Select(y => y.Id).FirstOrDefault();
 

IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs

@@ -116,12 +116,7 @@ public class ReadingQuestionCriterionTrial : BaseAddAuditEntity
 
     [Comment("是否签名")]
     public bool IsSigned { get; set; } = false;
-
-    /// <summary>
-    /// 裁判
-    /// </summary>
     [Comment("仲裁阅片")]
-    
     public bool IsArbitrationReading { get; set; } = true;
     [Comment("肿瘤学阅片  原字段 IsClinicalReading")]
     public bool IsOncologyReading { get; set; }