XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

默认值遗漏
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-09-07 00:46:08 +08:00
parent 6e2a58c3d7
commit 243fae4b19
70 changed files with 323 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs
View File

@ -46,7 +46,7 @@ namespace IRaCIS.Core.Domain.Models
public bool IsEnable { get; set; }
public string Note { get; set; }
public string Note { get; set; }=string.Empty;
public Guid TrialReadingCriterionId { get; set; }

4
IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
View File

@ -15,9 +15,9 @@ namespace IRaCIS.Core.Domain.Models
{
public class OSSImageInfo
{
public string FileName { get; set; }
public string FileName { get; set; } = string.Empty;
public string ImagePath { get; set; }
public string ImagePath { get; set; } = string.Empty;
}
///<summary>
///TaskMedicalReview

4
IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs
View File

@ -26,9 +26,9 @@ namespace IRaCIS.Core.Domain.Models
public bool IsEnable { get; set; }
public string Note { get; set; }
public string Note { get; set; } = string.Empty;
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public int PlanVisitCount { get; set; }

2
IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs
View File

@ -23,7 +23,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialId { get; set; }
public string VirturalSiteCode { get; set; }
public string VirturalSiteCode { get; set; } = string.Empty;

4
IRaCIS.Core.Domain/BaseModel/DomainEvent.cs
View File

@ -17,8 +17,8 @@ namespace IRaCIS.Core.Domain.BaseModel
public class FailedDomainEvent
{
public Guid Id { get; set; }
public string EventType { get; set; }
public string EventData { get; set; }
public string EventType { get; set; } = string.Empty;
public string EventData { get; set; } = string.Empty;
public DateTime FailedAt { get; set; }
}
}

2
IRaCIS.Core.Domain/BaseModel/Entity.cs
View File

@ -104,7 +104,7 @@ namespace IRaCIS.Core.Domain.Models
public abstract class BaseAddAuditEntityWithUserName : Entity, IAuditAddWithUserName
{
public string CreateUser { get; set; }
public string CreateUser { get; set; } = string.Empty;
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }

2
IRaCIS.Core.Domain/Common/Dictionary.cs
View File

@ -46,7 +46,7 @@ namespace IRaCIS.Core.Domain.Models
public int ShowOrder { get; set; }
public string Code { get; set; }
public string Code { get; set; } = string.Empty;
public Guid? ParentId { get; set; }

8
IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
View File

