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

@@ -67,7 +67,7 @@ namespace IRaCIS.Core.Application.Service
 
             var resultlist = await visitQuery.WhereIf(finalVisitNum != null && finalVisitNum != 0, x => x.VisitNum <= finalVisitNum)
                  .Where(x => x.VisitNum > mixReadVisitNum|| x.VisitNum==thisVisitNum)
-                 //.Where(x => !x.IsBaseLine) // 排除基线
+                 .Where(x => !x.IsBaseLine) // 排除基线
                  .WhereIf(inDto.ReadingSetType == ReadingSetType.TumorReading, x => readModulequery.Where(y => y.SubjectVisitId == x.Id && y.TrialReadingCriterionId == inDto.TrialReadingCriterionId && y.ReadingSetType == ReadingSetType.ImageReading).Count() > 0)
                  .WhereIf(inDto.ReadingSetType == ReadingSetType.ImageReading, x => readModulequery.Where(y => y.Id != inDto.Id && y.SubjectVisitId == x.Id && y.TrialReadingCriterionId == inDto.TrialReadingCriterionId && y.ReadingSetType == ReadingSetType.ImageReading).Count() == 0)
                  .Select(x => new GetSubjectReadVisitsOutDto()
@@ -97,29 +97,6 @@ namespace IRaCIS.Core.Application.Service
                 throw new BusinessValidationFailedException(_localizer["ReadModule_CRCConfirmCanNtoEdit"]);
             }
 
-            var readModule = await _readModuleRepository.Where(x => x.Id == inDto.Id).FirstNotNullAsync();
-
-            var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == readModule.TrialReadingCriterionId).Select(x => new
-            {
-                x.ReadingType,
-                x.IsArbitrationReading,
-                x.IsReadingPeriod,
-                x.ArbitrationRule,
-                x.IsGlobalReading,
-                x.IsOncologyReading,
-            }).FirstNotNullAsync();
-
-            // 如果生成了 访视级别的阅片期裁判 不让修改
-            if (criterionInfo.IsArbitrationReading && criterionInfo.IsReadingPeriod && !criterionInfo.IsGlobalReading && criterionInfo.ArbitrationRule == ArbitrationRule.Reading)
-            {
-                if (await _visitTaskRepository.AnyAsync(x => x.SourceSubjectVisitId == readModule.SubjectVisitId && x.ReadingCategory == ReadingCategory.Judge))
-                {
-                    //---当前阅片已生成裁判任务,操作失败。
-                    throw new BusinessValidationFailedException(_localizer["ReadModule_JudgeTaskGenerated"]);
-                }
-            }
-
-
             await _readModuleRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.Id, x => new ReadModule()
             {
                 SubjectVisitId = inDto.SubjectVisitIdId,
@@ -1101,15 +1078,6 @@ namespace IRaCIS.Core.Application.Service
 
             var readModule = await _readModuleRepository.Where(x => x.Id == readModuleId).FirstNotNullAsync();
 
-            var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == readModule.TrialReadingCriterionId).Select(x => new
-            {
-                x.ReadingType,
-                x.IsArbitrationReading,
-                x.IsReadingPeriod,
-                x.ArbitrationRule,
-                x.IsGlobalReading,
-                x.IsOncologyReading,
-            }).FirstNotNullAsync();
 
             if (await _readingClinicalDataRepository.Where(t => t.ReadingId == readModuleId).AnyAsync(t => t.ReadingClinicalDataState == ReadingClinicalDataStatus.HaveSigned))
             {
@@ -1138,17 +1106,6 @@ namespace IRaCIS.Core.Application.Service
                 throw new BusinessValidationFailedException(_localizer["ReadModule_TaskGenerated"]);
             }
 
-            // 如果生成了 访视级别的阅片期裁判 不让删除
-            if (criterionInfo.IsArbitrationReading && criterionInfo.IsReadingPeriod && !criterionInfo.IsGlobalReading && criterionInfo.ArbitrationRule == ArbitrationRule.Reading)
-            {
-                if (await _visitTaskRepository.AnyAsync(x => x.SourceSubjectVisitId == readModule.SubjectVisitId && x.ReadingCategory == ReadingCategory.Judge))
-                {
-                    //---当前阅片已生成裁判任务,操作失败。
-                    throw new BusinessValidationFailedException(_localizer["ReadModule_JudgeTaskGenerated"]);
-                }
-            }
-
-
 
             await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => readModuleId == x.SouceReadModuleId, x => new VisitTask()
             {