diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 9d0e2636a..d93fe8f6e 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -2546,7 +2546,7 @@ namespace IRaCIS.Core.Application.Service.Common QuestionName = _userInfo.IsEn_Us ? t.QuestionEnName : t.QuestionName, CDISCCode = t.CDISCCode, TranslateDicName = t.DictionaryCode - }).ToList(); + }).Distinct().ToList(); @@ -2854,7 +2854,10 @@ namespace IRaCIS.Core.Application.Service.Common TranslateDicNameList = translateDicNameList }; - + if(export_Template == StaticData.Export.ReadingLession_Export) + { + dynamicColumnConfig.TempalteLastColumnIndex = 8; + } } @@ -2916,7 +2919,7 @@ namespace IRaCIS.Core.Application.Service.Common list = DealOncologyResult(_oncologyRepository, criterion.IsOncologyReading, list); //裁判阅片明细表 处理完标记后处理 - if (export_Template == StaticData.Export.CommonJudgeReadingDetail_Export) + if (export_Template == StaticData.Export.CommonJudgeReadingDetail_Export || export_Template == StaticData.Export.CommonJudgeReadingDetail_Export) { //裁判产生标记为空的数据过滤掉 list = list.Where(t => t.IsTrigerJudge != null).ToList();