@ -115,7 +115,7 @@ namespace IRaCIS.Core.Domain.Models
public string DataType { get; set; } = String.Empty;
// 后端翻译的类型 对应前端界面 "",Dictionary,Date
public string EnumType { get; set; }
public string EnumType { get; set; } = String.Empty;
@ -163,11 +163,11 @@ namespace IRaCIS.Core.Domain.Models
/// 是否为特殊类型
/// </summary>
public bool IsSpecialType { get; set; }
public string DictionaryKey { get; set; }
public string DictionaryKey { get; set; } = string.Empty;
public bool IsShowByTrialConfig { get; set; }
public string TrialConfigRelyFieldName { get; set; }
public string TrialConfigRelyFieldName { get; set; } = string.Empty;
#endregion
@ -180,7 +180,7 @@ namespace IRaCIS.Core.Domain.Models
{
public bool IsRoute { get; set; }
public string RoutePath { get; set; }
public string RoutePath { get; set; } = string.Empty;
public bool IsHaveParameters { get; set; }

10
IRaCIS.Core.Domain/Common/PublishLog.cs
View File

@ -17,14 +17,14 @@ namespace IRaCIS.Core.Domain.Models
{
public string Version { get; set; }
public string Version { get; set; } = string.Empty;
public DateTime? PublishTime { get; set; }
public DateTime? PublishTime { get; set; }
public string UpdateContent { get; set; }
public string UpdateContent { get; set; } = string.Empty;
//0 开发中 ，已发布
public int State { get; set; }
//0 开发中 ，已发布
public int State { get; set; }
public bool IsCurrentVersion { get; set; }

4
IRaCIS.Core.Domain/Common/SystemBasicData.cs
View File

@ -33,9 +33,9 @@ namespace IRaCIS.Core.Domain.Models
public int ShowOrder { get; set; }
public string Code { get; set; }
public string Code { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public Guid? ParentId { get; set; }
public string ValueCN { get; set; } = string.Empty;

2
IRaCIS.Core.Domain/Dcotor/Attachment.cs
View File

@ -21,7 +21,7 @@ namespace IRaCIS.Core.Domain.Models
public Doctor Doctor { get; set; }
public Guid DoctorId { get; set; }
public string Type { get; set; }
public string Type { get; set; } = string.Empty;
public bool IsOfficial { get; set; } = false;
public string Path { get; set; } = string.Empty;
public string Code { get; set; } = string.Empty;

2
IRaCIS.Core.Domain/Dcotor/Doctor.cs
View File

@ -58,7 +58,7 @@ namespace IRaCIS.Core.Domain.Models
[StringLength(100)]
public string Password { get; set; }
public string Password { get; set; } = string.Empty;
[StringLength(50)]

20
IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs
View File

@ -23,17 +23,17 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 文件名称
/// </summary>
public string FileName { get; set; }
public string FileName { get; set; } = string.Empty;
/// <summary>
/// <summary>
/// 文件路径
/// </summary>
public string FilePath { get; set; }
public string FilePath { get; set; } = string.Empty;
/// <summary>
/// <summary>
/// 标准类型
/// </summary>
public CriterionType CriterionType { get; set; }
public CriterionType CriterionType { get; set; }
/// <summary>
/// 医生Id
@ -43,12 +43,12 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
public string Remark { get; set; } = string.Empty;
/// <summary>
/// <summary>
/// 文件类型
/// </summary>
public CriterionFileType FileType { get; set; }
public CriterionFileType FileType { get; set; }
@ -59,8 +59,8 @@ namespace IRaCIS.Core.Domain.Models
public string CriterionName { get; set; }
public Guid? TrialReadingCriterionId { get; set; }
public string CriterionName { get; set; } = string.Empty;
public Guid? TrialReadingCriterionId { get; set; }
public Guid? TrialId { get; set; }

2
IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs
View File

@ -41,7 +41,7 @@ namespace IRaCIS.Core.Domain.Models
public int CreateUserType { get; set; }
[Required]
public string YearMonth { get; set; }
public string YearMonth { get; set; } = string.Empty;
public bool IsLock { get; set; } = false;

2
IRaCIS.Core.Domain/Dcotor/TrialExperience.cs
View File

@ -22,7 +22,7 @@ namespace IRaCIS.Core.Domain.Models
public Dictionary Phase { get; set; }
[StringLength(512)]
public string EvaluationContent { get; set; }
public string EvaluationContent { get; set; } = string.Empty;
public int VisitReadingCount { get; set; }

4
IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
View File

@ -84,8 +84,8 @@ namespace IRaCIS.Core.Domain.Models
public string Description { get; set; } = string.Empty;
public string AttachName { get; set; }
public string AttachNameCN { get; set; }
public string AttachName { get; set; } = string.Empty;
public string AttachNameCN { get; set; } = string.Empty;
public string EmailHtmlContent { get; set; } = string.Empty;

2
IRaCIS.Core.Domain/Financial/CalculateTask.cs
View File

@ -10,7 +10,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid ReviewerId { get; set; }
[Required]
public string YearMonth { get; set; }
public string YearMonth { get; set; } = string.Empty;
public bool IsLock { get; set; }
}
}

2
IRaCIS.Core.Domain/Financial/ExchangeRate.cs
View File

@ -6,7 +6,7 @@ namespace IRaCIS.Core.Domain.Models
[Table("ExchangeRate")]
public class ExchangeRate : BaseFullAuditEntity
{
public string YearMonth { get; set; }
public string YearMonth { get; set; } = string.Empty;
[Column(TypeName = "decimal(18,2)")]
public decimal Rate { get; set; }

2
IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs
View File

@ -9,7 +9,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid ReviewerId { get; set; }
public DateTime YearMonthDate { get; set; }
public string YearMonth { get; set; }
public string YearMonth { get; set; } = string.Empty;
[Column(TypeName = "decimal(18,2)")]
public decimal AdjustmentUSD { get; set; }

6
IRaCIS.Core.Domain/Financial/PaymentDetail.cs
View File

@ -9,14 +9,14 @@ namespace IRaCIS.Core.Domain.Models
{
public Guid PaymentId { get; set; }
public Guid DoctorId { get; set; }
public string YearMonth { get; set; }
public string YearMonth { get; set; } = string.Empty;
public Guid TrialId { get; set; }
[StringLength(50)]
public string TrialCode { get; set; }
public string TrialCode { get; set; } = string.Empty;
[StringLength(50)]
public string PaymentType { get; set; }
public string PaymentType { get; set; } = string.Empty;
public int Count { get; set; }
[Column(TypeName = "decimal(18,2)")]

2
IRaCIS.Core.Domain/Financial/RankPrice.cs
View File

@ -8,7 +8,7 @@ namespace IRaCIS.Core.Domain.Models
public partial class RankPrice : BaseFullAuditEntity
{
[StringLength(200)]
public string RankName { get; set; }
public string RankName { get; set; } = string.Empty;
[Column(TypeName = "decimal(18,2)")]
public decimal Timepoint { get; set; }

8
IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs
View File

@ -9,16 +9,16 @@ namespace IRaCIS.Core.Domain.Models
{
public Guid DoctorId { get; set; }
[StringLength(200)]
public string DoctorNameInBank { get; set; }
public string DoctorNameInBank { get; set; } = string.Empty;
[StringLength(100)]
public string IDCard { get; set; }
public string IDCard { get; set; } = string.Empty;
[StringLength(100)]
public string BankCardNumber { get; set; }
public string BankCardNumber { get; set; } = string.Empty;
[StringLength(200)]
public string BankName { get; set; }
public string BankName { get; set; } = string.Empty;
public Guid RankId { get; set; }
[Column(TypeName = "decimal(18,2)")]

2
IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs
View File

@ -8,7 +8,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid ReviewerId { get; set; }
public string YearMonth { get; set; }
public string YearMonth { get; set; } = string.Empty;
public bool Training { get; set; } = false;

2
IRaCIS.Core.Domain/Image/ImageShare.cs
View File

@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
public DateTime ExpireTime { get; set; }
public string Password { get; set; }
public string Password { get; set; } = string.Empty;
}
}

6
IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs
View File

@ -30,12 +30,12 @@ namespace IRaCIS.Core.Domain.Models
public Guid NoneDicomStudyId { get; set; }
public string Path { get; set; }
public string Path { get; set; } = string.Empty;
public string FileName { get; set; }
public string FileName { get; set; } = string.Empty;
public string FileType { get; set; }
public string FileType { get; set; } = string.Empty;
public long? FileSize { get; set; }

4
IRaCIS.Core.Domain/Image/SystemAnonymization.cs
View File

@ -25,10 +25,10 @@ namespace IRaCIS.Core.Domain.Models
public string TagDescription { get; set; } = String.Empty;
public string TagDescriptionCN { get; set; }
public string TagDescriptionCN { get; set; } = string.Empty;
public string ReplaceValue { get; set; } = String.Empty;
public string ReplaceValue { get; set; } = String.Empty;
public string ValueRepresentation { get; set; } = String.Empty;

28
IRaCIS.Core.Domain/Image/TrialDicomAE.cs
View File

@ -9,36 +9,36 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///DicomAE
///</summary>
[Table("TrialDicomAE")]
public class TrialDicomAE : BaseFullAuditEntity
{
///<summary>
///DicomAE
///</summary>
[Table("TrialDicomAE")]
public class TrialDicomAE : BaseFullAuditEntity
{
#region 导航属性
#endregion
public Guid TrialId { get; set; }
public string CalledAE { get; set; } = string.Empty;
public string CalledAE { get; set; } = string.Empty;
public string IP { get; set; }
public string IP { get; set; } = string.Empty;
public int Port { get; set; }
public int Port { get; set; }
public string Modality { get; set; } = string.Empty;
public string Modality { get; set; } = string.Empty;
public string Description { get; set; }=string.Empty;
public string Description { get; set; } = string.Empty;
public DateTime? LatestTestTime { get; set; }
public DateTime? LatestTestTime { get; set; }
public bool? IsTestOK { get; set; }
public bool? IsTestOK { get; set; }
}
}
}

2
IRaCIS.Core.Domain/Institution/CRO.cs
View File

@ -11,7 +11,7 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public string CROName { get; set; } = string.Empty;
public string CRONameCN { get; set; } = string.Empty;
public string CROCode { get; set; }
public string CROCode { get; set; } = string.Empty;
public bool IsTrialLevel { get; set; }

4
IRaCIS.Core.Domain/Institution/Site.cs
View File

@ -18,7 +18,7 @@ namespace IRaCIS.Core.Domain.Models
public string SiteName { get; set; } = string.Empty;
public string SiteNameCN{ get; set; } = string.Empty;
public string AliasName { get; set; } = string.Empty;
public string SiteCode { get; set; }
public string SiteCode { get; set; } = string.Empty;
public int Code { get; set; }
@ -31,7 +31,7 @@ namespace IRaCIS.Core.Domain.Models
public string UniqueCode { get; set; } = string.Empty;
public string Address { get; set; }
public string Address { get; set; } = string.Empty;
public string DirectorName { get; set; } = string.Empty;
public string DirectorPhone { get; set; } = string.Empty;

6
IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs
View File

@ -30,7 +30,7 @@ namespace IRaCIS.Core.Domain.Models
public string NoticeContent { get; set; }
public string NoticeContent { get; set; } = string.Empty;
public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; }
@ -46,9 +46,9 @@ namespace IRaCIS.Core.Domain.Models
public DateTime? EndDate { get; set; }
public string FileName { get; set; }
public string FileName { get; set; } = string.Empty;
public string Path { get; set; }
public string Path { get; set; } = string.Empty;
public Guid? PublishedUserId { get; set; }

4
IRaCIS.Core.Domain/Management/UserFeedBack.cs
View File

@ -47,7 +47,7 @@ namespace IRaCIS.Core.Domain.Models
public int QuestionType { get; set; }
public string QuestionDescription { get; set; }
public string QuestionDescription { get; set; } = string.Empty;
@ -61,7 +61,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid? TrialId { get; set; }
public string ScreenshotListStr { get; set; }
public string ScreenshotListStr { get; set; } = string.Empty;

4
IRaCIS.Core.Domain/Management/UserPassWordLog.cs
View File

@ -27,11 +27,11 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 密码
/// </summary>
public string PassWord { get; set; }
public string PassWord { get; set; } = string.Empty;
}
}
}

