GlobalUsings 清理实体层
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-09-20 09:20:04 +08:00
parent 0a1ce59670
commit 32931e155c
187 changed files with 7126 additions and 7323 deletions
@@ -1,12 +1,6 @@
//--------------------------------------------------------------------
// 生成时间 2022-03-21 17:13:43
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("稽查 - 记录表")]
+43 -69
View File
@@ -1,93 +1,67 @@
using IRaCIS.Core.Domain.Share;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models;
[Comment("医生 - 入组项目中间记录表")]
[Table("Enroll")]
public partial class Enroll : BaseFullAuditEntity
namespace IRaCIS.Core.Domain.Models
{
#region
[JsonIgnore]
[ForeignKey("TrialId")]
public virtual Trial Trial { get; set; }
[JsonIgnore]
public virtual Doctor Doctor { get; set; }
[JsonIgnore]
public User DoctorUser { get; set; }
[Table("Enroll")]
public partial class Enroll : BaseFullAuditEntity
{
#region
[JsonIgnore]
[ForeignKey("TrialId")]
public virtual Trial Trial { get; set; }
[JsonIgnore]
public virtual Doctor Doctor { get; set; }
[JsonIgnore]
public User DoctorUser { get; set; }
[JsonIgnore]
public List<EnrollReadingCategory> EnrollReadingCategoryList { get; set; }
[JsonIgnore]
public List<EnrollReadingCategory> EnrollReadingCategoryList { get; set; }
[JsonIgnore]
public List<EnrollReadingCriterion> EnrollReadingCriteriaList { get; set; }
#endregion
[JsonIgnore]
public List<EnrollReadingCriterion> EnrollReadingCriteriaList { get; set; }
#endregion
[Comment(" 裁定")]
public int? Adjudication { get; set; }
public Guid DoctorId { get; set; }
public Guid TrialId { get; set; }
public Guid AttachmentId { get; set; } = Guid.Empty;
public EnrollStatus EnrollStatus { get; set; }
[Comment(" 裁定24小时")]
public int? Adjudication24H { get; set; }
public decimal? AdjustmentMultiple { get; set; }
public DateTime? EnrollTime { get; set; }
public DateTime? OutEnrollTime { get; set; }
[Comment(" 裁定48小时")]
public int? Adjudication48H { get; set; }
public string Memo { get; set; } = string.Empty;
[Comment(" 价格")]
[DecimalPrecision(18, 2)]
public decimal? AdjustmentMultiple { get; set; }
public int ReviewerReadingType { get; set; } = 0;
public Guid? AttachmentId { get; set; }
public int? Training { get; set; }
public Guid DoctorId { get; set; }
public int? RefresherTraining { get; set; }
public int DoctorTrialState { get; set; }
public int? Timepoint { get; set; }
[Comment(" 生成账号 加入到项目中后 赋值")]
public Guid? DoctorUserId { get; set; }
public int? Timepoint48H { get; set; }
[Comment(" 空跑")]
public int? Downtime { get; set; }
public int? Timepoint24H { get; set; }
[Comment(" 入组状态")]
public EnrollStatus EnrollStatus { get; set; }
public int? Adjudication { get; set; }
[Comment(" 入组时间")]
public DateTime? EnrollTime { get; set; }
public int? Adjudication48H { get; set; }
[Comment(" 总体")]
public int? Global { get; set; }
public int? Adjudication24H { get; set; }
[StringLength(500)]
public string Memo { get; set; } = null!;
public int? Global { get; set; }
[Comment(" 出组时间")]
public DateTime? OutEnrollTime { get; set; }
[Comment(" 重新培训")]
public int? RefresherTraining { get; set; }
[Comment(" 0代表裁判和TP都可以 1代表Tp 2 代表裁判")]
public int ReviewerReadingType { get; set; }
[Comment(" 时间点")]
public int? Timepoint { get; set; }
[Comment(" 时间点24小时")]
public int? Timepoint24H { get; set; }
[Comment(" 时间点48小时")]
public int? Timepoint48H { get; set; }
[Comment(" 培训")]
public int? Training { get; set; }
public Guid TrialId { get; set; }
public int? Downtime { get; set; }
/// <summary>
/// 生成账号 加入到项目中后 赋值
/// </summary>
public Guid? DoctorUserId { get; set; }
}
}
+20 -29
View File
@@ -1,37 +1,28 @@
using IRaCIS.Core.Domain.Share;
using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models;
[Comment("医生 - 入组项目流程记录表")]
[Table("EnrollDetail")]
public partial class EnrollDetail : BaseAddAuditEntity
namespace IRaCIS.Core.Domain.Models
{
#region
[JsonIgnore]
public virtual TrialStatusDetail TrialDetail { get; set; }
[JsonIgnore]
public Doctor Doctor { get; set; }
#endregion
[Table("EnrollDetail")]
public partial class EnrollDetail : BaseAddAuditEntity
{
#region µ¼º½ÊôÐÔ
[JsonIgnore]
public virtual TrialStatusDetail TrialDetail { get; set; }
[JsonIgnore]
public Doctor Doctor { get; set; }
#endregion
public Guid DoctorId { get; set; }
public Guid? EnrollId { get; set; }
public EnrollStatus EnrollStatus { get; set; }
[StringLength(1024)]
public string Memo { get; set; } = null!;
public int OptUserType { get; set; }
public Guid TrialDetailId { get; set; }
public Guid TrialId { get; set; }
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; }
}
}
@@ -3,31 +3,31 @@
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-07-08 10:43:53
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("医生 - 项目阅片标准阅片类型配置表")]
[Table("EnrollReadingCategory")]
public class EnrollReadingCategory : BaseAddAuditEntity
namespace IRaCIS.Core.Domain.Models
{
#region
///<summary>
///EnrollReadingCategory
///</summary>
[Table("EnrollReadingCategory")]
public class EnrollReadingCategory : BaseAddAuditEntity
{
#region
[JsonIgnore]
[ForeignKey("EnrollId")]
public Enroll Enroll { get; set; }
#endregion
public Guid EnrollId { get; set; }
[JsonIgnore]
[ForeignKey("EnrollId")]
public Enroll Enroll { get; set; }
#endregion
public Guid EnrollId { get; set; }
public ReadingCategory ReadingCategory { get; set; }
public ReadingCategory ReadingCategory { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
}
}
+2 -7
View File
@@ -1,10 +1,5 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using IRaCIS.Core.Domain.Share;
using System.Linq;
using IRaCIS.Core.Domain.Share;
using Newtonsoft.Json;
namespace IRaCIS.Core.Domain.Models
{
@@ -357,6 +352,6 @@ namespace IRaCIS.Core.Domain.Models
public bool IsTrialPACSConfirmed { get; set; }
}
}
+22 -24
View File
@@ -1,38 +1,36 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2024-06-04 10:38:19
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目部位配置")]
[Table("TrialBodyPart")]
public class TrialBodyPart : BaseAddAuditEntity
namespace IRaCIS.Core.Domain.Models
{
#region
///<summary>
///TrialBodyPart
///</summary>
[Table("TrialBodyPart")]
public class TrialBodyPart : BaseAddAuditEntity
{
#region
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
#endregion
public string Code { get; set; } = null!;
public string Code { get; set; } = string.Empty;
public bool IsHandAdd { get; set; }
[StringLength(500)]
public string Name { get; set; } = null!;
public string Name { get; set; } = string.Empty;
[StringLength(500)]
public string NameCN { get; set; } = null!;
public Guid TrialId { get; set; }
public string NameCN { get; set; } = string.Empty;
public Guid TrialId { get; set; }
public bool IsHandAdd { get; set; }
}
}
+15 -20
View File
@@ -1,25 +1,20 @@
using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目字典关系表")]
[Table("TrialDictionary")]
public partial class TrialDictionary : Entity
namespace IRaCIS.Core.Domain.Models
{
#region
[JsonIgnore]
public virtual Trial Trial { get; set; }
[JsonIgnore]
public virtual Dictionary Dictionary { get; set; }
#endregion
[Table("TrialDictionary")]
public partial class TrialDictionary : Entity
{
#region µ¼º½ÊôÐÔ
[JsonIgnore]
public virtual Trial Trial { get; set; }
[JsonIgnore]
public virtual Dictionary Dictionary { get; set; }
#endregion
[StringLength(400)]
public string KeyName { get; set; } = string.Empty;
public Guid TrialId { get; set; }
public string KeyName { get; set; } = string.Empty;
public Guid DictionaryId { get; set; }
public Guid TrialId { get; set; }
public Guid DictionaryId { get; set; }
}
}
+21 -23
View File
@@ -1,36 +1,34 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-02-16 16:23:57
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using IRaCIS.Core.Domain.Share;
using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目操作签名表")]
[Table("TrialSign")]
public class TrialSign : BaseAddAuditEntity
namespace IRaCIS.Core.Domain.Models
{
#region
///<summary>
///TrialSign
///</summary>
[Table("TrialSign")]
public class TrialSign : BaseAddAuditEntity
{
#region
#endregion
public Guid? TrialId { get; set; }
#endregion
public Guid? TrialId { get; set; }
public Guid? SubjectVisitId { get; set; }
public Guid? SignCodeId { get; set; }
public Guid? SubjectVisitId { get; set; }
public string SignCode { get; set; } = string.Empty;
[StringLength(1024)]
public string SignText { get; set; } = string.Empty;
//关联基础数据
public Guid? SignCodeId { get; set; }
public string SignCode { get; set; } = string.Empty;
public string SignText { get; set; } = string.Empty;
public bool IsCompleted { get; set; }
}
public bool IsCompleted { get; set; }
}
+18 -18
View File
@@ -1,35 +1,35 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-02-25 14:21:48
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目状态变更记录表")]
[Table("TrialStateChange")]
public class TrialStateChange : BaseAddAuditEntity
namespace IRaCIS.Core.Domain.Models
{
#region
[JsonIgnore]
[ForeignKey("TrialId")]
public Trial Trial { get; set; }
///<summary>
///TrialStateChange
///</summary>
[Table("TrialStateChange")]
public class TrialStateChange : BaseAddAuditEntity
{
#region
[JsonIgnore]
[ForeignKey("TrialId")]
public Trial Trial { get; set; }
#endregion
#endregion
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public string OriginState { get; set; } = String.Empty;
public string OriginState { get; set; } = String.Empty;
public string NowState { get; set; } = String.Empty;
public string NowState { get; set; } = String.Empty;
public string Reason { get; set; } = String.Empty;
public string Reason { get; set; } = String.Empty;
}
}
+16 -22
View File
@@ -1,31 +1,25 @@
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 入组流程记录")]
[Table("TrialStatus")]
public partial class TrialStatusDetail : BaseAddAuditEntity
namespace IRaCIS.Core.Domain.Models
{
#region
[JsonIgnore]
public List<EnrollDetail> IntoGroupDetails { get; set; }
[Table("TrialStatus")]
public partial class TrialStatusDetail : BaseAddAuditEntity
{
#region µ¼º½ÊôÐÔ
[JsonIgnore]
public List<EnrollDetail> IntoGroupDetails { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
public Guid TrialId { get; set; }
public int TrialStatus { get; set; }
[StringLength(400)]
public string Memo { get; set; } = string.Empty;
public Guid TrialId { get; set; }
public int TrialStatus { get; set; }
public int OptUserType { get; set; }
public string Memo { get; set; } = string.Empty;
public int OptUserType { get; set; }
}
}