From b26e596ffb3bab76d409fbfc94b16ddf28abf063 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 27 Jun 2022 14:35:38 +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 --- .../IRaCIS.Core.Application.xml | 18 ++++++++++ .../Reading/Dto/ReadingQuestionViewModel.cs | 7 ++++ .../Interface/IReadingImageTaskService.cs | 3 ++ .../Reading/ReadingImageTaskService.cs | 4 +-- .../Service/Reading/ReadingQuestionService.cs | 36 +++++++++++++++++++ 5 files changed, 66 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index a1fd5b2d0..6341ac511 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1225,6 +1225,11 @@ FileName + + + 上传时间 + + 项目ID @@ -4310,6 +4315,12 @@ + + + 添加CRC数据类型 + + + 删除 @@ -4647,6 +4658,13 @@ + + + 获取预览问题信息 + + + + 设置项目标准是否完成配置 diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index e8dd94359..b9353d91b 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -31,6 +31,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public bool IsEnable { get; set; } } + + public class GetPreviewTheQuestionInDto + { + [NotDefault] + public Guid Id { get; set; } + } + public class AddOrUpdateReadingQuestionCriterionSystemInDto { public Guid? Id { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs index 062594ecf..d36a33105 100644 --- a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs @@ -14,5 +14,8 @@ namespace IRaCIS.Core.Application.Contracts Task SubmitVisitTaskQuestions(SubmitVisitTaskQuestionsInDto inDto); Task SubmitJudgeVisitTaskResult(SaveJudgeVisitTaskResult inDto); + + + void FindChildQuestion(GetTrialReadingQuestionOutDto trialReadingQuestion, List questionlists); } } \ No newline at end of file diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 14069eaa3..2c64f0488 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -419,8 +419,8 @@ namespace IRaCIS.Application.Services /// /// /// - - private void FindChildQuestion(GetTrialReadingQuestionOutDto trialReadingQuestion, List questionlists) + [NonDynamicMethod] + public void FindChildQuestion(GetTrialReadingQuestionOutDto trialReadingQuestion, List questionlists) { trialReadingQuestion.Childrens = questionlists.Where(x => x.ParentId == trialReadingQuestion.ReadingQuestionTrialId).ToList(); if (trialReadingQuestion.Childrens != null && trialReadingQuestion.Childrens.Count != 0) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs index db445c12c..3d9618fe7 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs @@ -30,6 +30,7 @@ namespace IRaCIS.Application.Services private readonly IRepository _clinicalDataTrialSetRepository; private readonly IRepository _clinicalDataSystemSetRepository; private readonly IRepository _dictionaryRepository; + private readonly IReadingImageTaskService _readingImageTaskService; private readonly IRepository _readingTaskQuestionAnswer; private readonly IRepository _previousPDFRepository; @@ -42,6 +43,7 @@ namespace IRaCIS.Application.Services IRepository ClinicalDataTrialSetRepository, IRepository ClinicalDataSystemSetRepository, IRepository dictionaryRepository, + IReadingImageTaskService readingImageTaskService, IRepository readingTaskQuestionAnswer, IRepository previousPDFRepository ) @@ -54,6 +56,7 @@ namespace IRaCIS.Application.Services this._clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository; this._clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository; this._dictionaryRepository = dictionaryRepository; + this._readingImageTaskService = readingImageTaskService; this._readingTaskQuestionAnswer = readingTaskQuestionAnswer; this._previousPDFRepository = previousPDFRepository; } @@ -438,6 +441,39 @@ namespace IRaCIS.Application.Services return ResponseOutput.Ok(entity.Id.ToString()); } + /// + /// 获取预览问题信息 + /// + /// + /// + [HttpPost] + public async Task> GetPreviewTheQuestion(GetPreviewTheQuestionInDto inDto) + { + var trialQuestionQuery = from trialQuestion in _readingQuestionTrialRepository.Where(x=>x.ReadingQuestionCriterionTrialId== inDto.Id) + select new GetTrialReadingQuestionOutDto() + { + ReadingQuestionTrialId = trialQuestion.Id, + ReadingQuestionCriterionTrialId = trialQuestion.ReadingQuestionCriterionTrialId, + TrialId = trialQuestion.TrialId, + Type = trialQuestion.Type, + ParentTriggerValue = trialQuestion.ParentTriggerValue, + GroupName = trialQuestion.GroupName, + QuestionName = trialQuestion.QuestionName, + IsRequired = trialQuestion.IsRequired, + ShowOrder = trialQuestion.ShowOrder, + ParentId = trialQuestion.ParentId, + TypeValue = trialQuestion.TypeValue, + Answer = string.Empty + }; + var qusetionList = await trialQuestionQuery.OrderBy(x => x.ShowOrder).ToListAsync(); + List readingQuestionList = qusetionList.Where(x => x.ParentId == null).ToList(); + readingQuestionList.ForEach(x => + { + _readingImageTaskService.FindChildQuestion(x, qusetionList); + }); + + return readingQuestionList; + } ///// ///// 设置项目标准是否生效