diff --git a/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs b/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs index 5906e71fc..c5c795538 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs index 21511a827..39c33a358 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs @@ -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; } /// ///TaskMedicalReview diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs index 160684ab6..9c87902d3 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs b/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs index 68c915486..45c629891 100644 --- a/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs +++ b/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs @@ -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; diff --git a/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs b/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs index f645ebf3e..c0f4fbb4a 100644 --- a/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs +++ b/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs @@ -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; } } } diff --git a/IRaCIS.Core.Domain/BaseModel/Entity.cs b/IRaCIS.Core.Domain/BaseModel/Entity.cs index 91638466d..26c0b0fc9 100644 --- a/IRaCIS.Core.Domain/BaseModel/Entity.cs +++ b/IRaCIS.Core.Domain/BaseModel/Entity.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs b/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs index 4786c8e6d..b301d3d87 100644 --- a/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs +++ b/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs @@ -19,7 +19,7 @@ namespace IRaCIS.Core.Domain.Models public interface IAuditAddWithUserName : IAuditAdd { - public string CreateUser { get; set; } + public string CreateUser { get; set; } } diff --git a/IRaCIS.Core.Domain/Common/Dictionary.cs b/IRaCIS.Core.Domain/Common/Dictionary.cs index 5ca06026e..a028e81cd 100644 --- a/IRaCIS.Core.Domain/Common/Dictionary.cs +++ b/IRaCIS.Core.Domain/Common/Dictionary.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs index 21ac90a95..1efc058dc 100644 --- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs +++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs @@ -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 /// 是否为特殊类型 /// 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; } diff --git a/IRaCIS.Core.Domain/Common/PublishLog.cs b/IRaCIS.Core.Domain/Common/PublishLog.cs index 8d7bf63e0..55c7019b5 100644 --- a/IRaCIS.Core.Domain/Common/PublishLog.cs +++ b/IRaCIS.Core.Domain/Common/PublishLog.cs @@ -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; } - - //0 开发中 ,已发布 - public int State { get; set; } + public string UpdateContent { get; set; } = string.Empty; + + //0 开发中 ,已发布 + public int State { get; set; } public bool IsCurrentVersion { get; set; } diff --git a/IRaCIS.Core.Domain/Common/SystemBasicData.cs b/IRaCIS.Core.Domain/Common/SystemBasicData.cs index e663a5f5c..799565951 100644 --- a/IRaCIS.Core.Domain/Common/SystemBasicData.cs +++ b/IRaCIS.Core.Domain/Common/SystemBasicData.cs @@ -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; diff --git a/IRaCIS.Core.Domain/Dcotor/Attachment.cs b/IRaCIS.Core.Domain/Dcotor/Attachment.cs index a78eee9c8..85aaf8f47 100644 --- a/IRaCIS.Core.Domain/Dcotor/Attachment.cs +++ b/IRaCIS.Core.Domain/Dcotor/Attachment.cs @@ -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; diff --git a/IRaCIS.Core.Domain/Dcotor/Doctor.cs b/IRaCIS.Core.Domain/Dcotor/Doctor.cs index abbd2d970..0d698ebb9 100644 --- a/IRaCIS.Core.Domain/Dcotor/Doctor.cs +++ b/IRaCIS.Core.Domain/Dcotor/Doctor.cs @@ -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)] diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs index b7c019ea1..5a5edecf4 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs +++ b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs @@ -23,17 +23,17 @@ namespace IRaCIS.Core.Domain.Models /// /// 文件名称 /// - public string FileName { get; set; } - - /// + public string FileName { get; set; } = string.Empty; + + /// /// 文件路径 /// - public string FilePath { get; set; } - - /// + public string FilePath { get; set; } = string.Empty; + + /// /// 标准类型 /// - public CriterionType CriterionType { get; set; } + public CriterionType CriterionType { get; set; } /// /// 医生Id @@ -43,12 +43,12 @@ namespace IRaCIS.Core.Domain.Models /// /// 备注 /// - public string Remark { get; set; } - - /// + public string Remark { get; set; } = string.Empty; + + /// /// 文件类型 /// - 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; } diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs b/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs index fce8c78d6..2701ef933 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs +++ b/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs @@ -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; diff --git a/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs b/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs index b9c88d696..831c52e13 100644 --- a/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs +++ b/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs index 1bd2ce787..6160fb984 100644 --- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs +++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs @@ -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; diff --git a/IRaCIS.Core.Domain/Financial/CalculateTask.cs b/IRaCIS.Core.Domain/Financial/CalculateTask.cs index d46027c7c..7d60de36e 100644 --- a/IRaCIS.Core.Domain/Financial/CalculateTask.cs +++ b/IRaCIS.Core.Domain/Financial/CalculateTask.cs @@ -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; } } } diff --git a/IRaCIS.Core.Domain/Financial/ExchangeRate.cs b/IRaCIS.Core.Domain/Financial/ExchangeRate.cs index 41fe845b6..c3cf0e6f2 100644 --- a/IRaCIS.Core.Domain/Financial/ExchangeRate.cs +++ b/IRaCIS.Core.Domain/Financial/ExchangeRate.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs b/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs index 732db0aa6..51fc64c24 100644 --- a/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs +++ b/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/Financial/PaymentDetail.cs b/IRaCIS.Core.Domain/Financial/PaymentDetail.cs index 81c217ba4..04513282a 100644 --- a/IRaCIS.Core.Domain/Financial/PaymentDetail.cs +++ b/IRaCIS.Core.Domain/Financial/PaymentDetail.cs @@ -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)")] diff --git a/IRaCIS.Core.Domain/Financial/RankPrice.cs b/IRaCIS.Core.Domain/Financial/RankPrice.cs index 7fce8616e..99686efcb 100644 --- a/IRaCIS.Core.Domain/Financial/RankPrice.cs +++ b/IRaCIS.Core.Domain/Financial/RankPrice.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs b/IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs index 6b5d05c46..9dc577be4 100644 --- a/IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs +++ b/IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs @@ -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)")] diff --git a/IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs b/IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs index 822c312d6..039ba04de 100644 --- a/IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs +++ b/IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs @@ -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; diff --git a/IRaCIS.Core.Domain/Image/ImageShare.cs b/IRaCIS.Core.Domain/Image/ImageShare.cs index cbd10e7af..0244d9781 100644 --- a/IRaCIS.Core.Domain/Image/ImageShare.cs +++ b/IRaCIS.Core.Domain/Image/ImageShare.cs @@ -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; } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs b/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs index 10575a795..48e9be4de 100644 --- a/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs +++ b/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/Image/SystemAnonymization.cs b/IRaCIS.Core.Domain/Image/SystemAnonymization.cs index 31275b027..8ae645fe1 100644 --- a/IRaCIS.Core.Domain/Image/SystemAnonymization.cs +++ b/IRaCIS.Core.Domain/Image/SystemAnonymization.cs @@ -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; diff --git a/IRaCIS.Core.Domain/Image/TrialDicomAE.cs b/IRaCIS.Core.Domain/Image/TrialDicomAE.cs index 58fdbf36e..db3588e36 100644 --- a/IRaCIS.Core.Domain/Image/TrialDicomAE.cs +++ b/IRaCIS.Core.Domain/Image/TrialDicomAE.cs @@ -9,36 +9,36 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { - /// - ///DicomAE - /// - [Table("TrialDicomAE")] - public class TrialDicomAE : BaseFullAuditEntity - { + /// + ///DicomAE + /// + [Table("TrialDicomAE")] + public class TrialDicomAE : BaseFullAuditEntity + { #region 导航属性 #endregion public Guid TrialId { get; set; } - - - public string CalledAE { get; set; } = string.Empty; - - public string IP { get; set; } - - - public int Port { get; set; } - - - public string Modality { get; set; } = string.Empty; - public string Description { get; set; }=string.Empty; + public string CalledAE { get; set; } = string.Empty; + + public string IP { get; set; } = string.Empty; - public DateTime? LatestTestTime { get; set; } + public int Port { get; set; } - public bool? IsTestOK { get; set; } - - } -} + public string Modality { get; set; } = string.Empty; + + + public string Description { get; set; } = string.Empty; + + + public DateTime? LatestTestTime { get; set; } + + public bool? IsTestOK { get; set; } + + } + +} diff --git a/IRaCIS.Core.Domain/Institution/CRO.cs b/IRaCIS.Core.Domain/Institution/CRO.cs index 35b8bc753..a592a7680 100644 --- a/IRaCIS.Core.Domain/Institution/CRO.cs +++ b/IRaCIS.Core.Domain/Institution/CRO.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/Institution/Site.cs b/IRaCIS.Core.Domain/Institution/Site.cs index 1287a1c86..a1b43bd4d 100644 --- a/IRaCIS.Core.Domain/Institution/Site.cs +++ b/IRaCIS.Core.Domain/Institution/Site.cs @@ -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; diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs index c73658228..33fc437d5 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/Management/UserFeedBack.cs b/IRaCIS.Core.Domain/Management/UserFeedBack.cs index 9dd0d1d66..f83a4e91b 100644 --- a/IRaCIS.Core.Domain/Management/UserFeedBack.cs +++ b/IRaCIS.Core.Domain/Management/UserFeedBack.cs @@ -47,10 +47,10 @@ namespace IRaCIS.Core.Domain.Models public int QuestionType { get; set; } - public string QuestionDescription { get; set; } + public string QuestionDescription { get; set; } = string.Empty; + - public int State { get; set; } @@ -61,9 +61,9 @@ namespace IRaCIS.Core.Domain.Models public Guid? TrialId { get; set; } - public string ScreenshotListStr { get; set; } + public string ScreenshotListStr { get; set; } = string.Empty; + - diff --git a/IRaCIS.Core.Domain/Management/UserPassWordLog.cs b/IRaCIS.Core.Domain/Management/UserPassWordLog.cs index e702b0be4..c76bd52b9 100644 --- a/IRaCIS.Core.Domain/Management/UserPassWordLog.cs +++ b/IRaCIS.Core.Domain/Management/UserPassWordLog.cs @@ -27,11 +27,11 @@ namespace IRaCIS.Core.Domain.Models /// /// 密码 /// - public string PassWord { get; set; } - + public string PassWord { get; set; } = string.Empty; - - } + + + } } diff --git a/IRaCIS.Core.Domain/Management/UserType.cs b/IRaCIS.Core.Domain/Management/UserType.cs index a1490e0e8..02cc5c28a 100644 --- a/IRaCIS.Core.Domain/Management/UserType.cs +++ b/IRaCIS.Core.Domain/Management/UserType.cs @@ -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,11 +33,11 @@ namespace IRaCIS.Core.Domain.Models public bool IsEnable { get; set; } = true; - public string PermissionStr { get; set; } + public string PermissionStr { get; set; } = string.Empty; + - } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs index 7e42a1cc4..d1535e36f 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs @@ -24,12 +24,12 @@ namespace IRaCIS.Core.Domain.Models public Guid SubjectVisitId { get; set; } - public string Path { get; set; } - - public string FileName { get; set; } - + public string Path { get; set; } = string.Empty; - public bool? IsVisist { get; set; } + public string FileName { get; set; } = string.Empty; + + + public bool? IsVisist { get; set; } /// /// 临床级别 diff --git a/IRaCIS.Core.Domain/QC/QCQuestion.cs b/IRaCIS.Core.Domain/QC/QCQuestion.cs index febd0c98b..aca577f2b 100644 --- a/IRaCIS.Core.Domain/QC/QCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/QCQuestion.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs index fcca55688..8fdac80c2 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs @@ -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 int ShowOrder { get; set; } + public string ParentTriggerValue { get; set; } = string.Empty; + + + public int ShowOrder { get; set; } public bool? IsConfirm { get; set; } diff --git a/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs b/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs index 2b18610b2..998576725 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs index ec93af7de..93a4f7fa3 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs @@ -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; + + /// /// 附加评估答案翻译字典 /// - public string TranslateDictionaryCode { get; set; }=string.Empty; + public string TranslateDictionaryCode { get; set; }=string.Empty; /// /// 是否是最终结果 @@ -50,14 +50,14 @@ namespace IRaCIS.Core.Domain.Models /// 最终结果 /// - public string FinalAnswer { get; set; } - - /// + public string FinalAnswer { get; set; } = string.Empty; + + /// /// 最终结果翻字典 /// - public string FinalTranslateDictionaryCode { get; set; } - - } + public string FinalTranslateDictionaryCode { get; set; } = string.Empty; + + } } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs index 9b1c1d414..7e04dfa4f 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs @@ -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 { - /// - /// 临床资料系统配置 - /// - [Table("ClinicalDataSystemSet")] - public class ClinicalDataSystemSet : BaseAddAuditEntity + /// + /// 临床资料系统配置 + /// + [Table("ClinicalDataSystemSet")] + public class ClinicalDataSystemSet : BaseAddAuditEntity { #region 导航属性 @@ -24,10 +23,10 @@ namespace IRaCIS.Core.Domain.Models /// public int ClinicalDataSetEnum { get; set; } - /// - /// 名称 - /// - public string ClinicalDataSetName { get; set; } + /// + /// 名称 + /// + public string ClinicalDataSetName { get; set; } = string.Empty; /// /// 是否应用 @@ -39,53 +38,53 @@ namespace IRaCIS.Core.Domain.Models /// public string ClinicalDataSetEnName { get; set; } = string.Empty; - /// - /// 临床级别 - /// - public ClinicalLevel ClinicalDataLevel { get; set; } + /// + /// 临床级别 + /// + public ClinicalLevel ClinicalDataLevel { get; set; } - /// - /// 上传方式 - /// - public ClinicalUploadType ClinicalUploadType { get; set; } + /// + /// 上传方式 + /// + public ClinicalUploadType ClinicalUploadType { get; set; } - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } + /// + /// 是否启用 + /// + public bool IsEnable { get; set; } - /// - /// 上传角色 - /// - public UploadRole UploadRole { get; set; } + /// + /// 上传角色 + /// + public UploadRole UploadRole { 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 string CriterionEnumListStr { get; set; }=String.Empty; + public string CriterionEnumListStr { get; set; } = String.Empty; [NotMapped] - public List 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 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 SystemClinicalDataCriterionList { get; set; } = new List(); + //public List SystemClinicalDataCriterionList { get; set; } = new List(); + + } - } - diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs index 64f743b74..478db8018 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs @@ -39,7 +39,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 名称 /// - public string ClinicalDataSetName { get; set; } + public string ClinicalDataSetName { get; set; }=string.Empty; /// /// 英文名称 @@ -87,16 +87,16 @@ namespace IRaCIS.Core.Domain.Models /// /// 模板文件名称 /// - 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 string CriterionEnumListStr { get; set; } = String.Empty; + public string CriterionEnumListStr { get; set; } = String.Empty; public List CriterionEnumList => CriterionEnumListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t) && int.TryParse(t.Trim(), out var s)).Select(t => int.Parse(t.Trim())).ToList(); diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs index fe2149803..615e5f8bd 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs @@ -24,15 +24,15 @@ namespace IRaCIS.Core.Domain.Models /// 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; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs index c37778d50..5dbb5d41c 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs @@ -24,17 +24,17 @@ namespace IRaCIS.Core.Domain.Models /// 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; /// /// 文件类型 /// - public string Type { get; set; } + public string Type { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs index 7a8ddccb0..55ba1071f 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.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/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs index f08083760..45cd279f7 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs @@ -37,9 +37,9 @@ namespace IRaCIS.Core.Domain.Models /// public Guid QuestionId { get; set; } - public string Answer { get; set; } - - public Guid ClinicalDataTrialSetId { get; set; } + public string Answer { get; set; } = string.Empty; + + public Guid ClinicalDataTrialSetId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs index 668a68260..e3fed2f34 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs index 1be26e10e..7502ef5af 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs @@ -33,8 +33,8 @@ namespace IRaCIS.Core.Domain.Models public Guid VisitTaskId { get; set; } - public string Answer { get; set; } - + public string Answer { get; set; } = string.Empty; + } diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs index 47862f8a5..d3f46318f 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs @@ -32,22 +32,22 @@ namespace IRaCIS.Core.Domain.Models /// /// 类型 /// - public string Type { get; set; } + public string Type { get; set; } = string.Empty; - /// - /// 父问题触发 - /// - public string ParentTriggerValue { get; set; } = string.Empty; + /// + /// 父问题触发 + /// + public string ParentTriggerValue { get; set; } = string.Empty; /// /// 问题名称 /// - public string QuestionName { get; set; } + public string QuestionName { get; set; } = string.Empty; - /// - /// 语言类型 - /// - public LanguageType LanguageType { get; set; } = LanguageType.Chinese; + /// + /// 语言类型 + /// + public LanguageType LanguageType { get; set; } = LanguageType.Chinese; /// /// 是否是必须 @@ -69,14 +69,14 @@ 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; } /// /// 任务类型 diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs index 9a4f7557a..42388cf4a 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs @@ -25,35 +25,35 @@ namespace IRaCIS.Core.Domain.Models /// /// 类型 /// - public string Type { get; set; } - - /// + public string Type { get; set; } = string.Empty; + + /// /// 父问题触发值 /// - public string ParentTriggerValue { get; set; } = string.Empty; + public string ParentTriggerValue { get; set; } = string.Empty; /// /// 问题名称 /// - public string QuestionName { get; set; } + public string QuestionName { get; set; } = string.Empty; - /// - /// 语言类型 - /// - public LanguageType LanguageType { get; set; } = LanguageType.Chinese; + /// + /// 语言类型 + /// + public LanguageType LanguageType { get; set; } = LanguageType.Chinese; /// /// 类型值 /// - public string TypeValue { get; set; } - + public string TypeValue { get; set; } = string.Empty; - /// + + /// /// 项目ID /// - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } /// /// 是否启用 diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs index 5638cec3e..db1e44a5a 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs @@ -29,12 +29,12 @@ namespace IRaCIS.Core.Domain.Models /// /// 分页名称 /// - public string PageName { get; set; } - - /// + public string PageName { get; set; } = string.Empty; + + /// /// 是否启用 /// - public bool IsEnable { get; set; } + public bool IsEnable { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs index a7f623663..b3f066c19 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs @@ -50,7 +50,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 标准 /// - public string CriterionName { get; set; } + public string CriterionName { get; set; } = string.Empty; /// /// 是否启用 diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs index 8698348b9..c7b533e91 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs @@ -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; - - } + + + } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs index a1dac37b9..7710591a4 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs @@ -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; - - } + + + } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs index bcfd1d304..f690a8be9 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs @@ -99,22 +99,22 @@ namespace IRaCIS.Core.Domain.Models /// /// 类型 /// - public string Type { get; set; } + public string Type { get; set; } = string.Empty; - /// - /// 父问题触发 - /// - public string ParentTriggerValue { get; set; } + /// + /// 父问题触发 + /// + public string ParentTriggerValue { get; set; } = string.Empty; - /// - /// 问题名称 - /// - public string QuestionName { get; set; } + /// + /// 问题名称 + /// + public string QuestionName { get; set; } = string.Empty; - /// - /// 是否是必须 - /// - public IsRequired IsRequired { get; set; } + /// + /// 是否是必须 + /// + public IsRequired IsRequired { get; set; } /// /// 排序 @@ -129,12 +129,12 @@ 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; } /// @@ -145,12 +145,12 @@ namespace IRaCIS.Core.Domain.Models /// /// 备注 /// - public string Remark { get; set; } + public string Remark { get; set; } = string.Empty; - /// - /// 关联ID - /// - public Guid? RelevanceId { get; set; } + /// + /// 关联ID + /// + public Guid? RelevanceId { get; set; } /// /// 关联Value @@ -160,12 +160,12 @@ namespace IRaCIS.Core.Domain.Models /// /// 分组 /// - public string GroupName { get; set; } + public string GroupName { get; set; } = string.Empty; - /// - /// 图片数量 - /// - public int ImageCount { get; set; } = 1; + /// + /// 图片数量 + /// + public int ImageCount { get; set; } = 1; /// /// 是否显示 diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs index 1b056bb37..81905c59f 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs @@ -28,8 +28,8 @@ 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; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs index c5b164d7c..38818aa3c 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs @@ -46,10 +46,10 @@ namespace IRaCIS.Core.Domain.Models /// 问题答案 /// - public string Answer { get; set; } + public string Answer { get; set; } = string.Empty; - - public Guid TrialId { get; set; } + + public Guid TrialId { get; set; } /// /// 全局答案类型 diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs index ccb6efcde..1d4886e61 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs @@ -38,18 +38,18 @@ namespace IRaCIS.Core.Domain.Models /// /// 结果 /// - public string EvaluationResult { get; set; } - - /// + public string EvaluationResult { get; set; } = string.Empty; + + /// /// 原因 /// - public string EvaluationReason { get; set; } + public string EvaluationReason { get; set; } = string.Empty; - - /// + + /// /// 项目Id /// - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } /// /// 受试者Id diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs index b524e02de..bbd3c4918 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs @@ -55,10 +55,10 @@ namespace IRaCIS.Core.Domain.Models public decimal RowIndex { get; set; } - public string Answer { get; set; } - - - public Guid RowId { get; set; } + public string Answer { get; set; } = string.Empty; + + + public Guid RowId { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs index 5be3f9597..8084a6318 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs @@ -70,12 +70,12 @@ namespace IRaCIS.Core.Domain.Models /// /// 模块名称 /// - public string ModuleName { get; set; } + public string ModuleName { get; set; } = string.Empty; - /// - /// 是否加急 - /// - public bool? IsUrgent { get; set; } + /// + /// 是否加急 + /// + public bool? IsUrgent { get; set; } public Guid SubjectVisitId { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs index 7317239db..f4d2ca6b1 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs @@ -38,12 +38,12 @@ namespace IRaCIS.Core.Domain.Models /// /// 阅片期名称 /// - public string ReadingPeriodName { get; set; } + public string ReadingPeriodName { get; set; } = string.Empty; - /// - /// 阅片范围 - /// - public ReadingScopeEnum ReadingScope { get; set; } + /// + /// 阅片范围 + /// + public ReadingScopeEnum ReadingScope { get; set; } /// /// 截止日期 diff --git a/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs b/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs index 40c68b430..642c03d1f 100644 --- a/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs +++ b/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs index 88fc6f7f1..f5198f72f 100644 --- a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs +++ b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 011ee8f9b..f80e1657b 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -277,7 +277,6 @@ namespace IRaCIS.Core.Domain.Models /// time public TrialType TrialType { get; set; } - //public string TempCode { get; set; } public int PlanSiteCount { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs b/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs index 67d9fadb6..421b4b200 100644 --- a/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs +++ b/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs @@ -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 NameCN { get; set; } + public string Name { get; set; } = string.Empty; - - public Guid TrialId { get; set; } + public string NameCN { get; set; } = string.Empty; + + + + public Guid TrialId { get; set; } public bool IsHandAdd { get; set; } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs index cfa84c0a4..4bc2dbd98 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs index 36b86415f..ee29aeb28 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs @@ -28,19 +28,19 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialSiteId { get; set; } - public string CallingAE { get; set; } - - - public string IP { get; set; } - - - public string Port { get; set; } - - - public string Description { get; set; } + public string CallingAE { get; set; } = string.Empty; - - } + public string IP { get; set; } = string.Empty; + + + public string Port { get; set; } = string.Empty; + + + public string Description { get; set; } = string.Empty; + + + + } } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs index e1fb8ec88..1b97fe6c8 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs @@ -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; - } + } } diff --git a/IRaCIS.Core.Domain/Visit/Subject.cs b/IRaCIS.Core.Domain/Visit/Subject.cs index 4d69a7de6..a0b5daf26 100644 --- a/IRaCIS.Core.Domain/Visit/Subject.cs +++ b/IRaCIS.Core.Domain/Visit/Subject.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs index b35e2c1f6..d0173db02 100644 --- a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs +++ b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs @@ -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; } diff --git a/IRaCIS.Core.Domain/_Config/_AppSettings.cs b/IRaCIS.Core.Domain/_Config/_AppSettings.cs index ef84fe0c5..9091c6e27 100644 --- a/IRaCIS.Core.Domain/_Config/_AppSettings.cs +++ b/IRaCIS.Core.Domain/_Config/_AppSettings.cs @@ -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; }