diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs index d3c8f65dc..d4716b5dd 100644 --- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs +++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs @@ -414,6 +414,13 @@ namespace IRaCIS.Application.Services } else { + var trialCriterionType = await _readingQuestionCriterionTrial.Where(x => x.Id == inDto.TrialReadingCriterionId).Select(x => x.CriterionType).FirstOrDefaultAsync(); + if (trialCriterionType == CriterionType.SelfDefine) + { + return result; + } + + List selectCode = await _trialCriterionDictionaryCodeRepository.Where(x => x.TrialCriterionId == inDto.TrialReadingCriterionId).Select(x => x.Code).ToListAsync(); diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 7d2f67686..e18f987db 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1187,6 +1187,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string QuestionName { get; set; } + public string QuestionEnName { get; set; } = string.Empty; + public string Answer { get; set; } public bool IsGlobalAnswer { get; set; } = false; diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs index db36bd188..88633c0e6 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs @@ -237,6 +237,7 @@ namespace IRaCIS.Application.Services QuestionId = y.ReadingQuestionTrialId, QuestionName = y.ReadingQuestionTrial.QuestionName.LanguageName(y.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us), + QuestionEnName=y.ReadingQuestionTrial.QuestionEnName, AnswerGroup = y.ReadingQuestionTrial.AnswerGroup, QuestionType = y.ReadingQuestionTrial.QuestionType, LimitEdit= y.ReadingQuestionTrial.LimitEdit, @@ -314,7 +315,7 @@ namespace IRaCIS.Application.Services VisitAnswer = lr.question.Answer, IsHaveChange = lr.global.Any(x=>x.QuestionId!=null&&!x.Answer.IsNullOrEmpty()) ? true : false, QuestionId = lr.question.QuestionId, - QuestionName = lr.question.QuestionName, + QuestionName = lr.question.QuestionName.LanguageName(lr.question.QuestionEnName, _userInfo.IsEn_Us), QuestionType = lr.question.QuestionType, LimitEdit=lr.question.LimitEdit, MaxAnswerLength=lr.question.MaxAnswerLength,