XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改导表配置完成
continuous-integration/drone/push Build is passing Details

Temp_Event_IRC_Met8
hang 2025-01-15 22:48:54 +08:00
parent fc70ec7ad0
commit 9d6cdd5711
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
View File

@ -2427,25 +2427,27 @@ namespace IRaCIS.Core.Application.Service.Common
|| criterion.CriterionType == CriterionType.IRECIST1Point1 || criterion.CriterionType == CriterionType.Lugano2014 || criterion.CriterionType == CriterionType.Lugano2014WithoutPET) || 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 ID" : "病灶编号");
extralNameList.Add(_userInfo.IsEn_Us ? "Lesion Type" : "病灶类型"); extralNameList.Add(_userInfo.IsEn_Us ? "Lesion Type" : "病灶类型");
} }
} }
else if (criterion.CriterionType == CriterionType.PCWG3) else if (criterion.CriterionType == CriterionType.PCWG3)
{ {
if (inQuery.ReadingExportType == ExportResult.DetailedTableOfLesions) //if (inQuery.ReadingExportType == ExportResult.DetailedTableOfLesions)
{ {
extralNameList.Add(_userInfo.IsEn_Us ? "Lesion Type" : "病灶类型"); extralNameList.Add(_userInfo.IsEn_Us ? "Lesion Type" : "病灶类型");
} }
} }
//肿瘤评估标准目前是去重
var tableNameList = trialConfigTableQuestionList.Select(t => t.QuestionName).Distinct().ToList(); 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 扩展病灶 #region 扩展病灶
@ -2562,11 +2564,26 @@ namespace IRaCIS.Core.Application.Service.Common
//非肿瘤的 问题名称是 表格名称_表格子问题名 //非肿瘤的 问题名称是 表格名称_表格子问题名
else else
{ {
var extralNameList = new List<string>() { _userInfo.IsEn_Us ? "Table Name" : "表格名称" }; //多表格问题
if (trialConfigTableQuestionList.Select(t => t.QuestionName).Distinct().Count() > 1)
{
var extralNameList = new List<string>() { _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 扩展病灶 #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 #endregion
dynamicColumnConfig = new DynamicColumnConfig() dynamicColumnConfig = new DynamicColumnConfig()