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

整理命名空间
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-09-20 00:00:13 +08:00
parent 42e4fe59ec
commit 0a1ce59670
47 changed files with 2501 additions and 2599 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
IRaCIS.Core.Domain/Allocation/SubjectUser.cs
View File

@ -11,13 +11,13 @@ using System.Collections.Generic;
using System.ComponentModel;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 项目标准阅片医生配置表")]
[Table("SubjectUser")]
public class SubjectUser : BaseFullAuditEntity
{
[Comment("受试者 - 项目标准阅片医生配置表")]
[Table("SubjectUser")]
public class SubjectUser : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
@ -59,6 +59,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

12
IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs
View File

@ -10,12 +10,12 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 分配规则")]
[Table("TaskAllocationRule")]
public class TaskAllocationRule : BaseFullAuditEntity
{
[Comment("项目阅片 - 分配规则")]
[Table("TaskAllocationRule")]
public class TaskAllocationRule : BaseFullAuditEntity
{
#region 导航属性
[ForeignKey("DoctorUserId")]
@ -50,6 +50,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

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

@ -12,18 +12,18 @@ using System.Linq;
using Newtonsoft.Json;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public class OSSImageInfo
{
public class OSSImageInfo
{
public string FileName { get; set; } = string.Empty;
public string ImagePath { get; set; } = string.Empty;
}
[Comment("项目阅片 - 医学审核")]
[Table("TaskMedicalReview")]
public class TaskMedicalReview : BaseFullAuditEntity
{
}
[Comment("项目阅片 - 医学审核")]
[Table("TaskMedicalReview")]
public class TaskMedicalReview : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
@ -189,8 +189,4 @@ namespace IRaCIS.Core.Domain.Models
public string PDRelationTaskIdListStr { get; set; } = string.Empty;
}
}

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

@ -10,12 +10,12 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 一致性分析规则")]
[Table("TaskMedicalReviewRule")]
public class TaskMedicalReviewRule : BaseFullAuditEntity
{
[Comment("项目阅片 - 一致性分析规则")]
[Table("TaskMedicalReviewRule")]
public class TaskMedicalReviewRule :BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
@ -44,6 +44,6 @@ namespace IRaCIS.Core.Domain.Models
}
}

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

@ -8,12 +8,12 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 虚拟中心编号更新记录")]
[Table("TrialVirtualSiteCodeUpdate")]
public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity
{
[Comment("项目 - 虚拟中心编号更新记录")]
[Table("TrialVirtualSiteCodeUpdate")]
public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity
{
#region 导航属性
@ -26,7 +26,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

17
IRaCIS.Core.Domain/Allocation/VisitTask.cs
View File

@ -11,14 +11,14 @@ using System.Collections.Generic;
using System.Linq;
using EntityFrameworkCore.Projectables;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
///<summary>
///VisitTask
///</summary>
[Table("VisitTask")]
public class VisitTask : BaseFullAuditEntity
{
///<summary>
///VisitTask
///</summary>
[Table("VisitTask")]
public class VisitTask : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<TaskStudy> TaskStudyList { get; set; }
@ -377,7 +377,7 @@ namespace IRaCIS.Core.Domain.Models
[Projectable]
[JsonIgnore]
public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask|| Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId
public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask || Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId
&& t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null
&& t.TaskState == TaskState.Effect
&& t.VisitTaskNum < VisitTaskNum
@ -434,5 +434,4 @@ namespace IRaCIS.Core.Domain.Models
public int ImageStudyState { get; set; }
}
}

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

@ -4,21 +4,20 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace IRaCIS.Core.Domain.BaseModel
namespace IRaCIS.Core.Domain.BaseModel;
/// <summary>
/// 领域实体事件基类
/// </summary>
public abstract class DomainEvent
{
/// <summary>
/// 领域实体事件基类
/// </summary>
public abstract class DomainEvent
{
}
}
public class FailedDomainEvent
{
public class FailedDomainEvent
{
public Guid Id { get; set; }
public string EventType { get; set; } = string.Empty;
public string EventData { get; set; } = string.Empty;
public DateTime FailedAt { get; set; }
}
}

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

@ -5,25 +5,25 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Security.Cryptography;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public interface IAggregateRoot;
public interface IEntity<TKey>
{
public interface IAggregateRoot;
public interface IEntity<TKey>
{
abstract TKey Id { get; set; }
}
}
//针对dicom
public interface IEntitySeqId
{
//针对dicom
public interface IEntitySeqId
{
public Guid SeqId { get; set; }
}
}
public abstract class Entity : IEntity<Guid>
{
public abstract class Entity : IEntity<Guid>
{
[Key]
[Required]
[DatabaseGenerated(DatabaseGeneratedOption.None)]
@ -56,15 +56,15 @@ namespace IRaCIS.Core.Domain.Models
#endregion
}
}
#region 减少实体属性，增加基类
#region 减少实体属性，增加基类
public abstract class BaseAddAuditEntity : Entity, IAuditAdd
{
public abstract class BaseAddAuditEntity : Entity, IAuditAdd
{
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
@ -72,57 +72,55 @@ namespace IRaCIS.Core.Domain.Models
[ForeignKey("CreateUserId")]
[JsonIgnore]
public virtual User CreateUser { get; set; }
}
public abstract class BaseAddDeleteAuditEntity : Entity, IAuditAdd, ISoftDelete
{
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
public Guid? DeleteUserId { get; set; }
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
[ForeignKey("CreateUserId")]
[JsonIgnore]
public User CreateUser { get; set; }
}
public abstract class BaseFullAuditEntity : Entity, IAuditUpdate, IAuditAdd
{
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }
[ForeignKey("CreateUserId")]
[JsonIgnore]
public User CreateUser { get; set; }
}
public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
{
public Guid? DeleteUserId { get; set; }
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }
[ForeignKey("CreateUserId")]
[JsonIgnore]
public User CreateUser { get; set; }
}
public abstract class BaseAuditUpdateEntity : Entity, IAuditUpdate
{
public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }
}
#endregion
}
public abstract class BaseAddDeleteAuditEntity : Entity, IAuditAdd, ISoftDelete
{
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
public Guid? DeleteUserId { get; set; }
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
[ForeignKey("CreateUserId")]
[JsonIgnore]
public User CreateUser { get; set; }
}
public abstract class BaseFullAuditEntity : Entity, IAuditUpdate, IAuditAdd
{
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }
[ForeignKey("CreateUserId")]
[JsonIgnore]
public User CreateUser { get; set; }
}
public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
{
public Guid? DeleteUserId { get; set; }
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }
[ForeignKey("CreateUserId")]
[JsonIgnore]
public User CreateUser { get; set; }
}
public abstract class BaseAuditUpdateEntity : Entity, IAuditUpdate
{
public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }
}
#endregion

