From 7fee1abdb51b61932c1c1474eb7cf7507d3f1b34 Mon Sep 17 00:00:00 2001 From: hang <87227557@qq.com> Date: Sat, 7 Sep 2024 11:29:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC+=E6=95=B0=E6=8D=AE=E5=BA=93=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reading/Dto/ReadingCalculateViewModel.cs | 4 +-- .../Reading/Dto/ReadingImageTaskViewModel.cs | 32 +++++++++---------- .../Reading/Dto/ReadingQuestionViewModel.cs | 12 +++---- .../ReadingQuestionSystem.cs | 2 +- .../ReadingQuestionTrial.cs | 10 +++--- .../ReadingTableQuestionTrial.cs | 2 +- .../ReadingTableAnswerRowInfo.cs | 6 ++-- .../ReadingTaskQuestionMark.cs | 8 ++--- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs index 49136f718..dbb1d0538 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs @@ -306,8 +306,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public decimal FristAddTaskNum { get; set; } - public string? OtherMeasureData { get; set; } = string.Empty; - public string MeasureData { get; set; } + public string OtherMeasureData { get; set; } = string.Empty; + public string MeasureData { get; set; } = string.Empty; public List TableQuestionList { get; set; } = new List(); } diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 688df02f5..1c32fe7d8 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -37,7 +37,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 文件类型 /// - public string? FileType { get; set; } + public string FileType { get; set; }=string.Empty; public Guid QuestionId { get; set; } public Guid TableQuestionId { get; set; } @@ -1096,7 +1096,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string MeasureData { get; set; } - public string? OtherMeasureData { get; set; } + public string OtherMeasureData { get; set; } public int ShowOrder { get; set; } @@ -1119,9 +1119,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public Guid? OtherStudyId { get; set; } - public string? OtherMarkTool { get; set; } + public string OtherMarkTool { get; set; } - public string? OtherPicturePath { get; set; } + public string OtherPicturePath { get; set; } public int? OtherNumberOfFrames { get; set; } @@ -1187,7 +1187,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public QuestionType? QuestionType { get; set; } - public string? OrderMarkName { get; set; } = string.Empty; + public string OrderMarkName { get; set; } = string.Empty; /// @@ -1205,12 +1205,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public Guid? OtherStudyId { get; set; } - public string? OtherMarkTool { get; set; } + public string OtherMarkTool { get; set; } - public string? OtherPicturePath { get; set; } + public string OtherPicturePath { get; set; } public int? OtherNumberOfFrames { get; set; } - public string? OtherMeasureData { get; set; } = string.Empty; + public string OtherMeasureData { get; set; } = string.Empty; } public class GetReadingQuestionAndAnswerInDto { @@ -1626,7 +1626,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 文件类型 /// - public string? FileType { get; set; } + public string FileType { get; set; } = string.Empty; /// /// 字典code @@ -2165,14 +2165,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 标记工具 /// - public string? MarkTool { get; set; } + public string MarkTool { get; set; } public decimal RowIndex { get; set; } /// /// 截图地址 /// - public string? PicturePath { get; set; } + public string PicturePath { get; set; } /// /// 任务Id @@ -2184,9 +2184,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public Guid TrialId { get; set; } - public string? MeasureData { get; set; } + public string MeasureData { get; set; } - public string? OtherMeasureData { get; set; } + public string OtherMeasureData { get; set; } public Guid? SeriesId { get; set; } @@ -2212,7 +2212,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public decimal? WL { get; set; } - public string? BlindName { get; set; } + public string BlindName { get; set; } public bool IsDicomReading { get; set; } = true; @@ -2232,9 +2232,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public Guid? OtherStudyId { get; set; } - public string? OtherMarkTool { get; set; } + public string OtherMarkTool { get; set; } - public string? OtherPicturePath { get; set; } + public string OtherPicturePath { get; set; } public int? OtherNumberOfFrames { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index 566e9679c..3cf43f6df 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -383,7 +383,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 文件类型 /// - public string? FileType { get; set; } + public string FileType { get; set; }=string.Empty; /// /// 自定义单位 @@ -507,7 +507,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 文件类型 /// - public string? FileType { get; set; } + public string FileType { get; set; } = string.Empty; public Guid? Id { get; set; } public Guid ReadingQuestionId { get; set; } public string Type { get; set; } = string.Empty; @@ -1080,7 +1080,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 文件类型 /// - public string? FileType { get; set; } + public string FileType { get; set; } = string.Empty; /// /// 数据来源 @@ -1159,7 +1159,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 文件类型 /// - public string? FileType { get; set; } + public string FileType { get; set; } = string.Empty; /// /// Id @@ -1680,7 +1680,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 文件类型 /// - public string? FileType { get; set; } + public string FileType { get; set; }=string.Empty; /// /// 数据来源 @@ -2076,7 +2076,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 文件类型 /// - public string? FileType { get; set; } + public string FileType { get; set; } = string.Empty; /// /// 自定义单位 diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs index f690a8be9..dbc7e7926 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs @@ -273,7 +273,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 文件类型 /// - public string? FileType { get; set; } + public string FileType { get; set; } = string.Empty; /// /// 分组分类 diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs index ba9ac4405..ace28be8d 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs @@ -286,12 +286,12 @@ namespace IRaCIS.Core.Domain.Models /// /// 文件类型 /// - public string? FileType { get; set; } + public string FileType { get; set; } = string.Empty; - /// - /// 是否显示在Dicom阅片中 - /// - public bool IsShowInDicom { get; set; } = false; + /// + /// 是否显示在Dicom阅片中 + /// + public bool IsShowInDicom { get; set; } = false; /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs index 932ebc2ec..a4be6e8ff 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs @@ -196,7 +196,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 文件类型 /// - public string? FileType { get; set; } = string.Empty; + public string FileType { get; set; } = string.Empty; /// /// 问题分类 diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs index 8338e1031..b54add574 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs @@ -68,9 +68,9 @@ namespace IRaCIS.Core.Domain.Models public Guid? OtherStudyId { get; set; } - public string? OtherMarkTool { get; set; } + public string OtherMarkTool { get; set; } = string.Empty; - public string? OtherPicturePath { get; set; } + public string OtherPicturePath { get; set; } = string.Empty; public int? OtherNumberOfFrames { get; set; } @@ -159,7 +159,7 @@ namespace IRaCIS.Core.Domain.Models - public string? OtherMeasureData { get; set; } = string.Empty; + public string OtherMeasureData { get; set; } = string.Empty; //病灶编号 diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs index 572de7d25..8781d16a5 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs @@ -52,7 +52,7 @@ namespace IRaCIS.Core.Domain.Models public QuestionType? QuestionType { get; set; } - public string? OrderMarkName { get; set; } = string.Empty; + public string OrderMarkName { get; set; } = string.Empty; public Guid? OtherInstanceId { get; set; } @@ -60,12 +60,12 @@ namespace IRaCIS.Core.Domain.Models public Guid? OtherStudyId { get; set; } - public string? OtherMarkTool { get; set; } = string.Empty; + public string OtherMarkTool { get; set; } = string.Empty; - public string? OtherPicturePath { get; set; } = string.Empty; + public string OtherPicturePath { get; set; } = string.Empty; public int? OtherNumberOfFrames { get; set; } - public string? OtherMeasureData { get; set; } = string.Empty; + public string OtherMeasureData { get; set; } = string.Empty; }