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

中止查询过滤+CDISC导出非肿瘤标准

Browse Source
This commit is contained in:
hang
2025-08-04 11:15:01 +08:00
parent 1c58ba7e28
commit 6d298e775f
2 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+25 -27
View File
@@ -407,7 +407,7 @@ namespace IRaCIS.Core.Application.Service.Common
/// <param name="_dictionaryService"></param>
/// <returns></returns>
[HttpPost]
public async Task<IActionResult> GetImageBackList_Export(ImageBackQueryDto inQuery,
public async Task<IActionResult> GetImageBackList_Export(ImageBackQueryDto inQuery,
[FromServices] IRepository<SubjectVisitImageBackRecord> _subjectVisitImageBackRecordReposiotry, [FromServices] IDictionaryService _dictionaryService)
{
var svExpression = QCCommon.GetSubjectVisitImageBackRecordFilter(inQuery.VisitPlanArray);
@@ -428,7 +428,7 @@ namespace IRaCIS.Core.Application.Service.Common
var defalutSortArray = new string[] { nameof(ImageBackViewModel.IsUrgent) + " desc", nameof(ImageBackViewModel.SubjectCode), nameof(ImageBackViewModel.VisitNum) };
var list = await query.OrderByDescending(t=>t.IsUrgent).ThenBy(t=>t.SubjectCode).ThenBy(t=>t.VisitNum).ToListAsync();
var list = await query.OrderByDescending(t => t.IsUrgent).ThenBy(t => t.SubjectCode).ThenBy(t => t.VisitNum).ToListAsync();
var exportInfo = (await _trialRepository.Where(t => t.Id == inQuery.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
@@ -1292,7 +1292,7 @@ namespace IRaCIS.Core.Application.Service.Common
//Uploader = t.Uploader.UserName,
//UploadTime = t.CreateTime
SubjectStatus=t.Subject.Status
SubjectStatus = t.Subject.Status
});
@@ -2619,33 +2619,21 @@ namespace IRaCIS.Core.Application.Service.Common
// 配置在外层问题 或者表格问题上
taskList = await query.ProjectTo<CommonLessionExport>(_mapper.ConfigurationProvider,
new
{
readingExportType = inQuery.ReadingExportType,
criterionType = criterion.CriterionType,
arbitrationRule = criterion.ArbitrationRule,
trialReadingCriterionId = inQuery.TrialReadingCriterionId,
isEn_Us = _userInfo.IsEn_Us
}).ToListAsync();
new
{
readingExportType = inQuery.ReadingExportType,
criterionType = criterion.CriterionType,
arbitrationRule = criterion.ArbitrationRule,
trialReadingCriterionId = inQuery.TrialReadingCriterionId,
isEn_Us = _userInfo.IsEn_Us
}).ToListAsync();
}
// CDISC 导出 只管到 外层问题层级 和阅片结果表是保持一致
else if (inQuery.ReadingExportType == ExportResult.CDISC)
{
if (criterion.CriterionType == CriterionType.SelfDefine)
{
taskList = await query.ProjectTo<CommonLessionExport>(_mapper.ConfigurationProvider,
new
{
readingExportType = inQuery.ReadingExportType,
criterionType = criterion.CriterionType,
arbitrationRule = criterion.ArbitrationRule,
trialReadingCriterionId = inQuery.TrialReadingCriterionId,
isEn_Us = _userInfo.IsEn_Us
}).ToListAsync();
}
else
if (criterion.CriterionGroup == CriterionGroup.Tumor)
{
list = await query.ProjectTo<CommonEvaluationExport>(_mapper.ConfigurationProvider,
@@ -2658,8 +2646,18 @@ namespace IRaCIS.Core.Application.Service.Common
isEn_Us = _userInfo.IsEn_Us
}).ToListAsync();
}
else
{
taskList = await query.ProjectTo<CommonLessionExport>(_mapper.ConfigurationProvider,
new
{
readingExportType = inQuery.ReadingExportType,
criterionType = criterion.CriterionType,
arbitrationRule = criterion.ArbitrationRule,
trialReadingCriterionId = inQuery.TrialReadingCriterionId,
isEn_Us = _userInfo.IsEn_Us
}).ToListAsync();
}
}
@@ -3150,7 +3148,7 @@ namespace IRaCIS.Core.Application.Service.Common
{
//遍历病灶的每个问题
foreach (var lessionItem in lession.LessionAnswerList.OrderBy(t=>t.ShowOrder))
foreach (var lessionItem in lession.LessionAnswerList.OrderBy(t => t.ShowOrder))
{
var cloneItem = item.Clone();