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

批量处理实体类空行
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-09-20 14:34:32 +08:00
parent 7524d39213
commit 718ddefe97
163 changed files with 0 additions and 1923 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
using System.ComponentModel;
@ -25,8 +21,6 @@ namespace IRaCIS.Core.Domain.Models
//ChildList
[JsonIgnore]
public List<SubjectUser> EarlierSubjectUserList { get; set; }
[JsonIgnore]
public User DoctorUser { get; set; }
@ -41,20 +35,13 @@ namespace IRaCIS.Core.Domain.Models
public DateTime? AssignTime { 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; }
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -25,8 +22,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialId { get; set; }
public int PlanSubjectCount { get; set; }
public bool IsEnable { get; set; }
public string Note { get; set; } = string.Empty;
@ -39,11 +34,6 @@ namespace IRaCIS.Core.Domain.Models
public bool IsJudgeDoctor { get; set; }
public int PlanReadingRatio { get; set; }
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -40,14 +37,7 @@ namespace IRaCIS.Core.Domain.Models
public bool IsEnable { get; set; }
public string Note { get; set; } = string.Empty;
public Guid TrialReadingCriterionId { get; set; }
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -24,12 +21,7 @@ namespace IRaCIS.Core.Domain.Models
//对影响任务进行的操作
public ReReadingOrBackOptType OptType { get; set; }
}
public enum ReReadingOrBackOptType
{
//取消分配

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

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
using System.Linq;
@ -36,10 +32,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public Trial Trial { get; set; }
/// <summary>
/// 文件
/// </summary>
@ -48,8 +40,6 @@ namespace IRaCIS.Core.Domain.Models
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<OSSImageInfo>>(this.ImagePath);
@ -70,8 +60,6 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public Guid? LatestReplyUserId { get; set; }
/// <summary>
/// 分配时间
/// </summary>
@ -94,12 +82,7 @@ namespace IRaCIS.Core.Domain.Models
public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; }
public Guid? MedicalManagerUserId { get; set; }
public Guid VisitTaskId { get; set; }
public Guid TrialId { get; set; }
/// <summary>
@ -111,8 +94,6 @@ namespace IRaCIS.Core.Domain.Models
/// 质询问题
/// </summary>
public string Questioning { get; set; } = string.Empty;
/// <summary>
/// 图片路径
/// </summary>
@ -132,26 +113,18 @@ namespace IRaCIS.Core.Domain.Models
/// 保存问题的时间
/// </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>
@ -161,8 +134,6 @@ namespace IRaCIS.Core.Domain.Models
/// 是否发送消息
/// </summary>
public bool IsSendMessage { get; set; } = false;
/// <summary>
/// 医学审核对话关闭原因
/// </summary>
@ -182,10 +153,5 @@ namespace IRaCIS.Core.Domain.Models
// | 分割
public string PDRelationTaskIdListStr { get; set; } = string.Empty;
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -32,11 +29,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public User DoctorUser { get; set; }
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -15,13 +12,6 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public Guid TrialId { get; set; }
public string VirturalSiteCode { get; set; } = string.Empty;
}
}

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

@ -1,7 +1,3 @@
using EntityFrameworkCore.Projectables;
using IRaCIS.Core.Domain.Share;
using System.Linq;
@ -23,9 +19,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
[ForeignKey("DoctorUserId")]
public User DoctorUser { get; set; }
@ -37,26 +30,16 @@ namespace IRaCIS.Core.Domain.Models
[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>();
@ -64,19 +47,12 @@ namespace IRaCIS.Core.Domain.Models
//病灶答案表
[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>
@ -98,14 +74,9 @@ namespace IRaCIS.Core.Domain.Models
}
}
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public List<UserFeedBack> UserFeedBackList { get; set; }
@ -131,9 +102,6 @@ namespace IRaCIS.Core.Domain.Models
}
}
/// <summary>
/// 报告任务关系 包含冻结
/// </summary>
@ -156,10 +124,6 @@ namespace IRaCIS.Core.Domain.Models
}
}
/// <summary>
/// 既往任务Id 不包括自己集合
/// </summary>
@ -181,11 +145,7 @@ namespace IRaCIS.Core.Domain.Models
}
}
#endregion
public string TaskName { get; set; } = string.Empty;
public string TaskBlindName { get; set; } = string.Empty;
@ -197,16 +157,12 @@ namespace IRaCIS.Core.Domain.Models
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;
@ -238,24 +194,14 @@ namespace IRaCIS.Core.Domain.Models
/// 分配状态
/// </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; }
@ -266,8 +212,6 @@ namespace IRaCIS.Core.Domain.Models
public DateTime? SignTime { get; set; }
public DateTime? SuggesteFinishedTime { get; set; }
/// <summary>
/// 是否是重阅产生的，方便过滤数据
/// </summary>
@ -277,18 +221,10 @@ namespace IRaCIS.Core.Domain.Models
/// 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>
@ -319,9 +255,6 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string PastResultTaskIds { get; set; } = "[]";
#region 裁判任务特有
[JsonIgnore]
@ -338,8 +271,6 @@ namespace IRaCIS.Core.Domain.Models
public string JudgeResultImagePath { get; set; } = string.Empty;
#endregion
#region 一致性分析的任务特有数据
/// <summary>
@ -361,15 +292,10 @@ namespace IRaCIS.Core.Domain.Models
/// 是否是一致性分析产生
/// </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
@ -379,14 +305,10 @@ namespace IRaCIS.Core.Domain.Models
&& t.IsSelfAnalysis == IsSelfAnalysis
&& t.ArmEnum == ArmEnum
).Any();
/// <summary>
/// 是否修改了整体肿瘤评估
/// </summary>
public bool IsChangeTumorEvaluate { get; set; } = false;
/// <summary>
/// 重阅重置任务的 标注是转化之前的 还是转化之后的
/// </summary>
@ -409,8 +331,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid? ConsistentAnalysisOriginalTaskId { get; set; }
#endregion
//临床数据
public bool IsNeedClinicalDataSign { get; set; }
@ -424,10 +344,6 @@ namespace IRaCIS.Core.Domain.Models
/// 前序任务需要签名 但是未签名
/// </summary>
public bool IsFrontTaskNeedSignButNotSign { get; set; }
public int ImageStudyState { get; set; }
}
}

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

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
@ -35,8 +31,6 @@ namespace IRaCIS.Core.Domain.Models
//重阅原始任务Id 重阅会产生新的任务
public Guid OriginalReReadingTaskId { get; set; }
//产生重阅的根任务Id
public Guid RootReReadingTaskId { get; set; }
@ -44,15 +38,9 @@ namespace IRaCIS.Core.Domain.Models
public Guid? NewReReadingTaskId { get; set; }
public Guid RequestReReadingUserId { 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;
@ -60,15 +48,10 @@ namespace IRaCIS.Core.Domain.Models
public RequestReReadingResult RequestReReadingResultEnum { get; set; }
public Guid? RequestReReadingConfirmUserId { get; set; }
public bool IsCopyOrigenalForms { get; set; }
//仅仅包括全局和访视
public bool IsCopyFollowForms { get; set; }
}
}

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

