diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index a560d8afa..bc043cdb5 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -95,7 +95,7 @@ namespace IRaCIS.Core.Application.Service.Common RemoveTime = t.TrialUser.RemoveTime, //角色授权禁用时间 - RoleIsDeleted=t.IsDeleted, + RoleIsDeleted = t.IsDeleted, CreateTime = t.CreateTime, DeletedTime = t.DeletedTime, }).OrderBy(t => t.UserRealName) @@ -2112,8 +2112,6 @@ 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) @@ -2150,29 +2148,6 @@ namespace IRaCIS.Core.Application.Service.Common } - //if (criterion.CriterionType == CriterionType.RECIST1Point1 || criterion.CriterionType == CriterionType.RECIST1Pointt1_MB) - //{ - // list.Add(new ExportDocumentDes() { Code = StaticData.Export.OverallTumorEvaluation_Export, ExportCatogory = ExportCatogory.OverallTumorEvaluation }); - // list.Add(new ExportDocumentDes() { Code = StaticData.Export.RECIST1Point1EvaluationOfTumorEfficacy_Export, ExportCatogory = ExportCatogory.EvaluationOfTumorEfficacy }); - // list.Add(new ExportDocumentDes() { Code = StaticData.Export.RECIST1Point1DetailedOfEvaluatedLesion_Export, ExportCatogory = ExportCatogory.DetailedOfEvaluatedLesion }); - //} - - //else if (criterion.CriterionType == CriterionType.PCWG3) - //{ - // list.Add(new ExportDocumentDes() { Code = StaticData.Export.OverallTumorEvaluation_Export, ExportCatogory = ExportCatogory.OverallTumorEvaluation }); - // list.Add(new ExportDocumentDes() { Code = StaticData.Export.PCWG3Point1DetailedOfEvaluatedLesion_Export, ExportCatogory = ExportCatogory.DetailedOfEvaluatedLesion }); - //} - //else if (criterion.CriterionType == CriterionType.IRECIST1Point1) - //{ - // list.Add(new ExportDocumentDes() { Code = StaticData.Export.OverallTumorEvaluation_Export, ExportCatogory = ExportCatogory.OverallTumorEvaluation }); - // list.Add(new ExportDocumentDes() { Code = StaticData.Export.IRECIST1Point1EvaluationOfTumorEfficacy_Export, ExportCatogory = ExportCatogory.DetailedOfEvaluatedLesion }); - //} - //else if (criterion.CriterionType == CriterionType.Lugano2014) - //{ - // list.Add(new ExportDocumentDes() { Code = StaticData.Export.OverallTumorEvaluation_Export, ExportCatogory = ExportCatogory.OverallTumorEvaluation }); - // list.Add(new ExportDocumentDes() { Code = StaticData.Export.Lugano2014EvaluationOfTumorEfficacy_Export, ExportCatogory = ExportCatogory.DetailedOfEvaluatedLesion }); - //} - var result = _commonDocumentRepository.Where(t => list.Select(c => c.Code).Contains(t.Code)).Select(c => new ExportDocumentDes() { Code = c.Code, FileName = _userInfo.IsEn_Us ? c.Name : c.NameCN }).ToList(); foreach (var item in list) @@ -2279,10 +2254,13 @@ namespace IRaCIS.Core.Application.Service.Common } - - if (inQuery.ReadingExportType == ExportResult.TableOfAssessmentResults || - inQuery.ReadingExportType == ExportResult.DetailedTableOfAssessmentResults || - inQuery.ReadingExportType == ExportResult.DetailedTableOfAdjudicationResults + // 肿瘤标准 按照任务级别 + 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) ) { @@ -2296,10 +2274,16 @@ namespace IRaCIS.Core.Application.Service.Common trialReadingCriterionId = inQuery.TrialReadingCriterionId, isEn_Us = _userInfo.IsEn_Us }).ToListAsync(); + } - //病灶明细表 斑块表 需要单独处理 - else if (inQuery.ReadingExportType == ExportResult.DetailedTableOfLesions || - inQuery.ReadingExportType == ExportResult.OCT_ReadingLession_Export) + //肿瘤标准 病灶明细表 按照病灶级别 (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) + ) || inQuery.ReadingExportType == ExportResult.OCT_ReadingLession_Export + ) { var taskList = await query.ProjectTo(_mapper.ConfigurationProvider, @@ -2398,7 +2382,8 @@ namespace IRaCIS.Core.Application.Service.Common } } - else if (inQuery.ReadingExportType == ExportResult.CDISC) + // CDISC 导出 和自定义导出 都会配置到表格问题层级,随意配置,所见即所得 + else /*if (inQuery.ReadingExportType == ExportResult.CDISC)*/ { // 配置在外层问题 或者表格问题上 var taskList = await query.ProjectTo(_mapper.ConfigurationProvider, diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 58f5c0a80..efb07078d 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -1250,11 +1250,6 @@ namespace IRaCIS.Core.Application.Contracts public class CommonLessionExport : CommonEvaluationExport { - ///// - ///// 最终导出的病灶信息 - ///// - //public List LessionAnswerList { get; set; } - [JsonIgnore] public List LesionList { get; set; } = new List(); diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index cdda6dc76..56017d2ef 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -420,7 +420,6 @@ namespace IRaCIS.Core.Domain.Share /// None = 0, - /// /// /// 阅片结果表 ///