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

Uat_IRC_Net8
hang 2025-01-06 17:58:17 +08:00
parent 6ead8ffd53
commit 1a64c07c8e
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2122,10 +2122,20 @@ namespace IRaCIS.Core.Application.Service.Common
export_Template = StaticData.Export.ReadingLession_Export; export_Template = StaticData.Export.ReadingLession_Export;
} }
else if (inQuery.ReadingExportType == ExportResult.OCT_ReadingLession_Export)
{
//OCT
export_Template = StaticData.Export.OCT_ReadingLession_Export;
}
//病灶明细表 需要单独处理
if (inQuery.ReadingExportType != ExportResult.DetailedTableOfLesions && inQuery.ReadingExportType != ExportResult.OCT_ReadingLession_Export) if (inQuery.ReadingExportType == ExportResult.TableOfAssessmentResults ||
inQuery.ReadingExportType == ExportResult.DetailedTableOfAssessmentResults ||
inQuery.ReadingExportType == ExportResult.DetailedTableOfAdjudicationResults
)
{ {
//其他可以统一处理 //其他可以统一处理
list = await query.ProjectTo<CommonEvaluationExport>(_mapper.ConfigurationProvider, list = await query.ProjectTo<CommonEvaluationExport>(_mapper.ConfigurationProvider,
@ -2138,13 +2148,10 @@ namespace IRaCIS.Core.Application.Service.Common
isEn_Us = _userInfo.IsEn_Us isEn_Us = _userInfo.IsEn_Us
}).ToListAsync(); }).ToListAsync();
} }
else //病灶明细表 斑块表 需要单独处理
else if (inQuery.ReadingExportType == ExportResult.DetailedTableOfLesions ||
inQuery.ReadingExportType == ExportResult.OCT_ReadingLession_Export)
{ {
//病灶明细表
if (inQuery.ReadingExportType == ExportResult.OCT_ReadingLession_Export)
{
export_Template = StaticData.Export.OCT_ReadingLession_Export;
}
var taskList = await query.ProjectTo<CommonLessionExport>(_mapper.ConfigurationProvider, var taskList = await query.ProjectTo<CommonLessionExport>(_mapper.ConfigurationProvider,
new new
@ -2241,6 +2248,12 @@ namespace IRaCIS.Core.Application.Service.Common
} }
}
else if (inQuery.ReadingExportType == ExportResult.CDISC)
{
// 配置在外层问题 或者表格问题上
} }
#endregion #endregion

10
IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
View File

@ -1231,10 +1231,10 @@ namespace IRaCIS.Core.Application.Contracts
public class CommonLessionExport : CommonEvaluationExport public class CommonLessionExport : CommonEvaluationExport
{ {
/// <summary> ///// <summary>
/// 最终导出的病灶信息 ///// 最终导出的病灶信息
/// </summary> ///// </summary>
public List<CommonLessionQuestionAnswerInfo> LessionAnswerList { get; set; } //public List<CommonLessionQuestionAnswerInfo> LessionAnswerList { get; set; }
[JsonIgnore] [JsonIgnore]
@ -1267,6 +1267,8 @@ namespace IRaCIS.Core.Application.Contracts
public string QuestionValue { get; set; } public string QuestionValue { get; set; }
public string TranslateDicName { get; set; } public string TranslateDicName { get; set; }
public string CDISCCode { get; set; }
} }

1
IRaCIS.Core.Application/Service/QC/_MapConfig.cs
View File

@ -295,6 +295,7 @@ namespace IRaCIS.Core.Application.Service
.ForMember(o => o.QuestionMark, t => t.MapFrom(u => u.ReadingTableQuestionTrial.QuestionMark)) .ForMember(o => o.QuestionMark, t => t.MapFrom(u => u.ReadingTableQuestionTrial.QuestionMark))
.ForMember(o => o.QuestionName, t => t.MapFrom(u => isEn_Us ? u.ReadingTableQuestionTrial.QuestionEnName : u.ReadingTableQuestionTrial.QuestionName)) .ForMember(o => o.QuestionName, t => t.MapFrom(u => isEn_Us ? u.ReadingTableQuestionTrial.QuestionEnName : u.ReadingTableQuestionTrial.QuestionName))
.ForMember(o => o.QuestionValue, t => t.MapFrom(u => u.Answer)) .ForMember(o => o.QuestionValue, t => t.MapFrom(u => u.Answer))
.ForMember(o => o.CDISCCode, t => t.MapFrom(u => u.ReadingTableQuestionTrial.CDISCCode))
.ForMember(o => o.TranslateDicName, t => t.MapFrom(u => u.ReadingTableQuestionTrial.DictionaryCode)) .ForMember(o => o.TranslateDicName, t => t.MapFrom(u => u.ReadingTableQuestionTrial.DictionaryCode))
; ;