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

Browse Source
This commit is contained in:
hang
2024-09-20 14:34:32 +08:00
parent 7524d39213
commit 718ddefe97
163 changed files with 0 additions and 1923 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Domain/Allocation/SubjectUser.cs
-13
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; }
}
}
IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs
-10
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; }
}
}
IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs
-10
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; }
}
}
IRaCIS.Core.Domain/Allocation/TaskInfluence.cs
-8
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
{
//取消分配
IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
-34
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;
}
}
IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs
-8
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; }
}
}
IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs
-10
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;
}
}
IRaCIS.Core.Domain/Allocation/VisitTask.cs
-84
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; }
}
}
IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs
-17
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; }
}
}