@ -2,8 +2,6 @@
namespace IRaCIS.Core.Domain.Models
{
public interface IAggregateRoot;
public interface IEntity<TKey>
{
@ -23,8 +21,6 @@ namespace IRaCIS.Core.Domain.Models
[Required]
[DatabaseGenerated(DatabaseGeneratedOption.None)]
public Guid Id { get; set; }
#region 领域事件 仅仅允许通过提供的方法进行操作
[JsonIgnore]
private readonly List<DomainEvent> _domainEvents = [];
@ -32,8 +28,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
[NotMapped]
public IReadOnlyCollection<DomainEvent> DomainEvents => _domainEvents.AsReadOnly();
public void AddDomainEvent(DomainEvent domainEvent)
{
_domainEvents.Add(domainEvent);
@ -49,13 +43,7 @@ namespace IRaCIS.Core.Domain.Models
_domainEvents.Clear();
}
#endregion
}
#region 减少实体属性，增加基类
public abstract class BaseAddAuditEntity : Entity, IAuditAdd
@ -94,8 +82,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public User CreateUser { get; set; }
}
public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
{
public Guid? DeleteUserId { get; set; }
@ -116,8 +102,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }
}
#endregion
}

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

@ -7,9 +7,6 @@
public DateTime CreateTime { get; set; }
}
public interface IAuditAdd : IAuditAdd<Guid>
{
@ -19,7 +16,4 @@
{
public string CreateUser { get; set; }
}
}

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

@ -10,9 +10,4 @@
{
}
}

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

@ -12,6 +12,4 @@
{
}
}

8
IRaCIS.Core.Domain/Common/CommonDocument.cs
View File

@ -1,11 +1,5 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models;
[Comment("数据上传 | 数据导出 | 邮件附件 文件记录表 （需要同步）")]
[Table("CommonDocument")]
public class CommonDocument : BaseFullDeleteAuditEntity
@ -29,5 +23,3 @@ public class CommonDocument : BaseFullDeleteAuditEntity
public string Path { get; set; } = null!;
}

10
IRaCIS.Core.Domain/Common/Dictionary.cs
View File

@ -1,6 +1,4 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 字典表（需要同步）")]
@ -10,8 +8,6 @@ public partial class Dictionary : BaseFullAuditEntity
#region 导航属性
[JsonIgnore]
public List<DoctorDictionary> DoctorDicRelationList { get; set; } = new List<DoctorDictionary>();
[JsonIgnore]
[ForeignKey("ConfigTypeId")]
public Dictionary ConfigDictionary { get; set; }
@ -23,8 +19,6 @@ public partial class Dictionary : BaseFullAuditEntity
public List<Dictionary> ChildList { get; set; } = new List<Dictionary>();
#endregion
[StringLength(400)]
public string ChildGroup { get; set; } = null!;
@ -52,8 +46,4 @@ public partial class Dictionary : BaseFullAuditEntity
[StringLength(400)]
public string ValueCN { get; set; } = null!;
}

17
IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs
View File

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models;
@ -44,12 +40,8 @@ public class EmailNoticeConfig : BaseFullDeleteAuditEntity
[Comment(" 发送周期")]
public string EmailCron { get; set; } = null!;
[MaxLength]
public string EmailHtmlContent { get; set; } = null!;
[MaxLength]
public string EmailHtmlContentCN { get; set; } = null!;
@ -72,12 +64,7 @@ public class EmailNoticeConfig : BaseFullDeleteAuditEntity
public bool IsReturnRequired { get; set; }
public SysEmailLevel SystemLevel { get; set; }
}
[Comment("后台 - 邮件配置用户类型表（需要同步）")]
[Table("EmailNoticeUserType")]
@ -87,14 +74,10 @@ public class EmailNoticeUserType : Entity
public EmailNoticeConfig EmailNoticeConfig { get; set; }
public Guid EmailNoticeConfigId { get; set; }
public UserTypeEnum UserType { get; set; }
public EmailUserType EmailUserType { get; set; }
}
public enum SysEmailLevel
{
not_sys = 0,

5
IRaCIS.Core.Domain/Common/ExploreRecommend.cs
View File

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 浏览器推荐 （需要同步）")]
@ -29,5 +26,3 @@ public class ExploreRecommend : BaseFullDeleteAuditEntity
public string Version { get; set; } = null!;
}