26
IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs
View File

@ -1,27 +1,23 @@
using System;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public interface IAuditAdd<TKey> where TKey : struct
{
public interface IAuditAdd<TKey> where TKey : struct
{
public TKey CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
}
}
public interface IAuditAdd : IAuditAdd<Guid>
{
}
public interface IAuditAddWithUserName : IAuditAdd<Guid>
{
public string CreateUser { get; set; }
}
public interface IAuditAdd : IAuditAdd<Guid>
{
}
public interface IAuditAddWithUserName : IAuditAdd<Guid>
{
public string CreateUser { get; set; }
}

18
IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs
View File

@ -1,20 +1,14 @@
using System;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public interface IAuditUpdate<TKey> where TKey : struct
{
public interface IAuditUpdate<TKey> where TKey : struct
{
public TKey UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }
}
public interface IAuditUpdate : IAuditUpdate<Guid>
{
}
}
public interface IAuditUpdate : IAuditUpdate<Guid>
{
}

15
IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs
View File

@ -1,19 +1,16 @@
using System;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public interface ISoftDelete<TKey> where TKey : struct
{
public interface ISoftDelete<TKey> where TKey : struct
{
public TKey? DeleteUserId { get; set; }
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
}
public interface ISoftDelete : ISoftDelete<Guid>
{
}
}
public interface ISoftDelete : ISoftDelete<Guid>
{
}

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

