diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index d1a204b0d..08e5f547e 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -667,6 +667,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public Guid? ReadingCriterionPageId { get; set; } + /// + /// 关联ID + /// + public Guid? RelevanceId { get; set; } + + /// + /// 关联Value + /// + public string RelevanceValue { get; set; } = string.Empty; + public List Childrens { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index ec8c20a05..a6a506228 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -267,6 +267,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 标准分页Id /// public Guid? ReadingCriterionPageId { get; set; } + + + /// + /// 关联ID + /// + public Guid? RelevanceId { get; set; } + + /// + /// 关联Value + /// + public string RelevanceValue { get; set; } = string.Empty; } public class ReadingQuestionSystemView @@ -492,6 +503,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 裁判类型 /// public JudgeTypeEnum JudgeType { get; set; } + + + /// + /// 关联ID + /// + public Guid? RelevanceId { get; set; } + + /// + /// 关联Value + /// + public string RelevanceValue { get; set; } = string.Empty; } public class AddOrUpdateReadingQuestionSystemInDto { @@ -641,6 +663,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 标准分页Id /// public Guid? ReadingCriterionPageId { get; set; } + + /// + /// 关联ID + /// + public Guid? RelevanceId { get; set; } + + /// + /// 关联Value + /// + public string RelevanceValue { get; set; } = string.Empty; } @@ -730,6 +762,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto + + /// /// 是否是系统数据 /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 4b82a2d53..89a000a0a 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -672,6 +672,8 @@ namespace IRaCIS.Application.Services QuestionName = data.QuestionName, IsRequired = data.IsRequired, ShowOrder = data.ShowOrder, + RelevanceId=data.RelevanceId, + RelevanceValue=data.RelevanceValue, ParentId = data.ParentId, TypeValue = data.TypeValue, Answer = leftquestionAnswer.Answer, diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs index 2b036e654..cd8a457cf 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs @@ -287,6 +287,8 @@ namespace IRaCIS.Application.Services Id = x.Id, JudgeType = x.JudgeType, ReadingCriterionPageId = x.ReadingCriterionPageId, + RelevanceId=x.RelevanceId, + RelevanceValue=x.RelevanceValue, ParentId = x.ParentId, ReadingQuestionCriterionTrialId = x.ReadingQuestionCriterionTrialId, ReadingQuestionSystemId = x.ReadingQuestionSystemId, @@ -328,10 +330,13 @@ namespace IRaCIS.Application.Services ParentTriggerValue=c.system.ParentTriggerValue, QuestionName=c.system.QuestionName, ReadingCriterionPageId=c.trial.FirstOrDefault()?.ReadingCriterionPageId, + RelevanceId = c.trial.FirstOrDefault()?.RelevanceId, + RelevanceValue = c.trial.FirstOrDefault()?.RelevanceValue, ReadingQuestionCriterionTrialId = item.Id, Remark=c.system.Remark, TrialId=item.TrialId, Type=c.system.Type, + TypeValue=c.system.TypeValue, }).ToList(); var copydata = needAddQuestionList.Clone(); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index e14fee89a..edc8bb1bc 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -620,6 +620,10 @@ namespace IRaCIS.Core.Application.Contracts public int? DigitPlaces { get; set; } public FormType? FormType { get; set; } + + public int ImageCount { get; set; } + + /// /// 项目标准Id /// @@ -702,6 +706,9 @@ namespace IRaCIS.Core.Application.Contracts /// public int? DigitPlaces { get; set; } + + public int ImageCount { get; set; } + public bool IsSignSave { get; set; } = false; } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 294601c30..6ddd59708 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -229,6 +229,7 @@ namespace IRaCIS.Core.Application result.DigitPlaces = trialCriterion.DigitPlaces; result.TrialCriterionId = trialCriterion.Id; result.FormType = trialCriterion.FormType; + result.ImageCount=trialCriterion.ImageCount; }; result.TrialQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.TrialId == inDto.TrialId&&x.ReadingQuestionCriterionTrialId == result.TrialCriterionId @@ -247,7 +248,6 @@ namespace IRaCIS.Core.Application /// public async Task SetTrialReadingCriterion(SetTrialReadingCriterionInDto inDto) { - if (inDto.IsSignSave) { var criterionFormType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialCriterionId).Select(x => x.FormType).FirstOrDefaultAsync(); @@ -261,12 +261,11 @@ namespace IRaCIS.Core.Application } } - await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialCriterionId, x => new ReadingQuestionCriterionTrial() { - FormType = inDto.FormType, DigitPlaces = inDto.DigitPlaces, + ImageCount=inDto.ImageCount, }); diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs index 0666d5915..c29325082 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs @@ -71,6 +71,11 @@ namespace IRaCIS.Core.Domain.Models /// public int? DigitPlaces { get; set; } = 2; + /// + /// 图片数量 + /// + public int ImageCount { get; set; } = 0; + /// /// 评估结果 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs index 4bba4385d..ef05c1d9f 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs @@ -117,6 +117,16 @@ namespace IRaCIS.Core.Domain.Models /// public Guid? ReadingCriterionPageId { get; set; } + /// + /// 关联ID + /// + public Guid? RelevanceId { get; set; } + + /// + /// 关联Value + /// + public string RelevanceValue { get; set; }=string.Empty; + /// /// 分页标准 ///