6
IRaCIS.Core.Domain/Management/UserType.cs
View File

@ -22,9 +22,9 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public UserTypeEnum UserTypeEnum { get; set; }
public string UserTypeName { get; set; }
public string UserTypeName { get; set; } = string.Empty;
public string Description { get; set; }
public string Description { get; set; } = string.Empty;
public int Order { get; set; }
@ -33,7 +33,7 @@ namespace IRaCIS.Core.Domain.Models
public bool IsEnable { get; set; } = true;
public string PermissionStr { get; set; }
public string PermissionStr { get; set; } = string.Empty;

6
IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs
View File

@ -24,12 +24,12 @@ namespace IRaCIS.Core.Domain.Models
public Guid SubjectVisitId { get; set; }
public string Path { get; set; }
public string Path { get; set; } = string.Empty;
public string FileName { get; set; }
public string FileName { get; set; } = string.Empty;
public bool? IsVisist { get; set; }
public bool? IsVisist { get; set; }
/// <summary>
/// 临床级别

2
IRaCIS.Core.Domain/QC/QCQuestion.cs
View File

@ -37,7 +37,7 @@ namespace IRaCIS.Core.Domain.Models
public string TypeValue { get; set; } = string.Empty;
public string ParentTriggerValue { get; set; }
public string ParentTriggerValue { get; set; } = string.Empty;
public Guid? ParentId { get; set; }