@ -4,18 +4,17 @@
// 生成时间 2022-02-15 15:45:52
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
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
namespace IRaCIS.Core.Domain.Models;
[Comment("系统 - 签名模板场景配置 (需要同步)")]
[Table("SystemBasicData")]
public class SystemBasicData : BaseFullAuditEntity
{
///<summary>
///SystemBasicData
///</summary>
[Table("SystemBasicData")]
public class SystemBasicData : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
@ -49,6 +48,4 @@ namespace IRaCIS.Core.Domain.Models
public string ValueCN { get; set; } = null!;
}
}

26
IRaCIS.Core.Domain/Dcotor/UserDoctor.cs
View File

@ -1,26 +0,0 @@
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
/// <summary>
/// 用户与医生管理关联关系表 - 实体
/// </summary>
[Table("UserDoctor")]
public partial class UserDoctor : Entity
{
#region 导航属性
[JsonIgnore]
public Doctor Doctor { get; set; }
[JsonIgnore]
public User User { get; set; }
#endregion
[ForeignKey("User")]
public Guid UserId { get; set; }
[ForeignKey("Doctor")]
public Guid DoctorId { get; set; }
}
}

11
IRaCIS.Core.Domain/Dcotor/Vacation.cs
View File

@ -2,12 +2,12 @@
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("医生 - 假期安排")]
[Table("Vacation")]
public class Vacation : BaseFullAuditEntity
{
[Comment("医生 - 假期安排")]
[Table("Vacation")]
public class Vacation : BaseFullAuditEntity
{
#region 导航属性
#endregion
@ -16,5 +16,4 @@ namespace IRaCIS.Core.Domain.Models
public DateTime EndDate { get; set; }
public int Status { get; set; } = 1;
}
}

12
IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs
View File

@ -7,12 +7,12 @@ using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目文档签署记录")]
[Table("TrialDocConfirmedUser")]
public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity
{
[Comment("项目 - 项目文档签署记录")]
[Table("TrialDocConfirmedUser")]
public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]
@ -44,4 +44,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

14
IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs
View File

@ -8,12 +8,12 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目邮件收发配置用户类型")]
[Table("TrialEmailNoticeUser")]
public class TrialEmailNoticeUser : Entity
{
[Comment("项目 - 项目邮件收发配置用户类型")]
[Table("TrialEmailNoticeUser")]
public class TrialEmailNoticeUser : Entity
{
#region 导航属性
[JsonIgnore]
public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; }
@ -26,6 +26,6 @@ namespace IRaCIS.Core.Domain.Models
public EmailUserType EmailUserType { get; set; }
}
}

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

@ -2,15 +2,14 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("CalculateTask")]
public class CalculateTask : Entity
{
[Table("CalculateTask")]
public class CalculateTask : Entity
{
public Guid ReviewerId { get; set; }
[Required]
public string YearMonth { get; set; } = string.Empty;
public bool IsLock { get; set; }
}
}

9
IRaCIS.Core.Domain/Image/DicomStudy.cs
View File

