From d79005242e787658f25c5e21d0772a75c4f60724 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 19 Sep 2022 14:11:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reading/Dto/ReadingImageTaskViewModel.cs | 6 +- .../Reading/Dto/ReadingQuestionViewModel.cs | 11 +++ .../Reading/ReadingImageTaskService.cs | 1 + .../Service/Reading/ReadingQuestionService.cs | 2 - IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs | 83 ++++++++++++++++++- .../Reading/ReadingTableQuestionSystem.cs | 5 ++ .../Reading/ReadingTableQuestionTrial.cs | 8 +- 7 files changed, 111 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 6e8d1de02..41d92763d 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1371,10 +1371,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class GetTrialReadingQuestionOutDto { - + /// + /// 字典code + /// + public string DictionaryCode { get; set; } + /// /// 项目标准Id /// diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index 0c7236acc..9be2e4325 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -109,6 +109,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class ReadingTableQuestionTrialAddOrEdit { public Guid? Id { get; set; } + + + /// + /// 字典code + /// + public string DictionaryCode { get; set; } = string.Empty; public Guid ReadingQuestionId { get; set; } public string Type { get; set; } = string.Empty; public Guid? ParentId { get; set; } @@ -157,6 +163,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid? Id { get; set; } public Guid ReadingQuestionId { get; set; } public string Type { get; set; } = string.Empty; + + /// + /// 字典code + /// + public string DictionaryCode { get; set; } = string.Empty; public Guid? ParentId { get; set; } public string ParentTriggerValue { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 3ecdfc469..c0d99b0c1 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -606,6 +606,7 @@ namespace IRaCIS.Application.Services ShowOrder = x.ShowOrder, GroupName = string.Empty, Id = x.Id, + DictionaryCode=x.DictionaryCode, Type = x.Type, TableQuestionType = x.TableQuestionType, DependParentId = x.DependParentId, diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs index 06ebcad70..c9c5d25c8 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs @@ -241,8 +241,6 @@ namespace IRaCIS.Application.Services [HttpPost] public async Task> GetReadingTableQuestionSystemList(ReadingTableQuestionSystemQuery inDto) { - - var readingTableQuestionSystemQueryable = _readingTableQuestionSystemRepository .WhereIf(inDto.TableQuestionType!=null,x=>x.TableQuestionType ==inDto.TableQuestionType!) .Where(x=>x.ReadingQuestionId==inDto.ReadingQuestionId).ProjectTo(_mapper.ConfigurationProvider); diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index e14082386..0531021cb 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -16,9 +16,90 @@ namespace IRaCIS.Core.Domain.Share public static readonly string Group = "group"; } + /// + /// 非把病灶状态 + /// + public enum NoTargetState + { /// - /// 模块枚举 + /// 存在 /// + Exist = 0, + + /// + /// 显著增大 + /// + Increase = 1, + + /// + /// 无法评估 + /// + UnableEvaluate = 2, + + /// + /// 消失 + /// + Loss = 3 + } + + + /// + /// 新病灶状态 + /// + public enum NewLesionState + { + + /// + /// 存在 + /// + Exist = 0, + + /// + /// 疑似 + /// + Suspected = 1, + + /// + /// 无法评估 + /// + UnableEvaluate = 2, + + /// + /// 消失 + /// + Loss = 3 + } + + /// + /// 靶病灶状态 + /// + public enum TargetState + { + + /// + /// 存在 + /// + Exist = 0, + + /// + /// 太小 + /// + TooSmall = 1, + + /// + /// 无法评估 + /// + UnableEvaluate = 2, + + /// + /// 消失 + /// + Loss = 3 + } + + /// + /// 模块枚举 + /// public enum ModuleTypeEnum { /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs index d47607cc0..77e87f72a 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs @@ -132,6 +132,11 @@ namespace IRaCIS.Core.Domain.Models /// public QuestionMark? QuestionMark { get; set; } + /// + /// 字典code + /// + public string DictionaryCode { get; set; } + [ForeignKey("DependParentId")] public ReadingTableQuestionSystem DependParentQuestion { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs index 9a96a1e4a..c9340b2f3 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs @@ -136,7 +136,13 @@ namespace IRaCIS.Core.Domain.Models /// public QuestionMark? QuestionMark { get; set; } - [JsonIgnore] + + /// + /// 字典code + /// + public string DictionaryCode { get; set; } + + [JsonIgnore] [ForeignKey("DependParentId")] public ReadingTableQuestionTrial DependParentQuestion { get; set; }