diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index f5b4493e..e023093f 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -822,6 +822,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string TypeValue { get; set; } + /// + /// 数值类型 + /// + public ValueOfType? ValueType { get; set; } + /// /// 类型 /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs index 96c80775..2c9ea39f 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs @@ -126,7 +126,8 @@ namespace IRaCIS.Application.Services JudgeType = y.ReadingQuestionTrial.JudgeType, Type = y.ReadingQuestionTrial.Type, TypeValue = y.ReadingQuestionTrial.TypeValue, - IsJudgeQuestion=y.ReadingQuestionTrial.IsJudgeQuestion, + ValueType = y.ReadingQuestionTrial.ValueType, + IsJudgeQuestion =y.ReadingQuestionTrial.IsJudgeQuestion, Answer = y.Answer }).ToList() }).ToListAsync(); @@ -162,6 +163,7 @@ namespace IRaCIS.Application.Services IsJudgeQuestion=lr.question.IsJudgeQuestion, JudgeType = lr.question.JudgeType, TypeValue = lr.question.TypeValue, + ValueType= lr.question.ValueType, }).ToList(); diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs index 3335709f..791686de 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs @@ -810,8 +810,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate await _readingTaskQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.VisitTaskId == lastTask.VisitTaskId && x.ReadingQuestionTrialId == visitForTumorEvaluationQuestionId,x=> new ReadingTaskQuestionAnswer { Answer= VisitTumorEvaluation.PD.GetEnumInt(), - - }); } diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index b2784343..60f7f88f 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -55,7 +55,7 @@ namespace IRaCIS.Core.Domain.Share /// /// 百分数 /// - Percentage = 2 + Percentage = 2, } ///