Uat_Study
parent
c3fbf10953
commit
45ef45cfea
|
@ -63,7 +63,7 @@ namespace IRaCIS.Application.Services
|
||||||
IRepository<ReadingCriterionPage> readingCriterionPageRepository,
|
IRepository<ReadingCriterionPage> readingCriterionPageRepository,
|
||||||
IRepository<ReadingJudgeInfo> readingJudgeInfoRepository,
|
IRepository<ReadingJudgeInfo> readingJudgeInfoRepository,
|
||||||
IRepository<ReadModule> readModuleRepository,
|
IRepository<ReadModule> readModuleRepository,
|
||||||
IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository,
|
IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository,
|
||||||
IRepository<TumorAssessment> tumorAssessmentRepository,
|
IRepository<TumorAssessment> tumorAssessmentRepository,
|
||||||
IRepository<ReadingTableAnswerRowInfo> readingTableAnswerRowInfoRepository,
|
IRepository<ReadingTableAnswerRowInfo> readingTableAnswerRowInfoRepository,
|
||||||
IRepository<ReadingTableQuestionSystem> readingTableQuestionSystemRepository,
|
IRepository<ReadingTableQuestionSystem> readingTableQuestionSystemRepository,
|
||||||
|
@ -128,7 +128,7 @@ namespace IRaCIS.Application.Services
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
public async Task<(List<GetRelatedVisitTaskOutDto>, object)> GetRelatedVisitTask(GetRelatedVisitTaskInDto inDto)
|
public async Task<(List<GetRelatedVisitTaskOutDto>, object)> GetRelatedVisitTask(GetRelatedVisitTaskInDto inDto)
|
||||||
{
|
{
|
||||||
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
|
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x=>x.TrialReadingCriterion).FirstNotNullAsync();
|
||||||
|
|
||||||
if (taskInfo.TaskState != TaskState.Effect)
|
if (taskInfo.TaskState != TaskState.Effect)
|
||||||
{
|
{
|
||||||
|
@ -158,7 +158,10 @@ namespace IRaCIS.Application.Services
|
||||||
|
|
||||||
}).OrderBy(x => x.VisitTaskNum).ToListAsync();
|
}).OrderBy(x => x.VisitTaskNum).ToListAsync();
|
||||||
|
|
||||||
|
if (!taskInfo.TrialReadingCriterion.IsReadingTaskViewInOrder)
|
||||||
|
{
|
||||||
|
result = result.Where(x => x.VisitTaskId == inDto.VisitTaskId).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
return (result, new
|
return (result, new
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue