diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index a20e5aae7..b47136377 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -14552,6 +14552,11 @@ 标准类型 + + + LastLoginIP + + 上一次修改密码的时间 diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs index 8209f9f12..70b48da83 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs @@ -8,116 +8,116 @@ using System.Collections.Generic; namespace IRaCIS.Core.Domain.Models { - /// - /// 项目阅片标准 - /// - [Table("ReadingQuestionCriterionTrial")] - public class ReadingQuestionCriterionTrial : Entity, IAuditAdd - { - /// - /// 系统标准ID - /// - public Guid? ReadingQuestionCriterionSystemId { get; set; } + /// + /// 项目阅片标准 + /// + [Table("ReadingQuestionCriterionTrial")] + public class ReadingQuestionCriterionTrial : Entity, IAuditAdd + { + /// + /// 系统标准ID + /// + public Guid? ReadingQuestionCriterionSystemId { get; set; } - /// - /// 项目Id - /// - public Guid TrialId { get; set; } + /// + /// 项目Id + /// + public Guid TrialId { get; set; } - /// - /// 标准 - /// - public string CriterionName { get; set; } + /// + /// 标准 + /// + public string CriterionName { get; set; } - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } + /// + /// 是否启用 + /// + public bool IsEnable { get; set; } - /// - /// 排序 - /// - public int ShowOrder { get; set; } + /// + /// 排序 + /// + public int ShowOrder { get; set; } - /// - /// 是否完成配置 - /// - public bool IsCompleteConfig { get; set; } + /// + /// 是否完成配置 + /// + public bool IsCompleteConfig { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } + /// + /// 创建时间 + /// + public DateTime CreateTime { get; set; } - /// - /// 创建人 - /// - public Guid CreateUserId { get; set; } + /// + /// 创建人 + /// + public Guid CreateUserId { get; set; } - /// - /// 描述 - /// - public string Description { get; set; } + /// + /// 描述 + /// + public string Description { get; set; } - /// - /// 是否确认 - /// - public bool IsConfirm { get; set; } + /// + /// 是否确认 + /// + public bool IsConfirm { get; set; } - /// - /// 表单类型 - /// + /// + /// 表单类型 + /// - public FormType FormType { get; set; } = FormType.SinglePage; + public FormType FormType { get; set; } = FormType.SinglePage; - /// - /// 修约小数点 - /// - public int? DigitPlaces { get; set; } = 1; + /// + /// 修约小数点 + /// + public int? DigitPlaces { get; set; } = 1; - /// - /// 评估结果 - /// - public string EvaluationResult { get; set; } = string.Empty; + /// + /// 评估结果 + /// + public string EvaluationResult { get; set; } = string.Empty; - /// - /// 全局阅片评估更新类型 - /// - public string GlobalUpdateType { get; set; } = string.Empty; + /// + /// 全局阅片评估更新类型 + /// + public string GlobalUpdateType { get; set; } = string.Empty; - /// - /// 评估原因 - /// - public string EvaluationReason { get; set; } = StaticData.International("CriterionTrial_EvaluationReason"); + /// + /// 评估原因 + /// + public string EvaluationReason { get; set; } = StaticData.International("CriterionTrial_EvaluationReason"); - /// - /// 是否显示详情 - /// - public bool IsShowDetail { get; set; } = true; + /// + /// 是否显示详情 + /// + public bool IsShowDetail { get; set; } = true; - /// - /// 同步时间 - /// - public DateTime SynchronizeTime { get; set; } + /// + /// 同步时间 + /// + public DateTime SynchronizeTime { get; set; } - /// - /// 同步器官时间 - /// - public DateTime? SynchronizeOriginalTime { get; set; } + /// + /// 同步器官时间 + /// + public DateTime? SynchronizeOriginalTime { get; set; } - /// - /// 标准类型 - /// - public CriterionType CriterionType { get; set; } + /// + /// 标准类型 + /// + public CriterionType CriterionType { get; set; } - /// - /// 是否加急 - /// + /// + /// 是否加急 + /// public bool IsUrgent { get; set; } = false; /// @@ -125,134 +125,134 @@ namespace IRaCIS.Core.Domain.Models /// public bool IseCRFShowInDicomReading { get; set; } = false; - #region 阅片单元配置 新加 + #region 阅片单元配置 新加 - public string CriterionModalitys { get; set; } = string.Empty; + public string CriterionModalitys { get; set; } = string.Empty; - /// - /// 阅片平台 - /// - public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.PACS; + /// + /// 阅片平台 + /// + public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.PACS; - /// - /// 阅片工具 - /// - public ReadingTool? ReadingTool { get; set; } + /// + /// 阅片工具 + /// + public ReadingTool? ReadingTool { get; set; } - /// - /// 任务组织级别 - /// - public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } + /// + /// 任务组织级别 + /// + public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } - /// - /// 阅片是否显示受试者信息 - /// - public bool IsReadingShowSubjectInfo { get; set; } = true; + /// + /// 阅片是否显示受试者信息 + /// + public bool IsReadingShowSubjectInfo { get; set; } = true; - /// - /// IR阅片页面是否可以查看既往任务结果 - /// - public bool IsReadingShowPreviousResults { get; set; } = true; + /// + /// IR阅片页面是否可以查看既往任务结果 + /// + public bool IsReadingShowPreviousResults { get; set; } = true; - /// - /// 是确认医学审核问题 - /// + /// + /// 是确认医学审核问题 + /// - public bool IsConfirmMedicineQuestion { get; set; } = false; + public bool IsConfirmMedicineQuestion { get; set; } = false; - /// - /// 仲裁对象 - /// - public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading; + /// + /// 仲裁对象 + /// + public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading; - /// - /// 阅片模式 - /// - public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; + /// + /// 阅片模式 + /// + public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; - /// - /// 是否有阅片期 - /// - public bool IsReadingPeriod { get; set; } = true; + /// + /// 是否有阅片期 + /// + public bool IsReadingPeriod { get; set; } = true; - /// - /// 是否生成全局阅片任务 - /// - public bool IsGlobalReading { get; set; } = true; + /// + /// 是否生成全局阅片任务 + /// + public bool IsGlobalReading { get; set; } = true; - /// - /// 是否签名 - /// - public bool IsSigned { get; set; } = false; + /// + /// 是否签名 + /// + public bool IsSigned { get; set; } = false; - /// - /// 仲裁阅片 - /// - public bool IsArbitrationReading { get; set; } = true; + /// + /// 仲裁阅片 + /// + public bool IsArbitrationReading { get; set; } = true; - /// - /// 肿瘤学阅片 原字段 IsClinicalReading - /// - public bool IsOncologyReading { get; set; } + /// + /// 肿瘤学阅片 原字段 IsClinicalReading + /// + public bool IsOncologyReading { get; set; } - /// - /// 是否系统设置了 肿瘤学 - /// - public bool IsSystemSetOncology { get; set; } = true; + /// + /// 是否系统设置了 肿瘤学 + /// + public bool IsSystemSetOncology { get; set; } = true; - /// - /// 任务展示访视 读片任务显示是否顺序 - /// - 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; - /// - /// 阅片信息签名时间 - /// - public DateTime? ReadingInfoSignTime { get; set; } + /// + /// 阅片信息签名时间 + /// + public DateTime? ReadingInfoSignTime { get; set; } - /// - /// 是否必须全局阅片 - /// - 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 /// @@ -260,13 +260,13 @@ namespace IRaCIS.Core.Domain.Models /// [ForeignKey("TrialId")] [JsonIgnore] - public Trial Trial { get; set; } + public Trial Trial { get; set; } - [JsonIgnore] + [JsonIgnore] - public List ReadingQuestionTrialList = new List(); + public List ReadingQuestionTrialList = new List(); - [JsonIgnore] + [JsonIgnore] public List TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List(); @@ -274,18 +274,37 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public List 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 - { - Random=0, - InOrder=1, + public enum ReadingOrder + { + Random = 0, - SubjectRandom=2, - } + InOrder = 1, + + SubjectRandom = 2, + } }