From 9d6cdd5711dd87ddd4bc5b6424ac356e67d00501 Mon Sep 17 00:00:00 2001 From: hang <87227557@qq.com> Date: Wed, 15 Jan 2025 22:48:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=A1=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/ExcelExportService.cs | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 8a1a2ae58..5aa0ff062 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -2427,25 +2427,27 @@ namespace IRaCIS.Core.Application.Service.Common || criterion.CriterionType == CriterionType.IRECIST1Point1 || criterion.CriterionType == CriterionType.Lugano2014 || criterion.CriterionType == CriterionType.Lugano2014WithoutPET) { - if(inQuery.ReadingExportType == ExportResult.DetailedTableOfLesions) + //if(inQuery.ReadingExportType == ExportResult.DetailedTableOfLesions) { extralNameList.Add(_userInfo.IsEn_Us ? "Lesion ID" : "病灶编号"); extralNameList.Add(_userInfo.IsEn_Us ? "Lesion Type" : "病灶类型"); } - + } else if (criterion.CriterionType == CriterionType.PCWG3) { - if (inQuery.ReadingExportType == ExportResult.DetailedTableOfLesions) + //if (inQuery.ReadingExportType == ExportResult.DetailedTableOfLesions) { extralNameList.Add(_userInfo.IsEn_Us ? "Lesion Type" : "病灶类型"); } } + //肿瘤评估标准目前是去重 var tableNameList = trialConfigTableQuestionList.Select(t => t.QuestionName).Distinct().ToList(); - configCoumNameList = fistLeveLNameList.Union(extralNameList).Union(tableNameList).ToList(); + //有表格问题 那么就是三部分，否则就是外层问题 + configCoumNameList = tableNameList.Count == 0 ? fistLeveLNameList : fistLeveLNameList.Union(extralNameList).Union(tableNameList).ToList(); #region 扩展病灶 @@ -2562,11 +2564,26 @@ namespace IRaCIS.Core.Application.Service.Common //非肿瘤的 问题名称是 表格名称_表格子问题名 else { - var extralNameList = new List() { _userInfo.IsEn_Us ? "Table Name" : "表格名称" }; + //多表格问题 + if (trialConfigTableQuestionList.Select(t => t.QuestionName).Distinct().Count() > 1) + { + var extralNameList = new List() { _userInfo.IsEn_Us ? "Table Name" : "表格名称" }; + + var tableNameList = trialConfigTableQuestionList.Select(t => t.TableName + "_" + t.QuestionName).ToList(); + + configCoumNameList = fistLeveLNameList.Union(extralNameList).Union(tableNameList).ToList(); + } + else + { + //单表格问题(直接用表格问题名称) 或者没有表格问题 + + var tableNameList = trialConfigTableQuestionList.Select(t => t.QuestionName).Distinct().ToList(); + + configCoumNameList = fistLeveLNameList.Union(tableNameList).ToList(); + } + - var tableNameList = trialConfigTableQuestionList.Select(t => t.TableName + "_" + t.QuestionName).ToList(); - configCoumNameList = fistLeveLNameList.Union(extralNameList).Union(tableNameList).ToList(); #region 扩展病灶 @@ -2614,23 +2631,6 @@ namespace IRaCIS.Core.Application.Service.Common } - #region 多个表格问题 单个表格问题 - ////有多个表格问题 - //if (trialConfigTableQuestionList.Select(t => t.TableName).Distinct().Count() > 1) - //{ - - - //} - ////单个表格，或者没有配置表格 直接用表格问题名称 - //else - //{ - // var tableNameList = trialConfigTableQuestionList.Select(t => t.QuestionName).ToList(); - - // configCoumNameList = fistLeveLNameList.Union(tableNameList).ToList(); - //} - #endregion - - #endregion dynamicColumnConfig = new DynamicColumnConfig()