6
IRaCIS.Core.Domain/QC/TrialQCQuestion.cs
View File

@ -49,13 +49,13 @@ namespace IRaCIS.Core.Domain.Models
public Guid? ParentId { get; set; }
public string TypeValue { get; set; }
public string TypeValue { get; set; } = string.Empty;
public string ParentTriggerValue { get; set; }
public string ParentTriggerValue { get; set; } = string.Empty;
public int ShowOrder { get; set; }
public int ShowOrder { get; set; }
public bool? IsConfirm { get; set; }

2
IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs
View File

@ -23,7 +23,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialId { get; set; }
public string Answer { get; set; }
public string Answer { get; set; } = string.Empty;
public TrialQCProcess QCProcessEnum { get; set; }

14
IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs
View File

@ -32,13 +32,13 @@ namespace IRaCIS.Core.Domain.Models
public Guid? VisitTaskId { get; set; }
public string Answer { get; set; }
public string Answer { get; set; } = string.Empty;
/// <summary>
/// <summary>
/// 附加评估答案翻译字典
/// </summary>
public string TranslateDictionaryCode { get; set; }=string.Empty;
public string TranslateDictionaryCode { get; set; }=string.Empty;
/// <summary>
/// 是否是最终结果
@ -50,14 +50,14 @@ namespace IRaCIS.Core.Domain.Models
/// 最终结果
/// </summary>
public string FinalAnswer { get; set; }
public string FinalAnswer { get; set; } = string.Empty;
/// <summary>
/// <summary>
/// 最终结果翻字典
/// </summary>
public string FinalTranslateDictionaryCode { get; set; }
public string FinalTranslateDictionaryCode { get; set; } = string.Empty;
}
}
}