@ -4,11 +4,11 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("DicomStudy")]
public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId
{
[Table("DicomStudy")]
public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId
{
#region 导航属性
//一个检查 由多个人管理
//public List<TrialSiteUser> TrialSiteUserList { get; set; } = new List<TrialSiteUser>();
@ -108,5 +108,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

9
IRaCIS.Core.Domain/Image/SCPInstance.cs
View File

@ -3,11 +3,11 @@ using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SCPInstance")]
public class SCPInstance : BaseFullAuditEntity, IEntitySeqId
{
[Table("SCPInstance")]
public class SCPInstance : BaseFullAuditEntity, IEntitySeqId
{
#region 导航属性
[JsonIgnore]
[ForeignKey("SeriesId")]
@ -73,5 +73,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

7
IRaCIS.Core.Domain/Image/TaskInstance.cs
View File

@ -2,10 +2,10 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public class TaskInstance : BaseFullAuditEntity, IEntitySeqId
{
public class TaskInstance : BaseFullAuditEntity, IEntitySeqId
{
#region 导航属性
[JsonIgnore]
[ForeignKey("SeriesId")]
@ -53,5 +53,4 @@ namespace IRaCIS.Core.Domain.Models
public long? FileSize { get; set; }
}
}

7
IRaCIS.Core.Domain/Image/TaskSeries.cs
View File

@ -3,10 +3,10 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public class TaskSeries : BaseFullDeleteAuditEntity, IEntitySeqId
{
public class TaskSeries : BaseFullDeleteAuditEntity, IEntitySeqId
{
#region 导航属性
[JsonIgnore]
[ForeignKey("StudyId")]
@ -51,5 +51,4 @@ namespace IRaCIS.Core.Domain.Models
public string ImageResizePath { get; set; }=string.Empty;
}
}

7
IRaCIS.Core.Domain/Image/TaskStudy.cs
View File

@ -3,10 +3,10 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public class TaskStudy : BaseFullDeleteAuditEntity, IEntitySeqId
{
public class TaskStudy : BaseFullDeleteAuditEntity, IEntitySeqId
{
#region 导航属性
[JsonIgnore]
[ForeignKey("VisitTaskId")]
@ -80,5 +80,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

19
IRaCIS.Core.Domain/Image/TrialImageDownload.cs
View File

@ -8,12 +8,12 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 影像下载监控")]
[Table("TrialImageDownload")]
public class TrialImageDownload : BaseFullAuditEntity
{
[Comment("项目 - 影像下载监控")]
[Table("TrialImageDownload")]
public class TrialImageDownload : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
@ -43,14 +43,13 @@ namespace IRaCIS.Core.Domain.Models
public string IP { get; set; }
}
}
public enum ImageType
{
public enum ImageType
{
Dicom = 1,
NoneDicom = 2,
DicomAndNoneDicom = 3
};
}
};

11
IRaCIS.Core.Domain/Management/Menu.cs
View File

@ -4,12 +4,12 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 系统菜单 （需要同步）")]
[Table("Menu")]
public class Menu : BaseFullAuditEntity
{
[Comment("后台 - 系统菜单 （需要同步）")]
[Table("Menu")]
public class Menu : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<UserTypeMenu> UserTypeMenuList { get; set; }
@ -57,5 +57,4 @@ namespace IRaCIS.Core.Domain.Models
public int ShowOrder { get; set; }
}
}

12
IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs
View File

@ -8,12 +8,12 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 系统通知用户类型配置")]
[Table("SystemNoticeUserType")]
public class SystemNoticeUserType : BaseAddAuditEntity
{
[Comment("后台 - 系统通知用户类型配置")]
[Table("SystemNoticeUserType")]
public class SystemNoticeUserType : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
@ -29,6 +29,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

9
IRaCIS.Core.Domain/Management/Role.cs
View File

@ -2,11 +2,11 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("Role")]
public partial class Role : BaseFullAuditEntity
{
[Table("Role")]
public partial class Role : BaseFullAuditEntity
{
#region 导航属性
#endregion
@ -17,5 +17,4 @@ namespace IRaCIS.Core.Domain.Models
public int Status { get; set; }
public int PrivilegeLevel { get; set; } //权限级别
}
}

9
IRaCIS.Core.Domain/Management/User.cs
View File

@ -5,11 +5,11 @@ using System.ComponentModel.DataAnnotations.Schema;
using EntityFrameworkCore.Projectables;
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("User")]
public partial class User : BaseFullAuditEntity
{
[Table("User")]
public partial class User : BaseFullAuditEntity
{
#region 导航属性
[ForeignKey("UserTypeId")]
public UserType UserTypeRole { get; set; }
@ -95,5 +95,4 @@ namespace IRaCIS.Core.Domain.Models
public string FullName => LastName + " / " + FirstName;
//[Projectable] public string FullName => $"{LastName} / {FirstName}";
}
}

13
IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs
View File

@ -10,12 +10,12 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 参与附加评估标准配置")]
[Table("SubjectCriteriaEvaluation")]
public class SubjectCriteriaEvaluation : BaseFullAuditEntity
{
[Comment("受试者 - 参与附加评估标准配置")]
[Table("SubjectCriteriaEvaluation")]
public class SubjectCriteriaEvaluation : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public Subject subject { get; set; }
@ -36,7 +36,4 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialReadingCriterionId { get; set; }
}
}

12
IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs
View File

@ -8,12 +8,12 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 附加评估标准影像筛选检查")]
[Table("SubjectCriteriaEvaluationVisitStudyFilter")]
public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity
{
[Comment("受试者 - 附加评估标准影像筛选检查")]
[Table("SubjectCriteriaEvaluationVisitStudyFilter")]
public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
@ -48,6 +48,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

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

@ -6,11 +6,11 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
[Comment("项目阅片 - 临床数据PDF文件")]
[Table("ReadingClinicalDataPDF")]
public class ReadingClinicalDataPDF : BaseAddAuditEntity
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 临床数据PDF文件")]
[Table("ReadingClinicalDataPDF")]
public class ReadingClinicalDataPDF : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
@ -30,11 +30,7 @@ namespace IRaCIS.Core.Domain.Models
public int Size { get; set; }
public string Type { get; set; } = null!;
}
}

