diff --git a/IRaCIS.Core.Domain/Allocation/SubjectUser.cs b/IRaCIS.Core.Domain/Allocation/SubjectUser.cs index 38c49f178..2065752ca 100644 --- a/IRaCIS.Core.Domain/Allocation/SubjectUser.cs +++ b/IRaCIS.Core.Domain/Allocation/SubjectUser.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; using System.ComponentModel; @@ -25,8 +21,6 @@ namespace IRaCIS.Core.Domain.Models //ChildList [JsonIgnore] public List EarlierSubjectUserList { get; set; } - - [JsonIgnore] public User DoctorUser { get; set; } @@ -41,20 +35,13 @@ namespace IRaCIS.Core.Domain.Models public DateTime? AssignTime { get; set; } public Guid SubjectId { get; set; } - - public Guid DoctorUserId { get; set; } - - public Arm ArmEnum { get; set; } public bool IsConfirmed { get; set; } = true; //该属性有值 说明该医生被替换了 分配的时候 要过滤掉 public Guid? ReplacedSubjectUserId { get; set; } - - - } } diff --git a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs index bbb9535b9..05c1290e0 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -25,8 +22,6 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialId { get; set; } public int PlanSubjectCount { get; set; } - - public bool IsEnable { get; set; } public string Note { get; set; } = string.Empty; @@ -39,11 +34,6 @@ namespace IRaCIS.Core.Domain.Models public bool IsJudgeDoctor { get; set; } public int PlanReadingRatio { get; set; } - - - - - } } diff --git a/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs b/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs index 356148ff6..12ff17bf5 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -40,14 +37,7 @@ namespace IRaCIS.Core.Domain.Models public bool IsEnable { get; set; } public string Note { get; set; } = string.Empty; - - public Guid TrialReadingCriterionId { get; set; } - - - - - } } diff --git a/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs b/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs index 4418a534e..2c95e32c9 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -24,12 +21,7 @@ namespace IRaCIS.Core.Domain.Models //对影响任务进行的操作 public ReReadingOrBackOptType OptType { get; set; } - - - } - - public enum ReReadingOrBackOptType { //取消分配 diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs index 6098be9cd..d5a8c57ab 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; using System.Linq; @@ -36,10 +32,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public Trial Trial { get; set; } - - - - /// /// 文件 /// @@ -48,8 +40,6 @@ namespace IRaCIS.Core.Domain.Models { get { - - try { var result = JsonConvert.DeserializeObject>(this.ImagePath); @@ -70,8 +60,6 @@ namespace IRaCIS.Core.Domain.Models #endregion public Guid? LatestReplyUserId { get; set; } - - /// /// 分配时间 /// @@ -94,12 +82,7 @@ namespace IRaCIS.Core.Domain.Models public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; } public Guid? MedicalManagerUserId { get; set; } - - - public Guid VisitTaskId { get; set; } - - public Guid TrialId { get; set; } /// @@ -111,8 +94,6 @@ namespace IRaCIS.Core.Domain.Models /// 质询问题 /// public string Questioning { get; set; } = string.Empty; - - /// /// 图片路径 /// @@ -132,26 +113,18 @@ namespace IRaCIS.Core.Domain.Models /// 保存问题的时间 /// public DateTime? SaveQuestionTime { get; set; } - - /// /// 不同意重阅原因 /// public string DisagreeReason { get; set; } = string.Empty; - - /// /// 是否申请重阅 /// public bool IsApplyHeavyReading { get; set; } = false; - - /// /// 保存结论时间 /// public DateTime? SaveConclusionTime { get; set; } - - /// /// 文件名称 /// @@ -161,8 +134,6 @@ namespace IRaCIS.Core.Domain.Models /// 是否发送消息 /// public bool IsSendMessage { get; set; } = false; - - /// /// 医学审核对话关闭原因 /// @@ -182,10 +153,5 @@ namespace IRaCIS.Core.Domain.Models // | 分割 public string PDRelationTaskIdListStr { get; set; } = string.Empty; - - } - - - } diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs index 5f7fcfa55..d62a8fef2 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -32,11 +29,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public User DoctorUser { get; set; } - - - - - } } diff --git a/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs b/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs index c9371db37..82504ddc7 100644 --- a/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs +++ b/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -15,13 +12,6 @@ namespace IRaCIS.Core.Domain.Models #endregion public Guid TrialId { get; set; } - - public string VirturalSiteCode { get; set; } = string.Empty; - - - } - - } diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index 4e5100c41..6685a0069 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -1,7 +1,3 @@ - - - - using EntityFrameworkCore.Projectables; using IRaCIS.Core.Domain.Share; using System.Linq; @@ -23,9 +19,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [ForeignKey("TrialReadingCriterionId")] public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - - - [ForeignKey("DoctorUserId")] public User DoctorUser { get; set; } @@ -37,26 +30,16 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [ForeignKey("JudgeVisitTaskId")] public VisitTask JudgeVisitTask { get; set; } - - - [JsonIgnore] public Subject Subject { get; set; } - - [JsonIgnore] public List TaskMedicalReviewList { get; set; } [ForeignKey("JudgeResultTaskId")] public VisitTask JudgeResultTask { get; set; } - - - //影像质量 等等第一层级问题答案 [JsonIgnore] public List ReadingTaskQuestionAnswerList { get; set; } = new List(); - - //病灶表 [JsonIgnore] public List LesionList { get; set; } = new List(); @@ -64,19 +47,12 @@ namespace IRaCIS.Core.Domain.Models //病灶答案表 [JsonIgnore] public List LesionAnswerList { get; set; } = new List(); - - - //重阅或者退回影像的记录中间表 [JsonIgnore] public List TaskInfluenceList { get; set; } = new List(); - - [JsonIgnore] //对于全局任务而言 才可以用的 关联的访视阅片结果 public List GlobalVisitResultList { get; set; } = new List(); - - /// /// 裁判结果图片地址 /// @@ -98,14 +74,9 @@ namespace IRaCIS.Core.Domain.Models } } - - [JsonIgnore] public Trial Trial { get; set; } - - - [JsonIgnore] public List UserFeedBackList { get; set; } @@ -131,9 +102,6 @@ namespace IRaCIS.Core.Domain.Models } } - - - /// /// 报告任务关系 包含冻结 /// @@ -156,10 +124,6 @@ namespace IRaCIS.Core.Domain.Models } } - - - - /// /// 既往任务Id 不包括自己集合 /// @@ -181,11 +145,7 @@ namespace IRaCIS.Core.Domain.Models } } - - #endregion - - public string TaskName { get; set; } = string.Empty; public string TaskBlindName { get; set; } = string.Empty; @@ -197,16 +157,12 @@ namespace IRaCIS.Core.Domain.Models public ReadingCategory ReadingCategory { get; set; } public Guid TrialId { get; set; } - - /// /// 分配时间 /// public DateTime? AllocateTime { get; set; } public Guid SubjectId { get; set; } - - public int Code { get; set; } public string TaskCode { get; set; } = string.Empty; @@ -238,24 +194,14 @@ namespace IRaCIS.Core.Domain.Models /// 分配状态 /// public TaskAllocationState TaskAllocationState { get; set; } - - public TaskState TaskState { get; set; } - - /// /// 重阅状态 /// public ReReadingApplyState ReReadingApplyState { get; set; } public Guid? DoctorUserId { get; set; } - - public Guid TrialReadingCriterionId { get; set; } - - - - //裁判任务的Id public Guid? JudgeVisitTaskId { get; set; } @@ -266,8 +212,6 @@ namespace IRaCIS.Core.Domain.Models public DateTime? SignTime { get; set; } public DateTime? SuggesteFinishedTime { get; set; } - - /// /// 是否是重阅产生的，方便过滤数据 /// @@ -277,18 +221,10 @@ namespace IRaCIS.Core.Domain.Models /// PM 对该任务进行了回退 影响的任务不设置 /// public bool IsPMSetBack { get; set; } - - /// 裁判结果的任务ID public Guid? JudgeResultTaskId { get; set; } - - - //随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定 public decimal VisitTaskNum { get; set; } - - - /// /// 首次阅片时间 /// @@ -319,9 +255,6 @@ namespace IRaCIS.Core.Domain.Models /// public string PastResultTaskIds { get; set; } = "[]"; - - - #region 裁判任务特有 [JsonIgnore] @@ -338,8 +271,6 @@ namespace IRaCIS.Core.Domain.Models public string JudgeResultImagePath { get; set; } = string.Empty; #endregion - - #region 一致性分析的任务特有数据 /// @@ -361,15 +292,10 @@ namespace IRaCIS.Core.Domain.Models /// 是否是一致性分析产生 /// public bool IsAnalysisCreate { get; set; } - - - /// /// 转换之前的任务Id(转化的任务才有该值) /// public Guid? BeforeConvertedTaskId { get; set; } - - [Projectable] [JsonIgnore] public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask || Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId @@ -379,14 +305,10 @@ namespace IRaCIS.Core.Domain.Models && t.IsSelfAnalysis == IsSelfAnalysis && t.ArmEnum == ArmEnum ).Any(); - - /// /// 是否修改了整体肿瘤评估 /// public bool IsChangeTumorEvaluate { get; set; } = false; - - /// /// 重阅重置任务的 标注是转化之前的 还是转化之后的 /// @@ -409,8 +331,6 @@ namespace IRaCIS.Core.Domain.Models public Guid? ConsistentAnalysisOriginalTaskId { get; set; } #endregion - - //临床数据 public bool IsNeedClinicalDataSign { get; set; } @@ -424,10 +344,6 @@ namespace IRaCIS.Core.Domain.Models /// 前序任务需要签名 但是未签名 /// public bool IsFrontTaskNeedSignButNotSign { get; set; } - - public int ImageStudyState { get; set; } - - } } diff --git a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs index 68722f7be..44ef98240 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models @@ -35,8 +31,6 @@ namespace IRaCIS.Core.Domain.Models //重阅原始任务Id 重阅会产生新的任务 public Guid OriginalReReadingTaskId { get; set; } - - //产生重阅的根任务Id public Guid RootReReadingTaskId { get; set; } @@ -44,15 +38,9 @@ namespace IRaCIS.Core.Domain.Models public Guid? NewReReadingTaskId { get; set; } public Guid RequestReReadingUserId { get; set; } - - public DateTime RequestReReadingTime { get; set; } - - //申请回退类型 public RequestReReadingType RequestReReadingType { get; set; } - - public string RequestReReadingReason { get; set; } = string.Empty; public string RequestReReadingRejectReason { get; set; } = string.Empty; @@ -60,15 +48,10 @@ namespace IRaCIS.Core.Domain.Models public RequestReReadingResult RequestReReadingResultEnum { get; set; } public Guid? RequestReReadingConfirmUserId { get; set; } - - public bool IsCopyOrigenalForms { get; set; } //仅仅包括全局和访视 public bool IsCopyFollowForms { get; set; } - - - } } diff --git a/IRaCIS.Core.Domain/BaseModel/Entity.cs b/IRaCIS.Core.Domain/BaseModel/Entity.cs index fa8e12ef7..25b99d09b 100644 --- a/IRaCIS.Core.Domain/BaseModel/Entity.cs +++ b/IRaCIS.Core.Domain/BaseModel/Entity.cs @@ -2,8 +2,6 @@ namespace IRaCIS.Core.Domain.Models { - - public interface IAggregateRoot; public interface IEntity { @@ -23,8 +21,6 @@ namespace IRaCIS.Core.Domain.Models [Required] [DatabaseGenerated(DatabaseGeneratedOption.None)] public Guid Id { get; set; } - - #region 领域事件 仅仅允许通过提供的方法进行操作 [JsonIgnore] private readonly List _domainEvents = []; @@ -32,8 +28,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [NotMapped] public IReadOnlyCollection DomainEvents => _domainEvents.AsReadOnly(); - - public void AddDomainEvent(DomainEvent domainEvent) { _domainEvents.Add(domainEvent); @@ -49,13 +43,7 @@ namespace IRaCIS.Core.Domain.Models _domainEvents.Clear(); } #endregion - - } - - - - #region 减少实体属性，增加基类 public abstract class BaseAddAuditEntity : Entity, IAuditAdd @@ -94,8 +82,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public User CreateUser { get; set; } } - - public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete { public Guid? DeleteUserId { get; set; } @@ -116,8 +102,6 @@ namespace IRaCIS.Core.Domain.Models public Guid UpdateUserId { get; set; } public DateTime UpdateTime { get; set; } } - - #endregion } diff --git a/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs b/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs index f1473131c..1251d01cc 100644 --- a/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs +++ b/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs @@ -7,9 +7,6 @@ public DateTime CreateTime { get; set; } } - - - public interface IAuditAdd : IAuditAdd { @@ -19,7 +16,4 @@ { public string CreateUser { get; set; } } - - - } diff --git a/IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs b/IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs index 744b141b4..34da3be32 100644 --- a/IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs +++ b/IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs @@ -10,9 +10,4 @@ { } - - - - - } diff --git a/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs b/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs index d7e743a71..0e2a17d82 100644 --- a/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs +++ b/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs @@ -12,6 +12,4 @@ { } - - } diff --git a/IRaCIS.Core.Domain/Common/CommonDocument.cs b/IRaCIS.Core.Domain/Common/CommonDocument.cs index 72af178fb..3d887fc7b 100644 --- a/IRaCIS.Core.Domain/Common/CommonDocument.cs +++ b/IRaCIS.Core.Domain/Common/CommonDocument.cs @@ -1,11 +1,5 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models; - - [Comment("数据上传 | 数据导出 | 邮件附件 文件记录表 （需要同步）")] [Table("CommonDocument")] public class CommonDocument : BaseFullDeleteAuditEntity @@ -29,5 +23,3 @@ public class CommonDocument : BaseFullDeleteAuditEntity public string Path { get; set; } = null!; } - - diff --git a/IRaCIS.Core.Domain/Common/Dictionary.cs b/IRaCIS.Core.Domain/Common/Dictionary.cs index 352751a64..e37787007 100644 --- a/IRaCIS.Core.Domain/Common/Dictionary.cs +++ b/IRaCIS.Core.Domain/Common/Dictionary.cs @@ -1,6 +1,4 @@ using IRaCIS.Core.Domain.Share; - - namespace IRaCIS.Core.Domain.Models; [Comment("̨ - ֵҪͬ")] @@ -10,8 +8,6 @@ public partial class Dictionary : BaseFullAuditEntity #region [JsonIgnore] public List DoctorDicRelationList { get; set; } = new List(); - - [JsonIgnore] [ForeignKey("ConfigTypeId")] public Dictionary ConfigDictionary { get; set; } @@ -23,8 +19,6 @@ public partial class Dictionary : BaseFullAuditEntity public List ChildList { get; set; } = new List(); #endregion - - [StringLength(400)] public string ChildGroup { get; set; } = null!; @@ -52,8 +46,4 @@ public partial class Dictionary : BaseFullAuditEntity [StringLength(400)] public string ValueCN { get; set; } = null!; - - - - } diff --git a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs index 637401d7a..8b07d0843 100644 --- a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs +++ b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models; @@ -44,12 +40,8 @@ public class EmailNoticeConfig : BaseFullDeleteAuditEntity [Comment(" 发送周期")] public string EmailCron { get; set; } = null!; - - [MaxLength] public string EmailHtmlContent { get; set; } = null!; - - [MaxLength] public string EmailHtmlContentCN { get; set; } = null!; @@ -72,12 +64,7 @@ public class EmailNoticeConfig : BaseFullDeleteAuditEntity public bool IsReturnRequired { get; set; } public SysEmailLevel SystemLevel { get; set; } - - - } - - [Comment("后台 - 邮件配置用户类型表（需要同步）")] [Table("EmailNoticeUserType")] @@ -87,14 +74,10 @@ public class EmailNoticeUserType : Entity public EmailNoticeConfig EmailNoticeConfig { get; set; } public Guid EmailNoticeConfigId { get; set; } - - public UserTypeEnum UserType { get; set; } public EmailUserType EmailUserType { get; set; } } - - public enum SysEmailLevel { not_sys = 0, diff --git a/IRaCIS.Core.Domain/Common/ExploreRecommend.cs b/IRaCIS.Core.Domain/Common/ExploreRecommend.cs index a9469ee21..a4dc99610 100644 --- a/IRaCIS.Core.Domain/Common/ExploreRecommend.cs +++ b/IRaCIS.Core.Domain/Common/ExploreRecommend.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models; [Comment("后台 - 浏览器推荐 （需要同步）")] @@ -29,5 +26,3 @@ public class ExploreRecommend : BaseFullDeleteAuditEntity public string Version { get; set; } = null!; } - - diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs index b0bea7be6..f844a3378 100644 --- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs +++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models; [Comment("稽查 - 配置表 （需要同步）")] @@ -127,10 +124,6 @@ public class FrontAuditConfig : BaseFullAuditEntity public string ValueCN { get; set; } = null!; } - - - - public class UrlConfig { public bool IsRoute { get; set; } @@ -165,12 +158,8 @@ public class TableConfig public string ColumnEnName { get; set; } = String.Empty; public bool IsPicture { get; set; } - - public bool IsNeedTransalate { get; set; } public string TranslateDictionaryName { get; set; } = String.Empty; - - public bool IsDynamicTranslate { get; set; } } diff --git a/IRaCIS.Core.Domain/Common/Internationalization.cs b/IRaCIS.Core.Domain/Common/Internationalization.cs index 46a99559b..b74000cb4 100644 --- a/IRaCIS.Core.Domain/Common/Internationalization.cs +++ b/IRaCIS.Core.Domain/Common/Internationalization.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -20,8 +17,6 @@ namespace IRaCIS.Core.Domain.Models /// 0 1 2 预翻译 已确认 废除 /// public int State { get; set; } - - public string Description { get; set; } = string.Empty; public string Code { get; set; } = string.Empty; @@ -33,15 +28,9 @@ namespace IRaCIS.Core.Domain.Models public int InternationalizationType { get; set; } public string FrontType { get; set; } = string.Empty; - - public string Module { get; set; } = string.Empty; //关联版本历史记录表Id public Guid? PublishLogId { get; set; } - - - - } } diff --git a/IRaCIS.Core.Domain/Common/NotDefault.cs b/IRaCIS.Core.Domain/Common/NotDefault.cs index d6585ac01..069259e45 100644 --- a/IRaCIS.Core.Domain/Common/NotDefault.cs +++ b/IRaCIS.Core.Domain/Common/NotDefault.cs @@ -50,8 +50,6 @@ public class NotDefaultAttribute : ValidationAttribute return true; } } - - public class CanConvertToTimeAttribute : ValidationAttribute { public const string DefaultErrorMessage = "The {0} field is is not a valid DateTime value"; diff --git a/IRaCIS.Core.Domain/Common/PublishLog.cs b/IRaCIS.Core.Domain/Common/PublishLog.cs index 0f8940e45..bc4178f99 100644 --- a/IRaCIS.Core.Domain/Common/PublishLog.cs +++ b/IRaCIS.Core.Domain/Common/PublishLog.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -9,8 +6,6 @@ namespace IRaCIS.Core.Domain.Models [Table("PublishLog")] public class PublishLog : BaseFullAuditEntity { - - public string Version { get; set; } = string.Empty; public DateTime? PublishTime { get; set; } diff --git a/IRaCIS.Core.Domain/Common/SystemBasicData.cs b/IRaCIS.Core.Domain/Common/SystemBasicData.cs index 8e9318c8a..419616dae 100644 --- a/IRaCIS.Core.Domain/Common/SystemBasicData.cs +++ b/IRaCIS.Core.Domain/Common/SystemBasicData.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -18,8 +14,6 @@ namespace IRaCIS.Core.Domain.Models public SystemBasicData Parent { get; set; } #endregion - - public string Name { get; set; } = string.Empty; public string Value { get; set; } = string.Empty; @@ -31,15 +25,11 @@ namespace IRaCIS.Core.Domain.Models public string Code { get; set; } = string.Empty; public Guid? ParentId { get; set; } - - public string ValueCN { get; set; } = string.Empty; public bool IsEnable { get; set; } public BasicDataTypeEnum BasicDataTypeEnum { get; set; } - - } } diff --git a/IRaCIS.Core.Domain/Dcotor/Doctor.cs b/IRaCIS.Core.Domain/Dcotor/Doctor.cs index f8903f8eb..c04a88369 100644 --- a/IRaCIS.Core.Domain/Dcotor/Doctor.cs +++ b/IRaCIS.Core.Domain/Dcotor/Doctor.cs @@ -13,8 +13,6 @@ public class Doctor : BaseFullAuditEntity public List DoctorDicRelationList { get; set; } = new List(); [JsonIgnore] public List TrialExperienceCriteriaList { get; set; } - - [JsonIgnore] public List EnrollList { get; set; } @@ -47,8 +45,6 @@ public class Doctor : BaseFullAuditEntity public bool AcceptingNewTrial { get; set; } public bool ActivelyReading { get; set; } - - [MaxLength] public string? AdminComment { get; set; } @@ -59,8 +55,6 @@ public class Doctor : BaseFullAuditEntity public string BlindName { get; set; } = null!; public string BlindNameCN { get; set; } = null!; - - [MaxLength] public string? BlindPublications { get; set; } @@ -108,12 +102,8 @@ public class Doctor : BaseFullAuditEntity public int Nation { get; set; } public Guid OrganizationId { get; set; } - - [MaxLength] public string? OtherClinicalExperience { get; set; } - - [MaxLength] public string? OtherClinicalExperienceCN { get; set; } @@ -184,6 +174,4 @@ public class Doctor : BaseFullAuditEntity [NotMapped] public string FullName => LastName + " / " + FirstName; - - } diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs index 96a53a745..d38154a98 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs +++ b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models; @@ -39,6 +35,3 @@ public class DoctorCriterionFile : BaseAddAuditEntity public Guid? TrialReadingCriterionId { get; set; } } - - - diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs b/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs index 9d5dd89f3..e484ba50d 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs +++ b/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs @@ -1,6 +1,4 @@ namespace IRaCIS.Core.Domain.Models; - - [Comment("ҽ - ҽֵ")] [Table("DoctorDictionary")] public class DoctorDictionary : Entity diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs b/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs index d15ee31af..3befe908a 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs +++ b/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs @@ -42,6 +42,4 @@ public partial class Workload : BaseFullAuditEntity [StringLength(400)] public string YearMonth { get; set; } = null!; - - } diff --git a/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs b/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs index e5bf3370c..4d7bf5edb 100644 --- a/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs +++ b/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -15,17 +12,10 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("EnrollId")] public Enroll Enroll { get; set; } #endregion - - public Guid EnrollId { get; set; } public Guid TrialReadingCriterionId { get; set; } public bool IsJoinAnalysis { get; set; } - - - } - - } diff --git a/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs b/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs index 2f8fd3a21..5db3bdc64 100644 --- a/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs +++ b/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs @@ -8,8 +8,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public List ExperienceCriteriaList { get; set; } #endregion - - public Guid DoctorId { get; set; } public Guid? PhaseId { get; set; } @@ -18,8 +16,6 @@ namespace IRaCIS.Core.Domain.Models [StringLength(512)] public string EvaluationContent { get; set; } = string.Empty; - - public int VisitReadingCount { get; set; } public DateTime? StartTime { get; set; } diff --git a/IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs b/IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs index 19613c319..603ccfec5 100644 --- a/IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs +++ b/IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs @@ -10,10 +10,5 @@ public Guid DoctorId { get; set; } public Guid TrialExperienceId { get; set; } public Guid EvaluationCriteriaId { get; set; } - - - - - } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs index e0b401da2..658656526 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -18,21 +15,14 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("ConfirmUserId")] public User ConfirmUser { get; set; } #endregion - - - public Guid SystemDocumentId { get; set; } public DateTime? ConfirmTime { get; set; } - - public Guid ConfirmUserId { get; set; } public DateTime? SignFirstViewTime { get; set; } public string SignText { get; set; } = string.Empty; - - } } diff --git a/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs b/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs index 898c5df45..feca99154 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -17,8 +14,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public SystemDocument SystemDocument { get; set; } #endregion - - public Guid SystemDocumentId { get; set; } public Guid NeedConfirmUserTypeId { get; set; } diff --git a/IRaCIS.Core.Domain/Document/SystemDocument.cs b/IRaCIS.Core.Domain/Document/SystemDocument.cs index 96b8f1a0e..78a5eac12 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocument.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocument.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -18,20 +15,11 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("FileTypeId")] public Dictionary FileType { get; set; } #endregion - - public Guid FileTypeId { get; set; } - - public string Name { get; set; } = string.Empty; public int SignViewMinimumMinutes { get; set; } - - public string Path { get; set; } = string.Empty; - - - } } diff --git a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs index 08061e738..2e644f42b 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -17,27 +14,10 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public TrialDocument TrialDocument { get; set; } #endregion - - - - public Guid TrialDocumentId { get; set; } - - public DateTime? ConfirmTime { get; set; } - - public Guid ConfirmUserId { get; set; } - - public DateTime? SignFirstViewTime { get; set; } - - public string SignText { get; set; } = string.Empty; - - - } - - } diff --git a/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs b/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs index cebfbff1a..ddcabe15d 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -21,10 +18,6 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialDocumentId { get; set; } public Guid NeedConfirmUserTypeId { get; set; } - - - - } } diff --git a/IRaCIS.Core.Domain/Document/TrialDocument.cs b/IRaCIS.Core.Domain/Document/TrialDocument.cs index c05b56542..325b8049f 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocument.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocument.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -22,8 +19,6 @@ namespace IRaCIS.Core.Domain.Models public Dictionary FileType { get; set; } #endregion //需要确认的项目用户 通过TrialId 关联 用中间表过滤 - - public Guid FileTypeId { get; set; } public string Name { get; set; } = string.Empty; @@ -35,9 +30,6 @@ namespace IRaCIS.Core.Domain.Models public string Description { get; set; } = string.Empty; public int SignViewMinimumMinutes { get; set; } - - - } } diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs index f70385ae4..5b86c4bfa 100644 --- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs +++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models; @@ -14,14 +10,10 @@ public class TrialEmailNoticeConfig : BaseFullDeleteAuditEntity [JsonIgnore] public Trial Trial { get; set; } - - [JsonIgnore] public List TrialEmailNoticeUserList { get; set; } = new List(); [JsonIgnore] public List TrialEmailBlackUserList { get; set; } = new List(); - - [JsonIgnore] public EmailNoticeConfig SysEmailNoticeConfig { get; set; } @@ -101,10 +93,6 @@ public class TrialEmailBlackUser : Entity [JsonIgnore] public User User { get; set; } - - public Guid TrialEmailNoticeConfigId { get; set; } - - public Guid UserId { get; set; } } diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs index da3c4dabd..dfc49b91a 100644 --- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs +++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -17,14 +13,8 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; } - - public UserTypeEnum UserType { get; set; } - - public Guid TrialEmailNoticeConfigId { get; set; } - - public EmailUserType EmailUserType { get; set; } } diff --git a/IRaCIS.Core.Domain/Financial/Payment.cs b/IRaCIS.Core.Domain/Financial/Payment.cs index dc7a6410f..3b8f447fa 100644 --- a/IRaCIS.Core.Domain/Financial/Payment.cs +++ b/IRaCIS.Core.Domain/Financial/Payment.cs @@ -17,8 +17,6 @@ namespace IRaCIS.Core.Domain.Models [DecimalPrecision(18, 2)] public decimal ExchangeRate { get; set; } - - [DecimalPrecision(18, 4)] public decimal AdjustmentCNY { get; set; } @@ -31,7 +29,5 @@ namespace IRaCIS.Core.Domain.Models [StringLength(500)] public string Note { get; set; } = string.Empty; - - } } diff --git a/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs b/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs index 542201fc2..09059afa1 100644 --- a/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs +++ b/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs @@ -13,8 +13,6 @@ namespace IRaCIS.Core.Domain.Models [DecimalPrecision(18, 4)] public decimal AdjustmentCNY { get; set; } - - public Guid TrialId { get; set; } = Guid.Empty; [DecimalPrecision(18, 2)] diff --git a/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs b/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs index cda951ac4..a6f6a91e5 100644 --- a/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs +++ b/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs @@ -20,7 +20,5 @@ namespace IRaCIS.Core.Domain.Models /// Ƿ ΪĿ /// public bool? IsNewTrial { get; set; } = false; - - } } diff --git a/IRaCIS.Core.Domain/GlobalUsings.cs b/IRaCIS.Core.Domain/GlobalUsings.cs index 08aa961ea..15bfebe57 100644 --- a/IRaCIS.Core.Domain/GlobalUsings.cs +++ b/IRaCIS.Core.Domain/GlobalUsings.cs @@ -4,5 +4,3 @@ global using System.Collections.Generic; global using System.ComponentModel.DataAnnotations; global using System.ComponentModel.DataAnnotations.Schema; global using Newtonsoft.Json; - - diff --git a/IRaCIS.Core.Domain/Image/DicomInstance.cs b/IRaCIS.Core.Domain/Image/DicomInstance.cs index dc10718ff..4a8ab74e8 100644 --- a/IRaCIS.Core.Domain/Image/DicomInstance.cs +++ b/IRaCIS.Core.Domain/Image/DicomInstance.cs @@ -38,8 +38,6 @@ public class DicomInstance : BaseFullAuditEntity, IEntitySeqId public DateTime? InstanceTime { get; set; } public int NumberOfFrames { get; set; } - - [MaxLength] [Unicode(false)] public string Path { get; set; } = null!; @@ -76,5 +74,3 @@ public class DicomInstance : BaseFullAuditEntity, IEntitySeqId [StringLength(400)] public string WindowWidth { get; set; } = null!; } - - diff --git a/IRaCIS.Core.Domain/Image/DicomStudy.cs b/IRaCIS.Core.Domain/Image/DicomStudy.cs index 19035e818..f944f043c 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudy.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudy.cs @@ -24,8 +24,6 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId [JsonIgnore] public List ReadingConsistentClinicalDataList { get; set; } - - [JsonIgnore] public List SubjectCriteriaEvaluationVisitStudyFilterList { get; set; } @@ -98,8 +96,4 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId public DateTime? UploadedTime { get; set; } public string Uploader { get; set; } = null!; - - - - } diff --git a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs index d475411e9..2da94d504 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models; [Comment("项目 - 影像上传监控")] @@ -14,8 +11,6 @@ public class StudyMonitor : BaseAddAuditEntity [JsonIgnore] [ForeignKey("StudyId")] public NoneDicomStudy NoneDicomStudy { get; set; } - - [JsonIgnore] [ForeignKey("StudyId")] public TaskStudy TaskStudy { get; set; } @@ -62,8 +57,6 @@ public class StudyMonitor : BaseAddAuditEntity public Guid SubjectId { get; set; } public Guid SubjectVisitId { get; set; } - - public Guid TrialId { get; set; } public DateTime? UploadFinishedTime { get; set; } diff --git a/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs b/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs index b886b3d14..1222b52c4 100644 --- a/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs +++ b/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -22,9 +19,6 @@ namespace IRaCIS.Core.Domain.Models public Subject Subject { get; set; } #endregion - - - public string StudyCode { get; set; } = string.Empty; public int FileCount { get; set; } @@ -32,26 +26,13 @@ namespace IRaCIS.Core.Domain.Models public int Code { get; set; } public Guid TrialId { get; set; } - - public Guid SubjectId { get; set; } - - public Guid SubjectVisitId { get; set; } - - - public string BodyPart { get; set; } = string.Empty; - - public string Modality { get; set; } = string.Empty; public DateTime ImageDate { get; set; } - - public string Description { get; set; } = string.Empty; - - public string VideoName { get; set; } = string.Empty; public string VideoObjectName { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs b/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs index 66d766b20..2ab5c13ec 100644 --- a/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs +++ b/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { @@ -11,8 +8,6 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("NoneDicomStudyId")] [JsonIgnore] public NoneDicomStudy NoneDicomStudy { get; set; } - - [JsonIgnore] public VisitTask VisitTask { get; set; } @@ -20,33 +15,21 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public NoneDicomStudy OriginNoneDicomStudy { get; set; } #endregion - - public Guid NoneDicomStudyId { get; set; } - - public string Path { get; set; } = string.Empty; - - public string FileName { get; set; } = string.Empty; public string FileType { get; set; } = string.Empty; public long? FileSize { get; set; } - - #region 跟任务绑定 同时区分检查 public Guid? VisitTaskId { get; set; } - - /// /// 为了不影响原始检查，跟任务绑定的 NoneDicomStudyId 为guid空 这个字段记录跟原始检查绑 /// public Guid? OriginNoneDicomStudyId { get; set; } #endregion - - } } diff --git a/IRaCIS.Core.Domain/Image/SCPImageUpload.cs b/IRaCIS.Core.Domain/Image/SCPImageUpload.cs index f4d099e95..2f70ba805 100644 --- a/IRaCIS.Core.Domain/Image/SCPImageUpload.cs +++ b/IRaCIS.Core.Domain/Image/SCPImageUpload.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -16,44 +13,15 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public TrialSite TrialSite { get; set; } #endregion - - public string CallingAE { get; set; } = string.Empty; - - public string CalledAE { get; set; } = string.Empty; - - - public string CallingAEIP { get; set; } = string.Empty; - - - public DateTime StartTime { get; set; } - - public DateTime EndTime { get; set; } - - - public int FileCount { get; set; } - - - public long FileSize { get; set; } - - public int StudyCount { get; set; } - - - - public Guid TrialId { get; set; } public Guid TrialSiteId { get; set; } - - - } - - } diff --git a/IRaCIS.Core.Domain/Image/SCPInstance.cs b/IRaCIS.Core.Domain/Image/SCPInstance.cs index 82aefc326..7a04eeeb8 100644 --- a/IRaCIS.Core.Domain/Image/SCPInstance.cs +++ b/IRaCIS.Core.Domain/Image/SCPInstance.cs @@ -12,9 +12,6 @@ [ForeignKey("StudyId")] public SCPStudy SCPStudy { get; set; } #endregion - - - public Guid SeqId { get; set; } public Guid StudyId { get; set; } public Guid SeriesId { get; set; } @@ -27,8 +24,6 @@ public int ImageRows { get; set; } public int ImageColumns { get; set; } public int SliceLocation { get; set; } - - public string SliceThickness { get; set; } = string.Empty; public int NumberOfFrames { get; set; } public string PixelSpacing { get; set; } = string.Empty; @@ -42,8 +37,5 @@ public string Path { get; set; } = string.Empty; public long? FileSize { get; set; } - - - } } diff --git a/IRaCIS.Core.Domain/Image/SCPPatient.cs b/IRaCIS.Core.Domain/Image/SCPPatient.cs index 05aa5bc5b..e60badc11 100644 --- a/IRaCIS.Core.Domain/Image/SCPPatient.cs +++ b/IRaCIS.Core.Domain/Image/SCPPatient.cs @@ -13,8 +13,6 @@ [JsonIgnore] public TrialSite TrialSite { get; set; } #endregion - - public string PatientIdStr { get; set; } = string.Empty; public string PatientName { get; set; } = string.Empty; public string PatientAge { get; set; } = string.Empty; @@ -26,14 +24,8 @@ public DateTime? LatestStudyTime { get; set; } public DateTime LatestPushTime { get; set; } - - public Guid? SubjectId { get; set; } public Guid TrialId { get; set; } public Guid TrialSiteId { get; set; } - - - - } } diff --git a/IRaCIS.Core.Domain/Image/SCPSeries.cs b/IRaCIS.Core.Domain/Image/SCPSeries.cs index ddd463ede..953f5e79a 100644 --- a/IRaCIS.Core.Domain/Image/SCPSeries.cs +++ b/IRaCIS.Core.Domain/Image/SCPSeries.cs @@ -11,8 +11,6 @@ [JsonIgnore] public List SCPInstanceList { get; set; } #endregion - - public Guid SeqId { get; set; } public Guid StudyId { get; set; } public string StudyInstanceUid { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Image/SCPStudy.cs b/IRaCIS.Core.Domain/Image/SCPStudy.cs index bb695ffcd..4c8c0f9c6 100644 --- a/IRaCIS.Core.Domain/Image/SCPStudy.cs +++ b/IRaCIS.Core.Domain/Image/SCPStudy.cs @@ -24,8 +24,6 @@ public SCPPatient Patient { get; set; } #endregion - - public Guid SeqId { get; set; } public Guid PatientId { get; set; } @@ -61,15 +59,9 @@ public string CalledAE { get; set; } = string.Empty; public bool IsUploadFinished { get; set; } - - public Guid TrialId { get; set; } public Guid TrialSiteId { get; set; } public Guid? SubjectVisitId { get; set; } - - - - } } diff --git a/IRaCIS.Core.Domain/Image/SystemAnonymization.cs b/IRaCIS.Core.Domain/Image/SystemAnonymization.cs index 416139440..8b451a254 100644 --- a/IRaCIS.Core.Domain/Image/SystemAnonymization.cs +++ b/IRaCIS.Core.Domain/Image/SystemAnonymization.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -15,28 +12,14 @@ namespace IRaCIS.Core.Domain.Models public string Group { get; set; } = String.Empty; public string Element { get; set; } = String.Empty; - - public string TagDescription { get; set; } = String.Empty; - - public string TagDescriptionCN { get; set; } = string.Empty; - - public string ReplaceValue { get; set; } = String.Empty; - - public string ValueRepresentation { get; set; } = String.Empty; - - public bool IsAdd { get; set; } public bool IsEnable { get; set; } - - public bool IsFixed { get; set; } - - } } diff --git a/IRaCIS.Core.Domain/Image/TaskSeries.cs b/IRaCIS.Core.Domain/Image/TaskSeries.cs index 08bd6bc70..424c3bdc5 100644 --- a/IRaCIS.Core.Domain/Image/TaskSeries.cs +++ b/IRaCIS.Core.Domain/Image/TaskSeries.cs @@ -34,8 +34,6 @@ public string AcquisitionTime { get; set; } = string.Empty; public string AcquisitionNumber { get; set; } = string.Empty; public string TriggerTime { get; set; } = string.Empty; - - public string BodyPartForEdit { get; set; } = string.Empty; public string ImageResizePath { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Image/TaskStudy.cs b/IRaCIS.Core.Domain/Image/TaskStudy.cs index a4659534f..62dd664a2 100644 --- a/IRaCIS.Core.Domain/Image/TaskStudy.cs +++ b/IRaCIS.Core.Domain/Image/TaskStudy.cs @@ -19,8 +19,6 @@ [JsonIgnore] [ForeignKey("SubjectId")] public Subject Subject { get; set; } - - #endregion public Guid SeqId { get; set; } @@ -38,8 +36,6 @@ public string Description { get; set; } = string.Empty; public int SeriesCount { get; set; } = 0; public int InstanceCount { get; set; } = 0; - - public string InstitutionName { get; set; } = string.Empty; public string PatientId { get; set; } = string.Empty; public string PatientName { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Image/TrialDicomAE.cs b/IRaCIS.Core.Domain/Image/TrialDicomAE.cs index 10b47c9ce..ca00c2816 100644 --- a/IRaCIS.Core.Domain/Image/TrialDicomAE.cs +++ b/IRaCIS.Core.Domain/Image/TrialDicomAE.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -13,22 +10,12 @@ namespace IRaCIS.Core.Domain.Models #endregion public Guid TrialId { get; set; } - - public string CalledAE { get; set; } = string.Empty; public string IP { get; set; } = string.Empty; - - public int Port { 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 aa4525826..fa20a7f9f 100644 --- a/IRaCIS.Core.Domain/Institution/CRO.cs +++ b/IRaCIS.Core.Domain/Institution/CRO.cs @@ -21,5 +21,3 @@ public class CRO : BaseFullAuditEntity public Guid? TrialId { get; set; } } - - diff --git a/IRaCIS.Core.Domain/Institution/Hospital.cs b/IRaCIS.Core.Domain/Institution/Hospital.cs index a90c7014f..8cb055263 100644 --- a/IRaCIS.Core.Domain/Institution/Hospital.cs +++ b/IRaCIS.Core.Domain/Institution/Hospital.cs @@ -11,8 +11,6 @@ [JsonIgnore] public List DoctorList { get; set; } #endregion - - public string HospitalName { get; set; } = string.Empty; public string UniversityAffiliated { get; set; } = string.Empty; public string Country { get; set; } = string.Empty; @@ -24,15 +22,9 @@ public string CountryCN { get; set; } = string.Empty; public string ProvinceCN { get; set; } = string.Empty; public string CityCN { get; set; } = string.Empty; - - /// /// 中心Id /// public Guid? SiteId { get; set; } = Guid.Empty; - - - - } } diff --git a/IRaCIS.Core.Domain/Institution/Site.cs b/IRaCIS.Core.Domain/Institution/Site.cs index 1cf0ab8da..0798c73d9 100644 --- a/IRaCIS.Core.Domain/Institution/Site.cs +++ b/IRaCIS.Core.Domain/Institution/Site.cs @@ -33,10 +33,5 @@ namespace IRaCIS.Core.Domain.Models public string DirectorPhone { get; set; } = string.Empty; public string ContactName { get; set; } = string.Empty; public string ContactPhone { get; set; } = string.Empty; - - - - - } } diff --git a/IRaCIS.Core.Domain/Institution/Sponsor.cs b/IRaCIS.Core.Domain/Institution/Sponsor.cs index 4c7ff4b25..47210df49 100644 --- a/IRaCIS.Core.Domain/Institution/Sponsor.cs +++ b/IRaCIS.Core.Domain/Institution/Sponsor.cs @@ -12,8 +12,6 @@ namespace IRaCIS.Core.Domain.Models public string SponsorCode { get; set; } = String.Empty; public bool IsTrialLevel { get; set; } - - public Guid? TrialId { get; set; } } } diff --git a/IRaCIS.Core.Domain/Management/Menu.cs b/IRaCIS.Core.Domain/Management/Menu.cs index 88cacbb59..780c0592f 100644 --- a/IRaCIS.Core.Domain/Management/Menu.cs +++ b/IRaCIS.Core.Domain/Management/Menu.cs @@ -7,9 +7,6 @@ [JsonIgnore] public List UserTypeMenuList { get; set; } #endregion - - - //上级菜单 public Guid? ParentId { get; set; } = Guid.Empty; @@ -50,10 +47,6 @@ public string Meta { get; set; } = string.Empty; public string Redirect { get; set; } = string.Empty; - - public string LanguageMark { get; set; } = string.Empty; - - } } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs index 8065418d9..9b5bd3e47 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share.Management; namespace IRaCIS.Core.Domain.Models @@ -19,9 +15,6 @@ namespace IRaCIS.Core.Domain.Models public List NoticeUserReadList { get; set; } = new List(); #endregion - - - public string NoticeContent { get; set; } = string.Empty; public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs index 5c55040a5..cc7de23b6 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -15,8 +12,6 @@ namespace IRaCIS.Core.Domain.Models #endregion public Guid SystemNoticeId { get; set; } - - } } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs index 64da51a57..a32bf1c52 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -18,12 +15,7 @@ namespace IRaCIS.Core.Domain.Models #endregion public Guid SystemNoticeId { get; set; } - - public Guid UserTypeId { get; set; } - - - } } diff --git a/IRaCIS.Core.Domain/Management/UserFeedBack.cs b/IRaCIS.Core.Domain/Management/UserFeedBack.cs index 739128cbb..242a74723 100644 --- a/IRaCIS.Core.Domain/Management/UserFeedBack.cs +++ b/IRaCIS.Core.Domain/Management/UserFeedBack.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -18,47 +15,23 @@ namespace IRaCIS.Core.Domain.Models public SubjectVisit SubjectVisit { get; set; } [JsonIgnore] public TrialSite TrialSite { get; set; } - - [JsonIgnore] public VisitTask VisitTask { get; set; } [NotMapped] public List FeedBackScreenshotList => JsonConvert.DeserializeObject>(ScreenshotListStr); #endregion - - public Guid? VisitTaskId { get; set; } public Guid? SubjectId { get; set; } - - public Guid? SubjectVisitId { get; set; } - - public int QuestionType { get; set; } public string QuestionDescription { get; set; } = string.Empty; - - - - - public int State { get; set; } - - public Guid? TrialSiteId { get; set; } - - public Guid? TrialId { get; set; } public string ScreenshotListStr { get; set; } = string.Empty; - - - - - - - } } diff --git a/IRaCIS.Core.Domain/Management/UserLog.cs b/IRaCIS.Core.Domain/Management/UserLog.cs index 54b547fee..a6b61c174 100644 --- a/IRaCIS.Core.Domain/Management/UserLog.cs +++ b/IRaCIS.Core.Domain/Management/UserLog.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -17,23 +14,12 @@ namespace IRaCIS.Core.Domain.Models public User OptUser { get; set; } #endregion public string IP { get; set; } = string.Empty; - - public string LoginFaildName { get; set; } = string.Empty; - - public UserOptType OptType { get; set; } - - public string LoginPassword { get; set; } = string.Empty; - - public Guid? LoginUserId { get; set; } public Guid? OptUserId { get; set; } - - - public string IPRegion { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Management/UserPassWordLog.cs b/IRaCIS.Core.Domain/Management/UserPassWordLog.cs index 5ab7d0bed..69875c00a 100644 --- a/IRaCIS.Core.Domain/Management/UserPassWordLog.cs +++ b/IRaCIS.Core.Domain/Management/UserPassWordLog.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -22,10 +19,5 @@ namespace IRaCIS.Core.Domain.Models /// 密码 /// public string PassWord { get; set; } = string.Empty; - - - } - - } diff --git a/IRaCIS.Core.Domain/Management/UserType.cs b/IRaCIS.Core.Domain/Management/UserType.cs index 20d3ade27..f5d4e4496 100644 --- a/IRaCIS.Core.Domain/Management/UserType.cs +++ b/IRaCIS.Core.Domain/Management/UserType.cs @@ -4,8 +4,6 @@ namespace IRaCIS.Core.Domain.Models { public class UserType : Entity { - - #region 导航属性 [JsonIgnore] public List UserTypeMenuList { get; set; } @@ -29,13 +27,6 @@ namespace IRaCIS.Core.Domain.Models public string UserTypeShortName { get; set; } = string.Empty; public bool IsEnable { get; set; } = true; - - public string PermissionStr { get; set; } = string.Empty; - - - - - } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Management/UserTypeGroup.cs b/IRaCIS.Core.Domain/Management/UserTypeGroup.cs index 4835c5251..079163d40 100644 --- a/IRaCIS.Core.Domain/Management/UserTypeGroup.cs +++ b/IRaCIS.Core.Domain/Management/UserTypeGroup.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -18,15 +15,8 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("UserTypeId")] public UserType UserType { get; set; } #endregion - - public Guid UserTypeId { get; set; } - - public Guid DictionaryId { get; set; } - - - } } diff --git a/IRaCIS.Core.Domain/Management/UserTypeMenu.cs b/IRaCIS.Core.Domain/Management/UserTypeMenu.cs index 6aa316d93..b5b1bf7c5 100644 --- a/IRaCIS.Core.Domain/Management/UserTypeMenu.cs +++ b/IRaCIS.Core.Domain/Management/UserTypeMenu.cs @@ -14,9 +14,5 @@ namespace IRaCIS.Core.Domain.Models public Guid UserTypeId { get; set; } public Guid MenuId { get; set; } - - - - } } diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs index 7064773ee..920a8c945 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -13,35 +10,16 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public SubjectVisit SubjectVisit { get; set; } #endregion - - public DateTime? StartTime { get; set; } public DateTime? EndTime { get; set; } - - public int? IsPD { get; set; } - - public Guid SubjectVisitId { get; set; } - - public bool IsSubjectLevel { get; set; } - - public string Path { get; set; } = String.Empty; - - public string FileName { get; set; } = String.Empty; - - public string Position { get; set; } = String.Empty; - - - public Guid ClinicalDataTrialSetId { get; set; } - - } } diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs index 1e461bd29..11468c6bd 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -16,25 +13,13 @@ namespace IRaCIS.Core.Domain.Models #endregion public DateTime? StartTime { get; set; } - - public DateTime? EndTime { get; set; } - - public bool IsPD { get; set; } public Guid SubjectVisitId { get; set; } - - public bool IsSubjectLevel { get; set; } - - public string Path { get; set; } = String.Empty; - - public string FileName { get; set; } = String.Empty; - - public string TreatmentType { get; set; } = String.Empty; /// diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs index 40b7f4168..d7d27bb86 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -16,15 +12,11 @@ namespace IRaCIS.Core.Domain.Models public SubjectVisit SubjectVisit { get; set; } #endregion - - public Guid SubjectVisitId { get; set; } public string Path { get; set; } = string.Empty; public string FileName { get; set; } = string.Empty; - - public bool? IsVisist { get; set; } /// @@ -47,8 +39,4 @@ namespace IRaCIS.Core.Domain.Models public Guid? SubjectId { get; set; } } - - - - } diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs index 4bc937e31..27cb7cc7c 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -13,9 +10,6 @@ namespace IRaCIS.Core.Domain.Models #region 导航属性 #endregion - - - public DateTime? OperationTime { get; set; } public Guid SubjectVisitId { get; set; } @@ -33,10 +27,5 @@ namespace IRaCIS.Core.Domain.Models /// [Required] public Guid ClinicalDataTrialSetId { get; set; } - - - } - - } diff --git a/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs b/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs index fc0c9e734..0f5f9195f 100644 --- a/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs +++ b/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs @@ -11,15 +11,8 @@ namespace IRaCIS.Core.Domain.Models #endregion public string FileName { get; set; } = string.Empty; - - public string RelativePath { get; set; } = string.Empty; public Guid TrialId { get; set; } - - - } - - } diff --git a/IRaCIS.Core.Domain/QC/QCChallenge.cs b/IRaCIS.Core.Domain/QC/QCChallenge.cs index d4ee34017..7261ccce2 100644 --- a/IRaCIS.Core.Domain/QC/QCChallenge.cs +++ b/IRaCIS.Core.Domain/QC/QCChallenge.cs @@ -17,10 +17,6 @@ namespace IRaCIS.Core.Domain.Models public List DialogList { get; set; } = new List(); #endregion - - - - public Guid TrialId { get; set; } public Guid SubjectVisitId { get; set; } @@ -29,8 +25,6 @@ namespace IRaCIS.Core.Domain.Models public string Note { get; set; } = string.Empty; public QCChanllengeReuploadEnum ReuploadEnum { get; set; } - - public DateTime? ReUploadedTime { get; set; } public string ReUploader { get; set; } = string.Empty; @@ -42,25 +36,15 @@ namespace IRaCIS.Core.Domain.Models public CurrentQC CurrentQCEnum { get; set; } public DateTime? LatestMsgTime { get; set; } - - public Guid? LatestReplyUserId { get; set; } - - public string ChallengeCode { get; set; } = string.Empty; public int Code { get; set; } - - - public bool IsClosed { get; set; } public DateTime? ClosedTime { get; set; } public string ClosedUser { get; set; } = string.Empty; - - - public QCChallengeCloseEnum CloseResonEnum { get; set; } public string Content { get; set; } = string.Empty; @@ -68,15 +52,6 @@ namespace IRaCIS.Core.Domain.Models public string ActionContent { get; set; } = string.Empty; public UserTypeEnum UserTypeEnum { get; set; } - - public string ChallengeType { get; set; } = string.Empty; - - - - - - - } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/QC/QCQuestion.cs b/IRaCIS.Core.Domain/QC/QCQuestion.cs index 18d5abe6e..b92925c70 100644 --- a/IRaCIS.Core.Domain/QC/QCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/QCQuestion.cs @@ -1,6 +1,3 @@ - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -18,12 +15,8 @@ namespace IRaCIS.Core.Domain.Models #endregion public string QuestionName { get; set; } = string.Empty; - - /// 语言类型 public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - - public bool IsRequired { get; set; } public bool IsEnable { get; set; } @@ -35,13 +28,6 @@ namespace IRaCIS.Core.Domain.Models public string ParentTriggerValue { get; set; } = string.Empty; public Guid? ParentId { get; set; } - - public int ShowOrder { get; set; } - - - } - - } diff --git a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs index 6237d2beb..05286a5d6 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs @@ -1,6 +1,3 @@ - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -21,44 +18,21 @@ namespace IRaCIS.Core.Domain.Models public List TrialQCQuestionAnswerList { get; set; } #endregion - - public Guid TrialId { get; set; } - - public string QuestionName { get; set; } = string.Empty; /// 语言类型 public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - - public bool IsRequired { get; set; } - - public bool IsEnable { get; set; } /// 下拉框、文本、单选、多选 public string Type { get; set; } = string.Empty; - - public Guid? ParentId { get; set; } - - public string TypeValue { get; set; } = string.Empty; - - 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 3ec279f17..68c79b541 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -15,8 +11,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public TrialQCQuestion TrialQCQuestionConfigure { get; set; } #endregion - - public Guid TrialId { get; set; } public string Answer { get; set; } = string.Empty; @@ -27,13 +21,6 @@ namespace IRaCIS.Core.Domain.Models public CurrentQC CurrentQCEnum { get; set; } public Guid SubjectVisitId { get; set; } - - public Guid TrialQCQuestionConfigureId { get; set; } - - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs index 671146e41..04df9b416 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -15,9 +12,6 @@ namespace IRaCIS.Core.Domain.Models public ReadingQuestionTrial TrialReadingQuestion { get; set; } #endregion - - - public Guid TrialReadingQuestionId { get; set; } public Guid SubjectId { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs index e5afca800..9cdf1a3cd 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -20,8 +17,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public List SubjectCriteriaEvaluationVisitFilterList { get; set; } #endregion - - public Guid SubjectId { get; set; } public Guid TrialReadingCriterionId { get; set; } @@ -30,9 +25,5 @@ namespace IRaCIS.Core.Domain.Models /// 是否参与评估 /// public bool IsJoinEvaluation { get; set; } - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs index 83cac45f0..5cca5ffd8 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -13,8 +10,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [ForeignKey("TrialReadingCriterionId")] public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - - [JsonIgnore] public SubjectCriteriaEvaluation SubjectCriteriaEvaluation { get; set; } @@ -22,15 +17,8 @@ namespace IRaCIS.Core.Domain.Models public SubjectVisit SubjectVisit { get; set; } #endregion - - public Guid SubjectId { get; set; } - - public Guid TrialReadingCriterionId { get; set; } - - - public Guid SubjectVisitId { get; set; } /// @@ -57,8 +45,6 @@ namespace IRaCIS.Core.Domain.Models { //待定 None = 0, - - //通过 Passed = 1, } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs index dec4fae0c..e984b202f 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -20,30 +17,19 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("SeriesId")] [JsonIgnore] public DicomSeries Series { get; set; } - - [ForeignKey("StudyId")] [JsonIgnore] public DicomStudy Study { get; set; } #endregion - - public Guid TrialReadingCriterionId { get; set; } public Guid SubjectVisitId { get; set; } - - public Guid StudyId { get; set; } public Guid SeriesId { get; set; } - - public bool IsConfirmed { get; set; } public bool IsReading { get; set; } - - - } } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs index a48ac65f3..b1f7d2054 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs @@ -1,5 +1,3 @@ - - using IRaCIS.Core.Domain.Share; using System.Linq; @@ -20,14 +18,10 @@ public class ClinicalDataSystemSet : BaseAddAuditEntity [StringLength(400)] public string ClinicalDataSetEnName { get; set; } = null!; - - [Comment(" 枚举(字典里面取的)")] public int ClinicalDataSetEnum { get; set; } public string ClinicalDataSetName { get; set; } = null!; - - [Comment("上传方式")] public ClinicalUploadType ClinicalUploadType { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs index 37d85e112..a51b34ec7 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs @@ -51,8 +51,6 @@ namespace IRaCIS.Core.Domain.Models public Guid ReadingId { get; set; } public Guid? StudyId { get; set; } - - public Guid SubjectId { get; set; } /// @@ -64,8 +62,6 @@ namespace IRaCIS.Core.Domain.Models /// 是否为访视 /// xiu public bool IsVisit { get; set; } - - /// /// 是否签名 /// @@ -80,23 +76,8 @@ namespace IRaCIS.Core.Domain.Models /// 是否完整 /// public bool? IsComplete { get; set; } - - public int FileCount { get; set; } - - //临床数据状态 public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } - - - - - } - - - - - - } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs index 6405e36fe..f7bf7cdb1 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs @@ -18,19 +18,9 @@ namespace IRaCIS.Core.Domain.Models public Guid ReadingClinicalDataId { get; set; } public string Path { get; set; } = string.Empty; - - public string FileName { get; set; } = string.Empty; - - public int Size { get; set; } = 0; public string Type { get; set; } = string.Empty; } - - - - - - } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs index 898988961..f63164a9f 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs @@ -70,8 +70,6 @@ namespace IRaCIS.Core.Domain.Models /// 是否为访视 /// xiu public bool IsVisit { get; set; } - - /// /// 是否签名 /// @@ -86,24 +84,8 @@ namespace IRaCIS.Core.Domain.Models /// 是否完整 /// public bool? IsComplete { get; set; } = true; - - public int FileCount { get; set; } - - //临床数据状态 public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } - - - - - - } - - - - - - } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs index 0c49f12f5..5160d1478 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs @@ -18,8 +18,6 @@ namespace IRaCIS.Core.Domain.Models public Guid ReadingConsistentClinicalDataId { get; set; } public string Path { get; set; } = string.Empty; - - public string FileName { get; set; } = string.Empty; public int Size { get; set; } = 0; @@ -28,13 +26,5 @@ namespace IRaCIS.Core.Domain.Models /// 文件类型 /// public string Type { get; set; } = string.Empty; - - } - - - - - - } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs index a16f7c007..48c409552 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -21,12 +18,7 @@ namespace IRaCIS.Core.Domain.Models #endregion public Guid TrialClinicalDataSetId { get; set; } - - public Guid TrialReadingCriterionId { get; set; } - - - } } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs index b72ca5e7d..0aefbf6ab 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models @@ -114,9 +110,6 @@ namespace IRaCIS.Core.Domain.Models /// 关联ID /// public Guid? RelevanceId { get; set; } - - - /// /// 父问题Id /// @@ -156,9 +149,5 @@ namespace IRaCIS.Core.Domain.Models /// 自定义计算问题 /// public string CalculateQuestions { get; set; } = "[]"; - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs index 8c23a72d1..eb72eafb0 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; using System.Linq; @@ -86,8 +82,6 @@ namespace IRaCIS.Core.Domain.Models /// 是否必填 /// public IsRequired IsRequired { get; set; } - - /// /// 外层问题Id /// @@ -112,10 +106,5 @@ namespace IRaCIS.Core.Domain.Models /// 关联Value /// public string RelevanceValue { get; set; } = string.Empty; - - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs index d0b8906aa..29c6d6adb 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models @@ -32,9 +28,6 @@ namespace IRaCIS.Core.Domain.Models } } - - - [JsonIgnore] [ForeignKey("TrialClinicalId")] public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } @@ -119,9 +112,6 @@ namespace IRaCIS.Core.Domain.Models /// 系统临床问题Id /// public Guid? SystemClinicalQuestionId { get; set; } - - - /// /// 父问题Id /// @@ -167,9 +157,5 @@ namespace IRaCIS.Core.Domain.Models /// 单位 /// public string Unit { get; set; } = string.Empty; - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs index 610a5662d..b21d0a800 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; using System.Linq; @@ -127,9 +123,5 @@ namespace IRaCIS.Core.Domain.Models /// 关联Value /// public string RelevanceValue { get; set; } = string.Empty; - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs index 651604c12..42abb8c1e 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs @@ -1,10 +1,4 @@ - - - namespace IRaCIS.Core.Domain.Models; - - - [Comment("受试者 - 临床表单表格问题行记录")] [Table("ClinicalAnswerRowInfo")] public class ClinicalAnswerRowInfo : BaseAddAuditEntity @@ -12,8 +6,6 @@ public class ClinicalAnswerRowInfo : BaseAddAuditEntity #region 导航属性 #endregion - - [Comment(" 表单Id")] public Guid ClinicalFormId { get; set; } @@ -25,6 +17,3 @@ public class ClinicalAnswerRowInfo : BaseAddAuditEntity [Comment(" 受试者Id")] public Guid SubjectId { get; set; } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs index d7ddcc1fb..5b14beb0d 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs @@ -1,9 +1,4 @@ - - - namespace IRaCIS.Core.Domain.Models; - - [Comment("受试者 - 临床表单")] [Table("ClinicalForm")] public class ClinicalForm : BaseAddAuditEntity @@ -36,6 +31,3 @@ public class ClinicalForm : BaseAddAuditEntity public Guid? VisitId { get; set; } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs index 22a374c1c..86afb43e2 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models; [Comment("受试者 - 临床表单问题答案")] @@ -8,8 +5,6 @@ namespace IRaCIS.Core.Domain.Models; public class ClinicalQuestionAnswer : BaseAddAuditEntity { #region 导航属性 - - [JsonIgnore] [ForeignKey("ClinicalFormId")] public ClinicalForm ClinicalForm { get; set; } @@ -29,7 +24,3 @@ public class ClinicalQuestionAnswer : BaseAddAuditEntity [Comment(" 受试者Id")] public Guid SubjectId { get; set; } } - - - - diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs index 83c7c2c66..be050c550 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models; [Comment("受试者 - 临床表单表格问题答案")] @@ -31,7 +28,3 @@ public partial class ClinicalTableAnswer : BaseAddAuditEntity public Guid TableQuestionId { get; set; } } - - - - diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs index 772fde7d2..3a0a5c7e3 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -17,9 +14,6 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("ClinicalFormId")] public ClinicalForm ClinicalForm { get; set; } #endregion - - - public Guid SubjectId { get; set; } public Guid TrialId { get; set; } @@ -28,11 +22,5 @@ namespace IRaCIS.Core.Domain.Models /// 表单Id /// public Guid ClinicalFormId { get; set; } - - - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs index 6ec3c73e9..ded59da36 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models @@ -16,8 +12,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [ForeignKey("TaskMedicalReviewId")] public TaskMedicalReview TaskMedicalReview { get; set; } - - /// /// 文件 /// @@ -26,8 +20,6 @@ namespace IRaCIS.Core.Domain.Models { get { - - try { var result = JsonConvert.DeserializeObject>(this.ImagePath); @@ -72,8 +64,6 @@ namespace IRaCIS.Core.Domain.Models /// 用户角色枚举 /// public int UserTypeEnumInt { get; set; } - - /// /// 阅片人是否认同 /// @@ -98,15 +88,10 @@ namespace IRaCIS.Core.Domain.Models /// 不同意重阅原因 /// public string DisagreeReason { get; set; } = string.Empty; - - /// /// 是否申请重阅 /// public bool? IsApplyHeavyReading { get; set; } - - - /// /// 图片路径 /// @@ -116,11 +101,5 @@ namespace IRaCIS.Core.Domain.Models /// 文件名称 /// public string FileName { get; set; } = string.Empty; - - - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs index 69dedba2f..58a2a17e0 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs @@ -7,8 +7,6 @@ namespace IRaCIS.Core.Domain.Models public class ReadingMedicineQuestionAnswer : BaseFullAuditEntity { #region 导航属性 - - [JsonIgnore] [ForeignKey("TaskMedicalReviewId")] public TaskMedicalReview TaskMedicalReview { get; set; } @@ -26,13 +24,6 @@ namespace IRaCIS.Core.Domain.Models public Guid TaskMedicalReviewId { get; set; } public Guid VisitTaskId { 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 5e7ee7ca1..efa6b5072 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models @@ -47,8 +43,6 @@ namespace IRaCIS.Core.Domain.Models /// 是否是必须 /// public bool IsRequired { get; set; } - - /// /// 排序 /// @@ -58,15 +52,10 @@ namespace IRaCIS.Core.Domain.Models /// 父问题ID /// public Guid? ParentId { get; set; } - - /// /// 类型值 /// public string TypeValue { get; set; } = string.Empty; - - - /// /// 是否启用 /// @@ -76,15 +65,8 @@ namespace IRaCIS.Core.Domain.Models /// 任务类型 /// public ReadingCategory ReadingCategory { get; set; } - - - - - public CriterionType? CriterionTypeEnum { get; set; } public bool IsGeneral { get; set; } - - } } diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs index b3ca33341..d78464e56 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -37,15 +33,10 @@ namespace IRaCIS.Core.Domain.Models /// 语言类型 /// public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - - - /// /// 类型值 /// public string TypeValue { get; set; } = string.Empty; - - /// /// 项目ID /// @@ -87,10 +78,5 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialReadingCriterionId { get; set; } public Guid? SystemQuestionId { get; set; } - - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs index 8e8cd10bb..66c20dcf9 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs @@ -1,12 +1,5 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models; - - - [Comment("系统标准 - 病灶器官表 （需要同步）")] [Table("CriterionNidusSystem")] public class CriterionNidusSystem : BaseAddAuditEntity @@ -27,6 +20,3 @@ public class CriterionNidusSystem : BaseAddAuditEntity [Comment("器官类型")] public OrganType OrganType { get; set; } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs index 45c91a773..0d2c39d46 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models; @@ -19,7 +15,3 @@ public class CriterionNidusTrial : BaseAddAuditEntity public OrganType OrganType { get; set; } } - - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs index 068ce93c3..8c9fe53ea 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -49,8 +45,6 @@ namespace IRaCIS.Core.Domain.Models /// 位置 /// public string TULAT { get; set; } = string.Empty; - - /// /// 位置 英文 /// @@ -60,8 +54,6 @@ namespace IRaCIS.Core.Domain.Models /// 备注 /// public string Remark { get; set; } = string.Empty; - - /// /// 是否是淋巴结 /// @@ -76,8 +68,6 @@ namespace IRaCIS.Core.Domain.Models /// 标准Id /// public Guid SystemCriterionId { get; set; } - - /// /// 是否可编辑位置 /// @@ -87,10 +77,5 @@ namespace IRaCIS.Core.Domain.Models /// 序号 /// public int ShowOrder { get; set; } = 0; - - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs index 8117f626e..8a2e962d3 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -28,8 +24,6 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialId { get; set; } public bool IsEnable { get; set; } - - /// /// 标准Id /// @@ -59,8 +53,6 @@ namespace IRaCIS.Core.Domain.Models /// 位置 /// public string TULAT { get; set; } = string.Empty; - - /// /// 位置 英文 /// @@ -95,9 +87,5 @@ namespace IRaCIS.Core.Domain.Models /// 器官类型 /// public OrganType? OrganType { get; set; } - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs index b9d3698ba..5a49ff49e 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -27,10 +24,6 @@ namespace IRaCIS.Core.Domain.Models /// 是否启用 /// public bool IsEnable { get; set; } - - - - /// /// 是否公共分页 /// @@ -40,12 +33,6 @@ namespace IRaCIS.Core.Domain.Models /// 排序 /// public int ShowOrder { get; set; } = 0; - - public Guid ReadingQuestionCriterionTrialId { get; set; } - - - - } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs index 8430346b5..586bfe3ff 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs @@ -31,8 +31,6 @@ namespace IRaCIS.Core.Domain.Models /// 是否完成配置 /// public bool IsCompleteConfig { get; set; } - - /// /// 确认时间 /// @@ -42,15 +40,10 @@ namespace IRaCIS.Core.Domain.Models /// 描述 /// public string Description { get; set; } = string.Empty; - - - /// /// 标准类型 /// public CriterionType CriterionType { get; set; } - - /// /// 肿瘤学阅片 /// @@ -65,17 +58,5 @@ namespace IRaCIS.Core.Domain.Models /// 是否必须全局阅片 /// public bool IsMustGlobalReading { get; set; } = false; - - - - - - } - - - - - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs index 3a79093bc..3a6297592 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs @@ -20,8 +20,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public List TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List(); - - [JsonIgnore] public List VisitTaskList { get; set; } @@ -60,10 +58,6 @@ namespace IRaCIS.Core.Domain.Models /// 是否完成配置 /// public bool IsCompleteConfig { get; set; } - - - - /// /// 描述 /// @@ -79,8 +73,6 @@ namespace IRaCIS.Core.Domain.Models /// public FormType FormType { get; set; } = FormType.SinglePage; - - /// /// 修约小数点 /// @@ -95,14 +87,10 @@ namespace IRaCIS.Core.Domain.Models /// 全局阅片评估更新类型 /// public string GlobalUpdateType { get; set; } = string.Empty; - - /// /// 评估原因 /// public string EvaluationReason { get; set; } = StaticData.International("CriterionTrial_EvaluationReason"); - - /// /// 是否显示详情 /// @@ -112,8 +100,6 @@ namespace IRaCIS.Core.Domain.Models /// 同步时间 /// public DateTime SynchronizeTime { get; set; } - - /// /// 同步器官时间 /// @@ -135,8 +121,6 @@ namespace IRaCIS.Core.Domain.Models public bool IseCRFShowInDicomReading { get; set; } = false; #region 阅片单元配置 新加 - - public string CriterionModalitys { get; set; } = string.Empty; /// @@ -153,8 +137,6 @@ namespace IRaCIS.Core.Domain.Models /// 任务组织级别 /// public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } - - /// /// 阅片是否显示受试者信息 /// @@ -164,28 +146,19 @@ namespace IRaCIS.Core.Domain.Models /// IR阅片页面是否可以查看既往任务结果 /// public bool IsReadingShowPreviousResults { get; set; } = true; - - /// /// 是确认医学审核问题 /// public bool IsConfirmMedicineQuestion { get; set; } = false; - - /// /// 仲裁对象 /// public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading; - - /// /// 阅片模式 /// public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; - - - /// /// 存在阅片期 /// @@ -200,14 +173,10 @@ namespace IRaCIS.Core.Domain.Models /// 是否签名 /// public bool IsSigned { get; set; } = false; - - /// /// 仲裁阅片 /// public bool IsArbitrationReading { get; set; } = true; - - /// /// 肿瘤学阅片 原字段 IsClinicalReading /// @@ -222,12 +191,8 @@ namespace IRaCIS.Core.Domain.Models /// 任务展示访视 读片任务显示是否顺序 /// public ReadingOrder IsReadingTaskViewInOrder { get; set; } = ReadingOrder.InOrder; - - //任务分配对象 public TaskAllocateObj TaskAllocateObjEnum { get; set; } - - //后续访视任务自动分配 public bool IsFollowVisitAutoAssign { get; set; } = true; @@ -243,8 +208,6 @@ namespace IRaCIS.Core.Domain.Models //后续全局自动分配默认状态 public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - - /// /// 阅片信息签名时间 /// @@ -254,18 +217,11 @@ namespace IRaCIS.Core.Domain.Models /// 是否必须全局阅片 /// public bool IsMustGlobalReading { get; set; } = false; - - //是否附加评估 public bool IsAdditionalAssessment { get; set; } - - //自动 手动生成任务 public bool IsAutoCreate { get; set; } = true; #endregion - - - /// /// 阅片过程下载影像 /// @@ -304,9 +260,6 @@ namespace IRaCIS.Core.Domain.Models IRReadingVisitEnable = 2, } - - - public enum ReadingOrder { Random = 0, @@ -315,6 +268,4 @@ namespace IRaCIS.Core.Domain.Models SubjectRandom = 2, } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs index dd4af1c71..1cd1797a4 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -16,10 +13,5 @@ namespace IRaCIS.Core.Domain.Models public Guid SystemCriterionId { get; set; } public string Code { get; set; } = string.Empty; - - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs index 04528f04d..7a9444542 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share.Reading; @@ -17,20 +13,12 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } #endregion - - public Guid TrialReadingCriterionId { get; set; } public CriterionType CriterionType { get; set; } - - public AdditionalAssessmentType AdditionalAssessmentType { get; set; } public bool? IsSelected { get; set; } - - - - } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs index 7e78c751c..5ecee2470 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -14,15 +11,8 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } #endregion - - public Guid TrialCriterionId { 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 9a50cdba3..a1cab8fd2 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs @@ -13,8 +13,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [ForeignKey("GroupId")] public ReadingQuestionSystem GroupInfo { get; set; } - - [JsonIgnore] [ForeignKey("ReadingQuestionCriterionSystemId")] public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; } @@ -22,8 +20,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [ForeignKey("ParentId")] public ReadingQuestionSystem ParentReadingQuestionSystem { get; set; } - - [JsonIgnore] [ForeignKey("RelevanceId")] public ReadingQuestionSystem RelevanceReadingQuestionSystem { get; set; } @@ -45,8 +41,6 @@ namespace IRaCIS.Core.Domain.Models } } - - [NotMapped] public List RelevanceValueList { @@ -129,8 +123,6 @@ namespace IRaCIS.Core.Domain.Models /// 是否启用 /// public bool IsEnable { get; set; } - - /// /// 是否是裁判问题 /// @@ -195,9 +187,6 @@ namespace IRaCIS.Core.Domain.Models /// 字典code /// public string DictionaryCode { get; set; } = string.Empty; - - - /// /// 问题类型 /// @@ -227,8 +216,6 @@ namespace IRaCIS.Core.Domain.Models /// 单位 /// public ValueUnit? Unit { get; set; } - - /// /// 问题英文名称 /// @@ -283,14 +270,5 @@ namespace IRaCIS.Core.Domain.Models /// 高亮问题的答案 /// public string HighlightAnswer { get; set; } = "[]"; - - - } - - - - - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs index 5b1f0e149..4f979d6ec 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs @@ -49,8 +49,6 @@ namespace IRaCIS.Core.Domain.Models } } - - [NotMapped] public List RelevanceValueList { @@ -68,8 +66,6 @@ namespace IRaCIS.Core.Domain.Models } } - - [NotMapped] public List CalculateQuestionList { @@ -111,8 +107,6 @@ namespace IRaCIS.Core.Domain.Models } #endregion public bool IsAdditional { get; set; } - - /// /// 项目标准Id /// @@ -152,8 +146,6 @@ namespace IRaCIS.Core.Domain.Models /// 父问题ID /// public Guid? ParentId { get; set; } - - /// /// 类型值 /// @@ -180,8 +172,6 @@ namespace IRaCIS.Core.Domain.Models /// 全局阅片显示类型 /// public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow; - - /// /// 转化显示类型 /// @@ -196,9 +186,6 @@ namespace IRaCIS.Core.Domain.Models /// 分组 /// public string GroupName { get; set; } = string.Empty; - - - /// /// 系统问题ID /// @@ -233,9 +220,6 @@ namespace IRaCIS.Core.Domain.Models /// 裁判百分比或绝对值的相差值匹配规则 /// public JudgeDifferenceType JudgeDifferenceType { get; set; } - - - /// /// 标准分页Id /// @@ -285,8 +269,6 @@ namespace IRaCIS.Core.Domain.Models /// 是否显示在Dicom阅片中 /// public bool IsShowInDicom { get; set; } = false; - - /// /// 序号标记 /// @@ -316,8 +298,6 @@ namespace IRaCIS.Core.Domain.Models /// 自定义单位 /// public string CustomUnit { get; set; } = string.Empty; - - /// /// 自定义计算标记 /// @@ -372,31 +352,19 @@ namespace IRaCIS.Core.Domain.Models /// 分组ID /// public Guid? GroupId { get; set; } - - /// /// 分组分类 /// public GroupClassify? GroupClassify { get; set; } - - /// /// 问题分类 /// public QuestionClassify? QuestionClassify { get; set; } - - - /// /// 高亮问题的答案 /// public string HighlightAnswer { get; set; } = "[]"; - - - } - - public class CalculateInfo { public bool IsTable { get; set; } @@ -406,7 +374,4 @@ namespace IRaCIS.Core.Domain.Models public Guid? TableQuestionId { get; set; } } - - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs index 405b0a8f1..8b2be4886 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs @@ -15,33 +15,16 @@ namespace IRaCIS.Core.Domain.Models public Dictionary Dictionary { get; set; } #endregion public Guid CriterionId { get; set; } - - public Guid DictionaryId { get; set; } - - - - public bool IsSystemCriterion { get; set; } = false; public string ParentCode { get; set; } = string.Empty; - - public bool IsBaseLineUse { get; set; } = false; - - public bool IsFollowVisitUse { get; set; } = false; /// /// ׼ֵ /// public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = CrterionDictionaryGroup.General; - - - - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs index 3d63c673a..1b1646ab7 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; using System.Linq; @@ -35,8 +31,6 @@ namespace IRaCIS.Core.Domain.Models } } - - [NotMapped] public List RelevanceValueList { @@ -62,8 +56,6 @@ namespace IRaCIS.Core.Domain.Models public Guid ReadingQuestionId { get; set; } public string Type { get; set; } = string.Empty; - - public Guid? ParentId { get; set; } /// @@ -127,8 +119,6 @@ namespace IRaCIS.Core.Domain.Models /// 数据列 /// public string DataTableColumn { get; set; } = string.Empty; - - /// /// 关联父问题 /// @@ -158,8 +148,6 @@ namespace IRaCIS.Core.Domain.Models /// 字典code /// public string DictionaryCode { get; set; } = string.Empty; - - /// /// 数值类型 /// @@ -199,9 +187,5 @@ namespace IRaCIS.Core.Domain.Models /// 问题分类 /// public QuestionClassify? QuestionClassify { get; set; } - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs index d825517d5..d804861c1 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; using System.Linq; @@ -38,8 +34,6 @@ namespace IRaCIS.Core.Domain.Models } } - - [NotMapped] public List RelevanceValueList { @@ -57,8 +51,6 @@ namespace IRaCIS.Core.Domain.Models } } - - [NotMapped] public List CalculateQuestionList { @@ -85,38 +77,24 @@ namespace IRaCIS.Core.Domain.Models /// 项目问题的Id ReadingQuestionTrial的id /// public Guid ReadingQuestionId { get; set; } - - public string Type { get; set; } = string.Empty; - - public Guid? ParentId { get; set; } public string ParentTriggerValue { get; set; } = string.Empty; - - public string QuestionName { get; set; } = string.Empty; - - public IsRequired IsRequired { get; set; } public int ShowOrder { get; set; } public string TypeValue { get; set; } = string.Empty; - - public bool IsEnable { get; set; } public string Remark { get; set; } = string.Empty; - - public Guid? RelevanceId { get; set; } public string RelevanceValue { get; set; } = string.Empty; public int ShowQuestion { get; set; } - - public int? MaxRowCount { get; set; } public string DataTableName { get; set; } = string.Empty; @@ -128,16 +106,12 @@ namespace IRaCIS.Core.Domain.Models public Guid? DependParentId { get; set; } public IsDepend IsDepend { get; set; } - - public Guid TrialCriterionId { get; set; } /// /// 问题标识 /// public QuestionMark? QuestionMark { get; set; } - - /// /// 字典code /// @@ -197,9 +171,6 @@ namespace IRaCIS.Core.Domain.Models /// 问题分类 /// public QuestionClassify? QuestionClassify { get; set; } - - - /// /// 复制病灶的时候 是否复制这个问题 /// @@ -209,10 +180,5 @@ namespace IRaCIS.Core.Domain.Models /// 系统表格问题Id /// public Guid? SystemTableQuestionId { get; set; } - - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs index f3a229397..026d80d24 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -24,9 +20,6 @@ namespace IRaCIS.Core.Domain.Models public Guid CriterionId { get; set; } public Guid DictionaryId { get; set; } - - - public string ParentCode { get; set; } = string.Empty; public bool IsBaseLineUse { get; set; } @@ -34,10 +27,5 @@ namespace IRaCIS.Core.Domain.Models public bool IsFollowVisitUse { get; set; } public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } - - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs index 771edd685..d14b2b149 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -16,8 +13,6 @@ namespace IRaCIS.Core.Domain.Models public Guid VisitTaskId { get; set; } public Guid? StudyId { get; set; } - - public Guid? SeriesId { get; set; } public Guid? InstanceId { get; set; } @@ -27,6 +22,4 @@ namespace IRaCIS.Core.Domain.Models public int? NumberOfFrames { get; set; } } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs index 88eda6ba9..55c54b9a6 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs @@ -15,8 +15,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [ForeignKey("GlobalTaskId")] public VisitTask GlobalVisitTask { get; set; } - - [JsonIgnore] [ForeignKey("QuestionId")] public ReadingQuestionTrial TrialReadingQuestion { get; set; } @@ -43,8 +41,6 @@ namespace IRaCIS.Core.Domain.Models /// public string Answer { get; set; } = string.Empty; - - public Guid TrialId { get; set; } /// @@ -55,6 +51,4 @@ namespace IRaCIS.Core.Domain.Models public Guid SubjectId { get; set; } } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs index f5aaf93a1..679e62fae 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs @@ -26,15 +26,8 @@ namespace IRaCIS.Core.Domain.Models /// [Required] public Guid JudgeTaskId { get; set; } - - - public Guid TrialId { get; set; } - - public Guid SubjectId { get; set; } } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs index 57bef0185..dff2ced8e 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -38,8 +35,6 @@ namespace IRaCIS.Core.Domain.Models /// 原因 /// public string EvaluationReason { get; set; } = string.Empty; - - /// /// 项目Id /// @@ -49,9 +44,5 @@ namespace IRaCIS.Core.Domain.Models /// 受试者Id /// public Guid SubjectId { get; set; } - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs index e8d06b659..233f2b5bc 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models @@ -31,29 +27,17 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [ForeignKey("QuestionId")] public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - - //病灶答案表 [JsonIgnore] public List LesionAnswerList { get; set; } = new List(); #endregion - - - - public Guid QuestionId { get; set; } - - public Guid VisitTaskId { get; set; } public Guid TrialId { get; set; } - - public Guid? InstanceId { get; set; } public Guid? SeriesId { get; set; } - - public Guid? StudyId { get; set; } public Guid? OtherInstanceId { get; set; } @@ -69,8 +53,6 @@ namespace IRaCIS.Core.Domain.Models public int? OtherNumberOfFrames { get; set; } public bool IsCanEditPosition { get; set; } = false; - - /// /// 是Dicom阅片 /// @@ -119,18 +101,11 @@ namespace IRaCIS.Core.Domain.Models public Guid? CTSeriesId { get; set; } public SplitOrMergeType? SplitOrMergeType { get; set; } - - - public int? NumberOfFrames { get; set; } - - /// /// 器官Id /// public Guid? OrganInfoId { get; set; } - - /// /// 窗宽WW /// @@ -150,12 +125,7 @@ namespace IRaCIS.Core.Domain.Models /// 报告页面显示来自于哪个标记 /// public string ReportMark { get; set; } = string.Empty; - - - public string OtherMeasureData { get; set; } = string.Empty; - - //病灶编号 public string RowMark { get; set; } = string.Empty; @@ -163,10 +133,5 @@ namespace IRaCIS.Core.Domain.Models /// 标记工具 /// public string MarkTool { get; set; } = string.Empty; - - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs index efe610356..fb726a788 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -14,27 +11,18 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("RowId")] public ReadingTableAnswerRowInfo Lesion { get; set; } - - [JsonIgnore] [ForeignKey("QuestionId")] public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - - [JsonIgnore] [ForeignKey("TableQuestionId")] public ReadingTableQuestionTrial ReadingTableQuestionTrial { get; set; } - - - [JsonIgnore] [ForeignKey("VisitTaskId")] public VisitTask VisitTask { get; set; } #endregion - - public Guid QuestionId { get; set; } /// @@ -45,18 +33,9 @@ namespace IRaCIS.Core.Domain.Models public Guid VisitTaskId { get; set; } public Guid TrialId { get; set; } - - public decimal RowIndex { get; set; } public string Answer { get; set; } = string.Empty; - - public Guid RowId { get; set; } - - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs index b932c5905..a5c9edaf0 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs @@ -41,24 +41,9 @@ namespace IRaCIS.Core.Domain.Models /// 全局阅片修改的答案 /// public string GlobalChangeAnswer { get; set; } = string.Empty; - - /// /// 全局阅片是否修改 /// 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 5e3fb1dca..5bd7fc1bb 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -20,8 +16,6 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("VisitTaskId")] public VisitTask VisitTask { get; set; } #endregion - - public Guid VisitTaskId { get; set; } public Guid QuestionId { get; set; } @@ -29,11 +23,7 @@ namespace IRaCIS.Core.Domain.Models public Guid? InstanceId { get; set; } public Guid? SeriesId { get; set; } - - public Guid? StudyId { get; set; } - - public string MarkTool { get; set; } = string.Empty; public string PicturePath { get; set; } = string.Empty; @@ -41,13 +31,9 @@ namespace IRaCIS.Core.Domain.Models public int? NumberOfFrames { get; set; } public string MeasureData { get; set; } = string.Empty; - - public Guid? FirstAddTaskId { get; set; } public QuestionType? QuestionType { get; set; } - - public string OrderMarkName { get; set; } = string.Empty; public Guid? OtherInstanceId { get; set; } @@ -62,9 +48,5 @@ namespace IRaCIS.Core.Domain.Models public int? OtherNumberOfFrames { get; set; } public string OtherMeasureData { get; set; } = string.Empty; - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs index dd2e0d0d1..cfd9ba307 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -32,11 +28,5 @@ namespace IRaCIS.Core.Domain.Models /// 类型具体解释 看枚举 /// public RelevanceType RelevanceType { get; set; } - - - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs index a5a448eda..2b392e552 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs @@ -35,13 +35,8 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [ForeignKey("TrialId")] public Trial Trial { get; set; } - - [JsonIgnore] public List ReadModuleCriterionFromList { get; set; } = new List(); - - - [JsonIgnore] public List ModuleTaskList { get; set; } [JsonIgnore] @@ -50,8 +45,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public List ReadingClinicalDataList { get; set; } #endregion - - public Guid SubjectId { get; set; } public Guid TrialReadingCriterionId { get; set; } @@ -72,16 +65,12 @@ namespace IRaCIS.Core.Domain.Models public bool? IsUrgent { get; set; } public Guid SubjectVisitId { get; set; } - - /// /// 阅片计划ID /// public Guid? ReadingPeriodSetId { get; set; } public Guid TrialId { get; set; } - - public bool IsCRCConfirm { get; set; } = false; public bool IsPMConfirm { get; set; } = false; @@ -92,8 +81,6 @@ namespace IRaCIS.Core.Domain.Models /// CRC是否正在申请撤回 /// public bool IsCRCApplicationRevoke { get; set; } = false; - - /// /// 临床数据是否完整 /// @@ -111,7 +98,4 @@ namespace IRaCIS.Core.Domain.Models public ReadingStatusEnum ReadingStatus { get; set; } = ReadingStatusEnum.TaskAllocate; } - - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs index 6a4443cca..61b634829 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs @@ -30,13 +30,5 @@ namespace IRaCIS.Core.Domain.Models /// 访视 /// public Guid SubjectVisitId { get; set; } - - - - - } - - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs index c00c50e7e..2b8a61a50 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs @@ -53,9 +53,6 @@ namespace IRaCIS.Core.Domain.Models /// 访视计划ID /// public Guid? VisitStageId { get; set; } - - - /// /// 是否生效 /// @@ -65,8 +62,6 @@ namespace IRaCIS.Core.Domain.Models /// 生效时间 /// public DateTime? EffectOfTime { get; set; } - - /// /// 是否为全局阅片 /// @@ -76,10 +71,6 @@ namespace IRaCIS.Core.Domain.Models /// 阅片配置的类型 /// public ReadingSetType ReadingSetType { get; set; } - - - - } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs index 9a42ce613..7b09cfcfd 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs @@ -22,14 +22,5 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialId { get; set; } public Guid TrialSiteId { get; set; } - - - } - - - - - - } diff --git a/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs b/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs index fa5f0731b..281274257 100644 --- a/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs +++ b/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -26,8 +23,6 @@ namespace IRaCIS.Core.Domain.Models /// 影像工具类型 /// public int ImageToolType { get; set; } - - public Guid UserId { get; set; } public bool AltKey { get; set; } = false; @@ -43,6 +38,4 @@ namespace IRaCIS.Core.Domain.Models 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 39b464e0a..c6d77a3f0 100644 --- a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs +++ b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -14,19 +11,9 @@ namespace IRaCIS.Core.Domain.Models #endregion public string TemplateName { get; set; } = string.Empty; - - public Guid UserId { get; set; } - - - - public int WW { get; set; } - - public int WL { get; set; } - - public int ShowOrder { get; set; } = 0; /// @@ -35,6 +22,4 @@ namespace IRaCIS.Core.Domain.Models public bool IsPitchOn { get; set; } = true; } - - } diff --git a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs index bbe2b9616..f428a09cf 100644 --- a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs +++ b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { diff --git a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs index a2ecea3de..25f110f8a 100644 --- a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs +++ b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { diff --git a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs index c9bd8bfff..561bd6811 100644 --- a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs +++ b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { diff --git a/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs b/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs index 811a55a45..95a28a305 100644 --- a/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs +++ b/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs @@ -8,8 +8,6 @@ namespace IRaCIS.Core.Domain.Models /// Id(阅片期Id 或者 访视ID) /// public new Guid Id { get; set; } - - /// /// 项目ID /// @@ -44,20 +42,14 @@ namespace IRaCIS.Core.Domain.Models /// 访视ID /// public Guid? SubjectVisitId { get; set; } - - /// /// 访视名称 /// public string? SubjectVisitName { get; set; } - - /// /// 截止访视 /// public Guid? CutOffVisitId { get; set; } - - /// /// 截止访视名称 /// @@ -72,9 +64,6 @@ namespace IRaCIS.Core.Domain.Models /// 对应Name /// public string? ReadModuleName { get; set; } - - - /// /// 创建时间 /// @@ -129,8 +118,6 @@ namespace IRaCIS.Core.Domain.Models /// 入组确认评估 /// public bool? IsEnrollmentConfirm { get; set; } = false; - - /// /// 阅片状态 /// @@ -140,14 +127,10 @@ namespace IRaCIS.Core.Domain.Models /// 是否是基线 /// public bool? IsBaseLine { get; set; } = false; - - /// /// 标准Id /// public Guid? TrialReadingCriterionId { get; set; } - - /// /// 标准名称 /// @@ -167,8 +150,6 @@ namespace IRaCIS.Core.Domain.Models /// 已经签名的临床数据数量 /// public int SignClinicalDataCount { get; set; } - - public CompleteClinicalDataEnum CompleteClinicalData { diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs index 95b93c4a5..2bcdd96f1 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -13,28 +10,19 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [ForeignKey("TrialSiteSurveyId")] public TrialSiteSurvey TrialSiteSurvey { get; set; } - - [JsonIgnore] [ForeignKey("EquipmentTypeId")] public Dictionary EquipmentType { get; set; } #endregion - - public Guid TrialSiteSurveyId { get; set; } public Guid EquipmentTypeId { get; set; } public string Parameters { get; set; } = string.Empty; public string ManufacturerName { get; set; } = string.Empty; - - public string ScannerType { get; set; } = string.Empty; public string Note { get; set; } = string.Empty; - - - } } diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs index 582b74875..b59565b16 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -32,19 +28,11 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialSiteId { get; set; } public TrialSiteSurveyEnum State { get; set; } = TrialSiteSurveyEnum.ToSubmit; - - public Guid TrialId { get; set; } - - public string UserName { get; set; } = string.Empty; public string Phone { get; set; } = string.Empty; - - public string Email { get; set; } = string.Empty; - - public int AverageEngravingCycle { get; set; } public bool IsConfirmImagingTechnologist { get; set; } @@ -66,10 +54,6 @@ namespace IRaCIS.Core.Domain.Models public DateTime? PreliminaryTime { get; set; } public DateTime? ReviewerTime { get; set; } - - - - } } diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs index a7a83f2d4..088d3a8f4 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -19,13 +15,9 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("UserTypeId")] public UserType UserTypeRole { get; set; } #endregion - - public Guid TrialSiteSurveyId { get; set; } public Guid? UserTypeId { get; set; } - - public int? TrialRoleCode { get; set; } public string Phone { get; set; } = string.Empty; @@ -42,22 +34,14 @@ namespace IRaCIS.Core.Domain.Models public bool IsGenerateAccount { get; set; } public bool IsGenerateSuccess { get; set; } - - public TrialSiteUserStateEnum InviteState { get; set; } = TrialSiteUserStateEnum.WaitSent; public bool IsJoin { get; set; } - - public bool IsHistoryUser { get; set; } public bool? IsHistoryUserDeleted { get; set; } public bool? IsHistoryUserOriginDeleted { get; set; } - - - - } } diff --git a/IRaCIS.Core.Domain/Trial/DataInspection.cs b/IRaCIS.Core.Domain/Trial/DataInspection.cs index 99930cee2..8eb6cd7ac 100644 --- a/IRaCIS.Core.Domain/Trial/DataInspection.cs +++ b/IRaCIS.Core.Domain/Trial/DataInspection.cs @@ -1,5 +1,3 @@ - - namespace IRaCIS.Core.Domain.Models; [Comment("稽查 - 记录表")] diff --git a/IRaCIS.Core.Domain/Trial/Enroll.cs b/IRaCIS.Core.Domain/Trial/Enroll.cs index b54da8b61..6da04af8f 100644 --- a/IRaCIS.Core.Domain/Trial/Enroll.cs +++ b/IRaCIS.Core.Domain/Trial/Enroll.cs @@ -13,16 +13,12 @@ namespace IRaCIS.Core.Domain.Models public virtual Doctor Doctor { get; set; } [JsonIgnore] public User DoctorUser { get; set; } - - [JsonIgnore] public List EnrollReadingCategoryList { get; set; } [JsonIgnore] public List EnrollReadingCriteriaList { get; set; } #endregion - - public Guid DoctorId { get; set; } public Guid TrialId { get; set; } public Guid? AttachmentId { get; set; } @@ -55,13 +51,9 @@ namespace IRaCIS.Core.Domain.Models public int? Global { get; set; } public int? Downtime { get; set; } - - /// /// 生成账号 加入到项目中后 赋值 /// public Guid? DoctorUserId { get; set; } - - } } diff --git a/IRaCIS.Core.Domain/Trial/EnrollDetail.cs b/IRaCIS.Core.Domain/Trial/EnrollDetail.cs index 7f1d29126..d374a61fc 100644 --- a/IRaCIS.Core.Domain/Trial/EnrollDetail.cs +++ b/IRaCIS.Core.Domain/Trial/EnrollDetail.cs @@ -11,18 +11,12 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public Doctor Doctor { get; set; } #endregion - - public Guid DoctorId { get; set; } public Guid TrialId { get; set; } public EnrollStatus EnrollStatus { get; set; } public Guid? EnrollId { get; set; } public string Memo { get; set; } = string.Empty; public int OptUserType { get; set; } - - public Guid TrialDetailId { get; set; } - - } } diff --git a/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs b/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs index aaf196659..d33687845 100644 --- a/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs +++ b/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -12,21 +8,13 @@ namespace IRaCIS.Core.Domain.Models public class EnrollReadingCategory : BaseAddAuditEntity { #region 导航属性 - - [JsonIgnore] [ForeignKey("EnrollId")] public Enroll Enroll { get; set; } #endregion public Guid EnrollId { get; set; } - - public ReadingCategory ReadingCategory { get; set; } - - public Guid TrialReadingCriterionId { get; set; } - - } } diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index dd94cda71..5cacc7d93 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -104,12 +104,8 @@ namespace IRaCIS.Core.Domain.Models public Guid? SponsorId { get; set; } = Guid.Empty; public Guid? ReviewModeId { get; set; } = Guid.Empty; - - [StringLength(500)] public string ProjectCycle { get; set; } = string.Empty; - - public int ExpectedPatients { get; set; } public decimal TimePointsPerPatient { get; set; } @@ -125,14 +121,9 @@ namespace IRaCIS.Core.Domain.Models public string MessageFromClient { get; set; } = string.Empty; public string Note { get; set; } = string.Empty; - - public string ReviewProtocolName { get; set; } = string.Empty; public string MessageFromClientName { get; set; } = string.Empty; public int Expedited { get; set; } - - - public string DeclarationTypes { get; set; } = string.Empty; [NotMapped] @@ -167,27 +158,18 @@ namespace IRaCIS.Core.Domain.Models /// 是否有 受试者年龄 /// public bool IsHaveSubjectAge { get; set; } = false; - - /// /// 是否有 入组性确认 /// public bool IsEnrollementQualificationConfirm { get; set; } = false; - - /// /// 出组后计划外访视名称 /// public string OutEnrollmentVisitName { get; set; } = "EOT"; - - - /// /// 是否 验证拍片日期 /// public bool IsVerifyVisitImageDate { get; set; } = true; - - /// /// 临床信息传输 1：系统录入 2：系统录入+PDF 0：无 /// @@ -214,8 +196,6 @@ namespace IRaCIS.Core.Domain.Models public bool IsImageExport { get; set; } = false; public bool IsSubjectSecondCodeView { get; set; } - - //阅片方式 public int ReadingMode { get; set; } = 1; @@ -225,24 +205,14 @@ namespace IRaCIS.Core.Domain.Models /// 跨项目复制 /// public bool IsImageReplicationAcrossTrial { get; set; } = false; - - public string BodyPartTypes { get; set; } = "鼻咽部|脑部|颈部|胸部|上/下腹部|盆腔|全身|其他"; - - - public string Modalitys { get; set; } = string.Empty; [NotMapped] public List ModalityList => Modalitys.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).ToList(); - - public string PreliminaryAuditReuploadText { get; set; } = string.Empty; public string ReviewAuditReuploadText { get; set; } = string.Empty; - - - //PD 进展是否显示 配置访视 是否显示 PD进展 (从而可以设置状态) public bool IsPDProgressView { get; set; } @@ -264,9 +234,6 @@ namespace IRaCIS.Core.Domain.Models /// 项目类型 1 正式项目、0 非正式项目 2是培训项目 /// time public TrialType TrialType { get; set; } - - - public int PlanSiteCount { get; set; } public int PlanVisitCount { get; set; } @@ -279,8 +246,6 @@ namespace IRaCIS.Core.Domain.Models public bool IsSubjectExpeditedView { get; set; } = false; public bool IsTrialStart { get; set; } = false; - - //QC 问题流程 public User QCQuestionConfirmedUser { get; set; } @@ -299,14 +264,10 @@ namespace IRaCIS.Core.Domain.Models public bool IsTrialUrgentConfirmed { get; set; } public bool IsQCQuestionConfirmed { get; set; } - - /// /// 同步临床数据时间 /// public DateTime? SyncClinicalDataTime { get; set; } - - public string BlindBaseLineName { get; set; } = "Baseline"; public string BlindFollowUpPrefix { get; set; } = "Follow-up"; @@ -346,12 +307,8 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsConfigureEmail { get; set; } = false; #endregion - - public bool IsPACSConnect { get; set; } public bool IsTrialPACSConfirmed { get; set; } - - } } diff --git a/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs b/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs index 783987bff..84db50346 100644 --- a/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs +++ b/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -17,18 +14,9 @@ namespace IRaCIS.Core.Domain.Models #endregion public string Code { get; set; } = string.Empty; - - public string Name { get; set; } = string.Empty; - - public string NameCN { get; set; } = string.Empty; - - - public Guid TrialId { get; set; } - - public bool IsHandAdd { get; set; } } diff --git a/IRaCIS.Core.Domain/Trial/TrialDictionary.cs b/IRaCIS.Core.Domain/Trial/TrialDictionary.cs index edd37e647..8ce457c5f 100644 --- a/IRaCIS.Core.Domain/Trial/TrialDictionary.cs +++ b/IRaCIS.Core.Domain/Trial/TrialDictionary.cs @@ -9,8 +9,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public virtual Dictionary Dictionary { get; set; } #endregion - - public string KeyName { get; set; } = string.Empty; public Guid TrialId { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/TrialSign.cs b/IRaCIS.Core.Domain/Trial/TrialSign.cs index 4c984374d..153f3188c 100644 --- a/IRaCIS.Core.Domain/Trial/TrialSign.cs +++ b/IRaCIS.Core.Domain/Trial/TrialSign.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -13,11 +10,7 @@ namespace IRaCIS.Core.Domain.Models #endregion public Guid? TrialId { get; set; } - - public Guid? SubjectVisitId { get; set; } - - //关联基础数据 public Guid? SignCodeId { get; set; } @@ -28,6 +21,4 @@ namespace IRaCIS.Core.Domain.Models public bool IsCompleted { get; set; } } - - } diff --git a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs index db3483f22..0cacbef80 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -17,18 +14,9 @@ namespace IRaCIS.Core.Domain.Models #endregion public Guid TrialId { get; set; } - - public string OriginState { get; set; } = String.Empty; - - public string NowState { get; set; } = String.Empty; - - public string Reason { get; set; } = String.Empty; - - - } } diff --git a/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs b/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs index 306e6b7c3..d668e69fa 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs @@ -10,16 +10,11 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public Trial Trial { get; set; } #endregion - - public Guid TrialId { get; set; } public int TrialStatus { get; set; } public string Memo { get; set; } = string.Empty; public int OptUserType { get; set; } - - - } } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs index 60aa6ffcc..0667ce14e 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs @@ -25,7 +25,5 @@ public string Note { get; set; } = string.Empty; public string Detail { get; set; } = string.Empty; - - } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs index 43dad1ee3..fe28016d5 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs @@ -1,7 +1,3 @@ - - - - using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { @@ -15,9 +11,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public Trial Trial { get; set; } #endregion - - - public Guid TrialId { get; set; } public Guid UserTypeId { get; set; } @@ -27,28 +20,13 @@ namespace IRaCIS.Core.Domain.Models /// public string Email { 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; } - - public Guid SystemUserId { get; set; } - - - public bool IsJoin { get; set; } - - - - public DateTime? ExpireTime { get; set; } public DateTime? ConfirmTime { get; set; } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs index 099d858f5..0503d40c1 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs @@ -19,8 +19,6 @@ public List SubjectVisitList { get; set; } [JsonIgnore] public List TrialSiteSurveyList { get; set; } - - //Site 由多个人负责 [JsonIgnore] public List CRCUserList { get; set; } @@ -42,8 +40,5 @@ public string TrialSiteAliasName { get; set; } = String.Empty; public DateTime? EnabledTime { get; set; } - - - } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs index fe5c3cad9..61b305678 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -14,27 +11,13 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public TrialSite TrialSite { get; set; } #endregion - - - public Guid TrialId { get; set; } public Guid TrialSiteId { 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/TrialSiteUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs index e0e8dab48..278cfc563 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -27,12 +24,5 @@ namespace IRaCIS.Core.Domain.Models public Guid UserId { get; set; } public Guid TrialId { get; set; } - - - - } - - - } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs index 7363d1d7f..a524d7528 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs @@ -21,8 +21,5 @@ namespace IRaCIS.Core.Domain.Models public DateTime? RemoveTime { get; set; } public DateTime? JoinTime { get; set; } - - - } } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs index ae956c09e..5873ebde2 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -28,9 +25,6 @@ namespace IRaCIS.Core.Domain.Models public DateTime? JoinTime { 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 78eb287de..4f8d4db69 100644 --- a/IRaCIS.Core.Domain/Visit/Subject.cs +++ b/IRaCIS.Core.Domain/Visit/Subject.cs @@ -26,16 +26,12 @@ public class Subject : BaseFullDeleteAuditEntity [JsonIgnore] public List SubjectCriteriaEvaluationList { get; set; } - - [JsonIgnore] public List SubjectCriteriaEvaluationVisitFilterList { get; set; } [JsonIgnore] public List SubjectAdditionalEvaluationResult { get; set; } - - [JsonIgnore] public List ReadingTaskQuestionAnswerList { get; set; } @@ -45,8 +41,6 @@ public class Subject : BaseFullDeleteAuditEntity [JsonIgnore] [ForeignKey("TrialId")] public Trial Trial { get; set; } - - [JsonIgnore] public TrialSite TrialSite { get; set; } [JsonIgnore] @@ -57,8 +51,6 @@ public class Subject : BaseFullDeleteAuditEntity [JsonIgnore] public List ClinicalFormList { get; set; } #endregion - - public Guid TrialId { get; set; } public Guid TrialSiteId { get; set; } @@ -99,7 +91,4 @@ public class Subject : BaseFullDeleteAuditEntity [Comment("重阅或者退回影响一致性分析")] public bool IsReReadingOrBackInfluenceAnalysis { get; set; } - - - } diff --git a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs index 0e4eacddb..965fa091d 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -13,16 +10,11 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public Subject Subject { get; set; } #endregion - - - public Guid SubjectId { 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 dc455e434..ca21f3740 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs @@ -1,6 +1,4 @@ using IRaCIS.Core.Domain.Share; - - namespace IRaCIS.Core.Domain.Models; [Comment("受试者访视")] @@ -15,13 +13,8 @@ public class SubjectVisit : BaseFullDeleteAuditEntity [JsonIgnore] [ForeignKey("OutPlanPreviousVisitId")] public SubjectVisit OutPlanPreviousVisit { get; set; } - - - [ForeignKey("ForwardUserId")] public User ForwardUser { get; set; } - - [JsonIgnore] [ForeignKey("PreliminaryAuditUserId")] public User PreliminaryAuditUser { get; set; } @@ -41,17 +34,11 @@ public class SubjectVisit : BaseFullDeleteAuditEntity [JsonIgnore] [ForeignKey("TrialId")] public Trial Trial { get; set; } - - [JsonIgnore] public List ReadModuleList { get; set; } - - [JsonIgnore] [ForeignKey("SubjectId")] public Subject Subject { get; set; } - - [JsonIgnore] public List PreviousHistoryList { get; set; } [JsonIgnore] @@ -120,8 +107,6 @@ public class SubjectVisit : BaseFullDeleteAuditEntity [Comment("审核状态")] public AuditStateEnum AuditState { get; set; } public ForwardStateEnum ForwardState { get; set; } - - [Comment("单审通过人")] public Guid? PreliminaryAuditUserId { get; set; } @@ -163,18 +148,10 @@ public class SubjectVisit : BaseFullDeleteAuditEntity public CheckChanllengeTypeEnum CheckChallengeState { get; set; } public PDStateEnum PDState { get; set; } = PDStateEnum.None; - - public DateTime? CheckPassedTime { get; set; } - - [Comment("计划外上一访视")] public Guid? OutPlanPreviousVisitId { get; set; } - - public RequestBackStateEnum RequestBackState { get; set; } - - public bool IsQCConfirmedReupload { get; set; } public bool IsLostVisit { get; set; } @@ -192,11 +169,7 @@ public class SubjectVisit : BaseFullDeleteAuditEntity public string CloseTheReason { get; set; } = string.Empty; public Guid? SubmitUserId { get; set; } - - public ReadingStatusEnum ReadingStatus { get; set; } - - } /// /// 影像下载打包状态 diff --git a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs index 41c4601bd..c4606961e 100644 --- a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs +++ b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -19,8 +16,6 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialId { get; set; } public int InconsistentCount { get; set; } - - } } diff --git a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs index 91f72cf50..bc82d208a 100644 --- a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs +++ b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs @@ -1,6 +1,3 @@ - - - namespace IRaCIS.Core.Domain.Models { /// @@ -16,8 +13,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public SubjectVisit SubjectVisit { get; set; } #endregion - - public Guid SubjectVisitId { get; set; } public Guid StudyId { get; set; } diff --git a/IRaCIS.Core.Domain/Visit/VisitStage.cs b/IRaCIS.Core.Domain/Visit/VisitStage.cs index c462fd8f4..dc2ba7db8 100644 --- a/IRaCIS.Core.Domain/Visit/VisitStage.cs +++ b/IRaCIS.Core.Domain/Visit/VisitStage.cs @@ -28,8 +28,5 @@ public int VisitWindowRight { get; set; } public bool IsHaveFirstConfirmed { get; set; } - - - } } diff --git a/IRaCIS.Core.Domain/_Config/_AppSettings.cs b/IRaCIS.Core.Domain/_Config/_AppSettings.cs index 28b1f939f..7a2f980eb 100644 --- a/IRaCIS.Core.Domain/_Config/_AppSettings.cs +++ b/IRaCIS.Core.Domain/_Config/_AppSettings.cs @@ -34,8 +34,6 @@ namespace IRaCIS.Core.Domain.Share /// 休息时间 (min) /// public int ReadingRestTimeMin { get; set; } - - /// /// 是否需要修改密码 /// @@ -53,8 +51,6 @@ namespace IRaCIS.Core.Domain.Share public int Port { get; set; } public string Host { get; set; } = string.Empty; - - public string FromEmail { get; set; } = string.Empty; public string FromName { get; set; } = string.Empty; @@ -73,8 +69,6 @@ namespace IRaCIS.Core.Domain.Share public string CompanyShortName { get; set; } = string.Empty; public string CompanyShortNameCN { get; set; } = string.Empty; - - } public class SystemEmailSendConfigView @@ -94,17 +88,11 @@ namespace IRaCIS.Core.Domain.Share public string IP { get; set; } = string.Empty; } - - - public class IRCEncreptOption { public string Base64RSAPublicKey { get; set; } public string Base64RSAPrivateKey { get; set; } - - - public bool IsResponseEncreptEnable { get; set; } public List ApiPathList { get; set; } @@ -148,8 +136,6 @@ namespace IRaCIS.Core.Domain.Share IRaCISBasicConfig = appSettings; } - - //获取实体编码字符串 public static string GetCodeStr(int codeInt, string typeStr) { @@ -186,6 +172,4 @@ namespace IRaCIS.Core.Domain.Share } } - - } \ No newline at end of file