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

同步数据模型和数据库对应关系2
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-09-19 23:45:43 +08:00
parent 19f4385055
commit 42e4fe59ec
73 changed files with 1760 additions and 1934 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,11 +9,12 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.ComponentModel;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
[Description("受试者某标准阅片用户中间关系表")]
[Comment("受试者 - 项目标准阅片医生配置表")]
[Table("SubjectUser")]
public class SubjectUser : BaseFullAuditEntity
{
@ -39,25 +40,23 @@ namespace IRaCIS.Core.Domain.Models
public Subject Subject { get; set; }
#endregion
public Guid TrialId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Arm ArmEnum { get; set; }
public DateTime? AssignTime { get; set; }
public Guid SubjectId { get; set; }
public Guid DoctorUserId { get; set; }
public bool IsConfirmed { get; set; }
public Arm ArmEnum { get; set; }
public bool IsConfirmed { get; set; } = true;
//该属性有值 说明该医生被替换了 分配的时候 要过滤掉
[Comment("该属性有值 说明该医生被替换了 分配的时候 要过滤掉")]
public Guid? ReplacedSubjectUserId { get; set; }
public Guid SubjectId { get; set; }
public Guid TrialId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
}

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

@ -8,12 +8,11 @@ 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
{
///<summary>
///TaskAllocationRule
///</summary>
[Comment("项目阅片 - 分配规则")]
[Table("TaskAllocationRule")]
public class TaskAllocationRule : BaseFullAuditEntity
{
@ -31,23 +30,22 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public Guid TrialId { get; set; }
public int PlanSubjectCount { get; set; }
public Guid DoctorUserId { get; set; }
[Comment(" 入组表Id 可以去掉 TrialId DoctorUserId")]
public Guid EnrollId { get; set; }
public bool IsEnable { get; set; }
public string Note { get; set; } = string.Empty;
public Guid DoctorUserId { get; set; }
public Guid EnrollId { get; set; }
//是否是裁判医生 裁判医生单独加入
public bool IsJudgeDoctor { get; set; }
public string Note { get; set; } = null!;
[Comment(" 计划比率")]
public int PlanReadingRatio { get; set; }
public int PlanSubjectCount { get; set; }

61
IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs
View File

@ -7,54 +7,53 @@ using System;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.Linq;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 一致性分析生成任务配置")]
[Table("TaskConsistentRule")]
public class TaskConsistentRule : BaseFullAuditEntity
{
///<summary>
///TaskConsistentRule
///</summary>
[Table("TaskConsistentRule")]
public class TaskConsistentRule : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
#endregion
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
#endregion
public Guid TrialId { get; set; }
public int PlanSubjectCount { get; set; }
public int PlanVisitCount { get; set; }
public int IntervalWeeks { get; set; }
public Guid TrialId { get; set; }
public bool IsHaveReadingPeriod { get; set; }
public int PlanSubjectCount { get; set; }
public bool IsGenerateGlobalTask { get; set; }
public int PlanVisitCount { get; set; }
public int BlindSubjectNumberOfPlaces { get; set; }
public int IntervalWeeks { get; set; }
public string BlindTrialSiteCode { get; set; } = string.Empty;
public bool IsHaveReadingPeriod { get; set; }
public bool IsSelfAnalysis { get; set; }
public bool IsGenerateGlobalTask { get; set; }
public bool IsEnable { get; set; }
public int BlindSubjectNumberOfPlaces { get; set; }
public string Note { get; set; }=string.Empty;
public string BlindTrialSiteCode { get; set; } = string.Empty;
public bool IsSelfAnalysis { get; set; }
public bool IsEnable { get; set; }
public string Note { get; set; } = string.Empty;
public Guid TrialReadingCriterionId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
}
}
}

65
IRaCIS.Core.Domain/Allocation/TaskInfluence.cs
View File

@ -7,47 +7,44 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 退回重阅影响")]
[Table("TaskInfluence")]
public class TaskInfluence : BaseAddAuditEntity
{
///<summary>
///TaskInfluence
///</summary>
[Table("TaskInfluence")]
public class TaskInfluence : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
public VisitTask OriginalTask { get; set; }
#region 导航属性
[JsonIgnore]
public VisitTask OriginalTask { get; set; }
[JsonIgnore]
public VisitTask InfluenceTask { get; set; }
#endregion
[JsonIgnore]
public VisitTask InfluenceTask { get; set; }
#endregion
public Guid OriginalTaskId { get; set; }
public Guid OriginalTaskId { get; set; }
public Guid InfluenceTaskId { get; set; }
public Guid InfluenceTaskId { get; set; }
//对影响任务进行的操作
public ReReadingOrBackOptType OptType { get; set; }
[Comment(" 对影响任务进行的操作")]
public ReReadingOrBackOptType OptType { get; set; }
}
public enum ReReadingOrBackOptType
{
//取消分配
CancelAssign = 0,
//失效
Abandon = 1,
//重阅重置
Return = 2,
}
}
public enum ReReadingOrBackOptType
{
//取消分配
CancelAssign = 0,
//失效
Abandon = 1,
//重阅重置
Return = 2,
}

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

@ -10,6 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
@ -19,9 +20,7 @@ namespace IRaCIS.Core.Domain.Models
public string ImagePath { get; set; } = string.Empty;
}
///<summary>
///TaskMedicalReview
///</summary>
[Comment("项目阅片 - 医学审核")]
[Table("TaskMedicalReview")]
public class TaskMedicalReview : BaseFullAuditEntity
{

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

@ -8,18 +8,18 @@ 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
{
///<summary>
///TaskTaskMedicalReviewRule
///</summary>
[Table("TaskMedicalReviewRule")]
public class TaskMedicalReviewRule :BaseFullAuditEntity
[Comment("项目阅片 - 一致性分析规则")]
[Table("TaskMedicalReviewRule")]
public class TaskMedicalReviewRule :BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public User DoctorUser { get; set; }
#endregion
public Guid DoctorUserId { get; set; }
@ -38,8 +38,7 @@ namespace IRaCIS.Core.Domain.Models
public int PlanTumorCount { get; set; }
[JsonIgnore]
public User DoctorUser { get; set; }

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

@ -7,13 +7,12 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///TrialVirtualSiteCodeUpdate
///</summary>
[Table("TrialVirtualSiteCodeUpdate")]
public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity
[Comment("项目 - 虚拟中心编号更新记录")]
[Table("TrialVirtualSiteCodeUpdate")]
public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity
{
#region 导航属性
@ -21,13 +20,13 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public Guid TrialId { get; set; }
public string VirturalSiteCode { get; set; } = string.Empty;
[StringLength(250)]
public string VirturalSiteCode { get; set; } = string.Empty;
}
}
}

97
IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs
View File

@ -8,72 +8,67 @@ 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
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 阅片任务重阅表")]
[Table("VisitTaskReReading")]
public class VisitTaskReReading : BaseFullAuditEntity
{
///<summary>
///重阅申请流程记录表
///</summary>
[Table("VisitTaskReReading")]
public class VisitTaskReReading : BaseFullAuditEntity
{
#region 导航属性
#region 导航属性
[JsonIgnore]
public User RequestReReadingUser { get; set; }
[JsonIgnore]
public User RequestReReadingUser { get; set; }
[JsonIgnore]
public VisitTask NewReReadingTask { get; set; }
[JsonIgnore]
public VisitTask RootReReadingTask { get; set; }
[JsonIgnore]
public VisitTask OriginalReReadingTask { get; set; }
[JsonIgnore]
public User RequestReReadingConfirmUser { get; set; }
[JsonIgnore]
public VisitTask NewReReadingTask { get; set; }
[JsonIgnore]
public VisitTask RootReReadingTask { get; set; }
[JsonIgnore]
public VisitTask OriginalReReadingTask { get; set; }
[JsonIgnore]
public User RequestReReadingConfirmUser { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
#endregion
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
[Comment(" 重阅原始任务Id")]
public Guid OriginalReReadingTaskId { get; set; }
//重阅原始任务Id 重阅会产生新的任务
public Guid OriginalReReadingTaskId { get; set; }
[Comment(" 重阅确认人")]
public Guid? RequestReReadingConfirmUserId { get; set; }
//产生重阅的根任务Id
public Guid RootReReadingTaskId { get; set; }
[Comment(" 请求重阅人")]
public Guid RequestReReadingUserId { get; set; }
//重阅申请 产生的新任务Id
public Guid? NewReReadingTaskId { get; set; }
public Guid RootReReadingTaskId { get; set; }
[Comment("仅仅包括全局和访视")]
public bool IsCopyFollowForms { get; set; }
public Guid RequestReReadingUserId { get; set; }
[Comment(" 是否复制之前任务表单数据")]
public bool IsCopyOrigenalForms { 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;
public RequestReReadingResult RequestReReadingResultEnum { get; set; }
public Guid? RequestReReadingConfirmUserId { get; set; }
public bool IsCopyOrigenalForms { get; set; }
//仅仅包括全局和访视
public bool IsCopyFollowForms { get; set; }
public Guid? NewReReadingTaskId { get; set; }
[StringLength(512)]
public string RequestReReadingReason { get; set; } = null!;
public string RequestReReadingRejectReason { get; set; } = null!;
public RequestReReadingResult RequestReReadingResultEnum { get; set; }
public DateTime? RequestReReadingTime { get; set; }
public RequestReReadingType RequestReReadingType { get; set; }
}
}

2
IRaCIS.Core.Domain/Common/Internationalization.cs
View File

@ -41,7 +41,7 @@ public class Internationalization : BaseFullAuditEntity
public int ShowOrder { get; set; }
[Comment(" 0 1 2 预翻译 已确认 废除")]
//[Comment(" 0 1 2 预翻译 已确认 废除")]
public int State { get; set; }
[StringLength(2000)]

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

@ -25,26 +25,30 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public string Name { get; set; }=string.Empty;
public string Value { get; set; } = string.Empty;
public BasicDataTypeEnum BasicDataTypeEnum { get; set; }
public string Description { get; set; } = string.Empty;
[StringLength(512)]
public string Code { get; set; } = null!;
public int ShowOrder { get; set; }
[StringLength(512)]
public string Description { get; set; } = null!;
public string Code { get; set; } = string.Empty;
public bool IsEnable { get; set; }
[StringLength(400)]
public string Name { get; set; } = null!;
public Guid? ParentId { get; set; }
public int ShowOrder { get; set; }
public string ValueCN { get; set; } = string.Empty;
[StringLength(512)]
public string Value { get; set; } = null!;
public bool IsEnable { get; set; }
[StringLength(512)]
public string ValueCN { get; set; } = null!;
public BasicDataTypeEnum BasicDataTypeEnum { get; set; }
}
}
}

29
IRaCIS.Core.Domain/Common/VerificationCode.cs
View File

@ -1,29 +1,26 @@
using IRaCIS.Core.Domain.Share;
using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 验证码记录")]
[Table("VerificationCode")]
public class VerificationCode : BaseAddAuditEntity
{
[Table("VerificationCode")]
public class VerificationCode:BaseAddAuditEntity
{
public Guid UserId { get; set; } = Guid.Empty;
//验证码
public string Code { get; set; } = string.Empty;
public Guid UserId { get; set; } = Guid.Empty;
//什么类型的验证码 邮箱|手机
public string Code { get; set; } = string.Empty;
public VerifyType CodeType { get; set; }
[Comment("邮箱|手机")]
public VerifyType CodeType { get; set; }
public bool HasSend { get; set; }
public bool HasSend { get; set; }
//发送的邮箱或者手机
public string EmailOrPhone { get; set; }=string.Empty;
public string EmailOrPhone { get; set; } = string.Empty;
//过期时间
public DateTime ExpirationTime { get; set; }
public DateTime ExpirationTime { get; set; }
}
}

6
IRaCIS.Core.Domain/Dcotor/TrialExperience.cs
View File

@ -1,3 +1,4 @@
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@ -5,6 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
[Comment("医生 - 项目临床经历")]
[Table("TrialExperience")]
public partial class TrialExperience : BaseFullAuditEntity
{
@ -12,6 +14,8 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public List<TrialExperienceCriteria> ExperienceCriteriaList { get; set; }
[JsonIgnore]
public Dictionary Phase { get; set; }
#endregion
@ -19,7 +23,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid? PhaseId { get; set; }
public Dictionary Phase { get; set; }
[StringLength(512)]
public string EvaluationContent { get; set; } = string.Empty;

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

@ -1,8 +1,10 @@
using System;
using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
[Comment("医生 - 假期安排")]
[Table("Vacation")]
public class Vacation : BaseFullAuditEntity
{

43
IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs
View File

@ -3,41 +3,38 @@
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-01-14 15:04:22
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
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("SystemDocConfirmedUser")]
public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity
{
///<summary>
///SystemDocConfirmedUser
///</summary>
[Table("SystemDocConfirmedUser")]
public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity
#region 导航属性
[JsonIgnore]
public SystemDocument SystemDocument { get; set; }
{
#region 导航属性
[JsonIgnore]
public SystemDocument SystemDocument { get; set; }
[JsonIgnore]
[ForeignKey("ConfirmUserId")]
public User ConfirmUser { get; set; }
#endregion
[JsonIgnore]
[ForeignKey("ConfirmUserId")]
public User ConfirmUser { get; set; }
#endregion
public Guid SystemDocumentId { get; set; }
public DateTime? ConfirmTime { get; set; }
public DateTime? ConfirmTime { get; set; }
public Guid ConfirmUserId { get; set; }
public DateTime? SignFirstViewTime { get; set; }
public Guid ConfirmUserId { get; set; }
[StringLength(1024)]
public string SignText { get; set; } = null!;
public DateTime? SignFirstViewTime { get; set; }
public Guid SystemDocumentId { get; set; }
public string SignText { get; set; } = string.Empty;
}
}

39
IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs
View File

@ -3,31 +3,30 @@
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-01-14 15:04:23
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
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("SystemDocNeedConfirmedUserType")]
public class SystemDocNeedConfirmedUserType : Entity
{
///<summary>
///SystemDocNeedConfirmedUserType
///</summary>
[Table("SystemDocNeedConfirmedUserType")]
public class SystemDocNeedConfirmedUserType : Entity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("NeedConfirmUserTypeId")]
public UserType UserTypeRole { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("NeedConfirmUserTypeId")]
public UserType UserTypeRole { get; set; }
[JsonIgnore]
public SystemDocument SystemDocument { get; set; }
#endregion
[JsonIgnore]
public SystemDocument SystemDocument { get; set; }
#endregion
public Guid SystemDocumentId { get; set; }
public Guid NeedConfirmUserTypeId { get; set; }
}
public Guid SystemDocumentId { get; set; }
public Guid NeedConfirmUserTypeId { get; set; }
}
}

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

@ -28,16 +28,16 @@ namespace IRaCIS.Core.Domain.Models
public Guid FileTypeId { get; set; }
[StringLength(2000)]
public string Name { get; set; } = null!;
public string Name { get; set; } = string.Empty;
[StringLength(2000)]
public string Path { get; set; } = null!;
public int SignViewMinimumMinutes { get; set; }
public string Path { get; set; } = string.Empty;
public int SignViewMinimumMinutes { get; set; }
}
}
}

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

@ -3,16 +3,15 @@
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-01-05 18:02:45
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///TrialDocUserTypeConfirmUser
///</summary>
[Table("TrialDocConfirmedUser")]
public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity
[Comment("项目 - 项目文档签署记录")]
[Table("TrialDocConfirmedUser")]
public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity
{
#region 导航属性
@ -37,8 +36,8 @@ namespace IRaCIS.Core.Domain.Models
public DateTime? SignFirstViewTime { get; set; }
public string SignText { get; set; } = string.Empty;
[StringLength(512)]
public string SignText { get; set; } = string.Empty;

37
IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs
View File

@ -3,34 +3,33 @@
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-01-05 09:11:50
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
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("TrialDocNeedConfirmedUserType")]
public class TrialDocNeedConfirmedUserType : Entity
{
///<summary>
///TrialDocumentUserConfirm
///</summary>
[Table("TrialDocNeedConfirmedUserType")]
public class TrialDocNeedConfirmedUserType : Entity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("NeedConfirmUserTypeId")]
public UserType UserTypeRole { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("NeedConfirmUserTypeId")]
public UserType UserTypeRole { get; set; }
[JsonIgnore]
public TrialDocument TrialDocument { get; set; }
#endregion
[JsonIgnore]
public TrialDocument TrialDocument { get; set; }
#endregion
public Guid TrialDocumentId { get; set; }
public Guid NeedConfirmUserTypeId { get; set; }
public Guid TrialDocumentId { get; set; }
public Guid NeedConfirmUserTypeId { get; set; }
}
}
}

56
IRaCIS.Core.Domain/Document/TrialDocument.cs
View File

@ -3,47 +3,47 @@
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-01-05 09:11:50
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
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("TrialDocument")]
public class TrialDocument : BaseFullDeleteAuditEntity
{
///<summary>
///TrialDocument
///</summary>
[Table("TrialDocument")]
public class TrialDocument : BaseFullDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<TrialDocConfirmedUser> TrialDocConfirmedUserList { get; set; }
[JsonIgnore]
public List<TrialDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
#region 导航属性
[JsonIgnore]
public List<TrialDocConfirmedUser> TrialDocConfirmedUserList { get; set; }
[JsonIgnore]
public List<TrialDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
[ForeignKey("FileTypeId")]
public Dictionary FileType { get; set; }
#endregion
//需要确认的项目用户 通过TrialId 关联 用中间表过滤
[JsonIgnore]
[ForeignKey("FileTypeId")]
public Dictionary FileType { get; set; }
#endregion
//需要确认的项目用户 通过TrialId 关联 用中间表过滤
public Guid FileTypeId { get; set; }
public Guid FileTypeId { get; set; }
public string Name { get; set; } = string.Empty;
public string Name { get; set; } = string.Empty;
public string Path { get; set; } = string.Empty;
public string Path { get; set; } = string.Empty;
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public string Description { get; set; } = string.Empty;
[StringLength(1000)]
public string Description { get; set; } = string.Empty;
public int SignViewMinimumMinutes { get; set; }
public int SignViewMinimumMinutes { get; set; }
}
}
}

149
IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
View File

@ -9,124 +9,109 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.Linq;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目发送邮件配置")]
[Table("TrialEmailNoticeConfig")]
public class TrialEmailNoticeConfig : BaseFullDeleteAuditEntity
{
///<summary>
///TrialEmailNoticeConfig
///</summary>
[Table("TrialEmailNoticeConfig")]
public class TrialEmailNoticeConfig : BaseFullDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
public Trial Trial { get; set; }
[JsonIgnore]
public List<TrialEmailNoticeUser> TrialEmailNoticeUserList { get; set; } = new List<TrialEmailNoticeUser>();
[JsonIgnore]
public List<TrialEmailBlackUser> TrialEmailBlackUserList { get; set; } = new List<TrialEmailBlackUser>();
[JsonIgnore]
public List<TrialEmailNoticeUser> TrialEmailNoticeUserList { get; set; } = new List<TrialEmailNoticeUser>();
[JsonIgnore]
public List<TrialEmailBlackUser> TrialEmailBlackUserList { get; set; } = new List<TrialEmailBlackUser>();
[JsonIgnore]
[JsonIgnore]
public EmailNoticeConfig SysEmailNoticeConfig { get; set; }
[ForeignKey("TrialReadingCriterionId")]
[JsonIgnore]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
public EmailNoticeConfig SysEmailNoticeConfig { get; set; }
[ForeignKey("TrialReadingCriterionId")]
[JsonIgnore]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
#endregion
#endregion
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public string AttachCNPath { get; set; } = null!;
public string AttachName { get; set; } = null!;
public string SMTPServerAddress { get; set; } = string.Empty;
public string AttachNameCN { get; set; } = null!;
public int SMTPServerPort { get; set; }
public string AttachPath { get; set; } = null!;
public string AuthorizationCode { get; set; } = string.Empty;
public string AuthorizationCode { get; set; } = null!;
public int BusinessLevelEnum { get; set; }
public string FromName { get; set; } = string.Empty;
public int BusinessModuleEnum { get; set; }
public EmailBusinessScenario BusinessScenarioEnum { get; set; }
public string FromEmail { get; set; } = string.Empty;
public string Code { get; set; } = null!;
public CriterionType? CriterionTypeEnum { get; set; }
public string Description { get; set; } = null!;
/// <summary> 业务模块 /// </summary>
public int BusinessModuleEnum { get; set; }
public string EmailCron { get; set; } = null!;
/// <summary> 业务层级 /// </summary>
public int BusinessLevelEnum { get; set; }
[MaxLength]
public string? EmailHtmlContent { get; set; }
[MaxLength]
public string? EmailHtmlContentCN { get; set; }
/// <summary> 邮件加急类型 /// </summary>
public int EmailUrgentEnum { get; set; }
public string EmailTopic { get; set; } = null!;
/// <summary> 定时周期 /// </summary>
public string EmailCron { get; set; } = string.Empty;
public string EmailTopicCN { get; set; } = null!;
/// <summary> 邮件主题 /// </summary>
public string EmailTopic { get; set; } = string.Empty;
public int EmailTypeEnum { get; set; }
public string EmailTopicCN { get; set; } = string.Empty;
public int EmailUrgentEnum { get; set; }
/// <summary> 附件 /// </summary>
public string AttachPath { get; set; } = string.Empty;
public string FromEmail { get; set; } = null!;
public string AttachCNPath { get; set; } = string.Empty;
public string FromName { get; set; } = null!;
public string Description { get; set; } = string.Empty;
public bool IsAutoSend { get; set; }
public bool IsDistinguishCriteria { get; set; }
public string AttachName { get; set; } = string.Empty;
public string AttachNameCN { get; set; } = string.Empty;
public bool IsEnable { get; set; }
public bool IsReturnRequired { get; set; }
public string EmailHtmlContent { get; set; } = string.Empty;
public string EmailHtmlContentCN { get; set; } = string.Empty;
public string SMTPServerAddress { get; set; } = null!;
public int SMTPServerPort { get; set; }
public Guid? SysEmailNoticeConfigId { get; set; }
public Guid? SysEmailNoticeConfigId { get; set; }
[Required]
public string Code { get; set; } = string.Empty;
[Required]
public bool IsReturnRequired { get; set; }
[Required]
public bool IsAutoSend { get; set; }
public bool IsEnable { get; set; }
public EmailBusinessScenario BusinessScenarioEnum { get; set; }
public CriterionType? CriterionTypeEnum { get; set; }
public Guid? TrialReadingCriterionId { get; set; }
}
public class TrialEmailBlackUser : Entity
{
[JsonIgnore]
public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; }
[JsonIgnore]
public User User { get; set; }
public Guid TrialEmailNoticeConfigId { get; set; }
public Guid UserId { get; set; }
}
public Guid? TrialReadingCriterionId { get; set; }
}
[Comment("项目 - 项目邮件用户黑名单")]
[Table("TrialEmailBlackUser")]
public class TrialEmailBlackUser : Entity
{
[JsonIgnore]
public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; }
[JsonIgnore]
public User User { get; set; }
public Guid TrialEmailNoticeConfigId { get; set; }
public Guid UserId { get; set; }
}

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

@ -7,23 +7,19 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///TrialEmailNoticeUser
///</summary>
[Table("TrialEmailNoticeUser")]
public class TrialEmailNoticeUser : Entity
[Comment("项目 - 项目邮件收发配置用户类型")]
[Table("TrialEmailNoticeUser")]
public class TrialEmailNoticeUser : Entity
{
#region 导航属性
#region 导航属性
[JsonIgnore]
public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; }
#endregion
#endregion
[JsonIgnore]
public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; }
public UserTypeEnum UserType { get; set; }
public UserTypeEnum UserType { get; set; }
public Guid TrialEmailNoticeConfigId { get; set; }

48
IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs
View File

@ -1,29 +1,35 @@
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("TrialPaymentPrice")]
public class TrialPaymentPrice : BaseFullAuditEntity
{
[Table("TrialPaymentPrice")]
public partial class TrialPaymentPrice : BaseFullAuditEntity
{
public Guid TrialId { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
public Trial Trial { get; set; }
[Column(TypeName = "decimal(18,2)")]
public decimal TrialAdditional { get; set; } = 0;
public string SowName { get; set; } = string.Empty;
public string SowPath { get; set; } = string.Empty;
[Column(TypeName = "decimal(18,2)")]
public decimal AdjustmentMultiple { get; set; } = 1;
/// <summary>
/// ÊÇ·ñÓРΪÐÂÏîÄ¿
/// </summary>
public bool? IsNewTrial { get; set; } = false;
public Guid TrialId { get; set; }
}
[DecimalPrecision(18, 2)]
public decimal AdjustmentMultiple { get; set; }
[Comment(" 是否为新项目")]
public bool? IsNewTrial { get; set; }
public string SowName { get; set; } = null!;
[StringLength(500)]
public string SowPath { get; set; } = null!;
[DecimalPrecision(18, 2)]
public decimal TrialAdditional { get; set; }
}

57
IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs
View File

@ -1,42 +1,45 @@
using System;
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("TrialRevenuesPrice")]
public class TrialRevenuesPrice : BaseFullAuditEntity
{
[Table("TrialRevenuesPrice")]
public class TrialRevenuesPrice : BaseFullAuditEntity
{
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
[Column(TypeName = "decimal(18,2)")]
public decimal Timepoint { get; set; }
[DecimalPrecision(18, 2)]
public decimal Adjudication { get; set; }
[Column(TypeName = "decimal(18,2)")]
public decimal TimepointIn24H { get; set; }
[DecimalPrecision(18, 2)]
public decimal AdjudicationIn24H { get; set; }
[Column(TypeName = "decimal(18,2)")]
public decimal TimepointIn48H { get; set; }
[DecimalPrecision(18, 2)]
public decimal AdjudicationIn48H { get; set; }
[Column(TypeName = "decimal(18,2)")]
public decimal Adjudication { get; set; }
[DecimalPrecision(18, 2)]
public decimal Downtime { get; set; }
[Column(TypeName = "decimal(18,2)")]
public decimal AdjudicationIn24H { get; set; }
[DecimalPrecision(18, 2)]
public decimal Global { get; set; }
[Column(TypeName = "decimal(18,2)")]
public decimal AdjudicationIn48H { get; set; }
[DecimalPrecision(18, 2)]
public decimal RefresherTraining { get; set; }
[Column(TypeName = "decimal(18,2)")]
public decimal Global { get; set; }
[DecimalPrecision(18, 2)]
public decimal Timepoint { get; set; }
[Column(TypeName = "decimal(18,2)")]
public decimal Training { get; set; }
[DecimalPrecision(18, 2)]
public decimal TimepointIn24H { get; set; }
[Column(TypeName = "decimal(18,2)")]
public decimal Downtime { get; set; }
[DecimalPrecision(18, 2)]
public decimal TimepointIn48H { get; set; }
[DecimalPrecision(18, 2)]
public decimal Training { get; set; }
[Column(TypeName = "decimal(18,2)")]
public decimal RefresherTraining { get; set; }
}
}

46
IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs
View File

@ -1,33 +1,41 @@
using System;
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("TrialRevenuesPriceVerification")]
public class TrialRevenuesPriceVerification : Entity
{
public class TrialRevenuesPriceVerification : Entity
{
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public Guid ReviewerId { get; set; }
public bool Adjudication { get; set; }
public string YearMonth { get; set; } = string.Empty;
public bool AdjudicationIn24H { get; set; }
public bool Training { get; set; } = false;
public bool AdjudicationIn48H { get; set; }
public bool Downtime { get; set; } = false;
public bool Downtime { get; set; }
public bool Global { get; set; } = false;
public bool Global { get; set; }
public bool Timepoint { get; set; } = false;
public bool RefresherTraining { get; set; }
public bool TimepointIn24H { get; set; } = false;
public Guid ReviewerId { get; set; }
public bool TimepointIn48H { get; set; } = false;
[Comment(" false代表没有价格")]
public bool Timepoint { get; set; }
public bool Adjudication { get; set; } = false;
public bool TimepointIn24H { get; set; }
public bool AdjudicationIn24H { get; set; } = false;
public bool TimepointIn48H { get; set; }
public bool AdjudicationIn48H { get; set; } = false;
public bool RefresherTraining { get; set; } = false;
public DateTime WorkLoadDate { get; set; }
}
public bool Training { get; set; }
public DateTime? WorkLoadDate { get; set; }
[StringLength(400)]
public string YearMonth { get; set; } = null!;
}

22
IRaCIS.Core.Domain/Financial/VolumeReward.cs
View File

@ -1,15 +1,17 @@
using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
[Table("VolumeReward")]
public partial class VolumeReward : BaseFullAuditEntity
{
[Column(TypeName = "decimal(18,2)")]
public decimal Price { get; set; }
public int Min { get; set; }
public int Max { get; set; }
namespace IRaCIS.Core.Domain.Models;
[Comment("医生计费 - 奖励")]
[Table("VolumeReward")]
public partial class VolumeReward : BaseFullAuditEntity
{
[DecimalPrecision(18, 2)]
public decimal Price { get; set; }
public int Min { get; set; }
public int Max { get; set; }
}
}

57
IRaCIS.Core.Domain/Image/SystemAnonymization.cs
View File

@ -3,45 +3,38 @@
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-03-03 15:26:35
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
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("SystemAnonymization")]
public class SystemAnonymization : BaseFullAuditEntity
{
///<summary>
///SystemAnonymization
///</summary>
[Table("SystemAnonymization")]
public class SystemAnonymization : BaseFullAuditEntity
{
#region 导航属性
#region 导航属性
#endregion
public string Group { get; set; } = String.Empty;
#endregion
public string Element { get; set; } = null!;
public string Element { get; set; } = String.Empty;
public string Group { get; set; } = null!;
public bool IsAdd { get; set; }
public bool IsEnable { get; set; }
public bool IsFixed { get; set; }
public string ReplaceValue { get; set; } = null!;
public string TagDescription { get; set; } = null!;
public string TagDescriptionCN { get; set; } = null!;
public string ValueRepresentation { get; set; } = null!;
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; }
}
}

35
IRaCIS.Core.Domain/Image/TrialDicomAE.cs
View File

@ -7,38 +7,35 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目DicomAE")]
[Table("TrialDicomAE")]
public class TrialDicomAE : BaseFullAuditEntity
{
///<summary>
///DicomAE
///</summary>
[Table("TrialDicomAE")]
public class TrialDicomAE : BaseFullAuditEntity
{
#region 导航属性
#region 导航属性
#endregion
public Guid TrialId { get; set; }
#endregion
public Guid TrialId { get; set; }
public string CalledAE { get; set; } = string.Empty;
public string CalledAE { get; set; } = string.Empty;
public string IP { get; set; } = string.Empty;
public string IP { get; set; } = string.Empty;
public int Port { get; set; }
public int Port { get; set; }
public string Modality { get; set; } = string.Empty;
public string Modality { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public DateTime? LatestTestTime { get; set; }
public DateTime? LatestTestTime { get; set; }
public bool? IsTestOK { get; set; }
}
public bool? IsTestOK { get; set; }
}

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

@ -1,6 +1,8 @@
using IRaCIS.Core.Domain.Models;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
@ -8,6 +10,7 @@ using System.Threading.Tasks;
namespace IRaCIS.Core.Domain.Models
{
[Comment("项目 - 影像下载监控")]
[Table("TrialImageDownload")]
public class TrialImageDownload : BaseFullAuditEntity
{
@ -26,6 +29,7 @@ namespace IRaCIS.Core.Domain.Models
public DateTime DownloadStartTime { get; set; }
public DateTime? DownloadEndTime { get; set; }
[StringLength(400)]
public string VisitName { get; set; }
public ImageType ImageType { get; set; }

55
IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs
View File

@ -9,51 +9,48 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using IRaCIS.Core.Domain.Share.Management;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 系统通知")]
[Table("SystemNotice")]
public class SystemNotice : BaseFullAuditEntity
{
///<summary>
///SystemNotice
///</summary>
[Table("SystemNotice")]
public class SystemNotice : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<SystemNoticeUserType> NoticeUserTypeList { get; set; } = new List<SystemNoticeUserType>();
[JsonIgnore]
public List<SystemNoticeUserRead> NoticeUserReadList { get; set; } = new List<SystemNoticeUserRead>();
#region 导航属性
[JsonIgnore]
public List<SystemNoticeUserType> NoticeUserTypeList { get; set; } = new List<SystemNoticeUserType>();
[JsonIgnore]
public List<SystemNoticeUserRead> NoticeUserReadList { get; set; } = new List<SystemNoticeUserRead>();
#endregion
#endregion
[MaxLength]
public string NoticeContent { get; set; } = string.Empty;
public string NoticeContent { get; set; } = string.Empty;
public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; }
public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; }
public SystemNotice_NoticeLevelEnum NoticeLevelEnum { get; set; }
public SystemNotice_NoticeLevelEnum NoticeLevelEnum { get; set; }
public SystemNotice_ApplicableProjectEnum ApplicableProjectEnum { get; set; }
public SystemNotice_ApplicableProjectEnum ApplicableProjectEnum { get; set; }
public SystemNotice_NoticeModeEnum NoticeModeEnum { get; set; }
public SystemNotice_NoticeModeEnum NoticeModeEnum { get; set; }
public SystemNotice_NoticeStateEnum NoticeStateEnum { get; set; }
public SystemNotice_NoticeStateEnum NoticeStateEnum { get; set; }
public DateTime? StartDate { get; set; }
public DateTime? StartDate { get; set; }
public DateTime? EndDate { get; set; }
public DateTime? EndDate { get; set; }
public string FileName { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public string Path { get; set; } = string.Empty;
public string Path { get; set; } = string.Empty;
public Guid? PublishedUserId { get; set; }
public Guid? PublishedUserId { get; set; }
public User PublishedUser { get; set; }
public User PublishedUser { get; set; }
public DateTime? PublishedTime { get; set; }
}
public DateTime? PublishedTime { get; set; }
}

21
IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs
View File

@ -7,22 +7,19 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 系统通知用户读取记录")]
[Table("SystemNoticeUserRead")]
public class SystemNoticeUserRead : BaseAddAuditEntity
{
///<summary>
///SystemNoticeUserRead
///</summary>
[Table("SystemNoticeUserRead")]
public class SystemNoticeUserRead : BaseAddAuditEntity
{
#region 导航属性
#region 导航属性
#endregion
#endregion
public Guid SystemNoticeId { get; set; }
public Guid SystemNoticeId { get; set; }
}
}

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

@ -7,14 +7,13 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///SystemNoticeUserType
///</summary>
[Table("SystemNoticeUserType")]
public class SystemNoticeUserType : BaseAddAuditEntity
{
[Comment("后台 - 系统通知用户类型配置")]
[Table("SystemNoticeUserType")]
public class SystemNoticeUserType : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
@ -24,12 +23,12 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public Guid SystemNoticeId { get; set; }
public Guid UserTypeId { get; set; }
}
}
public Guid UserTypeId { get; set; }
}
}

72
IRaCIS.Core.Domain/Management/UserFeedBack.cs
View File

@ -8,58 +8,54 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
namespace IRaCIS.Core.Domain.Models
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 用户反馈")]
[Table("UserFeedBack")]
public class UserFeedBack : BaseFullAuditEntity
{
///<summary>
///UserFeedBack
///</summary>
[Table("UserFeedBack")]
public class UserFeedBack : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public Subject Subject { get; set; }
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
public TrialSite TrialSite { get; set; }
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public Subject Subject { get; set; }
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
public TrialSite TrialSite { get; set; }
[JsonIgnore]
public VisitTask VisitTask { get; set; }
[JsonIgnore]
public VisitTask VisitTask { get; set; }
[NotMapped]
public List<string> FeedBackScreenshotList => JsonConvert.DeserializeObject<List<string>>(ScreenshotListStr);
#endregion
[NotMapped]
public List<string> FeedBackScreenshotList => JsonConvert.DeserializeObject<List<string>>(ScreenshotListStr);
#endregion
public Guid? VisitTaskId { get; set; }
public Guid? VisitTaskId { get; set; }
public Guid? SubjectId { get; set; }
public Guid? SubjectId { get; set; }
public Guid? SubjectVisitId { get; set; }
public Guid? SubjectVisitId { get; set; }
public int QuestionType { get; set; }
public int QuestionType { get; set; }
public string QuestionDescription { get; set; } = string.Empty;
[MaxLength]
public string QuestionDescription { get; set; } = string.Empty;
public int State { get; set; }
public Guid? TrialSiteId { get; set; }
public int State { get; set; }
public Guid? TrialSiteId { get; set; }
public Guid? TrialId { get; set; }
public string ScreenshotListStr { get; set; } = string.Empty;
public Guid? TrialId { get; set; }
[MaxLength]
public string ScreenshotListStr { get; set; } = string.Empty;
@ -67,5 +63,5 @@ namespace IRaCIS.Core.Domain.Models
}
}
}