79
IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs
View File

@ -1,19 +1,18 @@
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
/// 临床资料系统配置
///</summary>
[Table("ClinicalDataSystemSet")]
public class ClinicalDataSystemSet : BaseAddAuditEntity
///<summary>
/// 临床资料系统配置
///</summary>
[Table("ClinicalDataSystemSet")]
public class ClinicalDataSystemSet : BaseAddAuditEntity
{
#region 导航属性
@ -24,10 +23,10 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public int ClinicalDataSetEnum { get; set; }
/// <summary>
/// 名称
/// </summary>
public string ClinicalDataSetName { get; set; }
/// <summary>
/// 名称
/// </summary>
public string ClinicalDataSetName { get; set; } = string.Empty;
/// <summary>
/// 是否应用
@ -39,50 +38,50 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string ClinicalDataSetEnName { get; set; } = string.Empty;
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; }
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; }
/// <summary>
/// 上传方式
/// </summary>
public ClinicalUploadType ClinicalUploadType { get; set; }
/// <summary>
/// 上传方式
/// </summary>
public ClinicalUploadType ClinicalUploadType { get; set; }
/// <summary>
/// 是否启用
/// </summary>
public bool IsEnable { get; set; }
/// <summary>
/// 是否启用
/// </summary>
public bool IsEnable { get; set; }
/// <summary>
/// 上传角色
/// </summary>
public UploadRole UploadRole { get; set; }
/// <summary>
/// 上传角色
/// </summary>
public UploadRole UploadRole { get; set; }
/// <summary>
/// 模板文件名称
/// </summary>
public string FileName { get; set; }
/// <summary>
/// 模板文件名称
/// </summary>
public string FileName { get; set; } = string.Empty;
/// <summary>
/// 文件路径
/// </summary>
public string Path { get; set; }
/// <summary>
/// 文件路径
/// </summary>
public string Path { get; set; } = string.Empty;
public string CriterionEnumListStr { get; set; }=String.Empty;
public string CriterionEnumListStr { get; set; } = String.Empty;
[NotMapped]
public List<int> CriterionEnumList => CriterionEnumListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t) && int.TryParse(t.Trim(),out var s)).Select(t => int.Parse(t.Trim()) ).ToList();
public List<int> CriterionEnumList => CriterionEnumListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t) && int.TryParse(t.Trim(), out var s)).Select(t => int.Parse(t.Trim())).ToList();
//public List<SystemClinicalDataCriterion> SystemClinicalDataCriterionList { get; set; } = new List<SystemClinicalDataCriterion>();
//public List<SystemClinicalDataCriterion> SystemClinicalDataCriterionList { get; set; } = new List<SystemClinicalDataCriterion>();
}
}

8
IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs
View File

@ -39,7 +39,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 名称
/// </summary>
public string ClinicalDataSetName { get; set; }
public string ClinicalDataSetName { get; set; }=string.Empty;
/// <summary>
/// 英文名称
@ -87,16 +87,16 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 模板文件名称
/// </summary>
public string FileName { get; set; }
public string FileName { get; set; } = string.Empty;
/// <summary>
/// 文件路径
/// </summary>
public string Path { get; set; }
public string Path { get; set; } = string.Empty;
public string CriterionEnumListStr { get; set; } = String.Empty;
public string CriterionEnumListStr { get; set; } = String.Empty;
public List<int> CriterionEnumList => CriterionEnumListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t) && int.TryParse(t.Trim(), out var s)).Select(t => int.Parse(t.Trim())).ToList();

