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

Browse Source
This commit is contained in:
hang
2024-11-11 16:53:24 +08:00
parent 05b5d0d264
commit c372498251
5 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+19 -10
View File
@@ -1854,7 +1854,7 @@ namespace IRaCIS.Core.Application.Service.Common
if (criterion.CriterionType == CriterionType.OCT)
{
list.Add(new ExportDocumentDes() { Code = StaticData.Export.OCT_ReadingLession_Export, ExportCatogory = ExportResult.DetailedTableOfLesions });
list.Add(new ExportDocumentDes() { Code = StaticData.Export.OCT_ReadingLession_Export, ExportCatogory = ExportResult.OCT_ReadingLession_Export });
}
switch (criterion.ArbitrationRule)
@@ -1974,15 +1974,13 @@ namespace IRaCIS.Core.Application.Service.Common
//病灶明细表
export_Template = StaticData.Export.ReadingLession_Export;
if (criterion.CriterionType == CriterionType.OCT)
{
export_Template = StaticData.Export.OCT_ReadingLession_Export;
}
}
//病灶明细表 需要单独处理
if (inQuery.ReadingExportType != ExportResult.DetailedTableOfLesions)
if (inQuery.ReadingExportType != ExportResult.DetailedTableOfLesions && inQuery.ReadingExportType != ExportResult.OCT_ReadingLession_Export)
{
//其他可以统一处理
list = await query.ProjectTo<CommonEvaluationExport>(_mapper.ConfigurationProvider,
new
{
@@ -1995,7 +1993,12 @@ namespace IRaCIS.Core.Application.Service.Common
}
else
{
//其他可以统一处理
//病灶明细表
if (inQuery.ReadingExportType == ExportResult.OCT_ReadingLession_Export)
{
export_Template = StaticData.Export.OCT_ReadingLession_Export;
}
var taskList = await query.ProjectTo<CommonLessionExport>(_mapper.ConfigurationProvider,
new
{
@@ -2067,10 +2070,16 @@ namespace IRaCIS.Core.Application.Service.Common
//有三部分组成 外层问题+ 没有配置病灶编号和类型+ 动态的表格问题
var dynamicLessionInfoList = addLessionInfoList.Union(dynamicPartialLessionInfoList).Union(item.QuestionAnswerList).ToList();
var cloneItem = item.Clone();
cloneItem.QuestionAnswerList = dynamicLessionInfoList;
//OCT 多个表格，但是只导出一个表格,有的问题答案就是空的
if (dynamicLessionInfoList.Count > 0)
{
var cloneItem = item.Clone();
cloneItem.QuestionAnswerList = dynamicLessionInfoList;
list.Add(cloneItem);
}
list.Add(cloneItem);
}
}
else