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

修改

Uat_Study
he 2022-11-21 11:13:12 +08:00
parent ad9ad4c41e
commit 680c01f720
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
View File

@ -250,7 +250,6 @@ namespace IRaCIS.Core.Application.ViewModel
public ReadingCategory ReadingCategory { get; set; } public ReadingCategory ReadingCategory { get; set; }
/// <summary> /// <summary>
/// 是否是一致性分析产生 /// 是否是一致性分析产生
/// </summary> /// </summary>

11
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -860,7 +860,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
//var isReadingTaskViewInOrder = await _trialRepository.Where(x => x.Id == iRUnReadSubjectQuery.TrialId).Select(x => x.IsReadingTaskViewInOrder).FirstOrDefaultAsync(); //var isReadingTaskViewInOrder = await _trialRepository.Where(x => x.Id == iRUnReadSubjectQuery.TrialId).Select(x => x.IsReadingTaskViewInOrder).FirstOrDefaultAsync();
var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == iRUnReadSubjectQuery.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException(); var criterionConfig = await _trialReadingCriterionRepository.Where(x => x.Id == iRUnReadSubjectQuery.TrialReadingCriterionId).FirstNotNullAsync();
var readingTool = criterionConfig.ReadingTool; var readingTool = criterionConfig.ReadingTool;
var isReadingTaskViewInOrder = criterionConfig.IsReadingTaskViewInOrder; var isReadingTaskViewInOrder = criterionConfig.IsReadingTaskViewInOrder;
@ -904,6 +904,10 @@ namespace IRaCIS.Core.Application.Service.Allocation
RandomReadInfo = new IRUnReadOutDto(), RandomReadInfo = new IRUnReadOutDto(),
IsReadingTaskViewInOrder = isReadingTaskViewInOrder, IsReadingTaskViewInOrder = isReadingTaskViewInOrder,
ReadingTool = readingTool, ReadingTool = readingTool,
IseCRFShowInDicomReading= criterionConfig.IseCRFShowInDicomReading,
IsReadingShowSubjectInfo= criterionConfig.IsReadingShowSubjectInfo,
IsReadingShowPreviousResults= criterionConfig.IsReadingShowPreviousResults,
DigitPlaces= criterionConfig.DigitPlaces,
}); });
} }
else else
@ -927,6 +931,10 @@ namespace IRaCIS.Core.Application.Service.Allocation
IsReadingTaskViewInOrder = isReadingTaskViewInOrder, IsReadingTaskViewInOrder = isReadingTaskViewInOrder,
RandomReadInfo = iRUnReadOut, RandomReadInfo = iRUnReadOut,
ReadingTool = readingTool, ReadingTool = readingTool,
IseCRFShowInDicomReading = criterionConfig.IseCRFShowInDicomReading,
IsReadingShowSubjectInfo = criterionConfig.IsReadingShowSubjectInfo,
IsReadingShowPreviousResults = criterionConfig.IsReadingShowPreviousResults,
DigitPlaces = criterionConfig.DigitPlaces,
}); });
} }
@ -965,6 +973,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
{ {
Id = u.Id, Id = u.Id,
IsUrgent = u.IsUrgent, IsUrgent = u.IsUrgent,
VisitNum = u.VisitTaskNum, VisitNum = u.VisitTaskNum,
TaskBlindName = u.TaskBlindName, TaskBlindName = u.TaskBlindName,
VisistId = u.SourceSubjectVisitId, VisistId = u.SourceSubjectVisitId,