From 7885cd151a84adb5c522918427a7ecd73682515e Mon Sep 17 00:00:00 2001
From: hang <87227557@qq.com>
Date: Tue, 21 Jan 2025 22:54:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 14 ++++
.../Service/Common/ExcelExportService.cs | 70 +++++++++----------
2 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 2c7525ff9..07e7bc1c8 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -102,6 +102,20 @@
Excel Title Name
+
+
+ 暂时废弃--合并到上面
+
+
+
+
+
+
+
+
+
+
+
导出文件模板
diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
index cad7b972b..0860e05a1 100644
--- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
@@ -2347,21 +2347,21 @@ namespace IRaCIS.Core.Application.Service.Common
GroupName = _userInfo.IsEn_Us ? t.GroupInfo.GroupEnName : t.GroupInfo.GroupName
}).ToList();
- //外层问题有重复，针对重复的加上组名
- foreach (var item in trialConfigQuestionList.GroupBy(t => t.QuestionName).Where(g => g.Count() > 1))
- {
- var qName = item.Key;
+ #region 外层问题有重复，针对重复的加上组名
- foreach (var configQuestion in trialConfigQuestionList)
- {
- if (configQuestion.QuestionName == qName)
- {
- configQuestion.QuestionName = $"{configQuestion.GroupName}_{configQuestion.QuestionName}";
- }
- }
-
- }
+ //foreach (var item in trialConfigQuestionList.GroupBy(t => t.QuestionName).Where(g => g.Count() > 1))
+ //{
+ // var qName = item.Key;
+ // foreach (var configQuestion in trialConfigQuestionList)
+ // {
+ // if (configQuestion.QuestionName == qName)
+ // {
+ // configQuestion.QuestionName = $"{configQuestion.GroupName}_{configQuestion.QuestionName}";
+ // }
+ // }
+ //}
+ #endregion
if (inQuery.ReadingExportType != ExportResult.CDISC)
@@ -2384,13 +2384,15 @@ namespace IRaCIS.Core.Application.Service.Common
TranslateDicName = t.DictionaryCode
}).ToList();
- #region 外层问题 可能存在合并
+
var fistLeveLNameList = new List();
//肿瘤评估，非CDISC 导出
if (criterion.CriterionGroup == CriterionGroup.Tumor)
{
+ #region 外层问题处理
+
if (criterion.CriterionType == CriterionType.RECIST1Point1 || criterion.CriterionType == CriterionType.RECIST1Pointt1_MB || criterion.CriterionType == CriterionType.IRECIST1Point1)
{
@@ -2424,30 +2426,13 @@ namespace IRaCIS.Core.Application.Service.Common
}
+ #endregion
+
var exTralDicNameList = new List() { "LesionType" };
translateDicNameList = trialConfigQuestionList.Union(trialConfigTableQuestionList).Where(t => t.TranslateDicName.IsNotNullOrEmpty()).Select(t => t.TranslateDicName).Union(exTralDicNameList).Distinct().ToList();
- }
- else
- //非肿瘤评估，非CDISC 导出
- {
- fistLeveLNameList = trialConfigQuestionList.Select(t => new DynamicColumnConfig.ColumItem()
- {
- Id = t.QuestionId,
- Name = t.QuestionName
- }).ToList();
- translateDicNameList = trialConfigQuestionList.Union(trialConfigTableQuestionList).Where(t => t.TranslateDicName.IsNotNullOrEmpty()).Select(t => t.TranslateDicName).Distinct().ToList();
-
- }
-
- #endregion
-
- #region 表格问题 处理增加列
-
- //肿瘤 表格问题直接去重、同时添加一些列 外层问题合并一些列
- if (criterion.CriterionGroup == CriterionGroup.Tumor)
- {
+ #region 表格问题处理 肿瘤 表格问题直接去重、同时添加一些列
var extralNameList = new List();
if (criterion.CriterionType == CriterionType.RECIST1Point1 || criterion.CriterionType == CriterionType.RECIST1Pointt1_MB
@@ -2587,10 +2572,21 @@ namespace IRaCIS.Core.Application.Service.Common
#endregion
+ #endregion
}
- //非肿瘤的 问题名称是 表格名称_表格子问题名
else
+ //非肿瘤评估，非CDISC 导出
{
+ //外层问题处理
+ fistLeveLNameList = trialConfigQuestionList.Select(t => new DynamicColumnConfig.ColumItem()
+ {
+ Id = t.QuestionId,
+ Name = t.QuestionName
+ }).ToList();
+
+ translateDicNameList = trialConfigQuestionList.Union(trialConfigTableQuestionList).Where(t => t.TranslateDicName.IsNotNullOrEmpty()).Select(t => t.TranslateDicName).Distinct().ToList();
+
+ #region 表格问题处理 问题名称是 表格名称_表格子问题名
var isMutiTable = trialConfigTableQuestionList.Select(t => t.TableName).Distinct().Count() > 1;
@@ -2673,10 +2669,10 @@ namespace IRaCIS.Core.Application.Service.Common
#endregion
+ #endregion
}
- #endregion
dynamicColumnConfig = new DynamicColumnConfig()
{
@@ -2690,7 +2686,7 @@ namespace IRaCIS.Core.Application.Service.Common
DynamicListName = "QuestionAnswerList",
RemoveColunmIndexList = removeColumnIndexList,
ColumnIdNameList = configCoumNameList,
- CDISCList=new List(),
+ CDISCList = new List(),
TranslateDicNameList = translateDicNameList
};