From 7ca2c701081111608e6da7ca37bda4e3c46ea13b Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 15 Jul 2022 10:01:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/ReadingImageTaskViewModel.cs | 3 +++ .../Service/Reading/ReadingImageTaskService.cs | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 3b56313cc..ebc0f9abb 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -217,6 +217,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid ReadingQuestionCriterionTrialId { get; set; } public Guid? VisitTaskId { get; set; } + + + public FormType? FormType { get; set; } } /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 67c5d2326..fc5c055f4 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -351,6 +351,11 @@ namespace IRaCIS.Application.Services var formType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.ReadingQuestionCriterionTrialId).Select(x => x.FormType).FirstOrDefaultAsync(); var groupList = new List(); + if (inDto.FormType != null) + { + formType = inDto.FormType.Value; + } + if (formType == FormType.MultiplePage) { qusetionList = qusetionList.Where(x => x.ReadingCriterionPageId != null).ToList();