147
IRaCIS.Core.Domain/Management/UserLog.cs
View File

@ -7,90 +7,89 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 用户账户操作日志")]
[Table("UserLog")]
public class UserLog : BaseAddAuditEntity
{
///<summary>
///UserLog
///</summary>
[Table("UserLog")]
public class UserLog : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
public User LoginUser { get; set; }
#region 导航属性
[JsonIgnore]
public User LoginUser { get; set; }
[JsonIgnore]
public User OptUser { get; set; }
#endregion
public string IP { get; set; } = string.Empty;
[JsonIgnore]
public User OptUser { get; set; }
#endregion
[StringLength(400)]
public string IP { get; set; } = string.Empty;
[StringLength(400)]
public string LoginFaildName { get; set; }=string.Empty;
public string LoginFaildName { get; set; }=string.Empty;
public UserOptType OptType { get; set; }
public UserOptType OptType { get; set; }
public string LoginPassword { get; set; } = string.Empty;
public string LoginPassword { get; set; } = string.Empty;
public Guid? LoginUserId { get;set; }
public Guid? OptUserId { get;set; }
public Guid? LoginUserId { get;set; }
public Guid? OptUserId { get;set; }
public string IPRegion { get; set; } = string.Empty;
}
/// <summary>
/// 登录或者登出 锁定类型
/// </summary>
public enum UserOptType
{
/// <summary>
/// 用户登录
/// </summary>
Login = 1,
/// <summary>
/// 用户登出
/// </summary>
LoginOut = 2,
/// <summary>
///账号或者密码错误
/// </summary>
AccountOrPasswordError = 3,
/// <summary>
/// 账号锁定
/// </summary>
AccountLocked = 4,
//账号启用
AccountEnable = 5,
//登录锁定账户
LoginLockedAccount=6,
//修改密码
LoginModifyPassword =7,
UnloginModifyPasswoed=8,
//admin 重置密码
ResetPassword=9,
DeleteUser=10,
UpdateUser=11,
MFALogin=12,
MFALoginFail=13,
}
public string IPRegion { get; set; } = string.Empty;
}
/// <summary>
/// 登录或者登出 锁定类型
/// </summary>
public enum UserOptType
{
/// <summary>
/// 用户登录
/// </summary>
Login = 1,
/// <summary>
/// 用户登出
/// </summary>
LoginOut = 2,
/// <summary>
///账号或者密码错误
/// </summary>
AccountOrPasswordError = 3,
/// <summary>
/// 账号锁定
/// </summary>
AccountLocked = 4,
//账号启用
AccountEnable = 5,
//登录锁定账户
LoginLockedAccount=6,
//修改密码
LoginModifyPassword =7,
UnloginModifyPasswoed=8,
//admin 重置密码
ResetPassword=9,
DeleteUser=10,
UpdateUser=11,
MFALogin=12,
MFALoginFail=13,
}

34
IRaCIS.Core.Domain/Management/UserPassWordLog.cs
View File

@ -7,31 +7,25 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 用户修改密码")]
[Table("UserPassWordLog")]
public class UserPassWordLog : BaseAddAuditEntity
{
///<summary>
///UserPassWordLog
///</summary>
[Table("UserPassWordLog")]
public class UserPassWordLog : BaseAddAuditEntity
{
#region 导航属性
#region 导航属性
#endregion
#endregion
/// <summary>
/// 用户Id
/// </summary>
public Guid UserId { get; set; }
/// <summary>
/// 密码
/// </summary>
public string PassWord { get; set; } = string.Empty;
public Guid UserId { get; set; }
public string PassWord { get; set; } = string.Empty;
}
}
}

55
IRaCIS.Core.Domain/Management/UserType.cs
View File

@ -1,43 +1,54 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using IRaCIS.Core.Domain.Share;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 用户类型 （需要同步）")]
[Table("UserType")]
public class UserType : Entity
{
public class UserType:Entity
{
#region 导航属性
[JsonIgnore]
public List<UserTypeMenu> UserTypeMenuList { get; set; }
[JsonIgnore]
public List<UserTypeGroup> UserTypeGroupList { get; set; }
#region 导航属性
[JsonIgnore]
public List<UserTypeMenu> UserTypeMenuList { get; set; }
[JsonIgnore]
public List<UserTypeGroup> UserTypeGroupList { get; set; }
[JsonIgnore]
public List<SystemDocNeedConfirmedUserType> SystemDocNeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
public List<SystemDocNeedConfirmedUserType> SystemDocNeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
public List<User> UserList { get; set; }
#endregion
public UserTypeEnum UserTypeEnum { get; set; }
public string UserTypeName { get; set; } = string.Empty;
[JsonIgnore]
public List<User> UserList { get; set; }
#endregion
public string Description { get; set; } = string.Empty;
public string Description { get; set; } = null!;
public int Order { get; set; }
public bool IsEnable { get; set; }
public string UserTypeShortName { get; set; } = string.Empty;
[Comment(" 是否是内部用户类型")]
public bool IsInternal { get; set; }
public bool IsEnable { get; set; } = true;
[Comment(" 用于前端界面下拉框展示排序")]
public int Order { get; set; }
public string PermissionStr { get; set; } = null!;
public string PermissionStr { get; set; } = string.Empty;
[Comment(" 此数据固定，不能更改，和代码耦合")]
public UserTypeEnum UserTypeEnum { get; set; }
[Comment(" 名称、描述可以更改")]
public string UserTypeName { get; set; } = null!;
[Comment(" 用户类型名称简写")]
public string UserTypeShortName { get; set; } = null!;
}
}

39
IRaCIS.Core.Domain/Management/UserTypeGroup.cs
View File

@ -7,32 +7,29 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 用户类型组（需要同步）")]
[Table("UserTypeGroup")]
public class UserTypeGroup : Entity
{
///<summary>
///UserTypeGroup
///</summary>
[Table("UserTypeGroup")]
public class UserTypeGroup : Entity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("DictionaryId")]
public Dictionary Group { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("DictionaryId")]
public Dictionary Group { get; set; }
[JsonIgnore]
[ForeignKey("UserTypeId")]
public UserType UserType { get; set; }
#endregion
[JsonIgnore]
[ForeignKey("UserTypeId")]
public UserType UserType { get; set; }
#endregion
public Guid UserTypeId { get; set; }
public Guid UserTypeId { get; set; }
public Guid DictionaryId { get; set; }
public Guid DictionaryId { get; set; }
}
}
}

30
IRaCIS.Core.Domain/Management/UserTypeMenu.cs
View File

@ -2,25 +2,21 @@ using System;
using System.ComponentModel.DataAnnotations.Schema;
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("UserTypeMenu")]
public partial class UserTypeMenu : Entity
{
[Table("UserTypeMenu")]
public partial class UserTypeMenu : Entity
{
#region µ¼º½ÊôÐÔ
#region µ¼º½ÊôÐÔ
[JsonIgnore]
[ForeignKey("UserTypeId")]
public UserType UserType { get; set; }
[JsonIgnore]
public Menu Menu { get; set; }
#endregion
[JsonIgnore]
[ForeignKey("UserTypeId")]
public UserType UserType { get; set; }
[JsonIgnore]
public Menu Menu { get; set; }
#endregion
public Guid UserTypeId { get; set; }
public Guid MenuId { get; set; }
public Guid UserTypeId { get; set; }
public Guid MenuId { get; set; }
}
}

75
IRaCIS.Core.Domain/QC/TrialQCQuestion.cs
View File

@ -3,67 +3,62 @@
// 生成时间 2021-11-11 11:19:10
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
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("TrialQCQuestion")]
public class TrialQCQuestion : BaseFullAuditEntity
{
///<summary>
///TrialQCQuestionConfigure
///</summary>
[Table("TrialQCQuestion")]
public class TrialQCQuestion : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
[ForeignKey("ParentId")]
public TrialQCQuestion ParentQCQuestion { get; set; }
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
[ForeignKey("ParentId")]
public TrialQCQuestion ParentQCQuestion { get; set; }
[JsonIgnore]
public List<TrialQCQuestionAnswer> TrialQCQuestionAnswerList { get; set; }
[JsonIgnore]
public List<TrialQCQuestionAnswer> TrialQCQuestionAnswerList { get; set; }
#endregion
#endregion
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public string QuestionName { get; set; } = string.Empty;
/// <summary> 语言类型 </summary>
[StringLength(500)]
public string QuestionName { get; set; } = string.Empty;
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public bool IsRequired { get; set; }
public bool IsEnable { get; set; }
[Comment(" 下拉框、文本、单选、多选")]
public string Type { get; set; } = string.Empty;
public bool IsRequired { get; set; }
public bool IsEnable { get; set; }
/// <summary> 下拉框、文本、单选、多选 </summary>
public string Type { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public string TypeValue { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public string ParentTriggerValue { get; set; } = string.Empty;
public string TypeValue { get; set; } = string.Empty;
public int ShowOrder { get; set; }
public string ParentTriggerValue { get; set; } = string.Empty;
public bool? IsConfirm { get; set; }
public int ShowOrder { get; set; }
public bool? IsConfirm { get; set; }
}
}
}

43
IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs
View File

@ -4,40 +4,39 @@
// 生成时间 2021-11-11 17:01:49
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
using IRaCIS.Core.Domain.Share;
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("TrialQCQuestionAnswer")]
public class TrialQCQuestionAnswer : BaseFullAuditEntity
{
///<summary>
///TrialQCQuestionRecord
///</summary>
[Table("TrialQCQuestionAnswer")]
public class TrialQCQuestionAnswer : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public TrialQCQuestion TrialQCQuestionConfigure { get; set; }
#endregion
#region 导航属性
[JsonIgnore]
public TrialQCQuestion TrialQCQuestionConfigure { get; set; }
#endregion
public Guid TrialId { get; set; }
public string Answer { get; set; } = string.Empty;
public Guid TrialId { get; set; }
public TrialQCProcess QCProcessEnum { get; set; }
public string Answer { get; set; } = string.Empty;
// 1代表第一个人QC数据 2 代表第二个人QC数据
public CurrentQC CurrentQCEnum { get; set; }
public TrialQCProcess QCProcessEnum { get; set; }
public Guid SubjectVisitId { get; set; }
[Comment("1代表第一个人QC数据 2 代表第二个人QC数据")]
public CurrentQC CurrentQCEnum { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid TrialQCQuestionConfigureId { get; set; }
public Guid TrialQCQuestionConfigureId { get; set; }
}
}
}

67
IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs
View File

@ -7,57 +7,44 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///SubjectAdditionalEvaluationResult
///</summary>
[Table("SubjectAdditionalEvaluationResult")]
public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 附加评估标准结果")]
[Table("SubjectAdditionalEvaluationResult")]
public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialReadingQuestionId")]
public ReadingQuestionTrial TrialReadingQuestion { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialReadingQuestionId")]
public ReadingQuestionTrial TrialReadingQuestion { get; set; }
#endregion
#endregion
[Comment(" 附加评估答案")]
public string Answer { get; set; } = null!;
public Guid TrialReadingQuestionId { get; set; }
[Comment(" 最终结果")]
public string FinalAnswer { get; set; } = null!;
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
[Comment(" 最终结果翻字典")]
public string FinalTranslateDictionaryCode { get; set; } = null!;
public Guid? VisitTaskId { get; set; }
public string Answer { get; set; } = string.Empty;
[Comment(" 是否是最终结果")]
public bool IsFinalResult { get; set; }
/// <summary>
/// 附加评估答案翻译字典
/// </summary>
public Guid SubjectId { get; set; }
public string TranslateDictionaryCode { get; set; }=string.Empty;
/// <summary>
/// 是否是最终结果
/// </summary>
[Comment(" 附加评估答案翻译字典")]
public string TranslateDictionaryCode { get; set; } = null!;
public bool IsFinalResult { get; set; }
/// <summary>
/// 最终结果
/// </summary>
public Guid TrialReadingCriterionId { get; set; }
public string FinalAnswer { get; set; } = string.Empty;
public Guid TrialReadingQuestionId { get; set; }
/// <summary>
/// 最终结果翻字典
/// </summary>
public Guid? VisitTaskId { get; set; }
public string FinalTranslateDictionaryCode { get; set; } = string.Empty;
}
}
}

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

