From 6e2a58c3d7eab20b302b0cbf215e72e49ec3f943 Mon Sep 17 00:00:00 2001 From: hang <87227557@qq.com> Date: Sat, 7 Sep 2024 00:19:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 234 +++++++++++++++--- IRaCIS.Core.Domain/Common/Dictionary.cs | 2 +- IRaCIS.Core.Domain/Common/FrontAuditConfig.cs | 6 +- IRaCIS.Core.Domain/Common/VerificationCode.cs | 4 +- IRaCIS.Core.Domain/Dcotor/Doctor.cs | 2 +- IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj | 4 +- IRaCIS.Core.Domain/Image/DicomInstance.cs | 22 +- IRaCIS.Core.Domain/Image/DicomSeries.cs | 22 +- IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs | 2 +- IRaCIS.Core.Domain/Image/NoneDicomStudy.cs | 10 +- IRaCIS.Core.Domain/Image/SCPInstance.cs | 20 +- IRaCIS.Core.Domain/Image/SCPSeries.cs | 22 +- IRaCIS.Core.Domain/Image/TaskInstance.cs | 22 +- IRaCIS.Core.Domain/Image/TaskSeries.cs | 22 +- IRaCIS.Core.Domain/Management/Menu.cs | 8 +- IRaCIS.Core.Domain/Management/UserLog.cs | 2 +- IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs | 2 +- IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs | 6 +- IRaCIS.Core.Domain/QC/QCChallenge.cs | 2 +- .../SystemClinicalTableQuestion.cs | 18 +- .../ClinicalQuestion/TrialClinicalQuestion.cs | 2 +- .../TrialClinicalTableQuestion.cs | 18 +- .../ReadingMedicalReviewDialog.cs | 10 +- .../Reading/ReadingCriterion/OrganInfo.cs | 10 +- .../ReadingQuestionCriterionSystem.cs | 12 +- .../ReadingQuestionCriterionTrial.cs | 2 +- .../ReadingTableQuestionSystem.cs | 68 ++--- .../ReadingTableQuestionTrial.cs | 6 +- .../ReadingTaskQuestionAnswer.cs | 12 +- .../ReadingTaskQuestionMark.cs | 4 +- IRaCIS.Core.Domain/Trial/DataInspection.cs | 4 +- IRaCIS.Core.Domain/Trial/Trial.cs | 8 +- IRaCIS.Core.Domain/Trial/TrialSign.cs | 6 +- .../TrialSiteUser/TrialExternalUser.cs | 24 +- .../Visit/SubjectCanceDoctor.cs | 2 +- IRaCIS.Core.Domain/Visit/SubjectVisit.cs | 4 +- IRaCIS.Core.Test/IRaCIS.Core.Test.csproj | 1 - 37 files changed, 393 insertions(+), 232 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 3eafb5142..21ad9d7aa 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -74,6 +74,7 @@ 接口请求参考文档：https://www.koudingke.cn/docs/zh-Hans/net-lib-docs/latest/RestSharp/Usage/Usage + oosFolderPath 不要 "/ "开头 应该： TempFolder/ChildFolder @@ -90,6 +91,7 @@ + @@ -994,12 +996,54 @@ - + 获取该受试者任务上传列表（展示已上传情况） - - + + + + + 在调用预归档前验证 这些检查是否可以全新上传还是已存在补充 目前前端允许 IsAllowUpload==true 全新、IsAllowReUpload==true 补充的study ，全部丢到后端，后端判断存在，就删除之前的检查，全新插入 + + + + + + + IR 上传任务 nonedicom 列表 后处理的数据UploadedFileCount不能排序 --new + + + + + + + IQC 获取CRC 上传到某一个访视的的检查信息 (原始影像信息 包含dicom 非dicom) + + + + + + + IR 阅片页面 和IR 任务列表页面下载 勾选下载列表（后端要考虑到一致性分析 subjectCode的问题） + + + + + + + IR 阅片页面获取下载检查的信息 会根据标准进行过滤检查，（后端要考虑到一致性分析 subjectCode的问题） + 检查在访视下面，所以需要传递下载的访视Id，另外下载访视下面那些检查，就把访视下的对应的检查Id 丢到数组里就好 + + + + + + + + dicom 影响后处理预览接口 + + @@ -1032,49 +1076,27 @@ - + - IR 影像上传任务列表 + IR 影像上传任务列表 --old 20240903 界面调整，现在先废弃 - + - IR 上传任务 dicom 列表 后处理的数据不能排序 + IR 上传任务 dicom 列表 后处理的数据不能排序 --old 20240903 界面调整，现在先废弃 - + - IR 上传任务 nonedicom 列表 后处理的数据不能排序 + IR 上传任务 nonedicom 列表 后处理的数据不能排序 --old 20240903 界面调整，现在先废弃 - - - IQC 获取CRC 上传到某一个访视的的检查信息 (原始影像信息 包含dicom 非dicom) - - - - - - - IR 阅片页面 和IR 任务列表页面下载 勾选下载列表（后端要考虑到一致性分析 subjectCode的问题） - - - - - - - IR 阅片页面获取下载检查的信息 会根据标准进行过滤检查，（后端要考虑到一致性分析 subjectCode的问题） - - - - - 指定资源Id，渲染Dicom检查的Jpeg预览图像 Dicom检查的Id @@ -2081,6 +2103,41 @@ + + + 计算NTAV的EEM + + + + + + + 获取(EEM-Lumen)求和 + + + + + + + 计算NTAV的（EEM-Lumen）求和/回撤中的图像数 + + + + + + + 冠状动脉粥样硬化体积百分比（PAV） + + + + + + + 总动脉粥样硬化体积（NTAV） + + + + 将上一次的访视病灶添加到这一次 @@ -3144,6 +3201,95 @@ + + + 获取阅片的计算数据 + + + + + + + 获取Sod的值 + + + + + 获取iSod的值 + + + + + 上一次访视Id + + + + + 首次转变的任务ID + + + + + 触发任务list + + + + + 删除病灶获取起始病灶序号（RECIST1Point1 固定是1） + + + + + + 获取阅片报告 + + + + + + + 测试计算 + + + + + + + + 计算任务 + + + + + + + 获取报告验证的信息(这里每个标准可能不一样 返回用object) + + + + + + + 自动计算 + + + + + + + + 验证访视提交 + + + + + + + 将上一次的访视病灶添加到这一次 + + + + 获取阅片的计算数据 @@ -10311,6 +10457,11 @@ 传了Id + + + 是否是一致性分析产生 + + 加急类型 @@ -10339,6 +10490,16 @@ VisitTaskView 列表视图模型 + + + 是否手动生成 + + + + + 是否是一致性分析产生 + + 是否是一致性分析产生 @@ -10444,6 +10605,11 @@ FrontAuditConfigAddOrEdit 列表查询参数模型 + + + 字段的英文值 + + 是否向前站位 @@ -13512,12 +13678,6 @@ - - - 设置项目阅片标准 - - - 设置项目阅片信息 diff --git a/IRaCIS.Core.Domain/Common/Dictionary.cs b/IRaCIS.Core.Domain/Common/Dictionary.cs index 0608dffe4..5ca06026e 100644 --- a/IRaCIS.Core.Domain/Common/Dictionary.cs +++ b/IRaCIS.Core.Domain/Common/Dictionary.cs @@ -27,7 +27,7 @@ namespace IRaCIS.Core.Domain.Models #endregion - public string ChildGroup { get; set; } + public string ChildGroup { get; set; } = string.Empty; public int ChildCodeEnum { get; set; } diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs index 272ad5060..21ac90a95 100644 --- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs +++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs @@ -89,7 +89,7 @@ namespace IRaCIS.Core.Domain.Models //前端渲染数组 数组名 和数组值 - public string ChildDataLabel { get; set; } + public string ChildDataLabel { get; set; } = String.Empty; /// @@ -97,7 +97,7 @@ namespace IRaCIS.Core.Domain.Models /// public string ChildDataEnLabel { get; set; } = string.Empty; - public string ChildDataValue { get; set; } + public string ChildDataValue { get; set; } = String.Empty; @@ -112,7 +112,7 @@ namespace IRaCIS.Core.Domain.Models /// 前端展示类型 Router， Array，Table /// - public string DataType { get; set; } + public string DataType { get; set; } = String.Empty; // 后端翻译的类型 对应前端界面 "",Dictionary,Date public string EnumType { get; set; } diff --git a/IRaCIS.Core.Domain/Common/VerificationCode.cs b/IRaCIS.Core.Domain/Common/VerificationCode.cs index 8a7638fad..9a7f41926 100644 --- a/IRaCIS.Core.Domain/Common/VerificationCode.cs +++ b/IRaCIS.Core.Domain/Common/VerificationCode.cs @@ -11,7 +11,7 @@ namespace IRaCIS.Core.Domain.Models public Guid UserId { get; set; } = Guid.Empty; //验证码 - public string Code { get; set; } + public string Code { get; set; } = string.Empty; //什么类型的验证码 邮箱|手机 @@ -20,7 +20,7 @@ namespace IRaCIS.Core.Domain.Models public bool HasSend { get; set; } //发送的邮箱或者手机 - public string EmailOrPhone { get; set; } + public string EmailOrPhone { get; set; }=string.Empty; //过期时间 public DateTime ExpirationTime { get; set; } diff --git a/IRaCIS.Core.Domain/Dcotor/Doctor.cs b/IRaCIS.Core.Domain/Dcotor/Doctor.cs index bfa112dfa..abbd2d970 100644 --- a/IRaCIS.Core.Domain/Dcotor/Doctor.cs +++ b/IRaCIS.Core.Domain/Dcotor/Doctor.cs @@ -48,7 +48,7 @@ namespace IRaCIS.Core.Domain.Models #endregion - public string ReviewerCode { get; set; } + public string ReviewerCode { get; set; } = string.Empty; public int Code { get; set; } diff --git a/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj b/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj index 15c6078d5..8f65510a5 100644 --- a/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj +++ b/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj @@ -1,5 +1,7 @@  - + + enable + net8.0 diff --git a/IRaCIS.Core.Domain/Image/DicomInstance.cs b/IRaCIS.Core.Domain/Image/DicomInstance.cs index cc9a83c3a..8893ae3b8 100644 --- a/IRaCIS.Core.Domain/Image/DicomInstance.cs +++ b/IRaCIS.Core.Domain/Image/DicomInstance.cs @@ -22,9 +22,9 @@ namespace IRaCIS.Core.Domain.Models public Guid SeqId { get; set; } public Guid StudyId { get; set; } public Guid SeriesId { get; set; } - public string StudyInstanceUid { get; set; } - public string SeriesInstanceUid { get; set; } - public string SopInstanceUid { get; set; } + public string StudyInstanceUid { get; set; } = String.Empty; + public string SeriesInstanceUid { get; set; } = String.Empty; + public string SopInstanceUid { get; set; } = String.Empty; public int InstanceNumber { get; set; } public DateTime? InstanceTime { get; set; } public bool CPIStatus { get; set; } @@ -33,14 +33,14 @@ namespace IRaCIS.Core.Domain.Models public int SliceLocation { get; set; } - public string SliceThickness { get; set; } + public string SliceThickness { get; set; } = String.Empty; public int NumberOfFrames { get; set; } - public string PixelSpacing { get; set; } + public string PixelSpacing { get; set; } = String.Empty; - public string ImagerPixelSpacing { get; set; } - public string FrameOfReferenceUID { get; set; } - public string WindowCenter { get; set; } - public string WindowWidth { get; set; } + public string ImagerPixelSpacing { get; set; } = String.Empty; + public string FrameOfReferenceUID { get; set; } = String.Empty; + public string WindowCenter { get; set; } = String.Empty; + public string WindowWidth { get; set; } = String.Empty; public Guid TrialId { get; set; } @@ -48,9 +48,9 @@ namespace IRaCIS.Core.Domain.Models public Guid SubjectId { get; set; } public Guid SubjectVisitId { get; set; } public bool Anonymize { get; set; } - public string Path { get; set; } + public string Path { get; set; } = String.Empty; - public string HtmlPath { get; set; }=string.Empty; + public string HtmlPath { get; set; } = string.Empty; public long? FileSize { get; set; } diff --git a/IRaCIS.Core.Domain/Image/DicomSeries.cs b/IRaCIS.Core.Domain/Image/DicomSeries.cs index 775cbe66f..a6f3b5ae0 100644 --- a/IRaCIS.Core.Domain/Image/DicomSeries.cs +++ b/IRaCIS.Core.Domain/Image/DicomSeries.cs @@ -24,21 +24,21 @@ namespace IRaCIS.Core.Domain.Models public Guid SeqId { get; set; } public Guid StudyId { get; set; } - public string StudyInstanceUid { get; set; } - public string SeriesInstanceUid { get; set; } + public string StudyInstanceUid { get; set; }=string.Empty; + public string SeriesInstanceUid { get; set; } = string.Empty; public int SeriesNumber { get; set; } public DateTime? SeriesTime { get; set; } - public string Modality { get; set; } - public string Description { get; set; } + public string Modality { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; public int InstanceCount { get; set; } - public string SliceThickness { get; set; } + public string SliceThickness { get; set; } = string.Empty; - public string ImagePositionPatient { get; set; } - public string ImageOrientationPatient { get; set; } - public string BodyPartExamined { get; set; } - public string SequenceName { get; set; } - public string ProtocolName { get; set; } - public string ImagerPixelSpacing { get; set; } + public string ImagePositionPatient { get; set; } = string.Empty; + public string ImageOrientationPatient { get; set; } = string.Empty; + public string BodyPartExamined { get; set; } = string.Empty; + public string SequenceName { get; set; } = string.Empty; + public string ProtocolName { get; set; } = string.Empty; + public string ImagerPixelSpacing { get; set; } = string.Empty; public string AcquisitionTime { get; set; } = string.Empty; public string AcquisitionNumber { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs index 29d084dbe..e3d7716da 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs @@ -63,7 +63,7 @@ namespace IRaCIS.Core.Domain.Models public long FileSize { get; set; } - public string IP { get; set; } + public string IP { get; set; }=string.Empty; public bool IsDicomReUpload { get; set; } diff --git a/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs b/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs index 900b2f720..cc952b815 100644 --- a/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs +++ b/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs @@ -52,12 +52,12 @@ namespace IRaCIS.Core.Domain.Models - public string BodyPart { get; set; } + public string BodyPart { get; set; } = string.Empty; - - public string Modality { get; set; } - - public DateTime ImageDate { get; set; } + + public string Modality { get; set; } = string.Empty; + + public DateTime ImageDate { get; set; } public string Description { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Image/SCPInstance.cs b/IRaCIS.Core.Domain/Image/SCPInstance.cs index 4bc2ed272..a7a092f9c 100644 --- a/IRaCIS.Core.Domain/Image/SCPInstance.cs +++ b/IRaCIS.Core.Domain/Image/SCPInstance.cs @@ -22,9 +22,9 @@ namespace IRaCIS.Core.Domain.Models public Guid SeqId { get; set; } public Guid StudyId { get; set; } public Guid SeriesId { get; set; } - public string StudyInstanceUid { get; set; } - public string SeriesInstanceUid { get; set; } - public string SopInstanceUid { get; set; } + public string StudyInstanceUid { get; set; } = string.Empty; + public string SeriesInstanceUid { get; set; } = string.Empty; + public string SopInstanceUid { get; set; } = string.Empty; public int InstanceNumber { get; set; } public DateTime? InstanceTime { get; set; } public bool CPIStatus { get; set; } @@ -33,15 +33,15 @@ namespace IRaCIS.Core.Domain.Models public int SliceLocation { get; set; } - public string SliceThickness { get; set; } + public string SliceThickness { get; set; } = string.Empty; public int NumberOfFrames { get; set; } - public string PixelSpacing { get; set; } + public string PixelSpacing { get; set; } = string.Empty; + + public string ImagerPixelSpacing { get; set; } = string.Empty; + public string FrameOfReferenceUID { get; set; } = string.Empty; + public string WindowCenter { get; set; } = string.Empty; + public string WindowWidth { get; set; } = string.Empty; - public string ImagerPixelSpacing { get; set; } - public string FrameOfReferenceUID { get; set; } - public string WindowCenter { get; set; } - public string WindowWidth { get; set; } - public bool Anonymize { get; set; } public string Path { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Image/SCPSeries.cs b/IRaCIS.Core.Domain/Image/SCPSeries.cs index 5e4d6abb8..11a3b726a 100644 --- a/IRaCIS.Core.Domain/Image/SCPSeries.cs +++ b/IRaCIS.Core.Domain/Image/SCPSeries.cs @@ -20,21 +20,21 @@ namespace IRaCIS.Core.Domain.Models public Guid SeqId { get; set; } public Guid StudyId { get; set; } - public string StudyInstanceUid { get; set; } - public string SeriesInstanceUid { get; set; } + public string StudyInstanceUid { get; set; } = string.Empty; + public string SeriesInstanceUid { get; set; } = string.Empty; public int SeriesNumber { get; set; } public DateTime? SeriesTime { get; set; } - public string Modality { get; set; } - public string Description { get; set; } + public string Modality { get; set; }=string.Empty; + public string Description { get; set; } = string.Empty; public int InstanceCount { get; set; } - public string SliceThickness { get; set; } + public string SliceThickness { get; set; } = string.Empty; - public string ImagePositionPatient { get; set; } - public string ImageOrientationPatient { get; set; } - public string BodyPartExamined { get; set; } - public string SequenceName { get; set; } - public string ProtocolName { get; set; } - public string ImagerPixelSpacing { get; set; } + public string ImagePositionPatient { get; set; } = string.Empty; + public string ImageOrientationPatient { get; set; } = string.Empty; + public string BodyPartExamined { get; set; } = string.Empty; + public string SequenceName { get; set; } = string.Empty; + public string ProtocolName { get; set; } = string.Empty; + public string ImagerPixelSpacing { get; set; } = string.Empty; public string AcquisitionTime { get; set; } = string.Empty; public string AcquisitionNumber { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Image/TaskInstance.cs b/IRaCIS.Core.Domain/Image/TaskInstance.cs index 976ada1c5..ba6acebd1 100644 --- a/IRaCIS.Core.Domain/Image/TaskInstance.cs +++ b/IRaCIS.Core.Domain/Image/TaskInstance.cs @@ -21,9 +21,9 @@ namespace IRaCIS.Core.Domain.Models public Guid SeqId { get; set; } public Guid StudyId { get; set; } public Guid SeriesId { get; set; } - public string StudyInstanceUid { get; set; } - public string SeriesInstanceUid { get; set; } - public string SopInstanceUid { get; set; } + public string StudyInstanceUid { get; set; } = string.Empty; + public string SeriesInstanceUid { get; set; } = string.Empty; + public string SopInstanceUid { get; set; } = string.Empty; public int InstanceNumber { get; set; } public DateTime? InstanceTime { get; set; } public bool CPIStatus { get; set; } @@ -32,23 +32,23 @@ namespace IRaCIS.Core.Domain.Models public int SliceLocation { get; set; } - public string SliceThickness { get; set; } + public string SliceThickness { get; set; } = string.Empty; public int NumberOfFrames { get; set; } - public string PixelSpacing { get; set; } + public string PixelSpacing { get; set; } = string.Empty; - public string ImagerPixelSpacing { get; set; } - public string FrameOfReferenceUID { get; set; } - public string WindowCenter { get; set; } - public string WindowWidth { get; set; } + public string ImagerPixelSpacing { get; set; } = string.Empty; + public string FrameOfReferenceUID { get; set; } = string.Empty; + public string WindowCenter { get; set; } = string.Empty; + public string WindowWidth { get; set; } = string.Empty; public Guid TrialId { get; set; } public Guid SubjectId { get; set; } public Guid VisitTaskId { get; set; } public bool Anonymize { get; set; } - public string Path { get; set; } + public string Path { get; set; } = string.Empty; + - public string HtmlPath { get; set; }=string.Empty; public long? FileSize { get; set; } diff --git a/IRaCIS.Core.Domain/Image/TaskSeries.cs b/IRaCIS.Core.Domain/Image/TaskSeries.cs index b6d1ba154..5f74e1290 100644 --- a/IRaCIS.Core.Domain/Image/TaskSeries.cs +++ b/IRaCIS.Core.Domain/Image/TaskSeries.cs @@ -20,21 +20,21 @@ namespace IRaCIS.Core.Domain.Models public Guid SeqId { get; set; } public Guid StudyId { get; set; } - public string StudyInstanceUid { get; set; } - public string SeriesInstanceUid { get; set; } + public string StudyInstanceUid { get; set; } = String.Empty; + public string SeriesInstanceUid { get; set; } = String.Empty; public int SeriesNumber { get; set; } public DateTime? SeriesTime { get; set; } - public string Modality { get; set; } - public string Description { get; set; } + public string Modality { get; set; } = String.Empty; + public string Description { get; set; } = String.Empty; public int InstanceCount { get; set; } - public string SliceThickness { get; set; } + public string SliceThickness { get; set; } = String.Empty; - public string ImagePositionPatient { get; set; } - public string ImageOrientationPatient { get; set; } - public string BodyPartExamined { get; set; } - public string SequenceName { get; set; } - public string ProtocolName { get; set; } - public string ImagerPixelSpacing { get; set; } + public string ImagePositionPatient { get; set; } = String.Empty; + public string ImageOrientationPatient { get; set; } = String.Empty; + public string BodyPartExamined { get; set; } = String.Empty; + public string SequenceName { get; set; } = String.Empty; + public string ProtocolName { get; set; } = String.Empty; + public string ImagerPixelSpacing { get; set; } = String.Empty; public string AcquisitionTime { get; set; } = string.Empty; public string AcquisitionNumber { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Management/Menu.cs b/IRaCIS.Core.Domain/Management/Menu.cs index 04ef92b3a..0613290df 100644 --- a/IRaCIS.Core.Domain/Management/Menu.cs +++ b/IRaCIS.Core.Domain/Management/Menu.cs @@ -20,7 +20,7 @@ namespace IRaCIS.Core.Domain.Models // 类型（M目录 C菜单 F按钮 L链接） public string MenuType { get; set; } = string.Empty; - public string MenuIcon { get; set; } + public string MenuIcon { get; set; } = string.Empty; public string MenuName { get; set; } = string.Empty; @@ -44,10 +44,10 @@ namespace IRaCIS.Core.Domain.Models public bool IsExternalLink { get; set; } //权限点 - public string PermissionStr { get; set; } + public string PermissionStr { get; set; } = string.Empty; //Api 接口地址 - public string ApiPath { get; set; } + public string ApiPath { get; set; } = string.Empty; public string Note { get; set; } = string.Empty; @@ -56,7 +56,7 @@ namespace IRaCIS.Core.Domain.Models public string Redirect { get; set; } = string.Empty; - public string LanguageMark { get; set; } + public string LanguageMark { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Management/UserLog.cs b/IRaCIS.Core.Domain/Management/UserLog.cs index 980656bca..0483ca1ce 100644 --- a/IRaCIS.Core.Domain/Management/UserLog.cs +++ b/IRaCIS.Core.Domain/Management/UserLog.cs @@ -40,7 +40,7 @@ namespace IRaCIS.Core.Domain.Models - public string IPRegion { get; set; } + public string IPRegion { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs b/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs index df3e08de2..3dd8bc9a0 100644 --- a/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs +++ b/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs @@ -26,6 +26,6 @@ namespace IRaCIS.Core.Domain.Models public bool? IsCRCNeedReply { get; set; } - public string ParamInfo { get; set; } + public string ParamInfo { get; set; } = string.Empty; } } diff --git a/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs b/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs index 104f759c3..89f04ad74 100644 --- a/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs +++ b/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs @@ -16,12 +16,12 @@ namespace IRaCIS.Core.Domain.Models public User User { get; set; } #endregion - public string FileName { get; set; } + public string FileName { get; set; } = string.Empty; - public string RelativePath { get; set; } + public string RelativePath { get; set; } = string.Empty; - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } diff --git a/IRaCIS.Core.Domain/QC/QCChallenge.cs b/IRaCIS.Core.Domain/QC/QCChallenge.cs index 6732c2bc2..86513fc7e 100644 --- a/IRaCIS.Core.Domain/QC/QCChallenge.cs +++ b/IRaCIS.Core.Domain/QC/QCChallenge.cs @@ -53,7 +53,7 @@ namespace IRaCIS.Core.Domain.Models public Guid? LatestReplyUserId { get; set; } - public string ChallengeCode { get; set; } + public string ChallengeCode { get; set; } = string.Empty; public int Code { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs index 96a1a0a24..7711509c5 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs @@ -55,12 +55,12 @@ namespace IRaCIS.Core.Domain.Models /// /// 临床问题类型(分组，单选。) /// - public string ClinicalTableQuestionType { get; set; } - - /// + public string ClinicalTableQuestionType { get; set; } = string.Empty; + + /// /// 问题标识 /// - public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; } + public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; } /// /// 最大长度 @@ -75,12 +75,12 @@ namespace IRaCIS.Core.Domain.Models /// /// 自定义选项 /// - public string TypeValue { get; set; } + public string TypeValue { get; set; } = string.Empty; - /// - /// 字典Code - /// - public string DictionaryCode { get; set; } = string.Empty; + /// + /// 字典Code + /// + public string DictionaryCode { get; set; } = string.Empty; /// /// 排序 diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs index d01d044da..60a9faa97 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs @@ -64,7 +64,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 临床问题类型(分组，单选。) /// - public string ClinicalQuestionType { get; set; } + public string ClinicalQuestionType { get; set; } = string.Empty; /// /// 问题标识 diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs index 20cf7ec6c..6be127746 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs @@ -56,12 +56,12 @@ namespace IRaCIS.Core.Domain.Models /// /// 临床问题类型(分组，单选。) /// - public string ClinicalTableQuestionType { get; set; } - - /// + public string ClinicalTableQuestionType { get; set; } = string.Empty; + + /// /// 问题标识 /// - public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; } + public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; } /// /// 最大长度 @@ -76,12 +76,12 @@ namespace IRaCIS.Core.Domain.Models /// /// 自定义选项 /// - public string TypeValue { get; set; } + public string TypeValue { get; set; } = string.Empty; - /// - /// 字典Code - /// - public string DictionaryCode { get; set; } = string.Empty; + /// + /// 字典Code + /// + public string DictionaryCode { get; set; } = string.Empty; /// /// 排序 diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs index 0a3fc3c2f..bfa14c86f 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs @@ -70,12 +70,12 @@ namespace IRaCIS.Core.Domain.Models /// /// 用户角色 /// - public string UserTypeShortName { get; set; } + public string UserTypeShortName { get; set; } = string.Empty; - /// - /// 医学审核对话关闭原因 - /// - public MedicalDialogClose? MedicalDialogCloseEnum { get; set; } + /// + /// 医学审核对话关闭原因 + /// + public MedicalDialogClose? MedicalDialogCloseEnum { get; set; } /// /// 用户角色枚举 diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs index e2fd617b9..e822ba3a9 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs @@ -63,13 +63,13 @@ namespace IRaCIS.Core.Domain.Models /// /// 备注 /// - public string Remark { get; set; } + public string Remark { get; set; } = string.Empty; - /// - /// 是否是淋巴结 - /// - public IsLymph IsLymphNodes { get; set; } + /// + /// 是否是淋巴结 + /// + public IsLymph IsLymphNodes { get; set; } /// /// 器官类型 diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs index ec37a79d3..9010c0dca 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs @@ -21,7 +21,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 标准 /// - public string CriterionName { get; set; } + public string CriterionName { get; set; } = string.Empty; /// /// 是否启用 @@ -47,14 +47,14 @@ namespace IRaCIS.Core.Domain.Models /// /// 描述 /// - public string Description { get; set; } + public string Description { get; set; } = string.Empty; - /// - /// 标准类型 - /// - public CriterionType CriterionType { get; set; } + /// + /// 标准类型 + /// + public CriterionType CriterionType { get; set; } /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs index 32f145c3b..a7f623663 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs @@ -73,7 +73,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 描述 /// - public string Description { get; set; } + public string Description { get; set; } = string.Empty; /// /// 是否确认 diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs index 6de27d20b..56d6660a8 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs @@ -66,7 +66,7 @@ namespace IRaCIS.Core.Domain.Models /// public Guid ReadingQuestionId { get; set; } - public string Type { get; set; } + public string Type { get; set; } = string.Empty; public Guid? ParentId { get; set; } @@ -74,17 +74,17 @@ namespace IRaCIS.Core.Domain.Models /// ///父问题触发值 /// - public string ParentTriggerValue { get; set; } - - /// + public string ParentTriggerValue { get; set; } = string.Empty; + + /// /// 问题名称 /// - public string QuestionName { get; set; } - - /// + public string QuestionName { get; set; } = string.Empty; + + /// /// IsRequired /// - public IsRequired IsRequired { get; set; } + public IsRequired IsRequired { get; set; } /// /// 排序号 @@ -94,29 +94,29 @@ namespace IRaCIS.Core.Domain.Models /// /// 值 /// - public string TypeValue { get; set; } - - /// + public string TypeValue { get; set; } = string.Empty; + + /// /// 是否启用 /// - public bool IsEnable { get; set; } + public bool IsEnable { get; set; } - public string Remark { get; set; } - - /// + public string Remark { get; set; } = string.Empty; + + /// /// 显示父问题 /// - public Guid? RelevanceId { get; set; } + public Guid? RelevanceId { get; set; } /// /// 显示父问题的值 /// - public string RelevanceValue { get; set; } - - /// + public string RelevanceValue { get; set; } = string.Empty; + + /// /// 是否显示 /// - public int ShowQuestion { get; set; } + public int ShowQuestion { get; set; } /// /// 最大问题数 @@ -126,18 +126,18 @@ namespace IRaCIS.Core.Domain.Models /// /// 数据表名称 /// - public string DataTableName { get; set; } - - /// + public string DataTableName { get; set; } = string.Empty; + + /// /// 数据列 /// - public string DataTableColumn { get; set; } + public string DataTableColumn { get; set; } = string.Empty; - /// - /// 关联父问题 - /// - public Guid? DependParentId { get; set; } + /// + /// 关联父问题 + /// + public Guid? DependParentId { get; set; } /// /// 是否关联 @@ -162,13 +162,13 @@ namespace IRaCIS.Core.Domain.Models /// /// 字典code /// - public string DictionaryCode { get; set; } + public string DictionaryCode { get; set; } = string.Empty; - /// - /// 数值类型 - /// - public ValueOfType? ValueType { get; set; } + /// + /// 数值类型 + /// + public ValueOfType? ValueType { get; set; } /// /// 单位 @@ -198,7 +198,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/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs index c10894d8b..932ebc2ec 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs @@ -126,9 +126,9 @@ namespace IRaCIS.Core.Domain.Models public string DataTableName { get; set; } = string.Empty; - public string DataTableColumn { get; set; } + public string DataTableColumn { get; set; } = string.Empty; - public TableQuestionType? TableQuestionType { get; set; } + public TableQuestionType? TableQuestionType { get; set; } public Guid? DependParentId { get; set; } @@ -196,7 +196,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/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs index d96db2391..b9ca5c537 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs @@ -43,18 +43,18 @@ namespace IRaCIS.Core.Domain.Models /// /// 答案 /// - public string Answer { get; set; } + public string Answer { get; set; } = string.Empty; /// /// 全局阅片修改的答案 /// - public string GlobalChangeAnswer { get; set; } + public string GlobalChangeAnswer { get; set; } = string.Empty; - /// - /// 全局阅片是否修改 - /// - public bool IsGlobalChange { get; set; } = false; + /// + /// 全局阅片是否修改 + /// + public bool IsGlobalChange { get; set; } = false; diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs index 9971310d7..572de7d25 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs @@ -60,9 +60,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; } public string? OtherMeasureData { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Trial/DataInspection.cs b/IRaCIS.Core.Domain/Trial/DataInspection.cs index 749b10c77..e37cb1b85 100644 --- a/IRaCIS.Core.Domain/Trial/DataInspection.cs +++ b/IRaCIS.Core.Domain/Trial/DataInspection.cs @@ -109,10 +109,10 @@ namespace IRaCIS.Core.Domain.Models public Guid? ObjectRelationParentId3 { get; set; } - public string EntityName { get; set; } + public string EntityName { get; set; } = string.Empty; - public Guid? TrialReadingCriterionId { get; set; } + public Guid? TrialReadingCriterionId { get; set; } public Guid? DoctorUserId { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 37c384ca9..011ee8f9b 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -259,16 +259,16 @@ namespace IRaCIS.Core.Domain.Models public bool IsPDProgressView { get; set; } //研究方案号 - public string ResearchProgramNo { get; set; } + public string ResearchProgramNo { get; set; } = string.Empty; //实验名称 - public string ExperimentName { get; set; } + public string ExperimentName { get; set; } = string.Empty; //主研单位 - public string MainResearchUnit { get; set; } + public string MainResearchUnit { get; set; } = string.Empty; // 负责人PI - public string HeadPI { get; set; } + public string HeadPI { get; set; } = string.Empty; public bool IsUrgent { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/TrialSign.cs b/IRaCIS.Core.Domain/Trial/TrialSign.cs index eead7343c..c5ec2ce7a 100644 --- a/IRaCIS.Core.Domain/Trial/TrialSign.cs +++ b/IRaCIS.Core.Domain/Trial/TrialSign.cs @@ -27,11 +27,11 @@ namespace IRaCIS.Core.Domain.Models //关联基础数据 public Guid? SignCodeId { get; set; } - public string SignCode { get; set; } + public string SignCode { get; set; } = string.Empty; - public string SignText { get; set; } + public string SignText { get; set; } = string.Empty; - public bool IsCompleted { get; set; } + public bool IsCompleted { get; set; } } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs index 0ad444f3c..034f3c020 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs @@ -30,15 +30,15 @@ namespace IRaCIS.Core.Domain.Models /// - public string Email { get; set; } - - - public string FirstName { get; set; } - - public string LastName { get; set; } + public string Email { get; set; } = String.Empty; - public string OrganizationName { get; set; }=String.Empty; + public string FirstName { get; set; } = String.Empty; + + public string LastName { get; set; } = String.Empty; + + + public string OrganizationName { get; set; }=String.Empty; public bool IsSystemUser{ get; set; } @@ -57,12 +57,12 @@ namespace IRaCIS.Core.Domain.Models public DateTime? ConfirmTime { get; set; } - public string RejectReason { get; set; } + public string RejectReason { get; set; } = String.Empty; - /// - /// 邀请状态 - /// - [Required] + /// + /// 邀请状态 + /// + [Required] public TrialExternalUserStateEnum InviteState { get; set; } = TrialExternalUserStateEnum.WaitSent; } diff --git a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs index 47744b41e..9e44aefd0 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs @@ -24,7 +24,7 @@ namespace IRaCIS.Core.Domain.Models public Guid SubjectId { get; set; } - public string Note { get; set; } + public string Note { get; set; } = string.Empty; public Guid? TrialReadingCriterionId { get; set; } diff --git a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs index eaa1465a8..d24bf28c4 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs @@ -170,7 +170,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 通过原因 /// - public string ManualPassReason { get; set; } + public string ManualPassReason { get; set; } = string.Empty; public bool IsUrgent { get; set; } @@ -220,7 +220,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 关闭一致性质疑原因 /// - public string CloseTheReason { get; set; } + public string CloseTheReason { get; set; } = string.Empty; public Guid? SubmitUserId { get; set; } diff --git a/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj b/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj index 823477b44..48fc1c1c4 100644 --- a/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj +++ b/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj @@ -1,7 +1,6 @@  enable - net8.0