XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
hang 2023-04-07 18:12:23 +08:00
parent 9dcd9c900a 9d289bede7
commit a42867879d
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/Service/Common/DictionaryService.cs
View File

@ -414,6 +414,13 @@ namespace IRaCIS.Application.Services
} }
else else
{ {
var trialCriterionType = await _readingQuestionCriterionTrial.Where(x => x.Id == inDto.TrialReadingCriterionId).Select(x => x.CriterionType).FirstOrDefaultAsync();
if (trialCriterionType == CriterionType.SelfDefine)
{
return result;
}
List<string> selectCode = await _trialCriterionDictionaryCodeRepository.Where(x => x.TrialCriterionId == inDto.TrialReadingCriterionId).Select(x => x.Code).ToListAsync(); List<string> selectCode = await _trialCriterionDictionaryCodeRepository.Where(x => x.TrialCriterionId == inDto.TrialReadingCriterionId).Select(x => x.Code).ToListAsync();

2
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -1187,6 +1187,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string QuestionName { get; set; } public string QuestionName { get; set; }
public string QuestionEnName { get; set; } = string.Empty;
public string Answer { get; set; } public string Answer { get; set; }
public bool IsGlobalAnswer { get; set; } = false; public bool IsGlobalAnswer { get; set; } = false;

3
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
View File

@ -237,6 +237,7 @@ namespace IRaCIS.Application.Services
QuestionId = y.ReadingQuestionTrialId, QuestionId = y.ReadingQuestionTrialId,
QuestionName = y.ReadingQuestionTrial.QuestionName.LanguageName(y.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us), QuestionName = y.ReadingQuestionTrial.QuestionName.LanguageName(y.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us),
QuestionEnName=y.ReadingQuestionTrial.QuestionEnName,
AnswerGroup = y.ReadingQuestionTrial.AnswerGroup, AnswerGroup = y.ReadingQuestionTrial.AnswerGroup,
QuestionType = y.ReadingQuestionTrial.QuestionType, QuestionType = y.ReadingQuestionTrial.QuestionType,
LimitEdit= y.ReadingQuestionTrial.LimitEdit, LimitEdit= y.ReadingQuestionTrial.LimitEdit,
@ -314,7 +315,7 @@ namespace IRaCIS.Application.Services
VisitAnswer = lr.question.Answer, VisitAnswer = lr.question.Answer,
IsHaveChange = lr.global.Any(x=>x.QuestionId!=null&&!x.Answer.IsNullOrEmpty()) ? true : false, IsHaveChange = lr.global.Any(x=>x.QuestionId!=null&&!x.Answer.IsNullOrEmpty()) ? true : false,
QuestionId = lr.question.QuestionId, QuestionId = lr.question.QuestionId,
QuestionName = lr.question.QuestionName, QuestionName = lr.question.QuestionName.LanguageName(lr.question.QuestionEnName, _userInfo.IsEn_Us),
QuestionType = lr.question.QuestionType, QuestionType = lr.question.QuestionType,
LimitEdit=lr.question.LimitEdit, LimitEdit=lr.question.LimitEdit,
MaxAnswerLength=lr.question.MaxAnswerLength, MaxAnswerLength=lr.question.MaxAnswerLength,