@ -8,15 +8,14 @@ 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
{
///<summary>
///SubjectCriteriaEvaluation
///</summary>
[Table("SubjectCriteriaEvaluation")]
public class SubjectCriteriaEvaluation : BaseFullAuditEntity
{
[Comment("受试者 - 参与附加评估标准配置")]
[Table("SubjectCriteriaEvaluation")]
public class SubjectCriteriaEvaluation : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public Subject subject { get; set; }
@ -29,18 +28,15 @@ namespace IRaCIS.Core.Domain.Models
public List<SubjectCriteriaEvaluationVisitFilter> SubjectCriteriaEvaluationVisitFilterList { get; set; }
#endregion
[Comment(" 是否参与评估")]
public bool IsJoinEvaluation { get; set; }
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
/// <summary>
/// 是否参与评估
/// </summary>
public bool IsJoinEvaluation { get; set; }
}
}
}

114
IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs
View File

@ -8,81 +8,69 @@ 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
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 附加评估标准影像筛选")]
[Table("SubjectCriteriaEvaluationVisitFilter")]
public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity
{
///<summary>
///SubjectCriteriaEvaluationVisitFilter
///</summary>
[Table("SubjectCriteriaEvaluationVisitFilter")]
public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
[JsonIgnore]
public SubjectCriteriaEvaluation SubjectCriteriaEvaluation { get; set; }
[JsonIgnore]
public SubjectCriteriaEvaluation SubjectCriteriaEvaluation { get; set; }
[JsonIgnore]
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
#endregion
public SubjectVisit SubjectVisit { get; set; }
#endregion
public Guid SubjectId { get; set; }
[Comment(" 影像判断结果")]
public ImageDeterminationResultState ImageDeterminationResultState { get; set; }
[Comment(" 影像筛选状态")]
public ImageFilterState ImageFilterState { get; set; }
public Guid TrialReadingCriterionId { get; set; }
[Comment(" 是否已生成任务")]
public bool IsGeneratedTask { get; set; }
public Guid SubjectId { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid SubjectVisitId { get; set; }
/// <summary>
/// 影像筛选状态
/// </summary>
public ImageFilterState ImageFilterState { get; set; }
/// <summary>
/// 影像判断结果
/// </summary>
public ImageDeterminationResultState ImageDeterminationResultState { get; set; }
/// <summary>
/// 是否已生成任务
/// </summary>
public bool IsGeneratedTask { get; set; }
}
/// <summary>
/// 影像确认结果
/// </summary>
public enum ImageDeterminationResultState
{
//待定
None = 0,
//通过
Passed = 1,
}
/// <summary>
/// 影像筛选状态
/// </summary>
public enum ImageFilterState
{
//默认值 待筛选
None = 0,
Filtering=1,
//筛选已完成
Finished = 2
}
public Guid TrialReadingCriterionId { get; set; }
}
/// <summary>
/// 影像确认结果
/// </summary>
public enum ImageDeterminationResultState
{
//待定
None = 0,
//通过
Passed = 1,
}
/// <summary>
/// 影像筛选状态
/// </summary>
public enum ImageFilterState
{
//默认值 待筛选
None = 0,
Filtering = 1,
//筛选已完成
Finished = 2
}

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

@ -7,11 +7,10 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///SubjectCriteriaEvaluationVisitStudyFilter
///</summary>
[Comment("受试者 - 附加评估标准影像筛选检查")]
[Table("SubjectCriteriaEvaluationVisitStudyFilter")]
public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity
{
@ -34,20 +33,19 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public Guid TrialReadingCriterionId { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid StudyId { get; set; }
public Guid SeriesId { get; set; }
[Comment(" 是否确认")]
public bool IsConfirmed { get; set; }
public bool IsReading { get; set; }
public Guid SeriesId { get; set; }
public Guid StudyId { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
}

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

@ -7,17 +7,16 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///TrialClinicalDataSetCriterion
///</summary>
[Table("TrialClinicalDataSetCriterion")]
public class TrialClinicalDataSetCriterion : BaseFullAuditEntity
{
[Comment("项目标准 - 临床数据配置")]
[Table("TrialClinicalDataSetCriterion")]
public class TrialClinicalDataSetCriterion : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialClinicalDataSetId")]
public ClinicalDataTrialSet TrialClinicalDataSet { get; set; }
@ -27,12 +26,12 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public Guid TrialClinicalDataSetId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
}
}
}
}

245
IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs
View File

@ -9,162 +9,159 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using IRaCIS.Core.Domain.Models;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("系统临床数据问题 (需要同步)")]
[Table("SystemClinicalQuestion")]
public class SystemClinicalQuestion : BaseAddAuditEntity
{
///<summary>
///系统临床数据问题
///</summary>
[Table("SystemClinicalQuestion")]
public class SystemClinicalQuestion : BaseAddAuditEntity
{
#region 导航属性
/// <summary>
/// 分组
/// </summary>
[JsonIgnore]
[ForeignKey("GroupId")]
public SystemClinicalQuestion GroupQuestin { get; set; }
#region 导航属性
/// <summary>
/// 分组
/// </summary>
[JsonIgnore]
[ForeignKey("GroupId")]
public SystemClinicalQuestion GroupQuestin { get; set; }
[NotMapped]
public List<CalculateInfo> CalculateQuestionList
[NotMapped]
public List<CalculateInfo> CalculateQuestionList
{
get
{
get
try
{
var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
return result == null ? new List<CalculateInfo>() : result;
}
catch (Exception)
{
try
{
var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
return result == null ? new List<CalculateInfo>() : result;
}
catch (Exception)
{
return new List<CalculateInfo>();
}
return new List<CalculateInfo>();
}
}
#endregion
/// <summary>
/// 项目临床数据Id
/// </summary>
public Guid SystemClinicalId { get; set; }
}
#endregion
/// <summary>
/// 问题名称
/// </summary>
public string QuestionName { get; set; } = string.Empty;
/// <summary>
/// 项目临床数据Id
/// </summary>
public Guid SystemClinicalId { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// 问题名称
/// </summary>
public string QuestionName { get; set; } = string.Empty;
/// <summary>
/// 临床问题类型(分组，单选。)
/// </summary>
public string ClinicalQuestionType { get; set; } = string.Empty;
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// 问题标识
/// </summary>
public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; }
/// <summary>
/// 临床问题类型(分组，单选。)
/// </summary>
public string ClinicalQuestionType { get; set; } = string.Empty;
/// <summary>
/// 最大长度
/// </summary>
public int? MaxAnswerLength { get; set; }
/// <summary>
/// 问题标识
/// </summary>
public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; }
/// <summary>
/// 最大行数
/// </summary>
public int? MaxQuestionCount { get; set; }
/// <summary>
/// 最大长度
/// </summary>
public int? MaxAnswerLength { get; set; }
/// <summary>
/// 临床数据选项类型(无，自定义)
/// </summary>
public ClinicalOptionType ClinicalOptionTypeEnum { get; set; }
/// <summary>
/// 最大行数
/// </summary>
public int? MaxQuestionCount { get; set; }
/// <summary>
/// 分组Id
/// </summary>
public Guid? GroupId { get; set; }
/// <summary>
/// 临床数据选项类型(无，自定义)
/// </summary>
public ClinicalOptionType ClinicalOptionTypeEnum { get; set; }
/// <summary>
/// 自定义选项
/// </summary>
public string TypeValue { get; set; } = string.Empty;
/// <summary>
/// 分组Id
/// </summary>
public Guid? GroupId { get; set; }
/// <summary>
/// 字典Code
/// </summary>
public string DictionaryCode { get; set; } = string.Empty;
/// <summary>
/// 自定义选项
/// </summary>
public string TypeValue { get; set; } = string.Empty;
/// <summary>
/// 排序
/// </summary>
public int ShowOrder { get; set; } = 0;
/// <summary>
/// 字典Code
/// </summary>
public string DictionaryCode { get; set; } = string.Empty;
/// <summary>
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 排序
/// </summary>
public int ShowOrder { get; set; } = 0;
/// <summary>
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
/// <summary>
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
/// <summary>
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 父问题Id
/// </summary>
public Guid? ParentId { get; set; }
/// <summary>
/// 父问题Id
/// </summary>
public Guid? ParentId { get; set; }
/// <summary>
/// 父问题触发值
/// </summary>
public string ParentTriggerValue { get; set; } = string.Empty;
/// <summary>
/// 父问题触发值
/// </summary>
public string ParentTriggerValue { get; set; } = string.Empty;
/// <summary>
/// 显示类型
/// </summary>
public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show;
/// <summary>
/// 显示类型
/// </summary>
public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show;
/// <summary>
/// 是否是检查日期
/// </summary>
public bool IsCheckDate { get; set; }
/// <summary>
/// 是否是检查日期
/// </summary>
public bool IsCheckDate { get; set; }
/// <summary>
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; }
/// <summary>
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; }
/// <summary>
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty;
/// <summary>
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty;
/// <summary>
/// 自定义计算标记
/// </summary>
public ClinicalCalculateMark? CustomCalculateMark { get; set; }
/// <summary>
/// 自定义计算标记
/// </summary>
public ClinicalCalculateMark? CustomCalculateMark { get; set; }
/// <summary>
/// 自定义计算问题
/// </summary>
public string CalculateQuestions { get; set; } = "[]";
}
/// <summary>
/// 自定义计算问题
/// </summary>
public string CalculateQuestions { get; set; } = "[]";
}

179
IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs
View File

@ -9,118 +9,89 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.Linq;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("系统临床表格问题 (需要同步)")]
[Table("SystemClinicalTableQuestion")]
public class SystemClinicalTableQuestion : BaseAddAuditEntity
{
///<summary>
/// 系统临床表格问题
///</summary>
[Table("SystemClinicalTableQuestion")]
public class SystemClinicalTableQuestion : BaseAddAuditEntity
{
#region 导航属性
[NotMapped]
public List<string> RelevanceValueList
#region 导航属性
[NotMapped]
public List<string> RelevanceValueList
{
get
{
get
try
{
try
{
return this.RelevanceValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
return this.RelevanceValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
#endregion
/// <summary>
/// 系统临床数据Id
/// </summary>
public Guid SystemClinicalId { get; set; }
/// <summary>
/// 问题名称
/// </summary>
public string QuestionName { get; set; } = string.Empty;
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// 临床问题类型(分组，单选。)
/// </summary>
public string ClinicalTableQuestionType { get; set; } = string.Empty;
/// <summary>
/// 问题标识
/// </summary>
public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; }
/// <summary>
/// 最大长度
/// </summary>
public int? MaxAnswerLength { get; set; }
/// <summary>
/// 临床数据选项类型(无，自定义)
/// </summary>
public ClinicalOptionType ClinicalOptionTypeEnum { get; set; }
/// <summary>
/// 自定义选项
/// </summary>
public string TypeValue { get; set; } = string.Empty;
/// <summary>
/// 字典Code
/// </summary>
public string DictionaryCode { get; set; } = string.Empty;
/// <summary>
/// 排序
/// </summary>
public int ShowOrder { get; set; }
/// <summary>
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 外层问题Id
/// </summary>
public Guid QuestionId { get; set; }
/// <summary>
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; }
/// <summary>
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty;
/// <summary>
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
}
#endregion
[Comment(" 系统临床数据Id")]
public Guid SystemClinicalId { get; set; }
[Comment(" 临床数据选项类型(无，自定义)")]
public int ClinicalOptionTypeEnum { get; set; }
[Comment(" 问题标识")]
public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; }
[Comment(" 临床问题类型(分组，单选。)")]
public string ClinicalTableQuestionType { get; set; } = null!;
[Comment(" 字典Code")]
[StringLength(400)]
public string DictionaryCode { get; set; } = null!;
public int? DigitPlaces { get; set; }
[Comment(" 是否必填")]
public int IsRequired { get; set; }
[Comment(" 最大长度")]
public int? MaxAnswerLength { get; set; }
[Comment(" 问题英文名称")]
[StringLength(400)]
public string QuestionEnName { get; set; } = null!;
[Comment(" 外层问题Id")]
public Guid QuestionId { get; set; }
[Comment(" 问题名称")]
[StringLength(400)]
public string QuestionName { get; set; } = null!;
[Comment(" 关联ID")]
public Guid? RelevanceId { get; set; }
[Comment(" 关联Value")]
[StringLength(1000)]
public string RelevanceValue { get; set; } = null!;
[Comment(" 排序")]
public int ShowOrder { get; set; }
[Comment(" 自定义选项")]
[StringLength(1000)]
public string TypeValue { get; set; } = null!;
public string Unit { get; set; } = null!;
}
}

