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

Browse Source
This commit is contained in:
hang
2024-09-19 23:45:43 +08:00
parent 19f4385055
commit 42e4fe59ec
73 changed files with 1760 additions and 1934 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Domain/Allocation/SubjectUser.cs
+11 -12
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; }
}
IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs
+10 -12
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; }
IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs
+30 -31
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; }
}
}
}
IRaCIS.Core.Domain/Allocation/TaskInfluence.cs
+31 -34
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,
}
IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
+2 -3
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
{
IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs
+7 -8
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; }
IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs
+7 -8
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;
}
}
}
IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs
+46 -51
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; }
}
}