From f39ef0d799a2a7ac4ddad6e6d1ef10dd2246e27d Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 23 Oct 2023 16:52:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reading/Dto/ReadingImageTaskViewModel.cs | 5 ++++ .../Reading/Dto/ReadingQuestionViewModel.cs | 30 +++++++++++++++++++ .../Interface/IReadingImageTaskService.cs | 2 +- .../ReadingImageTaskService.cs | 8 +++-- IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs | 12 ++++++++ .../ReadingQuestionSystem.cs | 13 +++++--- .../ReadingQuestionTrial.cs | 7 +++++ 7 files changed, 69 insertions(+), 8 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index bb26b4704..0803c8c00 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -507,6 +507,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid TrialId { get; set; } + /// + /// 分组分类 + /// + public List? GroupClassifyList { get; set; } + /// /// 问题分类 /// diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index 37b96be24..4983fb326 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -341,6 +341,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public QuestionClassify? QuestionClassify { get; set; } + /// + /// 分组分类 + /// + public GroupClassify? GroupClassify { get; set; } + /// /// 单位 /// @@ -450,6 +455,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public QuestionClassify? QuestionClassify { get; set; } + /// + /// 分组分类 + /// + public GroupClassify? GroupClassify { get; set; } + /// /// 数据来源 /// @@ -999,6 +1009,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public QuestionClassify? QuestionClassify { get; set; } + /// + /// 分组分类 + /// + public GroupClassify? GroupClassify { get; set; } + /// /// 单位 /// @@ -1068,6 +1083,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public QuestionClassify? QuestionClassify { get; set; } + /// + /// 分组分类 + /// + public GroupClassify? GroupClassify { get; set; } + public List ParentTriggerValueList { get; set; } = new List(); public List RelevanceValueList { get; set; } = new List(); @@ -1593,6 +1613,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public QuestionClassify? QuestionClassify { get; set; } + /// + /// 分组分类 + /// + public GroupClassify? GroupClassify { get; set; } + /// /// 限制编辑 /// @@ -1957,6 +1982,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public QuestionClassify? QuestionClassify { get; set; } + /// + /// 分组分类 + /// + public GroupClassify? GroupClassify { get; set; } + /// /// 数据来源 /// diff --git a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs index 99d4cc7de..6cba1b928 100644 --- a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingImageTaskService.cs @@ -23,7 +23,7 @@ namespace IRaCIS.Core.Application.Contracts Task GetGlobalReadingInfo(GetGlobalReadingInfoInDto inDto); - Task> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId,QuestionClassify? questionClassify); + Task> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId,QuestionClassify? questionClassify, List? groupClassifyList); Task GetReadingTableQuestion(GetReadingTableQuestionOrAnswerInDto inDto); diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index dcf3282cb..e418bc662 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -704,7 +704,7 @@ namespace IRaCIS.Application.Services { //await AddDefaultValueToTask(inDto.VisitTaskId); var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); - var result = await GetReadingQuestion(taskInfo.TrialReadingCriterionId, taskInfo.Id, inDto.QuestionClassify); + var result = await GetReadingQuestion(taskInfo.TrialReadingCriterionId, taskInfo.Id, inDto.QuestionClassify,inDto.GroupClassifyList); @@ -722,7 +722,7 @@ namespace IRaCIS.Application.Services /// /// [NonDynamicMethod] - public async Task> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId, QuestionClassify? questionClassify) + public async Task> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId, QuestionClassify? questionClassify, List? groupClassifyList) { @@ -776,7 +776,9 @@ namespace IRaCIS.Application.Services //排除表格问题 同时排除组问题 var groupids = questions.Where(x => x.Type != ReadingQestionType.Group).Select(x => x.GroupId).ToList(); - var result = questions.Where(x => x.Type == ReadingQestionType.Group && groupids.Contains(x.Id)).ToList(); + var result = questions.Where(x => x.Type == ReadingQestionType.Group && groupids.Contains(x.Id)) + .WhereIf(groupClassifyList!=null,x=>x.GroupClassify!=null&& groupClassifyList.Contains(x.GroupClassify.Value)) + .ToList(); foreach (var item in result) { diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 5cb3743d9..2fccb06c7 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -67,6 +67,18 @@ namespace IRaCIS.Core.Domain.Share } + /// + /// 分组分类 + /// + public enum GroupClassify + { + /// + /// 质量问题 + /// + QualityProblem = 1, + + } + /// /// 临床表格问题标识 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs index 764d72254..1b7e453c3 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs @@ -203,10 +203,15 @@ namespace IRaCIS.Core.Domain.Models /// public string? FileType { get; set; } - /// - /// 问题分类 - /// - public QuestionClassify? QuestionClassify { get; set; } + /// + /// 分组分类 + /// + public GroupClassify? GroupClassify { get; set; } + + /// + /// 问题分类 + /// + public QuestionClassify? QuestionClassify { get; set; } [JsonIgnore] [ForeignKey("GroupId")] diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs index 959790ed5..0ffbd778d 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs @@ -271,6 +271,13 @@ namespace IRaCIS.Core.Domain.Models /// public Guid? GroupId { get; set; } + + /// + /// 分组分类 + /// + public GroupClassify? GroupClassify { get; set; } + + /// /// 问题分类 ///