292
IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs
View File

@ -9,173 +9,169 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using IRaCIS.Core.Domain.Models;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目临床数据问题")]
[Table("TrialClinicalQuestion")]
public class TrialClinicalQuestion : BaseAddAuditEntity
{
///<summary>
///项目临床数据问题
///</summary>
[Table("TrialClinicalQuestion")]
public class TrialClinicalQuestion : BaseAddAuditEntity
#region 导航属性
[NotMapped]
public List<CalculateInfo> CalculateQuestionList
{
#region 导航属性
[NotMapped]
public List<CalculateInfo> CalculateQuestionList
get
{
get
try
{
var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
return result == null ? new List<CalculateInfo>() : result;
}
catch (Exception)
{
try
{
var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
return result == null ? new List<CalculateInfo>() : result;
}
catch (Exception)
{
return new List<CalculateInfo>();
}
return new List<CalculateInfo>();
}
}
}
/// <summary>
/// 分组
/// </summary>
[JsonIgnore]
[ForeignKey("GroupId")]
public TrialClinicalQuestion GroupQuestin { get; set; }
[JsonIgnore]
[ForeignKey("TrialClinicalId")]
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
#endregion
/// <summary>
/// 项目临床数据Id
/// </summary>
public Guid TrialClinicalId { get; set; }
/// <summary>
/// 问题名称
/// </summary>
public string QuestionName { get; set; } = string.Empty;
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// 临床问题类型(分组，单选。)
/// </summary>
public string ClinicalQuestionType { get; set; } = string.Empty;
/// <summary>
/// 问题标识
/// </summary>
public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; }
/// <summary>
/// 最大长度
/// </summary>
public int? MaxAnswerLength { get; set; }
/// <summary>
/// 最大行数
/// </summary>
public int? MaxQuestionCount { get; set; }
/// <summary>
/// 临床数据选项类型(无，自定义)
/// </summary>
public ClinicalOptionType ClinicalOptionTypeEnum { get; set; }
/// <summary>
/// 分组Id
/// </summary>
public Guid? GroupId { get; set; }
/// <summary>
/// 自定义选项
/// </summary>
public string TypeValue { get; set; } = string.Empty;
/// <summary>
/// 字典Code
/// </summary>
public string DictionaryCode { get; set; } = string.Empty;
/// <summary>
/// 排序
/// </summary>
public int ShowOrder { get; set; } = 0;
/// <summary>
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
/// <summary>
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 系统临床问题Id
/// </summary>
public Guid? SystemClinicalQuestionId { get; set; }
[JsonIgnore]
[ForeignKey("TrialClinicalId")]
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
#endregion
/// <summary>
/// 父问题Id
/// </summary>
public Guid? ParentId { get; set; }
/// <summary>
/// 项目临床数据Id
/// </summary>
public Guid TrialClinicalId { get; set; }
/// <summary>
/// 父问题触发值
/// </summary>
public string ParentTriggerValue { get; set; } = string.Empty;
/// <summary>
/// 问题名称
/// </summary>
public string QuestionName { get; set; } = string.Empty;
/// <summary>
/// 显示类型
/// </summary>
public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show;
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// 是否是检查日期
/// </summary>
public bool IsCheckDate { get; set; }
/// <summary>
/// 临床问题类型(分组，单选。)
/// </summary>
public string ClinicalQuestionType { get; set; } = string.Empty;
/// <summary>
/// 问题标识
/// </summary>
public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; }
/// <summary>
/// 最大长度
/// </summary>
public int? MaxAnswerLength { get; set; }
/// <summary>
/// 最大行数
/// </summary>
public int? MaxQuestionCount { get; set; }
/// <summary>
/// 临床数据选项类型(无，自定义)
/// </summary>
public ClinicalOptionType ClinicalOptionTypeEnum { get; set; }
/// <summary>
/// 分组Id
/// </summary>
public Guid? GroupId { get; set; }
/// <summary>
/// 自定义选项
/// </summary>
public string TypeValue { get; set; } = string.Empty;
/// <summary>
/// 字典Code
/// </summary>
public string DictionaryCode { get; set; } = string.Empty;
/// <summary>
/// 排序
/// </summary>
public int ShowOrder { get; set; } = 0;
/// <summary>
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
/// <summary>
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 系统临床问题Id
/// </summary>
public Guid? SystemClinicalQuestionId { get; set; }
/// <summary>
/// 自定义计算标记
/// </summary>
public ClinicalCalculateMark? CustomCalculateMark { get; set; }
/// <summary>
/// 父问题Id
/// </summary>
public Guid? ParentId { get; set; }
/// <summary>
/// 自定义计算问题
/// </summary>
public string CalculateQuestions { get; set; } = "[]";
/// <summary>
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; }
/// <summary>
/// 父问题触发值
/// </summary>
public string ParentTriggerValue { get; set; } = string.Empty;
/// <summary>
/// 显示类型
/// </summary>
public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show;
/// <summary>
/// 是否是检查日期
/// </summary>
public bool IsCheckDate { get; set; }
/// <summary>
/// 自定义计算标记
/// </summary>
public ClinicalCalculateMark? CustomCalculateMark { get; set; }
/// <summary>
/// 分组
/// </summary>
[JsonIgnore]
[ForeignKey("GroupId")]
public TrialClinicalQuestion GroupQuestin { get; set; }
/// <summary>
/// 自定义计算问题
/// </summary>
public string CalculateQuestions { get; set; } = "[]";
/// <summary>
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; }
/// <summary>
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty;
}
/// <summary>
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty;
}

27
IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs
View File

@ -7,25 +7,24 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("系统标准 - 字典配置 （需要同步）")]
[Table("SystemCriterionDictionaryCode")]
public class SystemCriterionDictionaryCode : BaseAddAuditEntity
{
///<summary>
///SystemCriterionDictionaryCode
///</summary>
[Table("SystemCriterionDictionaryCode")]
public class SystemCriterionDictionaryCode : BaseAddAuditEntity
{
#region 导航属性
#region 导航属性
#endregion
#endregion
public Guid SystemCriterionId { get; set; }
public Guid SystemCriterionId { get; set; }
public string Code { get; set; } = string.Empty;
public string Code { get; set; } = string.Empty;
}
}
}

43
IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs
View File

@ -8,33 +8,32 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using IRaCIS.Core.Domain.Share.Reading;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目标准附加评估配置")]
[Table("TrialCriterionAdditionalAssessmentType")]
public class TrialCriterionAdditionalAssessmentType : BaseFullAuditEntity
{
///<summary>
///TrialCriterionAdditionalAssessmentType
///</summary>
[Table("TrialCriterionAdditionalAssessmentType")]
public class TrialCriterionAdditionalAssessmentType : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
#endregion
#region 导航属性
[JsonIgnore]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
#endregion
public Guid TrialReadingCriterionId { get; set; }
public CriterionType CriterionType { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public AdditionalAssessmentType AdditionalAssessmentType { get; set; }
public bool? IsSelected { get; set; }
public CriterionType CriterionType { get; set; }
}
public AdditionalAssessmentType AdditionalAssessmentType { get; set; }
public bool? IsSelected { get; set; }
}
}

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

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

4
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
View File

@ -11,8 +11,8 @@ using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目标准 - 标准配置")]
[Table("ReadingQuestionCriterionTrial")]
[Comment("项目标准问题")]
[Table("ReadingQuestionTrial")]
public class ReadingQuestionTrial : BaseAddAuditEntity
{
#region 导航属性

79
IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs
View File

@ -7,58 +7,55 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 阅片期配置")]
[Table("ReadingPeriodSet")]
public class ReadingPeriodSet : BaseFullDeleteAuditEntity
{
[Comment("项目 - 阅片期配置")]
[Table("ReadingPeriodSet")]
public class ReadingPeriodSet : BaseFullDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<ReadingPeriodSite> ReadingPeriodSites { get; set; } = new List<ReadingPeriodSite>();
[JsonIgnore]
/// <summary>
/// 访视模板
/// </summary>
[ForeignKey("VisitStageId")]
public VisitStage VisitStage { get; set; }
#region 导航属性
[JsonIgnore]
public List<ReadingPeriodSite> ReadingPeriodSites { get; set; } = new List<ReadingPeriodSite>();
[JsonIgnore]
/// <summary>
/// 访视模板
/// </summary>
[ForeignKey("VisitStageId")]
public VisitStage VisitStage { get; set; }
/// <summary>
/// 阅片期计划
/// </summary>
[JsonIgnore]
public List<ReadingPeriodPlan> ReadingPeriodPlanList { get; set; } = new List<ReadingPeriodPlan>();
#endregion
/// <summary>
/// 阅片期计划
/// </summary>
[JsonIgnore]
public List<ReadingPeriodPlan> ReadingPeriodPlanList { get; set; } = new List<ReadingPeriodPlan>();
#endregion
[Comment("生效时间")]
public DateTime? EffectOfTime { get; set; }
[Comment("")]
public DateTime? ExpirationDate { get; set; }
[Comment("截止访视")]
[DecimalPrecision(18, 0)]
public decimal? ExpirationVisitNum { get; set; }
[Comment("生效时间")]
public DateTime? EffectOfTime { get; set; }
public DateTime? ExpirationDate { get; set; }
[Comment("截止访视")]
[DecimalPrecision(18, 0)]
public decimal? ExpirationVisitNum { get; set; }
public bool IsGlobal { get; set; }
public bool IsGlobal { get; set; }
public ReadingPeriodStatus IsTakeEffect { get; set; }
public ReadingPeriodStatus IsTakeEffect { get; set; }
[StringLength(400)]
public string ReadingPeriodName { get; set; } = null!;
[Comment("阅片范围")]
public ReadingScopeEnum ReadingScope { get; set; }
[Comment("阅片配置的类型")]
public ReadingSetType ReadingSetType { get; set; }
[StringLength(400)]
public string ReadingPeriodName { get; set; } = null!;
[Comment("阅片范围")]
public ReadingScopeEnum ReadingScope { get; set; }
[Comment("阅片配置的类型")]
public ReadingSetType ReadingSetType { get; set; }
public Guid? SiteId { get; set; }
public Guid? SiteId { get; set; }
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid? VisitStageId { get; set; }
public Guid? VisitStageId { get; set; }
}
}

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

@ -7,40 +7,31 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///UserWLTemplate
///</summary>
[Table("UserWLTemplate")]
public class UserWLTemplate : BaseAddAuditEntity
{
[Comment("用户配置 - WL模板")]
[Table("UserWLTemplate")]
public class UserWLTemplate : BaseAddAuditEntity
{
#region 导航属性
#endregion
public string TemplateName { get; set; } = string.Empty;
public Guid UserId { get; set; }
public int WW { get; set; }
public int WW { get; set; }
public int WL { get; set; }
public int WL { get; set; }
public int ShowOrder { get; set; } = 0;
public int ShowOrder { get; set; } = 0;
public bool IsPitchOn { get; set; } = true;
/// <summary>
/// 是否为默认
/// </summary>
public bool IsPitchOn { get; set; } = true;
}
}
}
}

52
IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs
View File