11
IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
View File

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models;
[Comment("稽查 - 配置表 （需要同步）")]
@ -127,10 +124,6 @@ public class FrontAuditConfig : BaseFullAuditEntity
public string ValueCN { get; set; } = null!;
}
public class UrlConfig
{
public bool IsRoute { get; set; }
@ -165,12 +158,8 @@ public class TableConfig
public string ColumnEnName { get; set; } = String.Empty;
public bool IsPicture { get; set; }
public bool IsNeedTransalate { get; set; }
public string TranslateDictionaryName { get; set; } = String.Empty;
public bool IsDynamicTranslate { get; set; }
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -20,8 +17,6 @@ namespace IRaCIS.Core.Domain.Models
/// 0 1 2 预翻译 已确认 废除
/// </summary>
public int State { get; set; }
public string Description { get; set; } = string.Empty;
public string Code { get; set; } = string.Empty;
@ -33,15 +28,9 @@ namespace IRaCIS.Core.Domain.Models
public int InternationalizationType { get; set; }
public string FrontType { get; set; } = string.Empty;
public string Module { get; set; } = string.Empty;
//关联版本历史记录表Id
public Guid? PublishLogId { get; set; }
}
}

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

@ -50,8 +50,6 @@ public class NotDefaultAttribute : ValidationAttribute
return true;
}
}
public class CanConvertToTimeAttribute : ValidationAttribute
{
public const string DefaultErrorMessage = "The {0} field is is not a valid DateTime value";

5
IRaCIS.Core.Domain/Common/PublishLog.cs
View File

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -9,8 +6,6 @@ namespace IRaCIS.Core.Domain.Models
[Table("PublishLog")]
public class PublishLog : BaseFullAuditEntity
{
public string Version { get; set; } = string.Empty;
public DateTime? PublishTime { get; set; }

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

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
@ -18,8 +14,6 @@ namespace IRaCIS.Core.Domain.Models
public SystemBasicData Parent { get; set; }
#endregion
public string Name { get; set; } = string.Empty;
public string Value { get; set; } = string.Empty;
@ -31,15 +25,11 @@ namespace IRaCIS.Core.Domain.Models
public string Code { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public string ValueCN { get; set; } = string.Empty;
public bool IsEnable { get; set; }
public BasicDataTypeEnum BasicDataTypeEnum { get; set; }
}
}

12
IRaCIS.Core.Domain/Dcotor/Doctor.cs
View File

@ -13,8 +13,6 @@ public class Doctor : BaseFullAuditEntity
public List<DoctorDictionary> DoctorDicRelationList { get; set; } = new List<DoctorDictionary>();
[JsonIgnore]
public List<TrialExperienceCriteria> TrialExperienceCriteriaList { get; set; }
[JsonIgnore]
public List<Enroll> EnrollList { get; set; }
@ -47,8 +45,6 @@ public class Doctor : BaseFullAuditEntity
public bool AcceptingNewTrial { get; set; }
public bool ActivelyReading { get; set; }
[MaxLength]
public string? AdminComment { get; set; }
@ -59,8 +55,6 @@ public class Doctor : BaseFullAuditEntity
public string BlindName { get; set; } = null!;
public string BlindNameCN { get; set; } = null!;
[MaxLength]
public string? BlindPublications { get; set; }
@ -108,12 +102,8 @@ public class Doctor : BaseFullAuditEntity
public int Nation { get; set; }
public Guid OrganizationId { get; set; }
[MaxLength]
public string? OtherClinicalExperience { get; set; }
[MaxLength]
public string? OtherClinicalExperienceCN { get; set; }
@ -184,6 +174,4 @@ public class Doctor : BaseFullAuditEntity
[NotMapped]
public string FullName => LastName + " / " + FirstName;
}

7
IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs
View File

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models;
@ -39,6 +35,3 @@ public class DoctorCriterionFile : BaseAddAuditEntity
public Guid? TrialReadingCriterionId { get; set; }
}

2
IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs
View File

@ -1,6 +1,4 @@
namespace IRaCIS.Core.Domain.Models;
[Comment("医生 - 医生字典关联表")]
[Table("DoctorDictionary")]
public class DoctorDictionary : Entity

2
IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs
View File

@ -42,6 +42,4 @@ public partial class Workload : BaseFullAuditEntity
[StringLength(400)]
public string YearMonth { get; set; } = null!;
}

10
IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs
View File

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -15,17 +12,10 @@ namespace IRaCIS.Core.Domain.Models
[ForeignKey("EnrollId")]
public Enroll Enroll { get; set; }
#endregion
public Guid EnrollId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public bool IsJoinAnalysis { get; set; }
}
}

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

@ -8,8 +8,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public List<TrialExperienceCriteria> ExperienceCriteriaList { get; set; }
#endregion
public Guid DoctorId { get; set; }
public Guid? PhaseId { get; set; }
@ -18,8 +16,6 @@ namespace IRaCIS.Core.Domain.Models
[StringLength(512)]
public string EvaluationContent { get; set; } = string.Empty;
public int VisitReadingCount { get; set; }
public DateTime? StartTime { get; set; }

5
IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs
View File

