From 2daa2fdb136db903636a96b3b485a7fe738e6651 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 3 Aug 2022 15:59:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/ReadingImageTaskViewModel.cs | 5 +++++ .../Service/Reading/Dto/ReadingQuestionViewModel.cs | 4 ++++ .../Service/Reading/ReadingImageTaskService.cs | 1 + .../Service/Reading/ReadingQuestionService.cs | 2 ++ .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs | 4 ---- .../Service/TrialSiteUser/TrialConfigService.cs | 4 ++-- IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs | 5 +---- IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs | 5 +++++ 8 files changed, 20 insertions(+), 10 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 08e5f547e..d882f48a2 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -677,6 +677,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string RelevanceValue { get; set; } = string.Empty; + /// + /// 图片数量 + /// + public int ImageCount { get; set; } + 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 a6a506228..803221f58 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -514,6 +514,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 关联Value /// public string RelevanceValue { get; set; } = string.Empty; + /// + /// 图片数量 + /// + public int ImageCount { get; set; } } public class AddOrUpdateReadingQuestionSystemInDto { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 89a000a0a..74aed7506 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -674,6 +674,7 @@ namespace IRaCIS.Application.Services ShowOrder = data.ShowOrder, RelevanceId=data.RelevanceId, RelevanceValue=data.RelevanceValue, + ImageCount=data.ImageCount, 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 cd8a457cf..077cedba2 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs @@ -289,6 +289,7 @@ namespace IRaCIS.Application.Services ReadingCriterionPageId = x.ReadingCriterionPageId, RelevanceId=x.RelevanceId, RelevanceValue=x.RelevanceValue, + ImageCount=x.ImageCount, ParentId = x.ParentId, ReadingQuestionCriterionTrialId = x.ReadingQuestionCriterionTrialId, ReadingQuestionSystemId = x.ReadingQuestionSystemId, @@ -331,6 +332,7 @@ namespace IRaCIS.Application.Services QuestionName=c.system.QuestionName, ReadingCriterionPageId=c.trial.FirstOrDefault()?.ReadingCriterionPageId, RelevanceId = c.trial.FirstOrDefault()?.RelevanceId, + ImageCount = c.trial.FirstOrDefault()?.ImageCount??0, RelevanceValue = c.trial.FirstOrDefault()?.RelevanceValue, ReadingQuestionCriterionTrialId = item.Id, Remark=c.system.Remark, diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index edc8bb1bc..d4fbfc786 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -621,8 +621,6 @@ namespace IRaCIS.Core.Application.Contracts public FormType? FormType { get; set; } - public int ImageCount { get; set; } - /// /// 项目标准Id @@ -707,8 +705,6 @@ 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 6ddd59708..12c8fa657 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -229,7 +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 @@ -265,7 +265,7 @@ namespace IRaCIS.Core.Application { 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 c29325082..9e890a5f6 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs @@ -71,10 +71,7 @@ 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 ef05c1d9f..8a611bf87 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs @@ -127,6 +127,11 @@ namespace IRaCIS.Core.Domain.Models /// public string RelevanceValue { get; set; }=string.Empty; + /// + /// 图片数量 + /// + public int ImageCount { get; set; } = 0; + /// /// 分页标准 ///