12
IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs
View File

@ -8,12 +8,12 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目标准 - 临床数据配置")]
[Table("TrialClinicalDataSetCriterion")]
public class TrialClinicalDataSetCriterion : BaseFullAuditEntity
{
[Comment("项目标准 - 临床数据配置")]
[Table("TrialClinicalDataSetCriterion")]
public class TrialClinicalDataSetCriterion : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
@ -32,6 +32,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

20
IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs
View File

@ -10,14 +10,14 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.Linq;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
///<summary>
/// 项目临床表格问题
///</summary>
[Table("TrialClinicalTableQuestion")]
public class TrialClinicalTableQuestion : BaseAddAuditEntity
{
///<summary>
/// 项目临床表格问题
///</summary>
[Table("TrialClinicalTableQuestion")]
public class TrialClinicalTableQuestion : BaseAddAuditEntity
{
#region 导航属性
[NotMapped]
@ -134,7 +134,7 @@ namespace IRaCIS.Core.Domain.Models
public string RelevanceValue { get; set; } = string.Empty;
}
}

12
IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs
View File

@ -8,11 +8,11 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
[Comment("受试者 - 阅片模块临床表单")]
[Table("ReadModuleCriterionFrom")]
public class ReadModuleCriterionFrom : BaseAddAuditEntity
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 阅片模块临床表单")]
[Table("ReadModuleCriterionFrom")]
public class ReadModuleCriterionFrom : BaseAddAuditEntity
{
#region 导航属性
@ -45,4 +45,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

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

@ -6,14 +6,14 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
///<summary>
/// 项目阅片标准
///</summary>
[Table("ReadingQuestionCriterionTrial")]
public class ReadingQuestionCriterionTrial : BaseAddAuditEntity
{
///<summary>
/// 项目阅片标准
///</summary>
[Table("ReadingQuestionCriterionTrial")]
public class ReadingQuestionCriterionTrial : BaseAddAuditEntity
{
#region 导航属性
[ForeignKey("TrialId")]
[JsonIgnore]
@ -286,10 +286,10 @@ namespace IRaCIS.Core.Domain.Models
/// 是否影像筛选
/// </summary>
public bool IsImageFilter { get; set; }
}
}
public enum ReadingImageDownload
{
public enum ReadingImageDownload
{
None = 0,
/// <summary>
@ -297,10 +297,10 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
Subejct = 1,
Visit = 2,
}
}
public enum ReadingImageUpload
{
public enum ReadingImageUpload
{
None = 0,
/// <summary>
@ -309,18 +309,15 @@ namespace IRaCIS.Core.Domain.Models
IRReadingSubejctEnable = 1,
IRReadingVisitEnable = 2,
}
}
public enum ReadingOrder
{
public enum ReadingOrder
{
Random = 0,
InOrder = 1,
SubjectRandom = 2,
}
}

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

@ -8,12 +8,12 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目标准使用字典")]
[Table("TrialCriterionDictionaryCode")]
public class TrialCriterionDictionaryCode : BaseAddAuditEntity
{
[Comment("项目 - 项目标准使用字典")]
[Table("TrialCriterionDictionaryCode")]
public class TrialCriterionDictionaryCode : BaseAddAuditEntity
{
#region 导航属性
[ForeignKey("TrialCriterionId")]
[JsonIgnore]
@ -27,7 +27,7 @@ namespace IRaCIS.Core.Domain.Models
}
}

20
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs
View File

@ -10,14 +10,14 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.Linq;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
///<summary>
///系统表格问题
///</summary>
[Table("ReadingTableQuestionSystem")]
public class ReadingTableQuestionSystem : BaseAddAuditEntity
{
///<summary>
///系统表格问题
///</summary>
[Table("ReadingTableQuestionSystem")]
public class ReadingTableQuestionSystem : BaseAddAuditEntity
{
#region 导航属性
[ForeignKey("DependParentId")]
[JsonIgnore]
@ -206,7 +206,7 @@ namespace IRaCIS.Core.Domain.Models
public QuestionClassify? QuestionClassify { get; set; }
}
}

20
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
View File

@ -10,14 +10,14 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.Linq;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
///<summary>
/// 项目阅片问题
///</summary>
[Table("ReadingTableQuestionTrial")]
public class ReadingTableQuestionTrial : BaseAddAuditEntity
{
///<summary>
/// 项目阅片问题
///</summary>
[Table("ReadingTableQuestionTrial")]
public class ReadingTableQuestionTrial : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("DependParentId")]
@ -217,7 +217,7 @@ namespace IRaCIS.Core.Domain.Models
}
}