@ -10,10 +10,5 @@
public Guid DoctorId { get; set; }
public Guid TrialExperienceId { get; set; }
public Guid EvaluationCriteriaId { get; set; }
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -18,21 +15,14 @@ namespace IRaCIS.Core.Domain.Models
[ForeignKey("ConfirmUserId")]
public User ConfirmUser { get; set; }
#endregion
public Guid SystemDocumentId { get; set; }
public DateTime? ConfirmTime { get; set; }
public Guid ConfirmUserId { get; set; }
public DateTime? SignFirstViewTime { get; set; }
public string SignText { get; set; } = string.Empty;
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -17,8 +14,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public SystemDocument SystemDocument { get; set; }
#endregion
public Guid SystemDocumentId { get; set; }
public Guid NeedConfirmUserTypeId { get; set; }

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -18,20 +15,11 @@ namespace IRaCIS.Core.Domain.Models
[ForeignKey("FileTypeId")]
public Dictionary FileType { get; set; }
#endregion
public Guid FileTypeId { get; set; }
public string Name { get; set; } = string.Empty;
public int SignViewMinimumMinutes { get; set; }
public string Path { get; set; } = string.Empty;
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -17,27 +14,10 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public TrialDocument TrialDocument { get; set; }
#endregion
public Guid TrialDocumentId { get; set; }
public DateTime? ConfirmTime { get; set; }
public Guid ConfirmUserId { get; set; }
public DateTime? SignFirstViewTime { get; set; }
public string SignText { get; set; } = string.Empty;
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -21,10 +18,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialDocumentId { get; set; }
public Guid NeedConfirmUserTypeId { get; set; }
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -22,8 +19,6 @@ namespace IRaCIS.Core.Domain.Models
public Dictionary FileType { get; set; }
#endregion
//需要确认的项目用户 通过TrialId 关联 用中间表过滤
public Guid FileTypeId { get; set; }
public string Name { get; set; } = string.Empty;
@ -35,9 +30,6 @@ namespace IRaCIS.Core.Domain.Models
public string Description { get; set; } = string.Empty;
public int SignViewMinimumMinutes { get; set; }
}
}

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

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models;
@ -14,14 +10,10 @@ public class TrialEmailNoticeConfig : BaseFullDeleteAuditEntity
[JsonIgnore]
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 EmailNoticeConfig SysEmailNoticeConfig { get; set; }
@ -101,10 +93,6 @@ public class TrialEmailBlackUser : Entity
[JsonIgnore]
public User User { get; set; }
public Guid TrialEmailNoticeConfigId { get; set; }
public Guid UserId { get; set; }
}

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

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
@ -17,14 +13,8 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; }
public UserTypeEnum UserType { get; set; }
public Guid TrialEmailNoticeConfigId { get; set; }
public EmailUserType EmailUserType { get; set; }
}

4
IRaCIS.Core.Domain/Financial/Payment.cs
View File

@ -17,8 +17,6 @@ namespace IRaCIS.Core.Domain.Models
[DecimalPrecision(18, 2)]
public decimal ExchangeRate { get; set; }
[DecimalPrecision(18, 4)]
public decimal AdjustmentCNY { get; set; }
@ -31,7 +29,5 @@ namespace IRaCIS.Core.Domain.Models
[StringLength(500)]
public string Note { get; set; } = string.Empty;
}
}

2
IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs
View File

@ -13,8 +13,6 @@ namespace IRaCIS.Core.Domain.Models
[DecimalPrecision(18, 4)]
public decimal AdjustmentCNY { get; set; }
public Guid TrialId { get; set; } = Guid.Empty;
[DecimalPrecision(18, 2)]

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

@ -20,7 +20,5 @@ namespace IRaCIS.Core.Domain.Models
/// 是否有 为新项目
/// </summary>
public bool? IsNewTrial { get; set; } = false;
}
}

2
IRaCIS.Core.Domain/GlobalUsings.cs
View File

@ -4,5 +4,3 @@ global using System.Collections.Generic;
global using System.ComponentModel.DataAnnotations;
global using System.ComponentModel.DataAnnotations.Schema;
global using Newtonsoft.Json;

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

@ -38,8 +38,6 @@ public class DicomInstance : BaseFullAuditEntity, IEntitySeqId
public DateTime? InstanceTime { get; set; }
public int NumberOfFrames { get; set; }
[MaxLength]
[Unicode(false)]
public string Path { get; set; } = null!;
@ -76,5 +74,3 @@ public class DicomInstance : BaseFullAuditEntity, IEntitySeqId
[StringLength(400)]
public string WindowWidth { get; set; } = null!;
}

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

@ -24,8 +24,6 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId
[JsonIgnore]
public List<ReadingConsistentClinicalData> ReadingConsistentClinicalDataList { get; set; }
[JsonIgnore]
public List<SubjectCriteriaEvaluationVisitStudyFilter> SubjectCriteriaEvaluationVisitStudyFilterList { get; set; }
@ -98,8 +96,4 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId
public DateTime? UploadedTime { get; set; }
public string Uploader { get; set; } = null!;
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 影像上传监控")]
@ -14,8 +11,6 @@ public class StudyMonitor : BaseAddAuditEntity
[JsonIgnore]
[ForeignKey("StudyId")]
public NoneDicomStudy NoneDicomStudy { get; set; }
[JsonIgnore]
[ForeignKey("StudyId")]
public TaskStudy TaskStudy { get; set; }
@ -62,8 +57,6 @@ public class StudyMonitor : BaseAddAuditEntity
public Guid SubjectId { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid TrialId { get; set; }
public DateTime? UploadFinishedTime { get; set; }

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -22,9 +19,6 @@ namespace IRaCIS.Core.Domain.Models
public Subject Subject { get; set; }
#endregion
public string StudyCode { get; set; } = string.Empty;
public int FileCount { get; set; }
@ -32,26 +26,13 @@ namespace IRaCIS.Core.Domain.Models
public int Code { get; set; }
public Guid TrialId { get; set; }
public Guid SubjectId { get; set; }
public Guid SubjectVisitId { get; set; }
public string BodyPart { get; set; } = string.Empty;
public string Modality { get; set; } = string.Empty;
public DateTime ImageDate { get; set; }
public string Description { get; set; } = string.Empty;
public string VideoName { get; set; } = string.Empty;
public string VideoObjectName { get; set; } = string.Empty;

17
IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs
View File

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
@ -11,8 +8,6 @@ namespace IRaCIS.Core.Domain.Models
[ForeignKey("NoneDicomStudyId")]
[JsonIgnore]
public NoneDicomStudy NoneDicomStudy { get; set; }
[JsonIgnore]
public VisitTask VisitTask { get; set; }
@ -20,33 +15,21 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public NoneDicomStudy OriginNoneDicomStudy { get; set; }
#endregion
public Guid NoneDicomStudyId { get; set; }
public string Path { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public string FileType { get; set; } = string.Empty;
public long? FileSize { get; set; }
#region 跟任务绑定 同时区分检查
public Guid? VisitTaskId { get; set; }
/// <summary>
/// 为了不影响原始检查，跟任务绑定的 NoneDicomStudyId 为guid空 这个字段记录跟原始检查绑
/// </summary>
public Guid? OriginNoneDicomStudyId { get; set; }
#endregion
}
}

