+5
-4
@@ -269,7 +269,8 @@ namespace IRaCIS.Core.Application.Service
|
||||
ShowOrder = y.ReadingQuestionTrial.ShowOrder,
|
||||
Type = y.ReadingQuestionTrial.Type,
|
||||
TypeValue = y.ReadingQuestionTrial.TypeValue,
|
||||
ValueType = y.ReadingQuestionTrial.ValueType,
|
||||
CustomUnit = y.ReadingQuestionTrial.CustomUnit,
|
||||
Unit = y.ReadingQuestionTrial.Unit,
|
||||
IsJudgeQuestion = y.ReadingQuestionTrial.IsJudgeQuestion,
|
||||
Answer = y.Answer,
|
||||
}).ToList()
|
||||
@@ -313,7 +314,7 @@ namespace IRaCIS.Core.Application.Service
|
||||
ValueType = y.ValueType,
|
||||
IsJudgeQuestion = y.IsJudgeQuestion,
|
||||
Answer = string.Empty,
|
||||
|
||||
CustomUnit = y.CustomUnit,
|
||||
});
|
||||
|
||||
}
|
||||
@@ -399,7 +400,7 @@ namespace IRaCIS.Core.Application.Service
|
||||
JudgeType = lr.question.JudgeType,
|
||||
TypeValue = lr.question.TypeValue,
|
||||
ValueType = lr.question.ValueType,
|
||||
|
||||
CustomUnit = lr.question.CustomUnit,
|
||||
}).ToList();
|
||||
|
||||
|
||||
@@ -524,7 +525,7 @@ namespace IRaCIS.Core.Application.Service
|
||||
ShowOrder = x.Dictionary.ShowOrder,
|
||||
ParentCode = x.Dictionary.Parent.Code,
|
||||
Value = x.Dictionary.Value,
|
||||
ValueCN = x.Dictionary.ValueCN
|
||||
ValueCN = x.Dictionary.ValueCN,
|
||||
}).OrderBy(x => x.ParentCode).ThenBy(x => x.ShowOrder).ToListAsync();
|
||||
result.AssessTypeList = assessTypeList;
|
||||
|
||||
|
||||
@@ -265,6 +265,9 @@ namespace IRaCIS.Core.Application.Service
|
||||
Answer = x.Answer,
|
||||
Type = x.ReadingQuestionTrial.Type,
|
||||
Unit = x.ReadingQuestionTrial.Unit,
|
||||
CustomUnit= x.ReadingQuestionTrial.CustomUnit,
|
||||
ValueType=x.ReadingQuestionTrial.ValueType,
|
||||
|
||||
QuestionId = x.ReadingQuestionTrial.Id,
|
||||
QuestionName = x.ReadingQuestionTrial.QuestionName.LanguageName(x.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us),
|
||||
QuestionGenre = x.ReadingQuestionTrial.QuestionGenre,
|
||||
@@ -314,10 +317,13 @@ namespace IRaCIS.Core.Application.Service
|
||||
Answer = x.Answer,
|
||||
Type = x.Type,
|
||||
Unit = x.Unit,
|
||||
CustomUnit=x.CustomUnit,
|
||||
|
||||
QuestionId = x.QuestionId!.Value,
|
||||
QuestionName = x.QuestionName,
|
||||
QuestionGenre = x.QuestionGenre,
|
||||
DictionaryCode = x.DictionaryCode,
|
||||
ValueType=x.ValueType,
|
||||
}).ToList()
|
||||
};
|
||||
|
||||
@@ -358,6 +364,7 @@ namespace IRaCIS.Core.Application.Service
|
||||
QuestionName = x.QuestionName,
|
||||
QuestionGenre = x.QuestionGenre,
|
||||
DictionaryCode = x.DictionaryCode,
|
||||
ValueType=x.ValueType,
|
||||
}).ToList()
|
||||
};
|
||||
|
||||
|
||||
@@ -202,6 +202,8 @@ namespace IRaCIS.Core.Application.Service
|
||||
TypeValue = y.ReadingQuestionTrial.TypeValue,
|
||||
ValueType = y.ReadingQuestionTrial.ValueType,
|
||||
IsJudgeQuestion = y.ReadingQuestionTrial.IsJudgeQuestion,
|
||||
Unit = y.ReadingQuestionTrial.Unit,
|
||||
CustomUnit = y.ReadingQuestionTrial.CustomUnit,
|
||||
Answer = y.Answer,
|
||||
}).ToList()
|
||||
}).ToListAsync();
|
||||
@@ -285,6 +287,9 @@ namespace IRaCIS.Core.Application.Service
|
||||
QuestionName = y.QuestionName,
|
||||
QuestionGenre = y.QuestionGenre,
|
||||
DictionaryCode = y.DictionaryCode,
|
||||
Unit=y.Unit,
|
||||
CustomUnit=y.CustomUnit,
|
||||
ValueType = y.ValueType,
|
||||
Answer = y.Answer
|
||||
}).ToList();
|
||||
x.IsHaveChange = result.ReadingCategory == ReadingCategory.Visit ? false : globalVisits.Where(y => x.VisitTaskId == y.VisitTaskId).SelectMany(y => y.AfterQuestionList).Any(y => y.IsHaveChange);
|
||||
|
||||
Reference in New Issue
Block a user