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-05-17 09:01:29 +08:00
parent a93bbebb61
commit af282d2bb8
2 changed files with 206 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -14552,6 +14552,11 @@
标准类型 标准类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Application.Contracts.UserBasicInfo.LastLoginIP">
<summary>
LastLoginIP
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.UserBasicInfo.LastChangePassWordTime"> <member name="P:IRaCIS.Application.Contracts.UserBasicInfo.LastChangePassWordTime">
<summary> <summary>
上一次修改密码的时间 上一次修改密码的时间

381
IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
View File

@ -8,116 +8,116 @@ using System.Collections.Generic;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models
{ {
///<summary> ///<summary>
/// 项目阅片标准 /// 项目阅片标准
///</summary> ///</summary>
[Table("ReadingQuestionCriterionTrial")] [Table("ReadingQuestionCriterionTrial")]
public class ReadingQuestionCriterionTrial : Entity, IAuditAdd public class ReadingQuestionCriterionTrial : Entity, IAuditAdd
{ {
/// <summary> /// <summary>
/// 系统标准ID /// 系统标准ID
/// </summary> /// </summary>
public Guid? ReadingQuestionCriterionSystemId { get; set; } public Guid? ReadingQuestionCriterionSystemId { get; set; }
/// <summary> /// <summary>
/// 项目Id /// 项目Id
/// </summary> /// </summary>
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
/// <summary> /// <summary>
/// 标准 /// 标准
/// </summary> /// </summary>
public string CriterionName { get; set; } public string CriterionName { get; set; }
/// <summary> /// <summary>
/// 是否启用 /// 是否启用
/// </summary> /// </summary>
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
/// <summary> /// <summary>
/// 排序 /// 排序
/// </summary> /// </summary>
public int ShowOrder { get; set; } public int ShowOrder { get; set; }
/// <summary> /// <summary>
/// 是否完成配置 /// 是否完成配置
/// </summary> /// </summary>
public bool IsCompleteConfig { get; set; } public bool IsCompleteConfig { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
/// <summary> /// <summary>
/// 创建人 /// 创建人
/// </summary> /// </summary>
public Guid CreateUserId { get; set; } public Guid CreateUserId { get; set; }
/// <summary> /// <summary>
/// 描述 /// 描述
/// </summary> /// </summary>
public string Description { get; set; } public string Description { get; set; }
/// <summary> /// <summary>
/// 是否确认 /// 是否确认
/// </summary> /// </summary>
public bool IsConfirm { get; set; } public bool IsConfirm { get; set; }
/// <summary> /// <summary>
/// 表单类型 /// 表单类型
/// </summary> /// </summary>
public FormType FormType { get; set; } = FormType.SinglePage; public FormType FormType { get; set; } = FormType.SinglePage;
/// <summary> /// <summary>
/// 修约小数点 /// 修约小数点
/// </summary> /// </summary>
public int? DigitPlaces { get; set; } = 1; public int? DigitPlaces { get; set; } = 1;
/// <summary> /// <summary>
/// 评估结果 /// 评估结果
/// </summary> /// </summary>
public string EvaluationResult { get; set; } = string.Empty; public string EvaluationResult { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 全局阅片评估更新类型 /// 全局阅片评估更新类型
/// </summary> /// </summary>
public string GlobalUpdateType { get; set; } = string.Empty; public string GlobalUpdateType { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 评估原因 /// 评估原因
/// </summary> /// </summary>
public string EvaluationReason { get; set; } = StaticData.International("CriterionTrial_EvaluationReason"); public string EvaluationReason { get; set; } = StaticData.International("CriterionTrial_EvaluationReason");
/// <summary> /// <summary>
/// 是否显示详情 /// 是否显示详情
/// </summary> /// </summary>
public bool IsShowDetail { get; set; } = true; public bool IsShowDetail { get; set; } = true;
/// <summary> /// <summary>
/// 同步时间 /// 同步时间
/// </summary> /// </summary>
public DateTime SynchronizeTime { get; set; } public DateTime SynchronizeTime { get; set; }
/// <summary> /// <summary>
/// 同步器官时间 /// 同步器官时间
/// </summary> /// </summary>
public DateTime? SynchronizeOriginalTime { get; set; } public DateTime? SynchronizeOriginalTime { get; set; }
/// <summary> /// <summary>
/// 标准类型 /// 标准类型
/// </summary> /// </summary>
public CriterionType CriterionType { get; set; } public CriterionType CriterionType { get; set; }
/// <summary> /// <summary>
/// 是否加急 /// 是否加急
/// </summary> /// </summary>
public bool IsUrgent { get; set; } = false; public bool IsUrgent { get; set; } = false;
/// <summary> /// <summary>
@ -125,134 +125,134 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public bool IseCRFShowInDicomReading { get; set; } = false; public bool IseCRFShowInDicomReading { get; set; } = false;
#region 阅片单元配置 新加 #region 阅片单元配置 新加
public string CriterionModalitys { get; set; } = string.Empty; public string CriterionModalitys { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 阅片平台 /// 阅片平台
/// </summary> /// </summary>
public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.PACS; public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.PACS;
/// <summary> /// <summary>
/// 阅片工具 /// 阅片工具
/// </summary> /// </summary>
public ReadingTool? ReadingTool { get; set; } public ReadingTool? ReadingTool { get; set; }
/// <summary> /// <summary>
/// 任务组织级别 /// 任务组织级别
/// </summary> /// </summary>
public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; }
/// <summary> /// <summary>
/// 阅片是否显示受试者信息 /// 阅片是否显示受试者信息
/// </summary> /// </summary>
public bool IsReadingShowSubjectInfo { get; set; } = true; public bool IsReadingShowSubjectInfo { get; set; } = true;
/// <summary> /// <summary>
/// IR阅片页面是否可以查看既往任务结果 /// IR阅片页面是否可以查看既往任务结果
/// </summary> /// </summary>
public bool IsReadingShowPreviousResults { get; set; } = true; public bool IsReadingShowPreviousResults { get; set; } = true;
/// <summary> /// <summary>
/// 是确认医学审核问题 /// 是确认医学审核问题
/// </summary> /// </summary>
public bool IsConfirmMedicineQuestion { get; set; } = false; public bool IsConfirmMedicineQuestion { get; set; } = false;
/// <summary> /// <summary>
/// 仲裁对象 /// 仲裁对象
/// </summary> /// </summary>
public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading; public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading;
/// <summary> /// <summary>
/// 阅片模式 /// 阅片模式
/// </summary> /// </summary>
public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double;
/// <summary> /// <summary>
/// 是否有阅片期 /// 是否有阅片期
/// </summary> /// </summary>
public bool IsReadingPeriod { get; set; } = true; public bool IsReadingPeriod { get; set; } = true;
/// <summary> /// <summary>
/// 是否生成全局阅片任务 /// 是否生成全局阅片任务
/// </summary> /// </summary>
public bool IsGlobalReading { get; set; } = true; public bool IsGlobalReading { get; set; } = true;
/// <summary> /// <summary>
/// 是否签名 /// 是否签名
/// </summary> /// </summary>
public bool IsSigned { get; set; } = false; public bool IsSigned { get; set; } = false;
/// <summary> /// <summary>
/// 仲裁阅片 /// 仲裁阅片
/// </summary> /// </summary>
public bool IsArbitrationReading { get; set; } = true; public bool IsArbitrationReading { get; set; } = true;
/// <summary> /// <summary>
/// 肿瘤学阅片 原字段 IsClinicalReading /// 肿瘤学阅片 原字段 IsClinicalReading
/// </summary> /// </summary>
public bool IsOncologyReading { get; set; } public bool IsOncologyReading { get; set; }
/// <summary> /// <summary>
/// 是否系统设置了 肿瘤学 /// 是否系统设置了 肿瘤学
/// </summary> /// </summary>
public bool IsSystemSetOncology { get; set; } = true; public bool IsSystemSetOncology { get; set; } = true;
/// <summary> /// <summary>
/// 任务展示访视 读片任务显示是否顺序 /// 任务展示访视 读片任务显示是否顺序
/// </summary> /// </summary>
public ReadingOrder IsReadingTaskViewInOrder { get; set; } = ReadingOrder.InOrder; public ReadingOrder IsReadingTaskViewInOrder { get; set; } = ReadingOrder.InOrder;
//任务分配对象 //任务分配对象
public TaskAllocateObj TaskAllocateObjEnum { get; set; } public TaskAllocateObj TaskAllocateObjEnum { get; set; }
//后续访视任务自动分配 //后续访视任务自动分配
public bool IsFollowVisitAutoAssign { get; set; } = true; public bool IsFollowVisitAutoAssign { get; set; } = true;
//后续全局自动分配 //后续全局自动分配
public bool IsFollowGlobalVisitAutoAssign { get; set; } = true; public bool IsFollowGlobalVisitAutoAssign { get; set; } = true;
public bool IsFollowJudgeTaskAutoAssign { get; set; } = true; public bool IsFollowJudgeTaskAutoAssign { get; set; } = true;
public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated;
//后续访视自动分配默认状态 //后续访视自动分配默认状态
public TaskAllocateDefaultState FollowVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; public TaskAllocateDefaultState FollowVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated;
//后续全局自动分配默认状态 //后续全局自动分配默认状态
public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated;
/// <summary> /// <summary>
/// 阅片信息签名时间 /// 阅片信息签名时间
/// </summary> /// </summary>
public DateTime? ReadingInfoSignTime { get; set; } public DateTime? ReadingInfoSignTime { get; set; }
/// <summary> /// <summary>
/// 是否必须全局阅片 /// 是否必须全局阅片
/// </summary> /// </summary>
public bool IsMustGlobalReading { get; set; } = false; public bool IsMustGlobalReading { get; set; } = false;
//是否附加评估 //是否附加评估
public bool IsAdditionalAssessment { get; set; } public bool IsAdditionalAssessment { get; set; }
//自动 手动生成任务 //自动 手动生成任务
public bool IsAutoCreate { get; set; }=true; public bool IsAutoCreate { get; set; } = true;
#endregion #endregion
/// <summary> /// <summary>
@ -260,13 +260,13 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
[ForeignKey("TrialId")] [ForeignKey("TrialId")]
[JsonIgnore] [JsonIgnore]
public Trial Trial { get; set; } public Trial Trial { get; set; }
[JsonIgnore] [JsonIgnore]
public List<ReadingQuestionTrial> ReadingQuestionTrialList = new List<ReadingQuestionTrial>(); public List<ReadingQuestionTrial> ReadingQuestionTrialList = new List<ReadingQuestionTrial>();
[JsonIgnore] [JsonIgnore]
public List<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List<TrialCriterionAdditionalAssessmentType>(); public List<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List<TrialCriterionAdditionalAssessmentType>();
@ -274,18 +274,37 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore] [JsonIgnore]
public List<VisitTask> VisitTaskList { get; set; } public List<VisitTask> VisitTaskList { get; set; }
public ImageDownload? ImageDownloadEnum { get; set; }
public ImageUpload? ImageUploadEnum { get; set; }
}
public enum ImageDownload
{
None = 0,
Subejct = 1,
Visit = 2,
}
public enum ImageUpload
{
None = 0,
IRReadingEnable = 1
} }
public enum ReadingOrder public enum ReadingOrder
{ {
Random=0, Random = 0,
InOrder=1, InOrder = 1,
SubjectRandom=2, SubjectRandom = 2,
} }
} }