32
IRaCIS.Core.Domain/Image/SCPImageUpload.cs
View File

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -16,44 +13,15 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public TrialSite TrialSite { get; set; }
#endregion
public string CallingAE { get; set; } = string.Empty;
public string CalledAE { get; set; } = string.Empty;
public string CallingAEIP { get; set; } = string.Empty;
public DateTime StartTime { get; set; }
public DateTime EndTime { get; set; }
public int FileCount { get; set; }
public long FileSize { get; set; }
public int StudyCount { get; set; }
public Guid TrialId { get; set; }
public Guid TrialSiteId { get; set; }
}
}

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

@ -12,9 +12,6 @@
[ForeignKey("StudyId")]
public SCPStudy SCPStudy { get; set; }
#endregion
public Guid SeqId { get; set; }
public Guid StudyId { get; set; }
public Guid SeriesId { get; set; }
@ -27,8 +24,6 @@
public int ImageRows { get; set; }
public int ImageColumns { get; set; }
public int SliceLocation { get; set; }
public string SliceThickness { get; set; } = string.Empty;
public int NumberOfFrames { get; set; }
public string PixelSpacing { get; set; } = string.Empty;
@ -42,8 +37,5 @@
public string Path { get; set; } = string.Empty;
public long? FileSize { get; set; }
}
}

8
IRaCIS.Core.Domain/Image/SCPPatient.cs
View File

@ -13,8 +13,6 @@
[JsonIgnore]
public TrialSite TrialSite { get; set; }
#endregion
public string PatientIdStr { get; set; } = string.Empty;
public string PatientName { get; set; } = string.Empty;
public string PatientAge { get; set; } = string.Empty;
@ -26,14 +24,8 @@
public DateTime? LatestStudyTime { get; set; }
public DateTime LatestPushTime { get; set; }
public Guid? SubjectId { get; set; }
public Guid TrialId { get; set; }
public Guid TrialSiteId { get; set; }
}
}

2
IRaCIS.Core.Domain/Image/SCPSeries.cs
View File

@ -11,8 +11,6 @@
[JsonIgnore]
public List<SCPInstance> SCPInstanceList { get; set; }
#endregion
public Guid SeqId { get; set; }
public Guid StudyId { get; set; }
public string StudyInstanceUid { get; set; } = string.Empty;

8
IRaCIS.Core.Domain/Image/SCPStudy.cs
View File

@ -24,8 +24,6 @@
public SCPPatient Patient { get; set; }
#endregion
public Guid SeqId { get; set; }
public Guid PatientId { get; set; }
@ -61,15 +59,9 @@
public string CalledAE { get; set; } = string.Empty;
public bool IsUploadFinished { get; set; }
public Guid TrialId { get; set; }
public Guid TrialSiteId { get; set; }
public Guid? SubjectVisitId { get; set; }
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -15,28 +12,14 @@ namespace IRaCIS.Core.Domain.Models
public string Group { get; set; } = String.Empty;
public string Element { get; set; } = String.Empty;
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; }
}
}

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

@ -34,8 +34,6 @@
public string AcquisitionTime { get; set; } = string.Empty;
public string AcquisitionNumber { get; set; } = string.Empty;
public string TriggerTime { get; set; } = string.Empty;
public string BodyPartForEdit { get; set; } = string.Empty;
public string ImageResizePath { get; set; } = string.Empty;

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

@ -19,8 +19,6 @@
[JsonIgnore]
[ForeignKey("SubjectId")]
public Subject Subject { get; set; }
#endregion
public Guid SeqId { get; set; }
@ -38,8 +36,6 @@
public string Description { get; set; } = string.Empty;
public int SeriesCount { get; set; } = 0;
public int InstanceCount { get; set; } = 0;
public string InstitutionName { get; set; } = string.Empty;
public string PatientId { get; set; } = string.Empty;
public string PatientName { get; set; } = string.Empty;

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -13,22 +10,12 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public Guid TrialId { get; set; }
public string CalledAE { get; set; } = string.Empty;
public string IP { get; set; } = string.Empty;
public int Port { get; set; }
public string Modality { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public DateTime? LatestTestTime { get; set; }
public bool? IsTestOK { get; set; }

2
IRaCIS.Core.Domain/Institution/CRO.cs
View File

@ -21,5 +21,3 @@ public class CRO : BaseFullAuditEntity
public Guid? TrialId { get; set; }
}

8
IRaCIS.Core.Domain/Institution/Hospital.cs
View File

@ -11,8 +11,6 @@
[JsonIgnore]
public List<Doctor> DoctorList { get; set; }
#endregion
public string HospitalName { get; set; } = string.Empty;
public string UniversityAffiliated { get; set; } = string.Empty;
public string Country { get; set; } = string.Empty;
@ -24,15 +22,9 @@
public string CountryCN { get; set; } = string.Empty;
public string ProvinceCN { get; set; } = string.Empty;
public string CityCN { get; set; } = string.Empty;
/// <summary>
/// 中心Id
/// </summary>
public Guid? SiteId { get; set; } = Guid.Empty;
}
}

5
IRaCIS.Core.Domain/Institution/Site.cs
View File

@ -33,10 +33,5 @@ namespace IRaCIS.Core.Domain.Models
public string DirectorPhone { get; set; } = string.Empty;
public string ContactName { get; set; } = string.Empty;
public string ContactPhone { get; set; } = string.Empty;
}
}

2
IRaCIS.Core.Domain/Institution/Sponsor.cs
View File

@ -12,8 +12,6 @@ namespace IRaCIS.Core.Domain.Models
public string SponsorCode { get; set; } = String.Empty;
public bool IsTrialLevel { get; set; }
public Guid? TrialId { get; set; }
}
}

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

