From 8f2a8a301d71bad21f78e48c2d7ca563cfd24284 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 19 Aug 2022 10:52:26 +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/ReadingQuestionViewModel.cs | 33 +++++++++++++++++++ .../Service/Reading/ReadingQuestionService.cs | 2 +- IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs | 31 ++++++++++------- .../Reading/ReadingQuestionSystem.cs | 5 +++ .../Reading/ReadingQuestionTrial.cs | 5 +++ .../Reading/ReadingTableQuestionSystem.cs | 5 +++ .../Reading/ReadingTableQuestionTrial.cs | 5 +++ 7 files changed, 74 insertions(+), 12 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index 810f36e63..9a8e6aadb 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -56,6 +56,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 依赖父问题 /// public Guid? DependParentId { get; set; } + + /// + /// 问题标识 + /// + public QuestionMark? QuestionMark { get; set; } } @@ -111,6 +116,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public Guid SystemCriterionId { get; set; } + /// + /// 问题标识 + /// + public QuestionMark? QuestionMark { get; set; } + } @@ -448,6 +458,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 病灶类型 /// public LesionType? LesionType { get; set; } + + + /// + /// 问题类型 + /// + public QuestionType? QuestionType { get; set; } } public class ReadingQuestionSystemView @@ -553,6 +569,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 病灶类型 /// public LesionType? LesionType { get; set; } + + + /// + /// 问题类型 + /// + public QuestionType? QuestionType { get; set; } } @@ -835,6 +857,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 病灶类型 /// public LesionType? LesionType { get; set; } + + + /// + /// 问题类型 + /// + public QuestionType? QuestionType { get; set; } } @@ -949,6 +977,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 病灶类型 /// public LesionType? LesionType { get; set; } + + /// + /// 问题类型 + /// + public QuestionType? QuestionType { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs index 5a2c043bd..264f3e5e3 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs @@ -760,7 +760,7 @@ namespace IRaCIS.Application.Services /// - /// 添加系统qc问题标准 + /// 添加系统问题标准 /// /// [NonDynamicMethod] diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index bf419c8d3..ab58e1429 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -15,7 +15,7 @@ namespace IRaCIS.Core.Domain.Share /// /// 计划内访视 /// - InPlanSubjectVisit=0, + InPlanSubjectVisit = 0, /// /// 计划外访视 @@ -42,7 +42,7 @@ namespace IRaCIS.Core.Domain.Share /// Oncology = 5, - + } public enum ReadingSetType @@ -50,12 +50,12 @@ namespace IRaCIS.Core.Domain.Share /// /// 影像阅片 /// - ImageReading=0, + ImageReading = 0, /// /// 肿瘤阅片 /// - TumorReading=1, + TumorReading = 1, } /// @@ -66,12 +66,12 @@ namespace IRaCIS.Core.Domain.Share /// /// 全部 /// - All=0, + All = 0, /// /// 根据Site /// - Site=1, + Site = 1, } @@ -86,7 +86,7 @@ namespace IRaCIS.Core.Domain.Share /// /// 未生效 /// - NotTakeEffect=0, + NotTakeEffect = 0, /// /// 已生效 @@ -96,7 +96,7 @@ namespace IRaCIS.Core.Domain.Share /// /// 已撤销 /// - Revocation=2, + Revocation = 2, } /// @@ -107,12 +107,12 @@ namespace IRaCIS.Core.Domain.Share /// /// CRC /// - CRC=0, + CRC = 0, /// /// PM /// - PM=1, + PM = 1, } /// @@ -203,7 +203,7 @@ namespace IRaCIS.Core.Domain.Share /// /// 受试者 /// - [DisplayAttribute(Name ="受试者")] + [DisplayAttribute(Name = "受试者")] Subject = 0, /// @@ -225,6 +225,15 @@ namespace IRaCIS.Core.Domain.Share OncologyRead = 3, } + public enum QuestionMark + { + + } + + public enum QuestionType + { + } + /// /// 裁判阅片问题类型 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs index ffb7032aa..1300fe472 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs @@ -109,6 +109,11 @@ namespace IRaCIS.Core.Domain.Models /// public LesionType? LesionType { get; set; } + /// + /// 问题类型 + /// + public QuestionType? QuestionType { get; set; } + /// /// 创建人 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs index 6f6f64a05..c29a1db25 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs @@ -72,6 +72,11 @@ namespace IRaCIS.Core.Domain.Models /// public LesionType? LesionType { get; set; } + /// + /// 问题类型 + /// + public QuestionType? QuestionType { get; set; } + /// /// 备注 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs index 33da868c6..e96dba0d9 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs @@ -127,6 +127,11 @@ namespace IRaCIS.Core.Domain.Models /// public Guid SystemCriterionId { get; set; } + /// + /// 问题标识 + /// + public QuestionMark? QuestionMark { get; set; } + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs index ef175242e..cdde5630e 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs @@ -131,6 +131,11 @@ namespace IRaCIS.Core.Domain.Models /// public Guid TrialCriterionId { get; set; } + /// + /// 问题标识 + /// + public QuestionMark? QuestionMark { get; set; } + }