diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index c380370d2..082508c9f 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1810,8 +1810,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public List AnswerGroup { get; set; } - - public List AnswerCombination { get; set; } + /// + /// 裁判百分比或绝对值的相差值 + /// + public decimal? JudgeDifferenceValue { get; set; } + + + public List AnswerCombination { get; set; } @@ -1821,8 +1826,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class GetTrialCriterionJudgeQuestionListOutDto { public Guid ReadingQuestionTrialId { get; set; } - - public string QuestionName { get; set; } + + /// + /// 裁判百分比或绝对值的相差值 + /// + public decimal? JudgeDifferenceValue { get; set; } + + public string QuestionName { get; set; } public string PageName { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs index fceea7ca6..b04afbe5a 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs @@ -46,7 +46,8 @@ namespace IRaCIS.Application.Services QuestionGenre=x.QuestionGenre, DictionaryCode=x.DictionaryCode, JudgeType = x.JudgeType, - ReadingQuestionTrialId = x.Id + ReadingQuestionTrialId = x.Id, + JudgeDifferenceValue= x.JudgeDifferenceValue }).ToListAsync(); @@ -70,7 +71,9 @@ namespace IRaCIS.Application.Services { AnswerGroup = JsonConvert.SerializeObject(inDto.AnswerGroup), AnswerCombination = JsonConvert.SerializeObject(inDto.AnswerCombination), - JudgeType = inDto.JudgeType, + JudgeDifferenceValue= inDto.JudgeDifferenceValue, + + JudgeType = inDto.JudgeType, }); var result = await _readingQuestionTrialRepository.SaveChangesAsync(); diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 9e24174f9..2bec0137a 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -2571,12 +2571,17 @@ public enum PET5PSScore /// AnswerCombination = 3, - /// - /// 不计算 - /// - NotCalculate=4, + /// + /// 相差绝对值 + /// + DifferenceAbsoluteValue = 4, - } + /// + /// 相差百分比 + /// + PercentageDifference = 5, + + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs index 89f2cfec6..79b2d00b5 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs @@ -134,6 +134,11 @@ namespace IRaCIS.Core.Domain.Models /// public JudgeTypeEnum JudgeType { get; set; } = JudgeTypeEnum.AnswerDisaffinity; + /// + /// 裁判百分比或绝对值的相差值 + /// + public decimal? JudgeDifferenceValue { get; set; } + /// /// 创建人 ///