@ -7,9 +7,6 @@
[JsonIgnore]
public List<UserTypeMenu> UserTypeMenuList { get; set; }
#endregion
//上级菜单
public Guid? ParentId { get; set; } = Guid.Empty;
@ -50,10 +47,6 @@
public string Meta { get; set; } = string.Empty;
public string Redirect { get; set; } = string.Empty;
public string LanguageMark { get; set; } = string.Empty;
}
}

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

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share.Management;
namespace IRaCIS.Core.Domain.Models
@ -19,9 +15,6 @@ namespace IRaCIS.Core.Domain.Models
public List<SystemNoticeUserRead> NoticeUserReadList { get; set; } = new List<SystemNoticeUserRead>();
#endregion
public string NoticeContent { get; set; } = string.Empty;
public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; }

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -15,8 +12,6 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public Guid SystemNoticeId { get; set; }
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -18,12 +15,7 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public Guid SystemNoticeId { get; set; }
public Guid UserTypeId { get; set; }
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -18,47 +15,23 @@ namespace IRaCIS.Core.Domain.Models
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
public TrialSite TrialSite { get; set; }
[JsonIgnore]
public VisitTask VisitTask { get; set; }
[NotMapped]
public List<string> FeedBackScreenshotList => JsonConvert.DeserializeObject<List<string>>(ScreenshotListStr);
#endregion
public Guid? VisitTaskId { get; set; }
public Guid? SubjectId { get; set; }
public Guid? SubjectVisitId { get; set; }
public int QuestionType { get; set; }
public string QuestionDescription { get; set; } = string.Empty;
public int State { get; set; }
public Guid? TrialSiteId { get; set; }
public Guid? TrialId { get; set; }
public string ScreenshotListStr { get; set; } = string.Empty;
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -17,23 +14,12 @@ namespace IRaCIS.Core.Domain.Models
public User OptUser { get; set; }
#endregion
public string IP { get; set; } = string.Empty;
public string LoginFaildName { get; set; } = string.Empty;
public UserOptType OptType { get; set; }
public string LoginPassword { get; set; } = string.Empty;
public Guid? LoginUserId { get; set; }
public Guid? OptUserId { get; set; }
public string IPRegion { get; set; } = string.Empty;
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -22,10 +19,5 @@ namespace IRaCIS.Core.Domain.Models
/// 密码
/// </summary>
public string PassWord { get; set; } = string.Empty;
}
}

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

@ -4,8 +4,6 @@ namespace IRaCIS.Core.Domain.Models
{
public class UserType : Entity
{
#region 导航属性
[JsonIgnore]
public List<UserTypeMenu> UserTypeMenuList { get; set; }
@ -29,13 +27,6 @@ namespace IRaCIS.Core.Domain.Models
public string UserTypeShortName { get; set; } = string.Empty;
public bool IsEnable { get; set; } = true;
public string PermissionStr { get; set; } = string.Empty;
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -18,15 +15,8 @@ namespace IRaCIS.Core.Domain.Models
[ForeignKey("UserTypeId")]
public UserType UserType { get; set; }
#endregion
public Guid UserTypeId { get; set; }
public Guid DictionaryId { get; set; }
}
}

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

@ -14,9 +14,5 @@ namespace IRaCIS.Core.Domain.Models
public Guid UserTypeId { get; set; }
public Guid MenuId { get; set; }
}
}

22
IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs
View File

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -13,35 +10,16 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
#endregion
public DateTime? StartTime { get; set; }
public DateTime? EndTime { get; set; }
public int? IsPD { get; set; }
public Guid SubjectVisitId { get; set; }
public bool IsSubjectLevel { get; set; }
public string Path { get; set; } = String.Empty;
public string FileName { get; set; } = String.Empty;
public string Position { get; set; } = String.Empty;
public Guid ClinicalDataTrialSetId { get; set; }
}
}

15
IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs
View File

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -16,25 +13,13 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public DateTime? StartTime { get; set; }
public DateTime? EndTime { get; set; }
public bool IsPD { get; set; }
public Guid SubjectVisitId { get; set; }
public bool IsSubjectLevel { get; set; }
public string Path { get; set; } = String.Empty;
public string FileName { get; set; } = String.Empty;
public string TreatmentType { get; set; } = String.Empty;
/// <summary>

12
IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs
View File

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
@ -16,15 +12,11 @@ namespace IRaCIS.Core.Domain.Models
public SubjectVisit SubjectVisit { get; set; }
#endregion
public Guid SubjectVisitId { get; set; }
public string Path { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public bool? IsVisist { get; set; }
/// <summary>
@ -47,8 +39,4 @@ namespace IRaCIS.Core.Domain.Models
public Guid? SubjectId { get; set; }
}
}

11
IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs
View File

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -13,9 +10,6 @@ namespace IRaCIS.Core.Domain.Models
#region 导航属性
#endregion
public DateTime? OperationTime { get; set; }
public Guid SubjectVisitId { get; set; }
@ -33,10 +27,5 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
[Required]
public Guid ClinicalDataTrialSetId { get; set; }
}
}

7
IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs
View File

@ -11,15 +11,8 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public string FileName { get; set; } = string.Empty;
public string RelativePath { get; set; } = string.Empty;
public Guid TrialId { get; set; }
}
}

25
IRaCIS.Core.Domain/QC/QCChallenge.cs
View File

@ -17,10 +17,6 @@ namespace IRaCIS.Core.Domain.Models
public List<QCChallengeDialog> DialogList { get; set; } = new List<QCChallengeDialog>();
#endregion
public Guid TrialId { get; set; }
public Guid SubjectVisitId { get; set; }
@ -29,8 +25,6 @@ namespace IRaCIS.Core.Domain.Models
public string Note { get; set; } = string.Empty;
public QCChanllengeReuploadEnum ReuploadEnum { get; set; }
public DateTime? ReUploadedTime { get; set; }
public string ReUploader { get; set; } = string.Empty;
@ -42,25 +36,15 @@ namespace IRaCIS.Core.Domain.Models
public CurrentQC CurrentQCEnum { get; set; }
public DateTime? LatestMsgTime { get; set; }
public Guid? LatestReplyUserId { get; set; }
public string ChallengeCode { get; set; } = string.Empty;
public int Code { get; set; }
public bool IsClosed { get; set; }
public DateTime? ClosedTime { get; set; }
public string ClosedUser { get; set; } = string.Empty;
public QCChallengeCloseEnum CloseResonEnum { get; set; }
public string Content { get; set; } = string.Empty;
@ -68,15 +52,6 @@ namespace IRaCIS.Core.Domain.Models
public string ActionContent { get; set; } = string.Empty;
public UserTypeEnum UserTypeEnum { get; set; }
public string ChallengeType { get; set; } = string.Empty;
}
}

