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

This commit is contained in:
2024-09-20 09:20:04 +08:00
parent 0a1ce59670
commit 32931e155c
187 changed files with 7126 additions and 7323 deletions
+38 -39
View File
@@ -3,60 +3,59 @@
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-06-10 11:59:27
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.ComponentModel;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 项目标准阅片医生配置表")]
[Table("SubjectUser")]
public class SubjectUser : BaseFullAuditEntity
namespace IRaCIS.Core.Domain.Models
{
#region
[JsonIgnore]
public Trial Trial { get; set; }
[Description("受试者某标准阅片用户中间关系表")]
[Table("SubjectUser")]
public class SubjectUser : BaseFullAuditEntity
{
[JsonIgnore]
//Parent
[ForeignKey("ReplacedSubjectUserId")]
public SubjectUser ReplacedSubjectUser { get; set; }
#region
[JsonIgnore]
public Trial Trial { get; set; }
//ChildList
[JsonIgnore]
public List<SubjectUser> EarlierSubjectUserList { get; set; }
[JsonIgnore]
//Parent
[ForeignKey("ReplacedSubjectUserId")]
public SubjectUser ReplacedSubjectUser { get; set; }
//ChildList
[JsonIgnore]
public List<SubjectUser> EarlierSubjectUserList { get; set; }
[JsonIgnore]
public User DoctorUser { get; set; }
[JsonIgnore]
public User DoctorUser { get; set; }
[JsonIgnore]
public Subject Subject { get; set; }
#endregion
[JsonIgnore]
public Subject Subject { get; set; }
#endregion
public Arm ArmEnum { get; set; }
public Guid TrialId { get; set; }
public DateTime? AssignTime { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid DoctorUserId { get; set; }
public DateTime? AssignTime { get; set; }
public bool IsConfirmed { get; set; }
[Comment("该属性有值 说明该医生被替换了 分配的时候 要过滤掉")]
public Guid? ReplacedSubjectUserId { get; set; }
public Guid SubjectId { get; set; }
public Guid TrialId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid SubjectId { get; set; }
public Guid DoctorUserId { get; set; }
public Arm ArmEnum { get; set; }
public bool IsConfirmed { get; set; } = true;
//该属性有值 说明该医生被替换了 分配的时候 要过滤掉
public Guid? ReplacedSubjectUserId { get; set; }
}
}
@@ -1,53 +1,50 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-06-07 13:13:13
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 分配规则")]
[Table("TaskAllocationRule")]
public class TaskAllocationRule : BaseFullAuditEntity
namespace IRaCIS.Core.Domain.Models
{
#region
///<summary>
///TaskAllocationRule
///</summary>
[Table("TaskAllocationRule")]
public class TaskAllocationRule : BaseFullAuditEntity
{
#region
[ForeignKey("DoctorUserId")]
[JsonIgnore]
public User DoctorUser { get; set; }
[ForeignKey("DoctorUserId")]
[JsonIgnore]
public User DoctorUser { get; set; }
[JsonIgnore]
public Enroll Enroll { get; set; }
[JsonIgnore]
public Enroll Enroll { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
public Guid TrialId { get; set; }
public Guid DoctorUserId { get; set; }
public Guid TrialId { get; set; }
[Comment(" 入组表Id 可以去掉 TrialId DoctorUserId")]
public Guid EnrollId { get; set; }
public int PlanSubjectCount { get; set; }
public bool IsEnable { get; set; }
public bool IsJudgeDoctor { get; set; }
public bool IsEnable { get; set; }
public string Note { get; set; } = null!;
public string Note { get; set; } = string.Empty;
[Comment(" 计划比率")]
public int PlanReadingRatio { get; set; }
public Guid DoctorUserId { get; set; }
public int PlanSubjectCount { get; set; }
public Guid EnrollId { get; set; }
//是否是裁判医生 裁判医生单独加入
public bool IsJudgeDoctor { get; set; }
public int PlanReadingRatio { get; set; }
}
}
@@ -1,59 +1,54 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-07-01 15:32:56
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using System;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.Linq;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 一致性分析生成任务配置")]
[Table("TaskConsistentRule")]
public class TaskConsistentRule : BaseFullAuditEntity
namespace IRaCIS.Core.Domain.Models
{
///<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 Guid TrialId { get; set; }
public int PlanSubjectCount { get; set; }
public int PlanSubjectCount { get; set; }
public int PlanVisitCount { get; set; }
public int PlanVisitCount { get; set; }
public int IntervalWeeks { get; set; }
public int IntervalWeeks { get; set; }
public bool IsHaveReadingPeriod { get; set; }
public bool IsHaveReadingPeriod { get; set; }
public bool IsGenerateGlobalTask { get; set; }
public bool IsGenerateGlobalTask { get; set; }
public int BlindSubjectNumberOfPlaces { get; set; }
public int BlindSubjectNumberOfPlaces { get; set; }
public string BlindTrialSiteCode { get; set; } = string.Empty;
public string BlindTrialSiteCode { get; set; } = string.Empty;
public bool IsSelfAnalysis { get; set; }
public bool IsSelfAnalysis { get; set; }
public bool IsEnable { get; set; }
public bool IsEnable { get; set; }
public string Note { get; set; } = string.Empty;
public string Note { get; set; } = string.Empty;
public Guid TrialReadingCriterionId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
}
}
+34 -36
View File
@@ -1,50 +1,48 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-07-21 13:44:02
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 退回重阅影响")]
[Table("TaskInfluence")]
public class TaskInfluence : BaseAddAuditEntity
namespace IRaCIS.Core.Domain.Models
{
///<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; }
[Comment(" 对影响任务进行的操作")]
public ReReadingOrBackOptType OptType { get; set; }
//对影响任务进行的操作
public ReReadingOrBackOptType OptType { get; set; }
}
public enum ReReadingOrBackOptType
{
//取消分配
CancelAssign = 0,
//失效
Abandon = 1,
//重阅重置
Return = 2,
}
public enum ReReadingOrBackOptType
{
//取消分配
CancelAssign = 0,
//失效
Abandon = 1,
//重阅重置
Return = 2,
}
}
+172 -172
View File
@@ -3,190 +3,190 @@
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-06-29 10:56:50
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
public class OSSImageInfo
namespace IRaCIS.Core.Domain.Models
{
public string FileName { get; set; } = string.Empty;
public string ImagePath { get; set; } = string.Empty;
}
[Comment("项目阅片 - 医学审核")]
[Table("TaskMedicalReview")]
public class TaskMedicalReview : BaseFullAuditEntity
{
#region
[JsonIgnore]
public User LatestReplyUser { get; set; }
[JsonIgnore]
public User MedicalManagerUser { get; set; }
[JsonIgnore]
[ForeignKey("VisitTaskId")]
public VisitTask VisitTask { get; set; }
[JsonIgnore]
public List<ReadingMedicalReviewDialog> ReadingMedicalReviewDialogList { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
/// <summary>
/// 文件
/// </summary>
[NotMapped]
public List<OSSImageInfo> FileList
public class OSSImageInfo
{
get
public string FileName { get; set; } = string.Empty;
public string ImagePath { get; set; } = string.Empty;
}
///<summary>
///TaskMedicalReview
///</summary>
[Table("TaskMedicalReview")]
public class TaskMedicalReview : BaseFullAuditEntity
{
#region
[JsonIgnore]
public User LatestReplyUser { get; set; }
[JsonIgnore]
public User MedicalManagerUser { get; set; }
[JsonIgnore]
[ForeignKey("VisitTaskId")]
public VisitTask VisitTask { get; set; }
[JsonIgnore]
public List<ReadingMedicalReviewDialog> ReadingMedicalReviewDialogList { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
/// <summary>
/// 文件
/// </summary>
[NotMapped]
public List<OSSImageInfo> FileList
{
try
{
var result = JsonConvert.DeserializeObject<List<OSSImageInfo>>(this.ImagePath);
return result == null ? new List<OSSImageInfo>() : result;
}
catch (Exception)
get
{
return new List<OSSImageInfo>();
}
try
{
var result = JsonConvert.DeserializeObject<List<OSSImageInfo>>(this.ImagePath);
return result == null ? new List<OSSImageInfo>() : result;
}
catch (Exception)
{
return new List<OSSImageInfo>();
}
}
}
[NotMapped]
public List<Guid> PDRelationTaskIdList => PDRelationTaskIdListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Select(t => Guid.Parse(t)).ToList();
#endregion
public Guid? LatestReplyUserId { get; set; }
/// <summary>
/// 分配时间
/// </summary>
public DateTime? AllocateTime { get; set; }
/// <summary>
/// 审核状态
/// </summary>
[Required]
public MedicalReviewAuditState AuditState { get; set; }
/// <summary>
/// 审核通过时间
/// </summary>
public DateTime? AuditSignTime { get; set; }
/// <summary>
/// 阅片人是否认同
/// </summary>
public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; }
public Guid? MedicalManagerUserId { get; set; }
public Guid VisitTaskId { get; set; }
public Guid TrialId { get; set; }
/// <summary>
/// 是否有问题
/// </summary>
public bool IsHaveQuestion { get; set; } = false;
/// <summary>
/// 质询问题
/// </summary>
public string Questioning { get; set; } = string.Empty;
/// <summary>
/// 图片路径
/// </summary>
public string ImagePath { get; set; } = string.Empty;
/// <summary>
/// 审核建议
/// </summary>
public AuditAdvice AuditAdviceEnum { get; set; }
/// <summary>
/// 是否关闭对话
/// </summary>
public bool IsClosedDialog { get; set; }
/// <summary>
/// 保存问题的时间
/// </summary>
public DateTime? SaveQuestionTime { get; set; }
/// <summary>
/// 不同意重阅原因
/// </summary>
public string DisagreeReason { get; set; } = string.Empty;
/// <summary>
/// 是否申请重阅
/// </summary>
public bool IsApplyHeavyReading { get; set; } = false;
/// <summary>
/// 保存结论时间
/// </summary>
public DateTime? SaveConclusionTime { get; set; }
/// <summary>
/// 文件名称
/// </summary>
public string FileName { get; set; } = string.Empty;
/// <summary>
/// 是否发送消息
/// </summary>
public bool IsSendMessage { get; set; } = false;
/// <summary>
/// 医学审核对话关闭原因
/// </summary>
public MedicalDialogClose MedicalDialogCloseEnum { get; set; }
/// <summary>
/// 对话关闭原因
/// </summary>
public string DialogCloseReason { get; set; } = string.Empty;
/// <summary>
/// 无效的 为True无效
/// </summary>
public bool IsInvalid { get; set; }
public bool IsAutoGenerate { get; set; }
// | 分割
public string PDRelationTaskIdListStr { get; set; } = string.Empty;
}
[NotMapped]
public List<Guid> PDRelationTaskIdList => PDRelationTaskIdListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Select(t => Guid.Parse(t)).ToList();
#endregion
public Guid? LatestReplyUserId { get; set; }
/// <summary>
/// 分配时间
/// </summary>
public DateTime? AllocateTime { get; set; }
/// <summary>
/// 审核状态
/// </summary>
[Required]
public MedicalReviewAuditState AuditState { get; set; }
/// <summary>
/// 审核通过时间
/// </summary>
public DateTime? AuditSignTime { get; set; }
/// <summary>
/// 阅片人是否认同
/// </summary>
public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; }
public Guid? MedicalManagerUserId { get; set; }
public Guid VisitTaskId { get; set; }
public Guid TrialId { get; set; }
/// <summary>
/// 是否有问题
/// </summary>
public bool IsHaveQuestion { get; set; } = false;
/// <summary>
/// 质询问题
/// </summary>
public string Questioning { get; set; } = string.Empty;
/// <summary>
/// 图片路径
/// </summary>
public string ImagePath { get; set; } = string.Empty;
/// <summary>
/// 审核建议
/// </summary>
public AuditAdvice AuditAdviceEnum { get; set; }
/// <summary>
/// 是否关闭对话
/// </summary>
public bool IsClosedDialog { get; set; }
/// <summary>
/// 保存问题的时间
/// </summary>
public DateTime? SaveQuestionTime { get; set; }
/// <summary>
/// 不同意重阅原因
/// </summary>
public string DisagreeReason { get; set; } = string.Empty;
/// <summary>
/// 是否申请重阅
/// </summary>
public bool IsApplyHeavyReading { get; set; } = false;
/// <summary>
/// 保存结论时间
/// </summary>
public DateTime? SaveConclusionTime { get; set; }
/// <summary>
/// 文件名称
/// </summary>
public string FileName { get; set; } = string.Empty;
/// <summary>
/// 是否发送消息
/// </summary>
public bool IsSendMessage { get; set; } = false;
/// <summary>
/// 医学审核对话关闭原因
/// </summary>
public MedicalDialogClose MedicalDialogCloseEnum { get; set; }
/// <summary>
/// 对话关闭原因
/// </summary>
public string DialogCloseReason { get; set; } = string.Empty;
/// <summary>
/// 无效的 为True无效
/// </summary>
public bool IsInvalid { get; set; }
public bool IsAutoGenerate { get; set; }
// | 分割
public string PDRelationTaskIdListStr { get; set; } = string.Empty;
}
@@ -1,49 +1,43 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-06-29 13:32:34
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 一致性分析规则")]
[Table("TaskMedicalReviewRule")]
public class TaskMedicalReviewRule : BaseFullAuditEntity
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///TaskTaskMedicalReviewRule
///</summary>
[Table("TaskMedicalReviewRule")]
public class TaskMedicalReviewRule : BaseFullAuditEntity
{
#region
[JsonIgnore]
public User DoctorUser { get; set; }
#endregion
#region
public Guid DoctorUserId { get; set; }
#endregion
public bool IsEnable { get; set; }
public Guid DoctorUserId { get; set; }
public string Note { get; set; } = string.Empty;
public bool IsEnable { get; set; }
public Guid TrialId { get; set; }
public string Note { get; set; } = string.Empty;
public int PlanVisitCount { get; set; }
public Guid TrialId { get; set; }
public int PlanJudgeCount { get; set; }
public int PlanVisitCount { get; set; }
public int PlanGlobalCount { get; set; }
public int PlanTumorCount { get; set; }
public int PlanJudgeCount { get; set; }
public int PlanGlobalCount { get; set; }
public int PlanTumorCount { get; set; }
[JsonIgnore]
public User DoctorUser { get; set; }
}
}
@@ -1,29 +1,28 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2024-02-29 15:48:36
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 虚拟中心编号更新记录")]
[Table("TrialVirtualSiteCodeUpdate")]
public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///TrialVirtualSiteCodeUpdate
///</summary>
[Table("TrialVirtualSiteCodeUpdate")]
public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity
{
#region
#region
#endregion
#endregion
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
[StringLength(250)]
public string VirturalSiteCode { get; set; } = string.Empty;
public string VirturalSiteCode { get; set; } = string.Empty;
}
}
+387 -390
View File
@@ -3,435 +3,432 @@
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-06-07 14:09:29
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.Linq;
using EntityFrameworkCore.Projectables;
using IRaCIS.Core.Domain.Share;
using System.Linq;
namespace IRaCIS.Core.Domain.Models;
///<summary>
///VisitTask
///</summary>
[Table("VisitTask")]
public class VisitTask : BaseFullAuditEntity
namespace IRaCIS.Core.Domain.Models
{
#region
[JsonIgnore]
public List<TaskStudy> TaskStudyList { get; set; }
public List<NoneDicomStudyFile> TaskNoneDicomStudyFileList { get; set; }
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
[ForeignKey("DoctorUserId")]
public User DoctorUser { get; set; }
[ForeignKey("SouceReadModuleId")]
public ReadModule ReadModule { get; set; }
[ForeignKey("SourceSubjectVisitId")]
public SubjectVisit SourceSubjectVisit { get; set; }
[JsonIgnore]
[ForeignKey("JudgeVisitTaskId")]
public VisitTask JudgeVisitTask { get; set; }
[JsonIgnore]
public Subject Subject { get; set; }
[JsonIgnore]
public List<TaskMedicalReview> TaskMedicalReviewList { get; set; }
[ForeignKey("JudgeResultTaskId")]
public VisitTask JudgeResultTask { get; set; }
//影像质量 等等第一层级问题答案
[JsonIgnore]
public List<ReadingTaskQuestionAnswer> ReadingTaskQuestionAnswerList { get; set; } = new List<ReadingTaskQuestionAnswer>();
//病灶表
[JsonIgnore]
public List<ReadingTableAnswerRowInfo> LesionList { get; set; } = new List<ReadingTableAnswerRowInfo>();
//病灶答案表
[JsonIgnore]
public List<ReadingTableQuestionAnswer> LesionAnswerList { get; set; } = new List<ReadingTableQuestionAnswer>();
//重阅或者退回影像的记录中间表
[JsonIgnore]
public List<TaskInfluence> TaskInfluenceList { get; set; } = new List<TaskInfluence>();
[JsonIgnore]
//对于全局任务而言 才可以用的 关联的访视阅片结果
public List<ReadingGlobalTaskInfo> GlobalVisitResultList { get; set; } = new List<ReadingGlobalTaskInfo>();
/// <summary>
/// 裁判结果图片地址
/// </summary>
[NotMapped]
public List<string> JudgeResultImagePathList
///<summary>
///VisitTask
///</summary>
[Table("VisitTask")]
public class VisitTask : BaseFullAuditEntity
{
get
#region
[JsonIgnore]
public List<TaskStudy> TaskStudyList { get; set; }
public List<NoneDicomStudyFile> TaskNoneDicomStudyFileList { get; set; }
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
[ForeignKey("DoctorUserId")]
public User DoctorUser { get; set; }
[ForeignKey("SouceReadModuleId")]
public ReadModule ReadModule { get; set; }
[ForeignKey("SourceSubjectVisitId")]
public SubjectVisit SourceSubjectVisit { get; set; }
[JsonIgnore]
[ForeignKey("JudgeVisitTaskId")]
public VisitTask JudgeVisitTask { get; set; }
[JsonIgnore]
public Subject Subject { get; set; }
[JsonIgnore]
public List<TaskMedicalReview> TaskMedicalReviewList { get; set; }
[ForeignKey("JudgeResultTaskId")]
public VisitTask JudgeResultTask { get; set; }
//影像质量 等等第一层级问题答案
[JsonIgnore]
public List<ReadingTaskQuestionAnswer> ReadingTaskQuestionAnswerList { get; set; } = new List<ReadingTaskQuestionAnswer>();
//病灶表
[JsonIgnore]
public List<ReadingTableAnswerRowInfo> LesionList { get; set; } = new List<ReadingTableAnswerRowInfo>();
//病灶答案表
[JsonIgnore]
public List<ReadingTableQuestionAnswer> LesionAnswerList { get; set; } = new List<ReadingTableQuestionAnswer>();
//重阅或者退回影像的记录中间表
[JsonIgnore]
public List<TaskInfluence> TaskInfluenceList { get; set; } = new List<TaskInfluence>();
[JsonIgnore]
//对于全局任务而言 才可以用的 关联的访视阅片结果
public List<ReadingGlobalTaskInfo> GlobalVisitResultList { get; set; } = new List<ReadingGlobalTaskInfo>();
/// <summary>
/// 裁判结果图片地址
/// </summary>
[NotMapped]
public List<string> JudgeResultImagePathList
{
try
{
return this.JudgeResultImagePath.Trim().Split(',').ToList();
}
catch (Exception)
get
{
return new List<string>();
}
try
{
return this.JudgeResultImagePath.Trim().Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
}
[JsonIgnore]
[JsonIgnore]
public Trial Trial { get; set; }
public Trial Trial { get; set; }
[JsonIgnore]
public List<UserFeedBack> UserFeedBackList { get; set; }
[JsonIgnore]
public List<UserFeedBack> UserFeedBackList { get; set; }
/// <summary>
/// 关联的访视任务ID (当前任务是访视任务的话会有自己)集合
/// </summary>
[NotMapped]
public List<Guid> RelatedVisitTaskIdList
{
get
/// <summary>
/// 关联的访视任务ID (当前任务是访视任务的话会有自己)集合
/// </summary>
[NotMapped]
public List<Guid> RelatedVisitTaskIdList
{
try
get
{
return JsonConvert.DeserializeObject<List<Guid>>(this.RelatedVisitTaskIds);
}
catch (Exception)
{
try
{
return new List<Guid>();
}
return JsonConvert.DeserializeObject<List<Guid>>(this.RelatedVisitTaskIds);
}
catch (Exception)
{
return new List<Guid>();
}
}
}
}
/// <summary>
/// 报告任务关系 包含冻结
/// </summary>
[NotMapped]
public List<Guid> ReportRelatedTaskIdList
{
get
/// <summary>
/// 报告任务关系 包含冻结
/// </summary>
[NotMapped]
public List<Guid> ReportRelatedTaskIdList
{
try
get
{
return JsonConvert.DeserializeObject<List<Guid>>(this.ReportRelatedTaskIds);
}
catch (Exception)
{
try
{
return new List<Guid>();
}
return JsonConvert.DeserializeObject<List<Guid>>(this.ReportRelatedTaskIds);
}
catch (Exception)
{
return new List<Guid>();
}
}
}
}
/// <summary>
/// 既往任务Id 不包括自己集合
/// </summary>
[NotMapped]
public List<Guid> PastResultTaskIdList
{
get
/// <summary>
/// 既往任务Id 不包括自己集合
/// </summary>
[NotMapped]
public List<Guid> PastResultTaskIdList
{
try
{
return JsonConvert.DeserializeObject<List<Guid>>(this.PastResultTaskIds);
}
catch (Exception)
get
{
return new List<Guid>();
}
try
{
return JsonConvert.DeserializeObject<List<Guid>>(this.PastResultTaskIds);
}
catch (Exception)
{
return new List<Guid>();
}
}
}
#endregion
public string TaskName { get; set; } = string.Empty;
public string TaskBlindName { get; set; } = string.Empty;
//任务来源访视Id 方便回更访视读片状态
public Guid? SourceSubjectVisitId { get; set; }
public Guid? SouceReadModuleId { get; set; }
/// <summary> 任务类型 </summary>
public ReadingCategory ReadingCategory { get; set; }
public Guid TrialId { get; set; }
/// <summary>
/// 分配时间
/// </summary>
public DateTime? AllocateTime { get; set; }
public Guid SubjectId { get; set; }
public int Code { get; set; }
public string TaskCode { get; set; } = string.Empty;
public bool IsUrgent { get; set; }
/// <summary>
/// 加急类型
/// </summary>
public TaskUrgentType? TaskUrgentType { get; set; }
/// <summary>
/// 任务加急类型
/// </summary>
public string TaskUrgentRemake { get; set; } = string.Empty;
/// <summary>
/// 是否和编辑加急状态
/// </summary>
public bool IsCanEditUrgentState { get; set; } = true;
/// <summary>
/// 0 代表 单重阅片 产生的任务 否则就是双重 任务 1 任务 2
/// </summary>
[Required]
public Arm ArmEnum { get; set; }
/// <summary>
/// 分配状态
/// </summary>
public TaskAllocationState TaskAllocationState { get; set; }
public TaskState TaskState { get; set; }
/// <summary>
/// 重阅状态
/// </summary>
public ReReadingApplyState ReReadingApplyState { get; set; }
public Guid? DoctorUserId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
//裁判任务的Id
public Guid? JudgeVisitTaskId { get; set; }
//任务阅片状态
public ReadingTaskState ReadingTaskState { get; set; }
//签名时间
public DateTime? SignTime { get; set; }
public DateTime? SuggesteFinishedTime { get; set; }
/// <summary>
/// 是否是重阅产生的,方便过滤数据
/// </summary>
public bool IsReReadingCreate { get; set; }
/// <summary>
/// PM 对该任务进行了回退 影响的任务不设置
/// </summary>
public bool IsPMSetBack { get; set; }
/// <summary> 裁判结果的任务ID </summary>
public Guid? JudgeResultTaskId { get; set; }
//随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定
public decimal VisitTaskNum { get; set; }
/// <summary>
/// 首次阅片时间
/// </summary>
public DateTime? FirstReadingTime { get; set; }
/// <summary>
/// 全局是否有更新
/// </summary>
public bool? IsGlobalHaveUpdate { get; set; }
/// <summary>
/// IR是否阅读临床数据
/// </summary>
public bool IsReadClinicalData { get; set; } = false;
/// <summary>
/// 关联的访视任务ID (当前任务是访视任务的话会有自己)
/// </summary>
public string RelatedVisitTaskIds { get; set; } = "[]";
/// <summary>
/// 报告任务关系 包含冻结
/// </summary>
public string ReportRelatedTaskIds { get; set; } = "[]";
/// <summary>
/// 既往任务Id 不包括自己
/// </summary>
public string PastResultTaskIds { get; set; } = "[]";
#region
[JsonIgnore]
//对于裁判任务而言,触发裁判的列表
public List<VisitTask> JudgeVisitList { get; set; }
/// <summary>
/// 裁判结果的备注
/// </summary>
public string JudgeResultRemark { get; set; } = string.Empty;
/// <summary>
/// 裁判结果的图片路径
/// </summary>
public string JudgeResultImagePath { get; set; } = string.Empty;
#endregion
#region
/// <summary>
/// 阅片结果是否和原数据有差异
/// </summary>
public bool? IsAnalysisDiffToOriginalData { get; set; }
/// <summary>
/// 组件一致性和原Arm1是否有差异
/// </summary>
public bool? IsGroupDiffArm1 { get; set; }
/// <summary>
/// 组件一致性和原Arm2是否有差异
/// </summary>
public bool? IsGroupDiffArm2 { get; set; }
/// <summary>
/// 是否是一致性分析产生
/// </summary>
public bool IsAnalysisCreate { get; set; }
/// <summary>
/// 转换之前的任务Id(转化的任务才有该值)
/// </summary>
public Guid? BeforeConvertedTaskId { get; set; }
[Projectable]
[JsonIgnore]
public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask || Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId
&& t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null
&& t.TaskState == TaskState.Effect
&& t.VisitTaskNum < VisitTaskNum
&& t.IsSelfAnalysis == IsSelfAnalysis
&& t.ArmEnum == ArmEnum
).Any();
/// <summary>
/// 是否修改了整体肿瘤评估
/// </summary>
public bool IsChangeTumorEvaluate { get; set; } = false;
/// <summary>
/// 重阅重置任务的 标注是转化之前的 还是转化之后的
/// </summary>
public bool IsHistoryConvertedTask { get; set; } = false;
/// <summary>
/// 是否是自身一致性
/// </summary>
public bool? IsSelfAnalysis { get; set; }
public string BlindSubjectCode { get; set; } = string.Empty;
public string BlindTrialSiteCode { get; set; } = string.Empty;
//一致性分析规则Id 用于最后统计
//public Guid? TaskConsistentRuleId { get; set; }
/// <summary>
/// 针对产生的一致性任务而言,这个字段存储的是原始任务
/// </summary>
public Guid? ConsistentAnalysisOriginalTaskId { get; set; }
#endregion
//临床数据
public bool IsNeedClinicalDataSign { get; set; }
/// <summary>
/// 临床数据是否签名
/// </summary>
public bool IsClinicalDataSign { get; set; }
/// <summary>
/// 前序任务需要签名 但是未签名
/// </summary>
public bool IsFrontTaskNeedSignButNotSign { get; set; }
public int ImageStudyState { get; set; }
}
#endregion
public string TaskName { get; set; } = string.Empty;
public string TaskBlindName { get; set; } = string.Empty;
//任务来源访视Id 方便回更访视读片状态
public Guid? SourceSubjectVisitId { get; set; }
public Guid? SouceReadModuleId { get; set; }
/// <summary> 任务类型 </summary>
public ReadingCategory ReadingCategory { get; set; }
public Guid TrialId { get; set; }
/// <summary>
/// 分配时间
/// </summary>
public DateTime? AllocateTime { get; set; }
public Guid SubjectId { get; set; }
public int Code { get; set; }
public string TaskCode { get; set; } = string.Empty;
public bool IsUrgent { get; set; }
/// <summary>
/// 加急类型
/// </summary>
public TaskUrgentType? TaskUrgentType { get; set; }
/// <summary>
/// 任务加急类型
/// </summary>
public string TaskUrgentRemake { get; set; } = string.Empty;
/// <summary>
/// 是否和编辑加急状态
/// </summary>
public bool IsCanEditUrgentState { get; set; } = true;
/// <summary>
/// 0 代表 单重阅片 产生的任务 否则就是双重 任务 1 任务 2
/// </summary>
[Required]
public Arm ArmEnum { get; set; }
/// <summary>
/// 分配状态
/// </summary>
public TaskAllocationState TaskAllocationState { get; set; }
public TaskState TaskState { get; set; }
/// <summary>
/// 重阅状态
/// </summary>
public ReReadingApplyState ReReadingApplyState { get; set; }
public Guid? DoctorUserId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
//裁判任务的Id
public Guid? JudgeVisitTaskId { get; set; }
//任务阅片状态
public ReadingTaskState ReadingTaskState { get; set; }
//签名时间
public DateTime? SignTime { get; set; }
public DateTime? SuggesteFinishedTime { get; set; }
/// <summary>
/// 是否是重阅产生的,方便过滤数据
/// </summary>
public bool IsReReadingCreate { get; set; }
/// <summary>
/// PM 对该任务进行了回退 影响的任务不设置
/// </summary>
public bool IsPMSetBack { get; set; }
/// <summary> 裁判结果的任务ID </summary>
public Guid? JudgeResultTaskId { get; set; }
//随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定
public decimal VisitTaskNum { get; set; }
/// <summary>
/// 首次阅片时间
/// </summary>
public DateTime? FirstReadingTime { get; set; }
/// <summary>
/// 全局是否有更新
/// </summary>
public bool? IsGlobalHaveUpdate { get; set; }
/// <summary>
/// IR是否阅读临床数据
/// </summary>
public bool IsReadClinicalData { get; set; } = false;
/// <summary>
/// 关联的访视任务ID (当前任务是访视任务的话会有自己)
/// </summary>
public string RelatedVisitTaskIds { get; set; } = "[]";
/// <summary>
/// 报告任务关系 包含冻结
/// </summary>
public string ReportRelatedTaskIds { get; set; } = "[]";
/// <summary>
/// 既往任务Id 不包括自己
/// </summary>
public string PastResultTaskIds { get; set; } = "[]";
#region
[JsonIgnore]
//对于裁判任务而言,触发裁判的列表
public List<VisitTask> JudgeVisitList { get; set; }
/// <summary>
/// 裁判结果的备注
/// </summary>
public string JudgeResultRemark { get; set; } = string.Empty;
/// <summary>
/// 裁判结果的图片路径
/// </summary>
public string JudgeResultImagePath { get; set; } = string.Empty;
#endregion
#region
/// <summary>
/// 阅片结果是否和原数据有差异
/// </summary>
public bool? IsAnalysisDiffToOriginalData { get; set; }
/// <summary>
/// 组件一致性和原Arm1是否有差异
/// </summary>
public bool? IsGroupDiffArm1 { get; set; }
/// <summary>
/// 组件一致性和原Arm2是否有差异
/// </summary>
public bool? IsGroupDiffArm2 { get; set; }
/// <summary>
/// 是否是一致性分析产生
/// </summary>
public bool IsAnalysisCreate { get; set; }
/// <summary>
/// 转换之前的任务Id(转化的任务才有该值)
/// </summary>
public Guid? BeforeConvertedTaskId { get; set; }
[Projectable]
[JsonIgnore]
public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask || Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId
&& t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null
&& t.TaskState == TaskState.Effect
&& t.VisitTaskNum < VisitTaskNum
&& t.IsSelfAnalysis == IsSelfAnalysis
&& t.ArmEnum == ArmEnum
).Any();
/// <summary>
/// 是否修改了整体肿瘤评估
/// </summary>
public bool IsChangeTumorEvaluate { get; set; } = false;
/// <summary>
/// 重阅重置任务的 标注是转化之前的 还是转化之后的
/// </summary>
public bool IsHistoryConvertedTask { get; set; } = false;
/// <summary>
/// 是否是自身一致性
/// </summary>
public bool? IsSelfAnalysis { get; set; }
public string BlindSubjectCode { get; set; } = string.Empty;
public string BlindTrialSiteCode { get; set; } = string.Empty;
//一致性分析规则Id 用于最后统计
//public Guid? TaskConsistentRuleId { get; set; }
/// <summary>
/// 针对产生的一致性任务而言,这个字段存储的是原始任务
/// </summary>
public Guid? ConsistentAnalysisOriginalTaskId { get; set; }
#endregion
//临床数据
public bool IsNeedClinicalDataSign { get; set; }
/// <summary>
/// 临床数据是否签名
/// </summary>
public bool IsClinicalDataSign { get; set; }
/// <summary>
/// 前序任务需要签名 但是未签名
/// </summary>
public bool IsFrontTaskNeedSignButNotSign { get; set; }
public int ImageStudyState { get; set; }
}
@@ -3,72 +3,73 @@
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2022-06-07 14:09:29
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 阅片任务重阅表")]
[Table("VisitTaskReReading")]
public class VisitTaskReReading : BaseFullAuditEntity
namespace IRaCIS.Core.Domain.Models
{
#region
///<summary>
///重阅申请流程记录表
///</summary>
[Table("VisitTaskReReading")]
public class VisitTaskReReading : BaseFullAuditEntity
{
#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; }
[Comment(" 重阅原始任务Id")]
public Guid OriginalReReadingTaskId { get; set; }
public Guid TrialId { get; set; }
[Comment(" 重阅确认人")]
public Guid? RequestReReadingConfirmUserId { get; set; }
//重阅原始任务Id 重阅会产生新的任务
public Guid OriginalReReadingTaskId { get; set; }
[Comment(" 请求重阅人")]
public Guid RequestReReadingUserId { get; set; }
//产生重阅的根任务Id
public Guid RootReReadingTaskId { get; set; }
public Guid RootReReadingTaskId { get; set; }
[Comment("仅仅包括全局和访视")]
public bool IsCopyFollowForms { get; set; }
//重阅申请 产生的新任务Id
public Guid? NewReReadingTaskId { get; set; }
[Comment(" 是否复制之前任务表单数据")]
public bool IsCopyOrigenalForms { get; set; }
public Guid RequestReReadingUserId { 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; }
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; }
}
}