8
IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs
View File

@ -24,15 +24,15 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public Guid ReadingClinicalDataId { get; set; }
public string Path { get; set; }
public string Path { get; set; } = string.Empty;
public string FileName { get; set; }
public string FileName { get; set; } = string.Empty;
public int Size { get; set; } = 0;
public int Size { get; set; } = 0;
public string Type { get; set; }
public string Type { get; set; } = string.Empty;
}

6
IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs
View File

@ -24,17 +24,17 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public Guid ReadingConsistentClinicalDataId { get; set; }
public string Path { get; set; }
public string Path { get; set; } = string.Empty;
public string FileName { get; set; }
public string FileName { get; set; } = string.Empty;
public int Size { get; set; } = 0;
/// <summary>
/// 文件类型
/// </summary>
public string Type { get; set; }
public string Type { get; set; } = string.Empty;
}

2
IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs
View File

@ -64,7 +64,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 临床问题类型(分组，单选。)
/// </summary>
public string ClinicalQuestionType { get; set; }
public string ClinicalQuestionType { get; set; } = string.Empty;
/// <summary>
/// 问题标识

4
IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs
View File

@ -37,9 +37,9 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public Guid QuestionId { get; set; }
public string Answer { get; set; }
public string Answer { get; set; } = string.Empty;
public Guid ClinicalDataTrialSetId { get; set; }
public Guid ClinicalDataTrialSetId { get; set; }
}

2
IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs
View File

@ -30,7 +30,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid RowId { get; set; }
public string Answer { get; set; }
public string Answer { get; set; }=string.Empty;
public Guid TableQuestionId { get; set; }

2
IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs
View File

@ -33,7 +33,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid VisitTaskId { get; set; }
public string Answer { get; set; }
public string Answer { get; set; } = string.Empty;

26
IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs
View File

@ -32,22 +32,22 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 类型
/// </summary>
public string Type { get; set; }
public string Type { get; set; } = string.Empty;
/// <summary>
/// 父问题触发
/// </summary>
public string ParentTriggerValue { get; set; } = string.Empty;
/// <summary>
/// 父问题触发
/// </summary>
public string ParentTriggerValue { get; set; } = string.Empty;
/// <summary>
/// 问题名称
/// </summary>
public string QuestionName { get; set; }
public string QuestionName { get; set; } = string.Empty;
/// <summary>
/// 语言类型
/// </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary>
/// 语言类型
/// </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary>
/// 是否是必须
@ -69,14 +69,14 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 类型值
/// </summary>
public string TypeValue { get; set; }
public string TypeValue { get; set; } = string.Empty;
/// <summary>
/// <summary>
/// 是否启用
/// </summary>
public bool IsEnable { get; set; }
public bool IsEnable { get; set; }
/// <summary>
/// 任务类型

22
IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs
View File

@ -25,35 +25,35 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 类型
/// </summary>
public string Type { get; set; }
public string Type { get; set; } = string.Empty;
/// <summary>
/// <summary>
/// 父问题触发值
/// </summary>
public string ParentTriggerValue { get; set; } = string.Empty;
public string ParentTriggerValue { get; set; } = string.Empty;
/// <summary>
/// 问题名称
/// </summary>
public string QuestionName { get; set; }
public string QuestionName { get; set; } = string.Empty;
/// <summary>
/// 语言类型
/// </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary>
/// 语言类型
/// </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary>
/// 类型值
/// </summary>
public string TypeValue { get; set; }
public string TypeValue { get; set; } = string.Empty;
/// <summary>
/// <summary>
/// 项目ID
/// </summary>
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
/// <summary>
/// 是否启用

6
IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs
View File

@ -29,12 +29,12 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 分页名称
/// </summary>
public string PageName { get; set; }
public string PageName { get; set; } = string.Empty;
/// <summary>
/// <summary>
/// 是否启用
/// </summary>
public bool IsEnable { get; set; }
public bool IsEnable { get; set; }

2
IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
View File

@ -50,7 +50,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 标准
/// </summary>
public string CriterionName { get; set; }
public string CriterionName { get; set; } = string.Empty;
/// <summary>
/// 是否启用

4
IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs
View File

