diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index bc043cdb5..4cd597ad8 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -2099,7 +2099,7 @@ namespace IRaCIS.Core.Application.Service.Common var list = new List(); - var criterion = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == trialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName, t.ArbitrationRule, t.IsArbitrationReading }).FirstNotNullAsync(); + var criterion = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == trialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionGroup, t.CriterionName, t.ArbitrationRule, t.IsArbitrationReading }).FirstNotNullAsync(); list.Add(new ExportDocumentDes() { Code = StaticData.Export.CommonReading_Export, ExportCatogory = ExportResult.TableOfAssessmentResults }); @@ -2112,9 +2112,7 @@ namespace IRaCIS.Core.Application.Service.Common } - if (criterion.CriterionType == CriterionType.RECIST1Point1 || criterion.CriterionType == CriterionType.RECIST1Pointt1_MB - || criterion.CriterionType == CriterionType.IRECIST1Point1 || criterion.CriterionType == CriterionType.Lugano2014 - || criterion.CriterionType == CriterionType.Lugano2014WithoutPET || criterion.CriterionType == CriterionType.PCWG3) + if (criterion.CriterionGroup == CriterionGroup.Tumor) { list.Add(new ExportDocumentDes() { Code = StaticData.Export.ReadingLession_Export, ExportCatogory = ExportResult.DetailedTableOfLesions }); } @@ -2172,7 +2170,7 @@ namespace IRaCIS.Core.Application.Service.Common [FromServices] IRepository _trialRepository) { //每次查询必须是单标准的 - var criterion = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == inQuery.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.IsGlobalReading, t.IsArbitrationReading, t.CriterionName, t.ArbitrationRule }).FirstNotNullAsync(); + var criterion = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == inQuery.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionGroup, t.IsGlobalReading, t.IsArbitrationReading, t.CriterionName, t.ArbitrationRule }).FirstNotNullAsync(); var query = _visitTaskRepository.Where(t => t.TrialId == inQuery.TrialId && t.IsAnalysisCreate == false && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze)) @@ -2258,9 +2256,7 @@ namespace IRaCIS.Core.Application.Service.Common if ((inQuery.ReadingExportType == ExportResult.TableOfAssessmentResults || inQuery.ReadingExportType == ExportResult.DetailedTableOfAssessmentResults || inQuery.ReadingExportType == ExportResult.DetailedTableOfAdjudicationResults) && - (criterion.CriterionType == CriterionType.RECIST1Point1 || criterion.CriterionType == CriterionType.IRECIST1Point1 - || criterion.CriterionType == CriterionType.RECIST1Pointt1_MB || criterion.CriterionType == CriterionType.PCWG3 || - criterion.CriterionType == CriterionType.Lugano2014 || criterion.CriterionType == CriterionType.Lugano2014WithoutPET) + (criterion.CriterionGroup == CriterionGroup.Tumor) ) { @@ -2279,9 +2275,7 @@ namespace IRaCIS.Core.Application.Service.Common //肿瘤标准 病灶明细表 按照病灶级别 (OCT 暂时不删除,先看是否能覆盖) else if ( (inQuery.ReadingExportType == ExportResult.DetailedTableOfLesions && - (criterion.CriterionType == CriterionType.RECIST1Point1 || criterion.CriterionType == CriterionType.IRECIST1Point1 - || criterion.CriterionType == CriterionType.RECIST1Pointt1_MB || criterion.CriterionType == CriterionType.PCWG3 || - criterion.CriterionType == CriterionType.Lugano2014 || criterion.CriterionType == CriterionType.Lugano2014WithoutPET) + criterion.CriterionGroup == CriterionGroup.Tumor ) || inQuery.ReadingExportType == ExportResult.OCT_ReadingLession_Export ) { diff --git a/IRaCIS.Core.Infra.EFCore/Migrations/20250113065326_CriterionGroup.cs b/IRaCIS.Core.Infra.EFCore/Migrations/20250113065326_CriterionGroup.cs index 053be2f11..7dae81d3f 100644 --- a/IRaCIS.Core.Infra.EFCore/Migrations/20250113065326_CriterionGroup.cs +++ b/IRaCIS.Core.Infra.EFCore/Migrations/20250113065326_CriterionGroup.cs @@ -5,7 +5,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations { /// - public partial class CriterionGroup : Migration + public partial class CriterionGroup11 : Migration { /// protected override void Up(MigrationBuilder migrationBuilder)