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

修改
continuous-integration/drone/push Build is passing Details

IRC_NewDev
he 2024-09-26 13:49:39 +08:00
parent 53f3bb5d6d
commit 8ec35d90fb
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1621,6 +1621,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public string FileType { get; set; } = string.Empty; public string FileType { get; set; } = string.Empty;
public ValueUnit? Unit { get; set; }
/// <summary> /// <summary>
/// 字典code /// 字典code
/// </summary> /// </summary>
@ -2084,6 +2086,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public dynamic Answer { get; set; } public dynamic Answer { get; set; }
public string Type { get; set; } = string.Empty;
public ValueUnit? Unit { get; set; }
public JudgeReadingQuestionType QuestionType { get; set; } = JudgeReadingQuestionType.Question; public JudgeReadingQuestionType QuestionType { get; set; } = JudgeReadingQuestionType.Question;
} }

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

@ -301,6 +301,7 @@ namespace IRaCIS.Core.Application.Service
LimitEdit = y.LimitEdit, LimitEdit = y.LimitEdit,
MaxAnswerLength = y.MaxAnswerLength, MaxAnswerLength = y.MaxAnswerLength,
FileType = y.FileType, FileType = y.FileType,
Unit=y.Unit,
QuestionGenre = y.QuestionGenre, QuestionGenre = y.QuestionGenre,
ShowOrder = y.ShowOrder, ShowOrder = y.ShowOrder,
DictionaryCode = y.DictionaryCode, DictionaryCode = y.DictionaryCode,
@ -390,6 +391,7 @@ namespace IRaCIS.Core.Application.Service
DictionaryCode = lr.question.DictionaryCode, DictionaryCode = lr.question.DictionaryCode,
GlobalReadingShowType = lr.question.GlobalReadingShowType, GlobalReadingShowType = lr.question.GlobalReadingShowType,
Type = lr.question.Type, Type = lr.question.Type,
Unit = y.Unit,
GlobalAnswerType = GlobalAnswerType.Question, GlobalAnswerType = GlobalAnswerType.Question,
AnswerGroup = lr.question.AnswerGroup, AnswerGroup = lr.question.AnswerGroup,
AnswerCombination = lr.question.AnswerCombination, AnswerCombination = lr.question.AnswerCombination,

14
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
View File

@ -161,6 +161,8 @@ namespace IRaCIS.Core.Application.Service
.Select(x => new GlobalVisitJudgeQuestion() .Select(x => new GlobalVisitJudgeQuestion()
{ {
Answer = x.Answer, Answer = x.Answer,
Type= x.ReadingQuestionTrial.Type,
Unit= x.ReadingQuestionTrial.Unit,
ShowOrder = x.ReadingQuestionTrial.ShowOrder, ShowOrder = x.ReadingQuestionTrial.ShowOrder,
VisitTaskId = x.VisitTaskId, VisitTaskId = x.VisitTaskId,
QuestionId = x.ReadingQuestionTrial.Id, QuestionId = x.ReadingQuestionTrial.Id,
@ -174,6 +176,8 @@ namespace IRaCIS.Core.Application.Service
.Select(x => new GlobalVisitJudgeQuestion() .Select(x => new GlobalVisitJudgeQuestion()
{ {
Answer = x.Answer, Answer = x.Answer,
Type = x.ReadingQuestionTrial.Type,
Unit = x.ReadingQuestionTrial.Unit,
ShowOrder = x.ReadingQuestionTrial.ShowOrder, ShowOrder = x.ReadingQuestionTrial.ShowOrder,
VisitTaskId = x.VisitTaskId, VisitTaskId = x.VisitTaskId,
QuestionId = x.ReadingQuestionTrial.Id, QuestionId = x.ReadingQuestionTrial.Id,
@ -204,6 +208,8 @@ namespace IRaCIS.Core.Application.Service
.Select(x => new JudgeQuestion() .Select(x => new JudgeQuestion()
{ {
Answer = x.Answer, Answer = x.Answer,
Type = x.Type,
Unit = x.Unit,
QuestionId = x.QuestionId, QuestionId = x.QuestionId,
QuestionName = x.QuestionName, QuestionName = x.QuestionName,
QuestionGenre = x.QuestionGenre, QuestionGenre = x.QuestionGenre,
@ -223,6 +229,8 @@ namespace IRaCIS.Core.Application.Service
.Select(x => new JudgeQuestion() .Select(x => new JudgeQuestion()
{ {
Answer = x.Answer, Answer = x.Answer,
Type = x.Type,
Unit = x.Unit,
QuestionId = x.QuestionId, QuestionId = x.QuestionId,
QuestionName = x.QuestionName, QuestionName = x.QuestionName,
QuestionGenre = x.QuestionGenre, QuestionGenre = x.QuestionGenre,
@ -254,6 +262,8 @@ namespace IRaCIS.Core.Application.Service
.Select(x => new JudgeQuestion() .Select(x => new JudgeQuestion()
{ {
Answer = x.Answer, Answer = x.Answer,
Type = x.ReadingQuestionTrial.Type,
Unit = x.ReadingQuestionTrial.Unit,
QuestionId = x.ReadingQuestionTrial.Id, QuestionId = x.ReadingQuestionTrial.Id,
QuestionName = x.ReadingQuestionTrial.QuestionName.LanguageName(x.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us), QuestionName = x.ReadingQuestionTrial.QuestionName.LanguageName(x.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us),
QuestionGenre = x.ReadingQuestionTrial.QuestionGenre, QuestionGenre = x.ReadingQuestionTrial.QuestionGenre,
@ -302,6 +312,8 @@ namespace IRaCIS.Core.Application.Service
{ {
Answer = x.Answer, Answer = x.Answer,
Type = x.Type,
Unit = x.Unit,
QuestionId = x.QuestionId!.Value, QuestionId = x.QuestionId!.Value,
QuestionName = x.QuestionName, QuestionName = x.QuestionName,
QuestionGenre = x.QuestionGenre, QuestionGenre = x.QuestionGenre,
@ -342,6 +354,8 @@ namespace IRaCIS.Core.Application.Service
{ {
Answer = x.Answer, Answer = x.Answer,
Type = x.Type,
Unit = x.Unit,
QuestionId = x.QuestionId == null ? default(Guid) : x.QuestionId.Value, QuestionId = x.QuestionId == null ? default(Guid) : x.QuestionId.Value,
QuestionName = x.QuestionName, QuestionName = x.QuestionName,
QuestionGenre = x.QuestionGenre, QuestionGenre = x.QuestionGenre,