diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs index 7a6120ef6..80dcbd86c 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs @@ -88,6 +88,9 @@ namespace IRaCIS.Application.Services public async Task GetJudgeReadingInfo(GetJudgeReadingInfo inDto) { var visitTask = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstOrDefaultAsync(); + + + var criterionType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == visitTask.TrialReadingCriterionId).Select(x => x.CriterionType).FirstNotNullAsync(); GetJudgeReadingInfoOutDto judgeInfo = new GetJudgeReadingInfoOutDto() { ReadingTaskState = visitTask.ReadingTaskState, @@ -302,14 +305,17 @@ namespace IRaCIS.Application.Services }; - - // 加全局是否更新 和访视点注释 - judgeReadingQuestion.JudgeQuestionList.Add(new JudgeQuestion() + if (criterionType != CriterionType.PCWG3) { - Answer = item.AfterQuestionList.Any(x => x.IsHaveChange), - QuestionType = JudgeReadingQuestionType.GlobalChange, + // 加全局是否更新 和访视点注释 PCWG3不要 + judgeReadingQuestion.JudgeQuestionList.Add(new JudgeQuestion() + { + Answer = item.AfterQuestionList.Any(x => x.IsHaveChange), + QuestionType = JudgeReadingQuestionType.GlobalChange, - }); + }); + } + judgeReadingQuestion.JudgeQuestionList.Add(new JudgeQuestion() { @@ -338,13 +344,21 @@ namespace IRaCIS.Application.Services }).ToList() }; - // 加全局是否更新 和访视点注释 - rTwoJudge.JudgeQuestionList.Add(new JudgeQuestion() - { - Answer = twoItem.AfterQuestionList.Any(x => x.IsHaveChange), - QuestionType = JudgeReadingQuestionType.GlobalChange, - }); + + if (criterionType != CriterionType.PCWG3) + { + // 加全局是否更新 和访视点注释 + rTwoJudge.JudgeQuestionList.Add(new JudgeQuestion() + { + Answer = twoItem.AfterQuestionList.Any(x => x.IsHaveChange), + QuestionType = JudgeReadingQuestionType.GlobalChange, + + }); + } + + + rTwoJudge.JudgeQuestionList.Add(new JudgeQuestion() {