From a4396c07d99cf6563431faca8d246fe2ddb45a48 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 15 Feb 2023 11:40:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=AF=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/ExcelExportService.cs | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 981fed1c8..7ca77e695 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -640,6 +640,23 @@ namespace IRaCIS.Core.Application.Service.Common public string Code { get; set; } public string FileName { get; set; } + + public ExportCatogory ExportCatogory { get;set; } + } + + + public enum ExportCatogory + { + // 整体肿瘤评估 + OverallTumorEvaluation =1, + + //肿瘤疗效评估 + EvaluationOfTumorEfficacy = 2, + + //评估病灶明细 + DetailedOfEvaluatedLesion = 3, + + } /// @@ -650,19 +667,24 @@ namespace IRaCIS.Core.Application.Service.Common public async Task> GetTrialReadingCriterionCanExportDocumentList(Guid trialReadingCriterionId) { - var list = new List(); + var list = new List(); var criterionType = await _repository.Where(t => t.Id == trialReadingCriterionId).Select(t => t.CriterionType).FirstOrDefaultAsync(); if (criterionType == CriterionType.RECIST1Pointt1) { - list.Add(StaticData.Export.OverallTumorEvaluation_Export); - list.Add(StaticData.Export.RECIST1Point1EvaluationOfTumorEfficacy_Export); - list.Add(StaticData.Export.RECIST1Point1DetailedOfEvaluatedLesion_Export); + 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 }); } - var result = _repository.Where(t => list.Contains(t.Code)).Select(c => new ExportDocumentDes() { Code = c.Code, FileName = c.Name }).ToList(); + var result = _repository.Where(t => list.Select(c=>c.Code).Contains(t.Code)).Select(c => new ExportDocumentDes() { Code = c.Code, FileName = c.Name }).ToList(); - return result; + foreach (var item in list) + { + item.FileName = result.Where(t => t.Code == item.Code).FirstOrDefault()?.FileName; + } + + return list; }