@ -21,11 +21,11 @@ namespace IRaCIS.Core.Domain.Models
public Guid SystemCriterionId { get; set; }
public string Code { get; set; }
public string Code { get; set; } = string.Empty;
}
}
}

4
IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs
View File

@ -24,11 +24,11 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialCriterionId { get; set; }
public string Code { get; set; }
public string Code { get; set; } = string.Empty;
}
}
}

56
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs
View File

@ -99,22 +99,22 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 类型
/// </summary>
public string Type { get; set; }
public string Type { get; set; } = string.Empty;
/// <summary>
/// 父问题触发
/// </summary>
public string ParentTriggerValue { get; set; }
/// <summary>
/// 父问题触发
/// </summary>
public string ParentTriggerValue { get; set; } = string.Empty;
/// <summary>
/// 问题名称
/// </summary>
public string QuestionName { get; set; }
/// <summary>
/// 问题名称
/// </summary>
public string QuestionName { get; set; } = string.Empty;
/// <summary>
/// 是否是必须
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 是否是必须
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 排序
@ -129,12 +129,12 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 类型值
/// </summary>
public string TypeValue { get; set; }
public string TypeValue { get; set; } = string.Empty;
/// <summary>
/// 是否启用
/// </summary>
public bool IsEnable { get; set; }
/// <summary>
/// 是否启用
/// </summary>
public bool IsEnable { get; set; }
/// <summary>
@ -145,12 +145,12 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
public string Remark { get; set; } = string.Empty;
/// <summary>
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 关联Value
@ -160,12 +160,12 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 分组
/// </summary>
public string GroupName { get; set; }
public string GroupName { get; set; } = string.Empty;
/// <summary>
/// 图片数量
/// </summary>
public int ImageCount { get; set; } = 1;
/// <summary>
/// 图片数量
/// </summary>
public int ImageCount { get; set; } = 1;
/// <summary>
/// 是否显示

2
IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs
View File

@ -28,7 +28,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid? InstanceId { get; set; }
public string MeasureData { get; set; }
public string MeasureData { get; set; } = string.Empty;
public int? NumberOfFrames { get; set; }

4
IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs
View File

@ -46,10 +46,10 @@ namespace IRaCIS.Core.Domain.Models
/// 问题答案
/// </summary>
public string Answer { get; set; }
public string Answer { get; set; } = string.Empty;
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
/// <summary>
/// 全局答案类型

10
IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs
View File

@ -38,18 +38,18 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 结果
/// </summary>
public string EvaluationResult { get; set; }
public string EvaluationResult { get; set; } = string.Empty;
/// <summary>
/// <summary>
/// 原因
/// </summary>
public string EvaluationReason { get; set; }
public string EvaluationReason { get; set; } = string.Empty;
/// <summary>
/// <summary>
/// 项目Id
/// </summary>
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
/// <summary>
/// 受试者Id

4
IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs
View File

@ -55,10 +55,10 @@ namespace IRaCIS.Core.Domain.Models
public decimal RowIndex { get; set; }
public string Answer { get; set; }
public string Answer { get; set; } = string.Empty;
public Guid RowId { get; set; }
public Guid RowId { get; set; }

10
IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs
View File

@ -70,12 +70,12 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 模块名称
/// </summary>
public string ModuleName { get; set; }
public string ModuleName { get; set; } = string.Empty;
/// <summary>
/// 是否加急
/// </summary>
public bool? IsUrgent { get; set; }
/// <summary>
/// 是否加急
/// </summary>
public bool? IsUrgent { get; set; }
public Guid SubjectVisitId { get; set; }

10
IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs
View File

@ -38,12 +38,12 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 阅片期名称
/// </summary>
public string ReadingPeriodName { get; set; }
public string ReadingPeriodName { get; set; } = string.Empty;
/// <summary>
/// 阅片范围
/// </summary>
public ReadingScopeEnum ReadingScope { get; set; }
/// <summary>
/// 阅片范围
/// </summary>
public ReadingScopeEnum ReadingScope { get; set; }
/// <summary>
/// 截止日期

4
IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs
View File

@ -44,9 +44,9 @@ namespace IRaCIS.Core.Domain.Models
public bool MetaKey { get; set; } = false;
public string Text { get; set; }
public string Text { get; set; } = string.Empty;
public string Code { get; set; } = string.Empty;
public string Code { get; set; } = string.Empty;
}

4
IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs
View File