14
IRaCIS.Core.Domain/QC/QCQuestion.cs
View File

@ -1,6 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
@ -18,12 +15,8 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public string QuestionName { get; set; } = string.Empty;
/// <summary> 语言类型 </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public bool IsRequired { get; set; }
public bool IsEnable { get; set; }
@ -35,13 +28,6 @@ namespace IRaCIS.Core.Domain.Models
public string ParentTriggerValue { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public int ShowOrder { get; set; }
}
}

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

@ -1,6 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
@ -21,44 +18,21 @@ namespace IRaCIS.Core.Domain.Models
public List<TrialQCQuestionAnswer> TrialQCQuestionAnswerList { get; set; }
#endregion
public Guid TrialId { get; set; }
public string QuestionName { get; set; } = string.Empty;
/// <summary> 语言类型 </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
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 string ParentTriggerValue { get; set; } = string.Empty;
public int ShowOrder { get; set; }
public bool? IsConfirm { get; set; }
}
}

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

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
@ -15,8 +11,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public TrialQCQuestion TrialQCQuestionConfigure { get; set; }
#endregion
public Guid TrialId { get; set; }
public string Answer { get; set; } = string.Empty;
@ -27,13 +21,6 @@ namespace IRaCIS.Core.Domain.Models
public CurrentQC CurrentQCEnum { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid TrialQCQuestionConfigureId { get; set; }
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -15,9 +12,6 @@ namespace IRaCIS.Core.Domain.Models
public ReadingQuestionTrial TrialReadingQuestion { get; set; }
#endregion
public Guid TrialReadingQuestionId { get; set; }
public Guid SubjectId { get; set; }

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -20,8 +17,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public List<SubjectCriteriaEvaluationVisitFilter> SubjectCriteriaEvaluationVisitFilterList { get; set; }
#endregion
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
@ -30,9 +25,5 @@ namespace IRaCIS.Core.Domain.Models
/// 是否参与评估
/// </summary>
public bool IsJoinEvaluation { get; set; }
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -13,8 +10,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
[JsonIgnore]
public SubjectCriteriaEvaluation SubjectCriteriaEvaluation { get; set; }
@ -22,15 +17,8 @@ namespace IRaCIS.Core.Domain.Models
public SubjectVisit SubjectVisit { get; set; }
#endregion
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid SubjectVisitId { get; set; }
/// <summary>
@ -57,8 +45,6 @@ namespace IRaCIS.Core.Domain.Models
{
//待定
None = 0,
//通过
Passed = 1,
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -20,30 +17,19 @@ namespace IRaCIS.Core.Domain.Models
[ForeignKey("SeriesId")]
[JsonIgnore]
public DicomSeries Series { get; set; }
[ForeignKey("StudyId")]
[JsonIgnore]
public DicomStudy Study { get; set; }
#endregion
public Guid TrialReadingCriterionId { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid StudyId { get; set; }
public Guid SeriesId { get; set; }
public bool IsConfirmed { get; set; }
public bool IsReading { get; set; }
}
}

6
IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs
View File

@ -1,5 +1,3 @@
using IRaCIS.Core.Domain.Share;
using System.Linq;
@ -20,14 +18,10 @@ public class ClinicalDataSystemSet : BaseAddAuditEntity
[StringLength(400)]
public string ClinicalDataSetEnName { get; set; } = null!;
[Comment(" 枚举(字典里面取的)")]
public int ClinicalDataSetEnum { get; set; }
public string ClinicalDataSetName { get; set; } = null!;
[Comment("上传方式")]
public ClinicalUploadType ClinicalUploadType { get; set; }

19
IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs
View File

@ -51,8 +51,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid ReadingId { get; set; }
public Guid? StudyId { get; set; }
public Guid SubjectId { get; set; }
/// <summary>
@ -64,8 +62,6 @@ namespace IRaCIS.Core.Domain.Models
/// 是否为访视
/// </summary>xiu
public bool IsVisit { get; set; }
/// <summary>
/// 是否签名
/// </summary>
@ -80,23 +76,8 @@ namespace IRaCIS.Core.Domain.Models
/// 是否完整
/// </summary>
public bool? IsComplete { get; set; }
public int FileCount { get; set; }
//临床数据状态
public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; }
}
}

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

@ -18,19 +18,9 @@ namespace IRaCIS.Core.Domain.Models
public Guid ReadingClinicalDataId { get; set; }
public string Path { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public int Size { get; set; } = 0;
public string Type { get; set; } = string.Empty;
}
}

18
IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs
View File

@ -70,8 +70,6 @@ namespace IRaCIS.Core.Domain.Models
/// 是否为访视
/// </summary>xiu
public bool IsVisit { get; set; }
/// <summary>
/// 是否签名
/// </summary>
@ -86,24 +84,8 @@ namespace IRaCIS.Core.Domain.Models
/// 是否完整
/// </summary>
public bool? IsComplete { get; set; } = true;
public int FileCount { get; set; }
//临床数据状态
public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; }
}
}

10
IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs
View File