@ -7,34 +7,26 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///IRECIST1Point1肿瘤评估(系统标准)
///</summary>
[Table("TumorAssessment_IRECIST1Point1")]
public class TumorAssessment_IRECIST1Point1 : Entity
{
/// <summary>
/// 靶病灶
/// </summary>
public TargetAssessment TargetLesion { get; set; }
/// <summary>
/// 非靶病灶
/// </summary>
public NoTargetAssessment NonTargetLesions { get; set; }
/// <summary>
/// 新病灶
/// </summary>
public NewLesionAssessment NewLesion { get; set; }
/// <summary>
/// 整体疗效
/// </summary>
public OverallAssessment OverallEfficacy { get; set; }
}
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("系统标准 - 疗效评估对照表 (需要同步)")]
[Table("TumorAssessment_IRECIST1Point1")]
public class TumorAssessment_IRECIST1Point1 : Entity
{
[Comment("靶病灶")]
public TargetAssessment TargetLesion { get; set; }
[Comment("非靶病灶")]
public NoTargetAssessment NonTargetLesions { get; set; }
[Comment("新病灶")]
public NewLesionAssessment NewLesion { get; set; }
[Comment("整体疗效")]
public OverallAssessment OverallEfficacy { get; set; }
}
}

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

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

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

@ -7,6 +7,7 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -15,26 +16,18 @@ namespace IRaCIS.Core.Domain.Models
[Table("TumorAssessment_RECIST1Point1BM")]
public class TumorAssessment_RECIST1Point1BM : Entity
{
/// <summary>
/// 靶病灶
/// </summary>
public TargetAssessment TargetLesion { get; set; }
/// <summary>
/// 非靶病灶
/// </summary>
public NoTargetAssessment NonTargetLesions { get; set; }
/// <summary>
/// 新病灶
/// </summary>
[Comment("靶病灶")]
public TargetAssessment TargetLesion { get; set; }
[Comment("非靶病灶")]
public NoTargetAssessment NonTargetLesions { get; set; }
[Comment("新病灶")]
public NewLesionAssessment NewLesion { get; set; }
/// <summary>
/// 整体疗效
/// </summary>
public OverallAssessment OverallEfficacy { get; set; }
[Comment("整体疗效")]
public OverallAssessment OverallEfficacy { get; set; }
}
}

43
IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs
View File

@ -4,43 +4,40 @@
// 生成时间 2021-12-23 13:16: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
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目中心调研设备表")]
[Table("TrialSiteEquipmentSurvey")]
public class TrialSiteEquipmentSurvey : BaseFullAuditEntity
{
///<summary>
///TrialSiteEquipmentSurvey
///</summary>
[Table("TrialSiteEquipmentSurvey")]
public class TrialSiteEquipmentSurvey : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialSiteSurveyId")]
public TrialSiteSurvey TrialSiteSurvey { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialSiteSurveyId")]
public TrialSiteSurvey TrialSiteSurvey { get; set; }
[JsonIgnore]
[ForeignKey("EquipmentTypeId")]
public Dictionary EquipmentType { get; set; }
#endregion
[JsonIgnore]
[ForeignKey("EquipmentTypeId")]
public Dictionary EquipmentType { get; set; }
#endregion
public Guid TrialSiteSurveyId { get; set; }
public Guid TrialSiteSurveyId { get; set; }
public Guid EquipmentTypeId { get; set; }
public string Parameters { get; set; } = string.Empty;
public Guid EquipmentTypeId { get; set; }
public string Parameters { get; set; } = string.Empty;
public string ManufacturerName { get; set; } = string.Empty;
public string ManufacturerName { get; set; } = string.Empty;
public string ScannerType { get; set; } = string.Empty;
public string ScannerType { get; set; } = string.Empty;
public string Note { get; set; } = string.Empty;
public string Note { get; set; } = string.Empty;
}
}

86
IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs
View File

@ -4,77 +4,77 @@
// 生成时间 2021-12-23 13:16:57
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
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("TrialSiteSurvey")]
public class TrialSiteSurvey : BaseFullDeleteAuditEntity
{
///<summary>
///TrialSiteSurvey
///</summary>
[Table("TrialSiteSurvey")]
public class TrialSiteSurvey : BaseFullDeleteAuditEntity
{
#region 导航属性
// 必须 { get; set; } 否则 翻译出错
[JsonIgnore]
public List<TrialSiteUserSurvey> TrialSiteUserSurveyList { get; set; } = new List<TrialSiteUserSurvey>();
[JsonIgnore]
public List<TrialSiteEquipmentSurvey> TrialSiteEquipmentSurveyList { get; set; } = new List<TrialSiteEquipmentSurvey>();
#region 导航属性
// 必须 { get; set; } 否则 翻译出错
[JsonIgnore]
public List<TrialSiteUserSurvey> TrialSiteUserSurveyList { get; set; } = new List<TrialSiteUserSurvey>();
[JsonIgnore]
public List<TrialSiteEquipmentSurvey> TrialSiteEquipmentSurveyList { get; set; } = new List<TrialSiteEquipmentSurvey>();
[JsonIgnore]
public TrialSite TrialSite { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public User ReviewerUser { get; set; }
[JsonIgnore]
public User PreliminaryUser { get; set; }
#endregion
[JsonIgnore]
public TrialSite TrialSite { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public User ReviewerUser { get; set; }
[JsonIgnore]
public User PreliminaryUser { get; set; }
#endregion
public Guid TrialSiteId { get; set; }
public Guid TrialSiteId { get; set; }
public TrialSiteSurveyEnum State { get; set; } = TrialSiteSurveyEnum.ToSubmit;
public TrialSiteSurveyEnum State { get; set; } = TrialSiteSurveyEnum.ToSubmit;
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public string UserName { get; set; } = string.Empty;
public string UserName { get; set; } = string.Empty;
public string Phone { get; set; } = string.Empty;
public string Phone { get; set; } = string.Empty;
public string Email { get; set; } = string.Empty;
public string Email { get; set; } = string.Empty;
public int AverageEngravingCycle { get; set; }
public int AverageEngravingCycle { get; set; }
public bool IsConfirmImagingTechnologist { get; set; }
public bool IsConfirmImagingTechnologist { get; set; }
public string NotConfirmReson { get; set; } = string.Empty;
public string NotConfirmReson { get; set; } = string.Empty;
public int EfficacyEvaluatorType { get; set; }
public int EfficacyEvaluatorType { get; set; }
public bool IsFollowStudyParameters { get; set; }
public bool IsFollowStudyParameters { get; set; }
public string NotFollowReson { get; set; } = string.Empty;
public string NotFollowReson { get; set; } = string.Empty;
public string LatestBackReason { get; set; } = string.Empty;
public string LatestBackReason { get; set; } = string.Empty;
public Guid? PreliminaryUserId { get; set; }
public Guid? PreliminaryUserId { get; set; }
public Guid? ReviewerUserId { get; set; }
public Guid? ReviewerUserId { get; set; }
public DateTime? PreliminaryTime { get; set; }
public DateTime? PreliminaryTime { get; set; }
public DateTime? ReviewerTime { get; set; }
public DateTime? ReviewerTime { get; set; }
}
}
}

63
IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs
View File

@ -4,64 +4,61 @@
// 生成时间 2021-12-23 13:16: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
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目中心调研用户表")]
[Table("TrialSiteUserSurvey")]
public class TrialSiteUserSurvey : BaseFullAuditEntity
{
///<summary>
///TrialSiteUserSurvey
///</summary>
[Table("TrialSiteUserSurvey")]
public class TrialSiteUserSurvey : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialSiteSurveyId")]
public TrialSiteSurvey TrialSiteSurvey { get; set; }
[JsonIgnore]
[ForeignKey("UserTypeId")]
public UserType UserTypeRole { get; set; }
#endregion
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialSiteSurveyId")]
public TrialSiteSurvey TrialSiteSurvey { get; set; }
[JsonIgnore]
[ForeignKey("UserTypeId")]
public UserType UserTypeRole { get; set; }
#endregion
public Guid TrialSiteSurveyId { get; set; }
public Guid TrialSiteSurveyId { get; set; }
public Guid? UserTypeId { get; set; }
public Guid? UserTypeId { get; set; }
public int? TrialRoleCode { get; set; }
public int? TrialRoleCode { get; set; }
public string Phone { get; set; } = string.Empty;
public string Phone { get; set; } = string.Empty;
public string Email { get; set; } = string.Empty;
public string Email { get; set; } = string.Empty;
public string FirstName { get; set; } = string.Empty;
public string LastName { 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 string OrganizationName { get; set; } = string.Empty;
public Guid? SystemUserId { get; set; }
public Guid? SystemUserId { get; set; }
public bool IsGenerateAccount { get; set; }
public bool IsGenerateAccount { get; set; }
public bool IsGenerateSuccess { get; set; }
public bool IsGenerateSuccess { get; set; }
public TrialSiteUserStateEnum InviteState { get; set; } = TrialSiteUserStateEnum.WaitSent;
public TrialSiteUserStateEnum InviteState { get; set; } = TrialSiteUserStateEnum.WaitSent;
public bool IsJoin { get; set; }
public bool IsJoin { get; set; }
public bool IsHistoryUser { get; set; }
public bool IsHistoryUser { get; set; }
public bool? IsHistoryUserDeleted { get; set; }
public bool? IsHistoryUserDeleted { get; set; }
public bool? IsHistoryUserOriginDeleted { get; set; }
public bool? IsHistoryUserOriginDeleted { get; set; }
}
}

40
IRaCIS.Core.Domain/Trial/TrialBodyPart.cs
View File

@ -8,35 +8,31 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
namespace IRaCIS.Core.Domain.Models
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目部位配置")]
[Table("TrialBodyPart")]
public class TrialBodyPart : BaseAddAuditEntity
{
///<summary>
///TrialBodyPart
///</summary>
[Table("TrialBodyPart")]
public class TrialBodyPart : BaseAddAuditEntity
{
#region 导航属性
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
#endregion
public string Code { get; set; } = string.Empty;
public string Code { get; set; } = null!;
public bool IsHandAdd { get; set; }
public string Name { get; set; } = string.Empty;
[StringLength(500)]
public string Name { get; set; } = null!;
[StringLength(500)]
public string NameCN { get; set; } = null!;
public string NameCN { get; set; } = string.Empty;
public Guid TrialId { get; set; }
}
public Guid TrialId { get; set; }
public bool IsHandAdd { get; set; }
}
}

31
IRaCIS.Core.Domain/Trial/TrialDictionary.cs
View File

@ -1,24 +1,25 @@
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("TrialDictionary")]
public partial class TrialDictionary : Entity
{
[Table("TrialDictionary")]
public partial class TrialDictionary : Entity
{
#region µ¼º½ÊôÐÔ
[JsonIgnore]
public virtual Trial Trial { get; set; }
[JsonIgnore]
public virtual Dictionary Dictionary { get; set; }
#endregion
#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 string KeyName { get; set; } = string.Empty;
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public Guid DictionaryId { get; set; }
}
public Guid DictionaryId { get; set; }
}

45
IRaCIS.Core.Domain/Trial/TrialSign.cs
View File

@ -4,36 +4,33 @@
// 生成时间 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
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目操作签名表")]
[Table("TrialSign")]
public class TrialSign : BaseAddAuditEntity
{
///<summary>
///TrialSign
///</summary>
[Table("TrialSign")]
public class TrialSign : BaseAddAuditEntity
{
#region 导航属性
#region 导航属性
#endregion
public Guid? TrialId { get; set; }
#endregion
public Guid? TrialId { get; set; }
public Guid? SubjectVisitId { get; set; }
public Guid? SubjectVisitId { get; set; }
public Guid? SignCodeId { get; set; }
public string SignCode { get; set; } = string.Empty;
[StringLength(1024)]
public string SignText { get; set; } = string.Empty;
public bool IsCompleted { get; set; }
}
//关联基础数据
public Guid? SignCodeId { get; set; }
public string SignCode { get; set; } = string.Empty;
public string SignText { get; set; } = string.Empty;
public bool IsCompleted { get; set; }
}
}

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

@ -3,16 +3,15 @@
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-02-25 14:21:48
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///TrialStateChange
///</summary>
[Table("TrialStateChange")]
public class TrialStateChange : BaseAddAuditEntity
{
[Comment("项目 - 项目状态变更记录表")]
[Table("TrialStateChange")]
public class TrialStateChange : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialId")]
@ -21,18 +20,18 @@ 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;
public string OriginState { get; set; } = String.Empty;
}
}
public string NowState { get; set; } = String.Empty;
public string Reason { get; set; } = String.Empty;
}
}

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