13
IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs
View File

@ -11,12 +11,12 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 表格问题行记录")]
[Table("ReadingTableAnswerRowInfo")]
public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity
{
[Comment("项目阅片 - 表格问题行记录")]
[Table("ReadingTableAnswerRowInfo")]
public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("InstanceId")]
@ -171,7 +171,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

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

@ -8,12 +8,12 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("用户配置 - WL模板")]
[Table("UserWLTemplate")]
public class UserWLTemplate : BaseAddAuditEntity
{
[Comment("用户配置 - WL模板")]
[Table("UserWLTemplate")]
public class UserWLTemplate : BaseAddAuditEntity
{
#region 导航属性
#endregion
@ -31,7 +31,4 @@ namespace IRaCIS.Core.Domain.Models
public bool IsPitchOn { get; set; } = true;
}
}

16
IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs
View File

@ -8,14 +8,14 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
///<summary>
///RECIST1Point1肿瘤评估(系统标准)
///</summary>
[Table("TumorAssessment_RECIST1Point1")]
public class TumorAssessment_RECIST1Point1 : Entity
{
///<summary>
///RECIST1Point1肿瘤评估(系统标准)
///</summary>
[Table("TumorAssessment_RECIST1Point1")]
public class TumorAssessment_RECIST1Point1 : Entity
{
[Comment("靶病灶")]
public TargetAssessment TargetLesion { get; set; }
@ -28,6 +28,4 @@ namespace IRaCIS.Core.Domain.Models
[Comment("整体疗效")]
public OverallAssessment OverallEfficacy { get; set; }
}
}

18
IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs
View File

@ -8,14 +8,14 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
///<summary>
///RECIST1Point1BM肿瘤评估(系统标准)
///</summary>
[Table("TumorAssessment_RECIST1Point1BM")]
public class TumorAssessment_RECIST1Point1BM : Entity
{
///<summary>
///RECIST1Point1BM肿瘤评估(系统标准)
///</summary>
[Table("TumorAssessment_RECIST1Point1BM")]
public class TumorAssessment_RECIST1Point1BM : Entity
{
[Comment("靶病灶")]
public TargetAssessment TargetLesion { get; set; }
@ -28,6 +28,6 @@ namespace IRaCIS.Core.Domain.Models
[Comment("整体疗效")]
public OverallAssessment OverallEfficacy { get; set; }
}
}

12
IRaCIS.Core.Domain/Trial/TrialStateChange.cs
View File

@ -6,12 +6,12 @@
using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目状态变更记录表")]
[Table("TrialStateChange")]
public class TrialStateChange : BaseAddAuditEntity
{
[Comment("项目 - 项目状态变更记录表")]
[Table("TrialStateChange")]
public class TrialStateChange : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialId")]
@ -32,6 +32,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

11
IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs
View File

@ -4,12 +4,12 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("ÏîÄ¿ - Èë×éÁ÷³Ì¼Ç¼")]
[Table("TrialStatus")]
public partial class TrialStatusDetail : BaseAddAuditEntity
{
[Comment("ÏîÄ¿ - Èë×éÁ÷³Ì¼Ç¼")]
[Table("TrialStatus")]
public partial class TrialStatusDetail : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<EnrollDetail> IntoGroupDetails { get; set; }
@ -28,5 +28,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

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

@ -1,10 +1,10 @@
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public class TrialAudit : Entity
{
public class TrialAudit:Entity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
@ -24,11 +24,10 @@ namespace IRaCIS.Core.Domain.Models
public string OptUser { get; set; } = string.Empty;
public DateTime OptTime { get; set; }=DateTime.Now;
public DateTime OptTime { get; set; } = DateTime.Now;
public string Note { get; set; } = string.Empty;
public string Detail { get; set; } = string.Empty;
}
}

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

@ -7,14 +7,14 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
///<summary>
///TrialUserPreparation
///</summary>
[Table("TrialUserPreparation ")]
public class TrialUserPreparation : BaseFullAuditEntity
{
///<summary>
///TrialUserPreparation
///</summary>
[Table("TrialUserPreparation ")]
public class TrialUserPreparation : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
@ -37,6 +37,6 @@ namespace IRaCIS.Core.Domain.Models
}
}

23
IRaCIS.Core.Domain/Visit/SubjectVisit.cs
View File

@ -4,11 +4,11 @@ using System.ComponentModel.DataAnnotations.Schema;
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SubjectVisit")]
public class SubjectVisit : BaseFullDeleteAuditEntity
{
[Table("SubjectVisit")]
public class SubjectVisit : BaseFullDeleteAuditEntity
{
#region 导航属性
@ -227,13 +227,13 @@ namespace IRaCIS.Core.Domain.Models
public PackState NoDicomPackState { get; set; }
public string VisitNoDicomImageZipPath { get; set;} = string.Empty;
}
/// <summary>
/// 影像下载打包状态
/// </summary>
public enum PackState
{
public string VisitNoDicomImageZipPath { get; set; } = string.Empty;
}
/// <summary>
/// 影像下载打包状态
/// </summary>
public enum PackState
{
/// <summary>
/// 待打包
@ -249,5 +249,4 @@ namespace IRaCIS.Core.Domain.Models
/// 打包完成
/// </summary>
Packed = 2
}
}

1
IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
View File

@ -227,7 +227,6 @@ public class IRaCISDBContext : DbContext
public virtual DbSet<ResearchPublication> ResearchPublications { get; set; }
public virtual DbSet<TrialExperience> TrialExperience { get; set; }
public virtual DbSet<UserDoctor> UserDoctor { get; set; }
public virtual DbSet<Vacation> Vacation { get; set; }
public virtual DbSet<Attachment> Attachment { get; set; }