From fb478aa5f2dac9dbafea31130f70a0288a1ee2cc Mon Sep 17 00:00:00 2001 From: hang <87227557@qq.com> Date: Tue, 21 Jan 2025 22:23:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=A1=A8=E5=A1=AB?= =?UTF-8?q?=E5=85=85=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FileDocProcess/ExcelExportHelper.cs | 81 ++++++++++++++--- .../IRaCIS.Core.Application.xml | 4 +- .../Service/Common/ExcelExportService.cs | 90 +++++++++++++------ 3 files changed, 136 insertions(+), 39 deletions(-) diff --git a/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs b/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs index 58223c3bf..8baf7789d 100644 --- a/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs +++ b/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs @@ -263,9 +263,9 @@ public static class ExcelExportHelper public List CDISCList { get; set; } = new List(); /// - /// 动态的列名 + /// 动态的列名 如果Id 重复，那么就按照名称填充，否则就按照Id 填充列数据 /// - public List ColumnNameList { get; set; } = new List(); + public List ColumnIdNameList { get; set; } /// /// 动态翻译的字典名 @@ -292,7 +292,18 @@ public static class ExcelExportHelper /// public string DynamicItemTitleName { get; set; } + public string DynamicItemTitleId { get; set; } + public List RemoveColunmIndexList { get; set; } = new List(); + + public class ColumItem + { + public Guid Id { get; set; } + public string Name { get; set; } + } + + public List ColumnIdList => ColumnIdNameList == null ? new List() : ColumnIdNameList.Select(t => t.Id.ToString()).ToList(); + public List ColumnNameList => ColumnIdNameList == null ? new List() : ColumnIdNameList.Select(t => t.Name).ToList(); } @@ -467,8 +478,11 @@ public static class ExcelExportHelper if (dynamicColumnConfig != null) { + var isCdics = dynamicColumnConfig.CDISCList.Count > 0; + var sheet = workbook.GetSheetAt(0); + var cdicsRow = sheet.GetRow(dynamicColumnConfig.AutoColumnTitleRowIndex - 1); var titelRow = sheet.GetRow(dynamicColumnConfig.AutoColumnTitleRowIndex); var templateRow = sheet.GetRow(dynamicColumnConfig.AutoColumnTitleRowIndex + 1); @@ -479,7 +493,7 @@ public static class ExcelExportHelper var beforeDynamicRemoveCount = dynamicColumnConfig.RemoveColunmIndexList.Where(t => t < dynamicColumnConfig.AutoColumnStartIndex).Count(); //动态添加列的数量 - var needAddCount = dynamicColumnConfig.ColumnNameList.Count; + var needAddCount = dynamicColumnConfig.ColumnIdNameList.Count; //原始表 最终索引 var originTotalEndIndex = dynamicColumnConfig.TempalteLastColumnIndex; @@ -521,8 +535,14 @@ public static class ExcelExportHelper //创建新的列 for (int i = originTotalEndIndex; i < originTotalEndIndex + needAddCount; i++) { + titelRow.CreateCell(i + 1); templateRow.CreateCell(i + 1); + + if (isCdics) + { + cdicsRow.CreateCell(i + 1); + } } //移动Title 和下面的模板标识 @@ -542,10 +562,17 @@ public static class ExcelExportHelper for (int i = dynamicColunmStartIndex; i < dynamicColunmStartIndex + needAddCount; i++) { - var name = dynamicColumnConfig.ColumnNameList[i - dynamicColunmStartIndex]; + var name = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].Name; titelRow.GetCell(i).SetCellValue(name); templateRow.GetCell(i).SetCellValue(""); + + if (isCdics) + { + var cdicsCode = dynamicColumnConfig.CDISCList[i - dynamicColunmStartIndex]; + + cdicsRow.GetCell(i).SetCellValue(cdicsCode); + } } } @@ -577,6 +604,9 @@ public static class ExcelExportHelper if (dynamicColumnConfig != null) { + //Excel 列是按照名称填充 还是Id 填充 + var isExcelAddDataWithName = dynamicColumnConfig.ColumnIdNameList.Select(t => t.Id).Distinct().Count() == 1; + var dynamicTranslateDataList = await _dictionaryService.GetBasicDataSelect(dynamicColumnConfig.TranslateDicNameList.ToArray()); // 使用NPOI 进行二次处理 @@ -607,7 +637,17 @@ public static class ExcelExportHelper //var writeIndex = itemList.IndexOf(itemObj) + dynamicColumnConfig.AutoColumnStartIndex; - var writeIndex = dynamicColumnConfig.ColumnNameList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleName].ToString()) + dynamicColumnConfig.AutoColumnStartIndex; + var writeIndex = 0; + + if (isExcelAddDataWithName) + { + writeIndex = dynamicColumnConfig.ColumnNameList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleName].ToString()) + dynamicColumnConfig.AutoColumnStartIndex; + } + else + { + writeIndex = dynamicColumnConfig.ColumnIdList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleId].ToString()) + dynamicColumnConfig.AutoColumnStartIndex; + } + if (itemDicName.IsNotNullOrEmpty()) { @@ -642,7 +682,18 @@ public static class ExcelExportHelper #endregion } - + /// + /// 暂时废弃--合并到上面 + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// public static async Task<(MemoryStream, string)> CDISC_DataExport_Async(string code, ExcelExportInfo data, IRepository _commonDocumentRepository, IWebHostEnvironment _hostEnvironment, IDictionaryService? _dictionaryService = null, Type? translateType = null, CriterionType? criterionType = null, DynamicColumnConfig? dynamicColumnConfig = null) { var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US; @@ -779,7 +830,7 @@ public static class ExcelExportHelper var beforeDynamicRemoveCount = dynamicColumnConfig.RemoveColunmIndexList.Where(t => t < dynamicColumnConfig.AutoColumnStartIndex).Count(); //动态添加列的数量 - var needAddCount = dynamicColumnConfig.ColumnNameList.Count; + var needAddCount = dynamicColumnConfig.ColumnIdNameList.Count; //原始表 最终索引 var originTotalEndIndex = dynamicColumnConfig.TempalteLastColumnIndex; @@ -843,9 +894,9 @@ public static class ExcelExportHelper for (int i = dynamicColunmStartIndex; i < dynamicColunmStartIndex + needAddCount; i++) { - var name = dynamicColumnConfig.ColumnNameList[i - dynamicColunmStartIndex]; + var name = dynamicColumnConfig.ColumnIdNameList[i - dynamicColunmStartIndex].Name; - var cdicsCode= dynamicColumnConfig.CDISCList[i - dynamicColunmStartIndex]; + var cdicsCode = dynamicColumnConfig.CDISCList[i - dynamicColunmStartIndex]; cdicsRow.GetCell(i).SetCellValue(cdicsCode); titelRow.GetCell(i).SetCellValue(name); @@ -881,6 +932,8 @@ public static class ExcelExportHelper if (dynamicColumnConfig != null) { + var isExcelAddDataWithName = dynamicColumnConfig.ColumnIdNameList.Select(t => t.Id).Count() == 1; + var dynamicTranslateDataList = await _dictionaryService.GetBasicDataSelect(dynamicColumnConfig.TranslateDicNameList.ToArray()); // 使用NPOI 进行二次处理 @@ -911,7 +964,15 @@ public static class ExcelExportHelper //var writeIndex = itemList.IndexOf(itemObj) + dynamicColumnConfig.AutoColumnStartIndex; - var writeIndex = dynamicColumnConfig.ColumnNameList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleName].ToString()) + dynamicColumnConfig.AutoColumnStartIndex; + var writeIndex = 0; + if (isExcelAddDataWithName) + { + writeIndex = dynamicColumnConfig.ColumnNameList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleName].ToString()) + dynamicColumnConfig.AutoColumnStartIndex; + } + else + { + writeIndex = dynamicColumnConfig.ColumnIdList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleId].ToString()) + dynamicColumnConfig.AutoColumnStartIndex; + } if (itemDicName.IsNotNullOrEmpty()) { diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index fac96eb68..2c7525ff9 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -72,9 +72,9 @@ 模板列最后的索引 - + - 动态的列名 + 动态的列名 如果Id 重复，那么就按照名称填充，否则就按照Id 填充列数据 diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 9128348ad..cad7b972b 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -2077,7 +2077,7 @@ namespace IRaCIS.Core.Application.Service.Common DynamicItemTitleName = "QuestionName", DynamicListName = "QuestionAnswerList", RemoveColunmIndexList = new List() { }, - ColumnNameList = columNameList ?? new List(), + ColumnIdNameList = columNameList.Select(t => new DynamicColumnConfig.ColumItem() { Id = Guid.Empty, Name = t }).ToList(), TranslateDicNameList = translateDicNameList ?? new List() }; @@ -2344,14 +2344,30 @@ namespace IRaCIS.Core.Application.Service.Common QuestionName = _userInfo.IsEn_Us ? t.QuestionEnName : t.QuestionName, CDISCCode = t.CDISCCode, TranslateDicName = t.DictionaryCode, - GroupName = _userInfo.IsEn_Us ? t.GroupInfo.GroupEnName:t.GroupInfo.GroupName + 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; + + foreach (var configQuestion in trialConfigQuestionList) + { + if (configQuestion.QuestionName == qName) + { + configQuestion.QuestionName = $"{configQuestion.GroupName}_{configQuestion.QuestionName}"; + } + } + + } + + if (inQuery.ReadingExportType != ExportResult.CDISC) { //最终EXCEL 列 - var configCoumNameList = new List(); + var configCoumNameList = new List(); //最终翻译字典 var translateDicNameList = new List(); @@ -2370,7 +2386,7 @@ namespace IRaCIS.Core.Application.Service.Common #region 外层问题 可能存在合并 - var fistLeveLNameList = new List(); + var fistLeveLNameList = new List(); //肿瘤评估，非CDISC 导出 if (criterion.CriterionGroup == CriterionGroup.Tumor) @@ -2378,8 +2394,11 @@ namespace IRaCIS.Core.Application.Service.Common if (criterion.CriterionType == CriterionType.RECIST1Point1 || criterion.CriterionType == CriterionType.RECIST1Pointt1_MB || criterion.CriterionType == CriterionType.IRECIST1Point1) { - fistLeveLNameList = trialConfigQuestionList.Select(t => - (t.QuestionType == QuestionType.ExistDisease || t.QuestionType == QuestionType.Tumor) ? (_userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估") : t.QuestionName).Distinct().ToList(); + fistLeveLNameList = trialConfigQuestionList.Select(t => new DynamicColumnConfig.ColumItem() + { + Id = Guid.Empty, + Name = (t.QuestionType == QuestionType.ExistDisease || t.QuestionType == QuestionType.Tumor) ? (_userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估") : t.QuestionName + }).ToList(); @@ -2387,13 +2406,22 @@ namespace IRaCIS.Core.Application.Service.Common } else if (criterion.CriterionType == CriterionType.Lugano2014 || criterion.CriterionType == CriterionType.Lugano2014WithoutPET) { - fistLeveLNameList = trialConfigQuestionList.Select(t => - (t.QuestionType == QuestionType.ExistDisease || t.QuestionType == QuestionType.ImgOncology) ? (_userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估") : t.QuestionName).Distinct().ToList(); + + fistLeveLNameList = trialConfigQuestionList.Select(t => new DynamicColumnConfig.ColumItem() + { + Id = Guid.Empty, + Name = (t.QuestionType == QuestionType.ExistDisease || t.QuestionType == QuestionType.ImgOncology) ? (_userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估") : t.QuestionName + }).ToList(); } else if (criterion.CriterionType == CriterionType.PCWG3) { - fistLeveLNameList = trialConfigQuestionList.Select(t => t.QuestionName).ToList(); + fistLeveLNameList = trialConfigQuestionList.Select(t => new DynamicColumnConfig.ColumItem() + { + Id = Guid.Empty, + Name = t.QuestionName + }).ToList(); + } var exTralDicNameList = new List() { "LesionType" }; @@ -2403,7 +2431,11 @@ namespace IRaCIS.Core.Application.Service.Common else //非肿瘤评估，非CDISC 导出 { - fistLeveLNameList = trialConfigQuestionList.Select(t => t.QuestionName).ToList(); + 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(); @@ -2416,7 +2448,7 @@ namespace IRaCIS.Core.Application.Service.Common //肿瘤 表格问题直接去重、同时添加一些列 外层问题合并一些列 if (criterion.CriterionGroup == CriterionGroup.Tumor) { - var extralNameList = new List() { }; + var extralNameList = new List(); if (criterion.CriterionType == CriterionType.RECIST1Point1 || criterion.CriterionType == CriterionType.RECIST1Pointt1_MB || criterion.CriterionType == CriterionType.IRECIST1Point1 || criterion.CriterionType == CriterionType.Lugano2014 || criterion.CriterionType == CriterionType.Lugano2014WithoutPET) @@ -2424,8 +2456,8 @@ namespace IRaCIS.Core.Application.Service.Common //if(inQuery.ReadingExportType == ExportResult.DetailedTableOfLesions) { - extralNameList.Add(_userInfo.IsEn_Us ? "Lesion ID" : "病灶编号"); - extralNameList.Add(_userInfo.IsEn_Us ? "Lesion Type" : "病灶类型"); + extralNameList.Add(new DynamicColumnConfig.ColumItem() { Id = Guid.Empty, Name = _userInfo.IsEn_Us ? "Lesion ID" : "病灶编号" }); + extralNameList.Add(new DynamicColumnConfig.ColumItem() { Id = Guid.Empty, Name = _userInfo.IsEn_Us ? "Lesion Type" : "病灶类型" }); } } @@ -2433,13 +2465,13 @@ namespace IRaCIS.Core.Application.Service.Common { //if (inQuery.ReadingExportType == ExportResult.DetailedTableOfLesions) { - extralNameList.Add(_userInfo.IsEn_Us ? "Lesion Type" : "病灶类型"); + extralNameList.Add(new DynamicColumnConfig.ColumItem() { Id = Guid.Empty, Name = _userInfo.IsEn_Us ? "Lesion Type" : "病灶类型" }); } } - //肿瘤评估标准目前是去重 - var tableQuestionNameList = trialConfigTableQuestionList.Select(t => t.QuestionName).Distinct().ToList(); + //肿瘤评估标准目前是去重 按照问题名称填充 不是Id + var tableQuestionNameList = trialConfigTableQuestionList.Select(t => t.QuestionName).Distinct().Select(t => new DynamicColumnConfig.ColumItem() { Id = Guid.Empty, Name = t }).Distinct().ToList(); //有表格问题 那么就是三部分，否则就是外层问题 configCoumNameList = tableQuestionNameList.Count == 0 ? fistLeveLNameList : fistLeveLNameList.Union(extralNameList).Union(tableQuestionNameList).ToList(); @@ -2565,9 +2597,10 @@ namespace IRaCIS.Core.Application.Service.Common //多表格问题 if (isMutiTable) { - var extralNameList = new List() { _userInfo.IsEn_Us ? "Table Name" : "表格名称" }; + //多表格，增加的一列，就用Guid.Empty 标识 + var extralNameList = new List() { new DynamicColumnConfig.ColumItem() { Id = Guid.Empty, Name = _userInfo.IsEn_Us ? "Table Name" : "表格名称" } }; - var tableQuestionNameList = trialConfigTableQuestionList.Select(t => t.TableName + "_" + t.QuestionName).ToList(); + var tableQuestionNameList = trialConfigTableQuestionList.Select(t => new DynamicColumnConfig.ColumItem() { Id = t.QuestionId, Name = t.TableName + "_" + t.QuestionName }).ToList(); configCoumNameList = fistLeveLNameList.Union(extralNameList).Union(tableQuestionNameList).ToList(); } @@ -2575,7 +2608,7 @@ namespace IRaCIS.Core.Application.Service.Common { //单表格问题(直接用表格问题名称) 或者没有表格问题 - var tableNameList = trialConfigTableQuestionList.Select(t => t.QuestionName).Distinct().ToList(); + var tableNameList = trialConfigTableQuestionList.Select(t => new DynamicColumnConfig.ColumItem() { Id = t.QuestionId, Name = t.QuestionName }).ToList(); configCoumNameList = fistLeveLNameList.Union(tableNameList).ToList(); } @@ -2583,7 +2616,7 @@ namespace IRaCIS.Core.Application.Service.Common - #region 扩展病灶 + #region 扩展表格问题 //最终的病灶列表 要把裁判的也要加进去，需要处理裁判标记 @@ -2605,7 +2638,7 @@ namespace IRaCIS.Core.Application.Service.Common { var addLessionInfoList = new List(); - addLessionInfoList.Add(new CommonQuesionInfo() { QuestionName = _userInfo.IsEn_Us ? "Table Name" : "表格名称", QuestionValue = firstLessionAnser.TableName }); + addLessionInfoList.Add(new CommonQuesionInfo() { QuestionId = Guid.Empty, QuestionName = _userInfo.IsEn_Us ? "Table Name" : "表格名称", QuestionValue = firstLessionAnser.TableName }); var dynamicPartialLessionInfoList = lession.LessionAnswerList.Select(t => new CommonQuesionInfo() { QuestionName = t.TableName + "_" + t.QuestionName, QuestionValue = t.QuestionValue, TranslateDicName = t.TranslateDicName, CDISCCode = t.CDISCCode }); @@ -2653,9 +2686,11 @@ namespace IRaCIS.Core.Application.Service.Common DynamicItemDicName = "TranslateDicName", DynamicItemValueName = "QuestionValue", DynamicItemTitleName = "QuestionName", + DynamicItemTitleId = "QuestionId", DynamicListName = "QuestionAnswerList", RemoveColunmIndexList = removeColumnIndexList, - ColumnNameList = configCoumNameList, + ColumnIdNameList = configCoumNameList, + CDISCList=new List(), TranslateDicNameList = translateDicNameList }; @@ -2665,11 +2700,11 @@ namespace IRaCIS.Core.Application.Service.Common else { - //CDISC 导出 只到外层问题级别 + //CDISC 导出 只到外层问题级别 使用Id 填充Excel var totalConfigCoumNameList = trialConfigQuestionList.ToList(); - var configCoumNameList = totalConfigCoumNameList.Select(t => t.QuestionName).ToList(); + var configCoumNameList = totalConfigCoumNameList.Select(t => new DynamicColumnConfig.ColumItem() { Id = t.QuestionId, Name = t.QuestionName }).ToList(); var translateDicList = totalConfigCoumNameList.Where(t => t.TranslateDicName.IsNotNullOrEmpty()).Select(t => t.TranslateDicName).Distinct().ToList(); @@ -2684,9 +2719,10 @@ namespace IRaCIS.Core.Application.Service.Common DynamicItemDicName = "TranslateDicName", DynamicItemValueName = "QuestionValue", DynamicItemTitleName = "QuestionName", + DynamicItemTitleId = "QuestionId", DynamicListName = "QuestionAnswerList", RemoveColunmIndexList = removeColumnIndexList, - ColumnNameList = configCoumNameList, + ColumnIdNameList = configCoumNameList, CDISCList = cdiscCodeList, TranslateDicNameList = translateDicList }; @@ -2704,7 +2740,7 @@ namespace IRaCIS.Core.Application.Service.Common //R1 R2 两个人的访视都阅片完成了才可以，去除只有一个人阅片完成的访视 //找到只有一个人阅片的受试者 和访视 var exceptVisit = list.Where(t => t.ReadingCategory == ReadingCategory.Visit) - .GroupBy(t => new { t.SubjectCode, t.TaskName}).Where(g => g.Count() == 1).Select(g => new { g.Key.SubjectCode, g.Key.TaskName }).ToList(); + .GroupBy(t => new { t.SubjectCode, t.TaskName }).Where(g => g.Count() == 1).Select(g => new { g.Key.SubjectCode, g.Key.TaskName }).ToList(); list = list.Where(t => !exceptVisit.Any(ev => ev.SubjectCode == t.SubjectCode && ev.TaskName == t.TaskName)).ToList(); @@ -2738,7 +2774,7 @@ namespace IRaCIS.Core.Application.Service.Common if (inQuery.ReadingExportType == ExportResult.CDISC) { - (memoryStream, fileName) = await ExcelExportHelper.CDISC_DataExport_Async(export_Template, exportInfo, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(CommonEvaluationExport), criterion.CriterionType, dynamicColumnConfig); + (memoryStream, fileName) = await ExcelExportHelper.DataExport_NpoiTestAsync(export_Template, exportInfo, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(CommonEvaluationExport), criterion.CriterionType, dynamicColumnConfig); } else