@ -1,3 +1,4 @@
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@ -5,6 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
[Comment("ÏîÄ¿ - Èë×éÁ÷³Ì¼Ç¼")]
[Table("TrialStatus")]
public partial class TrialStatusDetail : BaseAddAuditEntity
{
@ -19,7 +21,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialId { get; set; }
public int TrialStatus { get; set; }
[StringLength(400)]
public string Memo { get; set; } = string.Empty;
public int OptUserType { get; set; }

77
IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs
View File

@ -4,67 +4,56 @@
// 生成时间 2022-03-04 13:33:37
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
using IRaCIS.Core.Domain.Share;
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("TrialExternalUser")]
public class TrialExternalUser : BaseFullAuditEntity
{
///<summary>
///TrialExternalUser
///</summary>
[Table("TrialExternalUser")]
public class TrialExternalUser : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public Guid UserTypeId { get; set; }
public string Phone { get; set; } = String.Empty;
public Guid UserTypeId { get; set; }
/// <summary>
public string Phone { get; set; } = String.Empty;
public string Email { get; set; } = String.Empty;
public string Email { get; set; } = String.Empty;
public string FirstName { get; set; } = String.Empty;
public string FirstName { get; set; } = String.Empty;
public string LastName { get; set; } = String.Empty;
public string LastName { get; set; } = String.Empty;
public string OrganizationName { get; set; }=String.Empty;
public string OrganizationName { get; set; } = String.Empty;
public bool IsSystemUser { get; set; }
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; }
[StringLength(512)]
public string RejectReason { get; set; } = String.Empty;
public Guid SystemUserId { get; set; }
[Comment(" 邀请状态")]
public TrialExternalUserStateEnum InviteState { get; set; } = TrialExternalUserStateEnum.WaitSent;
}
public bool IsJoin { get; set; }
public DateTime? ExpireTime { get; set; }
public DateTime? ConfirmTime { get; set; }
public string RejectReason { get; set; } = String.Empty;
/// <summary>
/// 邀请状态
/// </summary>
[Required]
public TrialExternalUserStateEnum InviteState { get; set; } = TrialExternalUserStateEnum.WaitSent;
}
}

70
IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs
View File

@ -1,53 +1,55 @@
using System;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目中心表")]
[Table("TrialSite")]
public class TrialSite : BaseFullDeleteAuditEntity
{
public class TrialSite : BaseFullDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]
#region 导航属性
[JsonIgnore]
[ForeignKey("SiteId")]
public Site Site { get; set; }
[ForeignKey("SiteId")]
public Site Site { get; set; }
[JsonIgnore]
[ForeignKey("TrialId")]
public Trial Trial { get; set; }
[JsonIgnore]
[ForeignKey("TrialId")]
public Trial Trial { get; set; }
/// <summary>
/// Site 下面有多个访视记录
/// </summary>
[JsonIgnore]
public List<SubjectVisit> SubjectVisitList { get; set; }
[JsonIgnore]
public List<TrialSiteSurvey> TrialSiteSurveyList { get; set; }
/// <summary>
/// Site 下面有多个访视记录
/// </summary>
[JsonIgnore]
public List<SubjectVisit> SubjectVisitList { get; set; }
[JsonIgnore]
public List<TrialSiteSurvey> TrialSiteSurveyList { get; set; }
//Site 由多个人负责
[JsonIgnore]
public List<TrialSiteUser> CRCUserList { get; set; }
//Site 由多个人负责
[JsonIgnore]
public List<TrialSiteUser> CRCUserList { get; set; }
[JsonIgnore]
public List<Subject> SubjectList { get; set; }
[JsonIgnore]
public List<Subject> SubjectList { get; set; }
[JsonIgnore]
[JsonIgnore]
public List<TrialSiteDicomAE> TrialSiteDicomAEList { get; set; }
#endregion
public Guid TrialId { get; set; }
public List<TrialSiteDicomAE> TrialSiteDicomAEList { get; set; }
#endregion
public Guid TrialId { get; set; }
public Guid? SiteId { get; set; }
public Guid? SiteId { get; set; }
public string TrialSiteCode { get; set; } = String.Empty;
public string TrialSiteCode { get; set; } = String.Empty;
public string TrialSiteName { get; set; } = String.Empty;
public string TrialSiteName { get; set; } = String.Empty;
public string TrialSiteAliasName { get; set; } = String.Empty;
public DateTime? EnabledTime { get; set; }
public string TrialSiteAliasName { get; set; }=String.Empty;
public DateTime? EnabledTime { get; set; }
}
}

41
IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs
View File

@ -7,40 +7,39 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目中心DicomAE表")]
[Table("TrialSiteDicomAE")]
public class TrialSiteDicomAE : BaseFullDeleteAuditEntity
{
///<summary>
///TrialSiteDicomAE
///</summary>
[Table("TrialSiteDicomAE")]
public class TrialSiteDicomAE : BaseFullDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]
public TrialSite TrialSite { get; set; }
#endregion
#region 导航属性
[JsonIgnore]
public TrialSite TrialSite { get; set; }
#endregion
public Guid TrialId { get; set; }
public Guid TrialSiteId { get; set; }
public Guid TrialId { get; set; }
public string CallingAE { get; set; } = string.Empty;
public Guid TrialSiteId { get; set; }
public string IP { get; set; } = string.Empty;
public string CallingAE { get; set; } = string.Empty;
public string Port { get; set; } = string.Empty;
[StringLength(500)]
public string Description { get; set; } = null!;
public string IP { get; set; } = null!;
public string Description { get; set; } = string.Empty;
[StringLength(500)]
public string Port { get; set; } = null!;
}
}
}

49
IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs
View File

@ -4,42 +4,41 @@
// 生成时间 2021-11-23 15:40:27
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
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("TrialSiteUser")]
public class TrialSiteUser : BaseFullDeleteAuditEntity
{
///<summary>
///UserTrialSite
///</summary>
[Table("TrialSiteUser")]
public class TrialSiteUser : BaseFullDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("UserId")]
public User User { get; set; }
[JsonIgnore]
[ForeignKey("TrialId")]
public Trial Trial { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("UserId")]
public User User { get; set; }
[JsonIgnore]
[ForeignKey("TrialId")]
public Trial Trial { get; set; }
[JsonIgnore]
public TrialSite TrialSite { get; set; }
[JsonIgnore]
public TrialSite TrialSite { get; set; }
#endregion
public Guid TrialSiteId { get; set; }
#endregion
public Guid TrialSiteId { get; set; }
public Guid UserId { get; set; }
public Guid UserId { get; set; }
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
}
}
}

40
IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs
View File

@ -2,32 +2,30 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using IRaCIS.Core.Domain.Share;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目参与人员中间表")]
[Table("TrialUser")]
public partial class TrialUser : BaseFullDeleteAuditEntity
{
/// <summary>
/// 运维人员与项目关联关系表 - 实体
/// </summary>
[Table("TrialUser")]
public partial class TrialUser : BaseFullDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
[ForeignKey("UserId")]
public User User { get; set; }
#endregion
[JsonIgnore]
[ForeignKey("UserId")]
public User User { get; set; }
#endregion
public Guid UserId { get; set; }
public Guid TrialId { get; set; }
public DateTime? RemoveTime { get; set; }
public Guid UserId { get; set; }
public Guid TrialId { get; set; }
public DateTime? RemoveTime { get; set; }
public DateTime? JoinTime { get; set; }
public DateTime? JoinTime { get; set; }
}
}

41
IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs
View File

@ -7,28 +7,25 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 阅片标准取消分配医生记录")]
[Table("SubjectCanceDoctor")]
public class SubjectCanceDoctor : BaseAddAuditEntity
{
///<summary>
///SubjectCanceDoctor
///</summary>
[Table("SubjectCanceDoctor")]
public class SubjectCanceDoctor : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
public Subject Subject { get; set; }
#endregion
#region 导航属性
[JsonIgnore]
public Subject Subject { get; set; }
#endregion
[StringLength(512)]
public string Note { get; set; } = null!;
public Guid SubjectId { get; set; }
public Guid? TrialReadingCriterionId { get; set; }
}
public Guid SubjectId { get; set; }
public string Note { get; set; } = string.Empty;
public Guid? TrialReadingCriterionId { get; set; }
}
}

29
IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs
View File

@ -3,30 +3,29 @@
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2021-12-23 15:37:48
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
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("VisitPlanInfluenceStat")]
public class VisitPlanInfluenceStat : BaseAddAuditEntity
{
///<summary>
///VisitPlanInfluenceStudystat
///</summary>
[Table("VisitPlanInfluenceStat")]
public class VisitPlanInfluenceStat : BaseAddAuditEntity
{
#region 导航属性
#region 导航属性
[JsonIgnore]
public List<VisitPlanInfluenceStudy> InfluenceStudyList { get; set; } = new List<VisitPlanInfluenceStudy>();
[JsonIgnore]
public List<VisitPlanInfluenceStudy> InfluenceStudyList { get; set; } = new List<VisitPlanInfluenceStudy>();
#endregion
#endregion
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public int InconsistentCount { get; set; }
public int InconsistentCount { get; set; }
}
}
}

49
IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs
View File

@ -3,45 +3,42 @@
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2021-12-20 16:42:26
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目配置 - 访视计划调整影像检查")]
[Table("VisitPlanInfluenceStudy")]
public class VisitPlanInfluenceStudy : BaseAddAuditEntity
{
///<summary>
///VisitPlanInfluenceSubjectVisit
///</summary>
[Table("VisitPlanInfluenceStudy")]
public class VisitPlanInfluenceStudy : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("VisitPlanInfluenceStatId")]
public VisitPlanInfluenceStat VisitPlanInfluenceStat { get; set; }
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
#endregion
#region 导航属性
[JsonIgnore]
[ForeignKey("VisitPlanInfluenceStatId")]
public VisitPlanInfluenceStat VisitPlanInfluenceStat { get; set; }
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
#endregion
public Guid SubjectVisitId { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid StudyId { get; set; }
public Guid StudyId { get; set; }
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public bool IsDicomStudy { get; set; }
public bool IsDicomStudy { get; set; }
public string Modality { get; set; } = string.Empty;
public string Modality { get; set; } = string.Empty;
public bool IsOverWindowNowNotOverWindow { get; set; }
public bool IsOverWindowNowNotOverWindow { get; set; }
public DateTime? StudyTime { get; set; }
public DateTime? StudyTime { get; set; }
public string HistoryWindow { get; set; } = string.Empty;
public string HistoryWindow { get; set; } = string.Empty;
public string NowWindow { get; set; } = string.Empty;
public string NowWindow { get; set; } = string.Empty;
public Guid VisitPlanInfluenceStatId { get; set; }
}
public Guid VisitPlanInfluenceStatId { get; set; }
}

48
IRaCIS.Core.Domain/Visit/VisitStage.cs
View File

@ -1,38 +1,40 @@
using System;
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("VisitStage")]
public class VisitStage : BaseFullDeleteAuditEntity
{
[Table("VisitStage")]
public class VisitStage : BaseFullDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public string BlindName { get; set; } = string.Empty;
public string BlindName { get; set; } = string.Empty;
[Column(TypeName = "decimal(18,1)")]
public decimal VisitNum { get; set; }
public string VisitName { get; set; } = string.Empty;
public int VisitDay { get; set; }
public string Description { get; set; } = string.Empty;
[DecimalPrecision(18, 1)]
public decimal VisitNum { get; set; }
public string VisitName { get; set; } = string.Empty;
public int VisitDay { get; set; }
public string Description { get; set; } = string.Empty;
public bool IsConfirmed { get; set; }=false;
public bool IsConfirmed { get; set; } = false;
public bool NeedGlobal { get; set; } = false;
public bool NeedGlobal { get; set; } = false;
public bool IsBaseLine { get; set; } = false;
public bool IsBaseLine { get; set; } = false;
public int VisitWindowLeft { get; set; }
public int VisitWindowRight { get; set; }
public int VisitWindowLeft { get; set; }
public int VisitWindowRight { get; set; }
public bool IsHaveFirstConfirmed { get; set; }
public bool IsHaveFirstConfirmed { get; set; }
}
}