@ -19,10 +19,10 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public string TemplateName { get; set; }
public string TemplateName { get; set; } = string.Empty;
public Guid UserId { get; set; }
public Guid UserId { get; set; }

1
IRaCIS.Core.Domain/Trial/Trial.cs
View File

@ -277,7 +277,6 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>time
public TrialType TrialType { get; set; }
//public string TempCode { get; set; }
public int PlanSiteCount { get; set; }

8
IRaCIS.Core.Domain/Trial/TrialBodyPart.cs
View File

@ -23,17 +23,17 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public string Code { get; set; }
public string Code { get; set; } = string.Empty;
public string Name { get; set; }
public string Name { get; set; } = string.Empty;
public string NameCN { get; set; }
public string NameCN { get; set; } = string.Empty;
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public bool IsHandAdd { get; set; }

6
IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs
View File

@ -22,12 +22,12 @@ namespace IRaCIS.Core.Domain.Models
public Guid OptUserId { get; set; }
public string OptUser { get; set; }
public string OptUser { get; set; } = string.Empty;
public DateTime OptTime { get; set; }=DateTime.Now;
public string Note { get; set; }
public string Note { get; set; } = string.Empty;
public string Detail { get; set; }
public string Detail { get; set; } = string.Empty;
}

10
IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs
View File

@ -28,19 +28,19 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialSiteId { get; set; }
public string CallingAE { get; set; }
public string CallingAE { get; set; } = string.Empty;
public string IP { get; set; }
public string IP { get; set; } = string.Empty;
public string Port { get; set; }
public string Port { get; set; } = string.Empty;
public string Description { get; set; }
public string Description { get; set; } = string.Empty;
}
}
}

4
IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs
View File

@ -33,10 +33,10 @@ namespace IRaCIS.Core.Domain.Models
public DateTime? JoinTime { get; set; }
public string RejectReason { get; set; }
public string RejectReason { get; set; } = string.Empty;
}
}
}

2
IRaCIS.Core.Domain/Visit/Subject.cs
View File

@ -69,7 +69,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialSiteId { get; set; }
public string Code { get; set; }
public string Code { get; set; } = string.Empty;
public string FirstName { get; set; } = string.Empty;
public string LastName { get; set; } = string.Empty;
public int? Age { get; set; }

6
IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs
View File

@ -33,15 +33,15 @@ namespace IRaCIS.Core.Domain.Models
public bool IsDicomStudy { get; set; }
public string Modality { get; set; }
public string Modality { get; set; } = string.Empty;
public bool IsOverWindowNowNotOverWindow { get; set; }
public DateTime? StudyTime { get; set; }
public string HistoryWindow { get; set; }
public string HistoryWindow { get; set; } = string.Empty;
public string NowWindow { get; set; }
public string NowWindow { get; set; } = string.Empty;
public Guid VisitPlanInfluenceStatId { get; set; }

24
IRaCIS.Core.Domain/_Config/_AppSettings.cs
View File

@ -53,27 +53,27 @@ namespace IRaCIS.Core.Domain.Share
{
public int Port { get; set; }
public string Host { get; set; }
public string Host { get; set; } = string.Empty;
public string FromEmail { get; set; }
public string FromEmail { get; set; } = string.Empty;
public string FromName { get; set; }
public string FromName { get; set; } = string.Empty;
public string AuthorizationCode { get; set; }
public string AuthorizationCode { get; set; } = string.Empty;
public string SiteUrl { get; set; }
public string SiteUrl { get; set; } = string.Empty;
public string OrganizationName { get; set; }
public string OrganizationNameCN { get; set; }
public string OrganizationName { get; set; } = string.Empty;
public string OrganizationNameCN { get; set; } = string.Empty;
public string CompanyName { get; set; }
public string CompanyName { get; set; } = string.Empty;
public string CompanyNameCN { get; set; }
public string CompanyNameCN { get; set; } = string.Empty;
public string CompanyShortName { get; set; }
public string CompanyShortName { get; set; } = string.Empty;
public string CompanyShortNameCN { get; set; }
public string CompanyShortNameCN { get; set; } = string.Empty;
}
@ -82,7 +82,7 @@ namespace IRaCIS.Core.Domain.Share
{
public int Port { get; set; }
public string IP { get; set; }
public string IP { get; set; }=string.Empty;
}