diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 639ab8a4b..b49df314b 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -102,11 +102,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public class SubmitVisitTaskQuestionsInDto { - + [NotDefault] public Guid TrialId { get; set; } - + [NotDefault] public Guid VisitTaskId { get; set; } - + [NotDefault] public Guid ReadingQuestionCriterionTrialId { get; set; } public List AnswerList { get; set; } = new List(); diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 3d988bafd..966268eea 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -75,7 +75,7 @@ namespace IRaCIS.Application.Services } if (subjectId != null) { - task = await _visitTaskRepository.Where(x => x.TrialId == trialId && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.SubjectId == subjectId.Value).Select(x => new GetReadingTaskDto() + task = await _visitTaskRepository.Where(x => x.TrialId == trialId && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.SubjectId == subjectId.Value&&x.DoctorUserId == _userInfo.Id).Select(x => new GetReadingTaskDto() { VisistTaskId=x.Id, ReadingCategory = x.ReadingCategory,