@ -18,8 +18,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid ReadingConsistentClinicalDataId { get; set; }
public string Path { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public int Size { get; set; } = 0;
@ -28,13 +26,5 @@ namespace IRaCIS.Core.Domain.Models
/// 文件类型
/// </summary>
public string Type { get; set; } = string.Empty;
}
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -21,12 +18,7 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public Guid TrialClinicalDataSetId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
}
}

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

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
@ -114,9 +110,6 @@ namespace IRaCIS.Core.Domain.Models
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 父问题Id
/// </summary>
@ -156,9 +149,5 @@ namespace IRaCIS.Core.Domain.Models
/// 自定义计算问题
/// </summary>
public string CalculateQuestions { get; set; } = "[]";
}
}

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

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
using System.Linq;
@ -86,8 +82,6 @@ namespace IRaCIS.Core.Domain.Models
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 外层问题Id
/// </summary>
@ -112,10 +106,5 @@ namespace IRaCIS.Core.Domain.Models
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
}
}

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

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
@ -32,9 +28,6 @@ namespace IRaCIS.Core.Domain.Models
}
}
[JsonIgnore]
[ForeignKey("TrialClinicalId")]
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
@ -119,9 +112,6 @@ namespace IRaCIS.Core.Domain.Models
/// 系统临床问题Id
/// </summary>
public Guid? SystemClinicalQuestionId { get; set; }
/// <summary>
/// 父问题Id
/// </summary>
@ -167,9 +157,5 @@ namespace IRaCIS.Core.Domain.Models
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty;
}
}

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

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
using System.Linq;
@ -127,9 +123,5 @@ namespace IRaCIS.Core.Domain.Models
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
}
}

11
IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs
View File

@ -1,10 +1,4 @@
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 临床表单表格问题行记录")]
[Table("ClinicalAnswerRowInfo")]
public class ClinicalAnswerRowInfo : BaseAddAuditEntity
@ -12,8 +6,6 @@ public class ClinicalAnswerRowInfo : BaseAddAuditEntity
#region 导航属性
#endregion
[Comment(" 表单Id")]
public Guid ClinicalFormId { get; set; }
@ -25,6 +17,3 @@ public class ClinicalAnswerRowInfo : BaseAddAuditEntity
[Comment(" 受试者Id")]
public Guid SubjectId { get; set; }
}

8
IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs
View File

@ -1,9 +1,4 @@
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 临床表单")]
[Table("ClinicalForm")]
public class ClinicalForm : BaseAddAuditEntity
@ -36,6 +31,3 @@ public class ClinicalForm : BaseAddAuditEntity
public Guid? VisitId { get; set; }
}

9
IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs
View File

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 临床表单问题答案")]
@ -8,8 +5,6 @@ namespace IRaCIS.Core.Domain.Models;
public class ClinicalQuestionAnswer : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("ClinicalFormId")]
public ClinicalForm ClinicalForm { get; set; }
@ -29,7 +24,3 @@ public class ClinicalQuestionAnswer : BaseAddAuditEntity
[Comment(" 受试者Id")]
public Guid SubjectId { get; set; }
}

7
IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs
View File

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 临床表单表格问题答案")]
@ -31,7 +28,3 @@ public partial class ClinicalTableAnswer : BaseAddAuditEntity
public Guid TableQuestionId { get; set; }
}

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

@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@ -17,9 +14,6 @@ namespace IRaCIS.Core.Domain.Models
[ForeignKey("ClinicalFormId")]
public ClinicalForm ClinicalForm { get; set; }
#endregion
public Guid SubjectId { get; set; }
public Guid TrialId { get; set; }
@ -28,11 +22,5 @@ namespace IRaCIS.Core.Domain.Models
/// 表单Id
/// </summary>
public Guid ClinicalFormId { get; set; }
}
}

21
IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs
View File

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
@ -16,8 +12,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
[ForeignKey("TaskMedicalReviewId")]
public TaskMedicalReview TaskMedicalReview { get; set; }
/// <summary>
/// 文件
/// </summary>
@ -26,8 +20,6 @@ namespace IRaCIS.Core.Domain.Models
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<OSSImageInfo>>(this.ImagePath);
@ -72,8 +64,6 @@ namespace IRaCIS.Core.Domain.Models
/// 用户角色枚举
/// </summary>
public int UserTypeEnumInt { get; set; }
/// <summary>
/// 阅片人是否认同
/// </summary>
@ -98,15 +88,10 @@ namespace IRaCIS.Core.Domain.Models
/// 不同意重阅原因
/// </summary>
public string DisagreeReason { get; set; } = string.Empty;
/// <summary>
/// 是否申请重阅
/// </summary>
public bool? IsApplyHeavyReading { get; set; }
/// <summary>
/// 图片路径
/// </summary>
@ -116,11 +101,5 @@ namespace IRaCIS.Core.Domain.Models
/// 文件名称
/// </summary>
public string FileName { get; set; } = string.Empty;
}
}

9
IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs
View File

@ -7,8 +7,6 @@ namespace IRaCIS.Core.Domain.Models
public class ReadingMedicineQuestionAnswer : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("TaskMedicalReviewId")]
public TaskMedicalReview TaskMedicalReview { get; set; }
@ -26,13 +24,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid TaskMedicalReviewId { get; set; }
public Guid VisitTaskId { get; set; }
public string Answer { get; set; } = string.Empty;
}
}

18
IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs
View File

@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
@ -47,8 +43,6 @@ namespace IRaCIS.Core.Domain.Models
/// 是否是必须
/// </summary>
public bool IsRequired { get; set; }
/// <summary>
/// 排序
/// </summary>
@ -58,15 +52,10 @@ namespace IRaCIS.Core.Domain.Models
/// 父问题ID
/// </summary>
public Guid? ParentId { get; set; }
/// <summary>
/// 类型值
/// </summary>
public string TypeValue { get; set; } = string.Empty;
/// <summary>
/// 是否启用
/// </summary>
@ -76,15 +65,8 @@ namespace IRaCIS.Core.Domain.Models
/// 任务类型
/// </summary>
public ReadingCategory ReadingCategory { get; set; }
public CriterionType? CriterionTypeEnum { get; set; }
public bool IsGeneral { get; set; }
}
}

Some files were not shown because too many files have changed in this diff Show More