diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index e666c4b8e..5fd42050b 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -9460,11 +9460,11 @@ - - site 调研 发送验证码 - - - + + 发送验证码 + + + @@ -9520,6 +9520,14 @@ + + + 驳回 + + + + + 提交 后台自动识别是谁提交 diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 60cc90cc6..b01c8e1ef 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1398,7 +1398,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid? SubjectId { get; set; } - public Guid? TrialReadingCriterionId { get; set; } + [NotDefault] + public Guid TrialReadingCriterionId { get; set; } public Guid? VisitTaskId { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index fc10a4b61..8ed453112 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -2259,11 +2259,12 @@ namespace IRaCIS.Application.Services var trialReadingCriterionId = inDto.TrialReadingCriterionId; + var trialReadingCriterion= await _readingQuestionCriterionTrialRepository.FindAsync(trialReadingCriterionId); - if (trialReadingCriterionId == null && inDto.VisitTaskId == null) - { - throw new BusinessValidationFailedException(_localizer["ReadingImage_IDMust"]); - } + //if (trialReadingCriterionId == null && inDto.VisitTaskId == null) + //{ + // throw new BusinessValidationFailedException(_localizer["ReadingImage_IDMust"]); + //} //看已阅的任务 if (inDto.VisitTaskId != null) @@ -2284,12 +2285,12 @@ namespace IRaCIS.Application.Services trialReadingCriterionId = task.TrialReadingCriterionId; } - else if (inDto.SubjectId != null) + else if (inDto.SubjectId != null && trialReadingCriterion.IsReadingTaskViewInOrder) { var subjectTaskList = (await _visitTaskService.GetOrderReadingIQueryable(new GetOrderReadingIQueryableInDto() { TrialId = inDto.TrialId, - TrialReadingCriterionId = trialReadingCriterionId.Value, + TrialReadingCriterionId = trialReadingCriterionId, Page = new PageInput() { PageIndex = 1,