精简实体修改
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-08-22 18:10:29 +08:00
parent f0943ca9a4
commit 4319982be9
159 changed files with 520 additions and 2225 deletions
+1 -9
View File
@@ -12,18 +12,10 @@ namespace IRaCIS.Core.Domain.Models
///DataInspection
///</summary>
[Table("DataInspection")]
public class DataInspection : Entity, IAuditAdd
public class DataInspection : BaseAuditAddEntity
{
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 创建用户ID
/// </summary>
public Guid CreateUserId { get; set; }
+2 -6
View File
@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
[Table("Enroll")]
public partial class Enroll : Entity,IAuditUpdate,IAuditAdd
public partial class Enroll : BaseFullAuditEntity
{
[JsonIgnore]
@@ -15,7 +15,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public virtual Doctor Doctor { get; set; }
//public TrialPaymentPrice TrialPaymentPrice { get; set; }
public Guid DoctorId { get; set; }
public Guid TrialId { get; set; }
@@ -30,10 +29,7 @@ namespace IRaCIS.Core.Domain.Models
public int ReviewerReadingType { get; set; } = 0;
public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; } = DateTime.Now;
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
public int? Training { get; set; }
+1 -3
View File
@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
[Table("EnrollDetail")]
public partial class EnrollDetail : Entity, IAuditAdd
public partial class EnrollDetail : BaseAuditAddEntity
{
[JsonIgnore]
public virtual TrialStatusDetail TrialDetail { get; set; }
@@ -15,9 +15,7 @@ namespace IRaCIS.Core.Domain.Models
public EnrollStatus EnrollStatus { get; set; }
public Guid? EnrollId { get; set; }
public string Memo { get; set; } = string.Empty;
public Guid CreateUserId { get; set; }
public int OptUserType { get; set; }
public DateTime CreateTime { get; set; }
public Guid TrialDetailId { get; set; }
@@ -13,31 +13,18 @@ namespace IRaCIS.Core.Domain.Models
///EnrollReadingCategory
///</summary>
[Table("EnrollReadingCategory")]
public class EnrollReadingCategory : Entity, IAuditAdd
public class EnrollReadingCategory : BaseAuditAddEntity
{
/// <summary>
/// EnrollId
/// </summary>
public Guid EnrollId { get; set; }
/// <summary>
/// ReadingCategory
/// </summary>
public ReadingCategory ReadingCategory { get; set; }
public Guid TrialReadingCriterionId { get; set; }
/// <summary>
/// CreateUserId
/// </summary>
public Guid CreateUserId { get; set; }
/// <summary>
/// CreateTime
/// </summary>
public DateTime CreateTime { get; set; }
[JsonIgnore]
[ForeignKey("EnrollId")]
+1 -12
View File
@@ -9,7 +9,7 @@ using Newtonsoft.Json;
namespace IRaCIS.Core.Domain.Models
{
[Table("Trial")]
public partial class Trial : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
public partial class Trial : BaseFullAuditDeleteEntity
{
public Trial()
{
@@ -145,13 +145,6 @@ namespace IRaCIS.Core.Domain.Models
public string MessageFromClientName { get; set; } = string.Empty;
public int Expedited { get; set; }
public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; }
public DateTime UpdateTime { get; set; }
public Guid UpdateUserId { get; set; }
@@ -325,7 +318,6 @@ namespace IRaCIS.Core.Domain.Models
public bool IsTrialStart { get; set; } = false;
public bool IsDeleted { get; set; }
//QC 问题流程
@@ -350,9 +342,6 @@ namespace IRaCIS.Core.Domain.Models
public bool IsQCQuestionConfirmed { get; set; }
public DateTime? DeletedTime { get; set; }
public Guid? DeleteUserId { get; set; }
/// <summary>
/// 同步临床数据时间
/// </summary>
+1 -4
View File
@@ -14,7 +14,7 @@ namespace IRaCIS.Core.Domain.Models
///TrialBodyPart
///</summary>
[Table("TrialBodyPart")]
public class TrialBodyPart : Entity, IAuditAdd
public class TrialBodyPart : BaseAuditAddEntity
{
public string Code { get; set; }
@@ -25,9 +25,6 @@ namespace IRaCIS.Core.Domain.Models
public string NameCN { get; set; }
public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; }
public Guid TrialId { get; set; }
+2 -19
View File
@@ -13,29 +13,12 @@ namespace IRaCIS.Core.Domain.Models
///TrialSign
///</summary>
[Table("TrialSign")]
public class TrialSign : Entity, IAuditAdd
public class TrialSign : BaseAuditAddEntity
{
/// <summary>
/// CreateTime
/// </summary>
[Required]
public DateTime CreateTime { get; set; }
/// <summary>
/// CreateUserId
/// </summary>
[Required]
public Guid CreateUserId { get; set; }
/// <summary>
/// TrialId
/// </summary>
public Guid? TrialId { get; set; }
/// <summary>
/// SubjectVisitId
/// </summary>
public Guid? SubjectVisitId { get; set; }
+1 -6
View File
@@ -11,7 +11,7 @@ namespace IRaCIS.Core.Domain.Models
///TrialStateChange
///</summary>
[Table("TrialStateChange")]
public class TrialStateChange : Entity, IAuditAdd
public class TrialStateChange : BaseAuditAddEntity
{
[JsonIgnore]
[ForeignKey("TrialId")]
@@ -28,11 +28,6 @@ namespace IRaCIS.Core.Domain.Models
public string Reason { get; set; }=String.Empty;
public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; }
[JsonIgnore]
[ForeignKey("CreateUserId")]
@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
[Table("TrialStatus")]
public partial class TrialStatusDetail : Entity, IAuditAdd
public partial class TrialStatusDetail : BaseAuditAddEntity
{
public virtual ICollection<EnrollDetail> IntoGroupDetails { get; set; }
public TrialStatusDetail()
@@ -27,9 +27,6 @@ namespace IRaCIS.Core.Domain.Models
public int OptUserType { get; set; }
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
}