diff --git a/IRaCIS.Core.Domain/_Config/_AppSettings.cs b/IRaCIS.Core.Application/BusinessFilter/_Config/_AppSettings.cs similarity index 98% rename from IRaCIS.Core.Domain/_Config/_AppSettings.cs rename to IRaCIS.Core.Application/BusinessFilter/_Config/_AppSettings.cs index 3cfb87de5..e7e9bdb6a 100644 --- a/IRaCIS.Core.Domain/_Config/_AppSettings.cs +++ b/IRaCIS.Core.Application/BusinessFilter/_Config/_AppSettings.cs @@ -1,5 +1,4 @@ -using IRaCIS.Core.Domain.Models; -using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration.Json; using System.ComponentModel; diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 9cfa3fc81..86c8e85eb 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -16038,6 +16038,161 @@ 维护 IsFrontTaskNeedSignButNotSign 字段 另外附加评估结果 + + + Id(阅片期Id 或者 访视ID) + + + + + 项目ID + + + + + 名称 + + + + + 受试者ID + + + + + 模块类型 + + + + + 是否加急 + + + + + 是否可改截止访视 + + + + + 访视ID + + + + + 访视名称 + + + + + 截止访视 + + + + + 截止访视名称 + + + + + 对应阅片期 + + + + + 对应Name + + + + + 创建时间 + + + + + 受试者Code + + + + + 项目中心Id + + + + + 是否为末次访视 + + + + + 上一访视 + + + + + 上一访视名称 + + + + + 中心ID + + + + + 是否为访视 + + + + + 访视Num + + + + + 是否为PD进展 + + + + + 入组确认评估 + + + + + 阅片状态 + + + + + 是否是基线 + + + + + 标准Id + + + + + 标准名称 + + + + + 阅片配置的类型 + + + + + 需要签名的临床数据数量 + + + + + 已经签名的临床数据数量 + + Reviewer 列表查询参数 diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs index 7a9cf2450..c46739705 100644 --- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs @@ -8,7 +8,6 @@ using IRaCIS.Application.Contracts; using IRaCIS.Core.Application.Interfaces; using IRaCIS.Core.Application.ViewModel; using IRaCIS.Core.Domain.Share; -using IRaCIS.Core.Domain.Share.Management; using IRaCIS.Core.Infra.EFCore.Common; using MassTransit; using Microsoft.AspNetCore.Mvc; diff --git a/IRaCIS.Core.Application/Service/Management/DTO/SystemNoticeViewModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/SystemNoticeViewModel.cs index b26eacd72..4235f359d 100644 --- a/IRaCIS.Core.Application/Service/Management/DTO/SystemNoticeViewModel.cs +++ b/IRaCIS.Core.Application/Service/Management/DTO/SystemNoticeViewModel.cs @@ -4,7 +4,7 @@ // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 //-------------------------------------------------------------------- using IRaCIS.Core.Application.Contracts; -using IRaCIS.Core.Domain.Share.Management; +using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Application.ViewModel { diff --git a/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs b/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs index 70115f57b..3432473f3 100644 --- a/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs +++ b/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs @@ -28,8 +28,8 @@ namespace IRaCIS.Core.Application.Service .WhereIf(inQuery.ApplicableProjectEnum != null, t => t.ApplicableProjectEnum == inQuery.ApplicableProjectEnum) .WhereIf(inQuery.NoticeLevelEnum != null, t => t.NoticeLevelEnum == inQuery.NoticeLevelEnum) .WhereIf(inQuery.NoticeModeEnum != null, t => t.NoticeModeEnum == inQuery.NoticeModeEnum) - .WhereIf(inQuery.NoticeStateEnum != null && inQuery.NoticeStateEnum != Domain.Share.Management.SystemNotice_NoticeStateEnum.HaveExpired, t => t.NoticeStateEnum == inQuery.NoticeStateEnum) - .WhereIf(inQuery.NoticeModeEnum != null && inQuery.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HaveExpired, t => t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished && t.EndDate != null && t.EndDate < appDateTimeNow) + .WhereIf(inQuery.NoticeStateEnum != null && inQuery.NoticeStateEnum != Domain.Share.SystemNotice_NoticeStateEnum.HaveExpired, t => t.NoticeStateEnum == inQuery.NoticeStateEnum) + .WhereIf(inQuery.NoticeModeEnum != null && inQuery.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.HaveExpired, t => t.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.HavePublished && t.EndDate != null && t.EndDate < appDateTimeNow) .WhereIf(inQuery.NoticeTypeEnum != null, t => t.NoticeTypeEnum == inQuery.NoticeTypeEnum) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.FileName), t => t.FileName.Contains(inQuery.FileName)) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.NoticeContent), t => t.NoticeContent.Contains(inQuery.NoticeContent)) @@ -46,7 +46,7 @@ namespace IRaCIS.Core.Application.Service { var entity = await _systemNoticeRepository.InsertFromDTOAsync(addOrEditSystemNotice); - if (entity.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished) + if (entity.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.HavePublished) { entity.PublishedUserId = _userInfo.Id; entity.PublishedTime = DateTime.Now; @@ -59,12 +59,12 @@ namespace IRaCIS.Core.Application.Service { var systemNotice = (await _systemNoticeRepository.Where(t => t.Id == addOrEditSystemNotice.Id, true, true).Include(t => t.NoticeUserTypeList).FirstOrDefaultAsync()).IfNullThrowException(); - if (addOrEditSystemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished && systemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.NotPublish) + if (addOrEditSystemNotice.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.HavePublished && systemNotice.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.NotPublish) { systemNotice.PublishedUserId = _userInfo.Id; systemNotice.PublishedTime = DateTime.Now; } - else if (addOrEditSystemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.NotPublish && systemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished) + else if (addOrEditSystemNotice.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.NotPublish && systemNotice.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.HavePublished) { systemNotice.PublishedUserId = null; systemNotice.PublishedTime = null; @@ -116,12 +116,12 @@ namespace IRaCIS.Core.Application.Service var appDateTimeNow = DateTime.Now; var systemNoticeQueryable = _systemNoticeRepository - .Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished) + .Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.HavePublished) .WhereIf(inQuery.ApplicableProjectEnum != null, t => t.ApplicableProjectEnum == inQuery.ApplicableProjectEnum) .WhereIf(inQuery.NoticeLevelEnum != null, t => t.NoticeLevelEnum == inQuery.NoticeLevelEnum) .WhereIf(inQuery.NoticeModeEnum != null, t => t.NoticeModeEnum == inQuery.NoticeModeEnum) - .WhereIf(inQuery.NoticeStateEnum != null && inQuery.NoticeStateEnum != Domain.Share.Management.SystemNotice_NoticeStateEnum.HaveExpired, t => t.NoticeStateEnum == inQuery.NoticeStateEnum) - .WhereIf(inQuery.NoticeModeEnum != null && inQuery.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HaveExpired, t => t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished && t.EndDate != null && t.EndDate < appDateTimeNow) + .WhereIf(inQuery.NoticeStateEnum != null && inQuery.NoticeStateEnum != Domain.Share.SystemNotice_NoticeStateEnum.HaveExpired, t => t.NoticeStateEnum == inQuery.NoticeStateEnum) + .WhereIf(inQuery.NoticeModeEnum != null && inQuery.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.HaveExpired, t => t.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.HavePublished && t.EndDate != null && t.EndDate < appDateTimeNow) .WhereIf(inQuery.NoticeTypeEnum != null, t => t.NoticeTypeEnum == inQuery.NoticeTypeEnum) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.FileName), t => t.FileName.Contains(inQuery.FileName)) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.NoticeContent), t => t.NoticeContent.Contains(inQuery.NoticeContent)) @@ -137,7 +137,7 @@ namespace IRaCIS.Core.Application.Service var appDateTimeNow = DateTime.Now; var query = _systemNoticeRepository - .Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished && !t.NoticeUserReadList.Any(t => t.CreateUserId == _userInfo.Id)) + .Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.HavePublished && !t.NoticeUserReadList.Any(t => t.CreateUserId == _userInfo.Id)) .Where(t => t.EndDate == null || t.EndDate != null && t.EndDate > appDateTimeNow) .ProjectTo(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, userId = _userInfo.Id }); diff --git a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs index 832c0b49f..ae7129f29 100644 --- a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs @@ -3,6 +3,7 @@ // 生成时间 2023-03-17 11:58:25 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 //-------------------------------------------------------------------- +using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; namespace IRaCIS.Core.Application.ViewModel diff --git a/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadModuleView.cs similarity index 100% rename from IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs rename to IRaCIS.Core.Application/Service/Reading/Dto/ReadModuleView.cs diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs index 7eefc3b49..4dbbc4005 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs @@ -1148,7 +1148,7 @@ namespace IRaCIS.Core.Application // !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null)).Count() > 0) // .Select(t=>new TrialDocNeedSign() // { - // TrialId=t.Id, + // TrialId=t.Id, // TrialCode=t.TrialCode, // ExperimentName=t.ExperimentName, // ResearchProgramNo=t.ResearchProgramNo, @@ -1172,7 +1172,7 @@ namespace IRaCIS.Core.Application TrialSignedDocCount = signedTrialCount, SysSignedDocCount = signedSysDocCont, - SysNoticeUnReadCount = await _systemNoticeRepository.Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished + SysNoticeUnReadCount = await _systemNoticeRepository.Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.SystemNotice_NoticeStateEnum.HavePublished && !t.NoticeUserReadList.Any(t => t.CreateUserId == _userInfo.Id)) .Where(t => t.EndDate == null || t.EndDate != null && t.EndDate > appDateTimeNow) .CountAsync(), diff --git a/IRaCIS.Core.Domain.Share/IRaCIS.Core.Domain.Share.csproj b/IRaCIS.Core.Domain.Share/IRaCIS.Core.Domain.Share.csproj index a2d32482b..c901b7922 100644 --- a/IRaCIS.Core.Domain.Share/IRaCIS.Core.Domain.Share.csproj +++ b/IRaCIS.Core.Domain.Share/IRaCIS.Core.Domain.Share.csproj @@ -7,5 +7,4 @@ ..\bin - diff --git a/IRaCIS.Core.Domain.Share/Management/SystemNotice.cs b/IRaCIS.Core.Domain.Share/Management/SystemNotice.cs index 2ca23ea9f..4a46cc7b5 100644 --- a/IRaCIS.Core.Domain.Share/Management/SystemNotice.cs +++ b/IRaCIS.Core.Domain.Share/Management/SystemNotice.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace IRaCIS.Core.Domain.Share.Management +namespace IRaCIS.Core.Domain.Share { public enum SystemNotice_NoticeModeEnum { @@ -51,6 +51,17 @@ namespace IRaCIS.Core.Domain.Share.Management } + public enum SysEmailLevel + { + not_sys = 0, + + //系统 不配置角色 + sys_not_role = 1, + + //系统需要配置角色的 + sys_Config_role = 2 + } + public enum FrontAudit { /// diff --git a/IRaCIS.Core.Domain.Share/Reading/ImageFilterState.cs b/IRaCIS.Core.Domain.Share/Reading/ImageFilterState.cs new file mode 100644 index 000000000..39de8ba9f --- /dev/null +++ b/IRaCIS.Core.Domain.Share/Reading/ImageFilterState.cs @@ -0,0 +1,96 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace IRaCIS.Core.Domain.Share; + +[Description("登录或者登出 锁定类型")] +public enum UserOptType +{ + + [Description("用户登录")] + Login = 1, + + [Description("用户登出")] + LoginOut = 2, + + [Description("账号或者密码错误")] + AccountOrPasswordError = 3, + + [Description("账号锁定")] + AccountLocked = 4, + + //账号启用 + AccountEnable = 5, + + //登录锁定账户 + LoginLockedAccount = 6, + + //修改密码 + LoginModifyPassword = 7, + + UnloginModifyPasswoed = 8, + + //admin 重置密码 + ResetPassword = 9, + + DeleteUser = 10, + + UpdateUser = 11, + + MFALogin = 12, + + MFALoginFail = 13, +} + +[Description("影像下载打包状态")] +public enum PackState +{ + + [Description("待打包")] + WaitPack = 0, + + [Description("打包中")] + Packing = 1, + + [Description("打包完成")] + Packed = 2 +} + +[Description("影像确认结果")] +public enum ImageDeterminationResultState +{ + //待定 + None = 0, + //通过 + Passed = 1, +} + +[Description("影像筛选状态")] +public enum ImageFilterState +{ + //默认值 待筛选 + None = 0, + + Filtering = 1, + + //筛选已完成 + Finished = 2 +} + +public enum ReReadingOrBackOptType +{ + //取消分配 + CancelAssign = 0, + + //失效 + Abandon = 1, + + //重阅重置 + + Return = 2, + +} \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Allocation/SubjectUser.cs b/IRaCIS.Core.Domain/Allocation/SubjectUser.cs index d651deda5..475c19ec0 100644 --- a/IRaCIS.Core.Domain/Allocation/SubjectUser.cs +++ b/IRaCIS.Core.Domain/Allocation/SubjectUser.cs @@ -13,11 +13,9 @@ public class SubjectUser : BaseFullAuditEntity public Trial Trial { get; set; } [JsonIgnore] - //Parent [ForeignKey("ReplacedSubjectUserId")] public SubjectUser ReplacedSubjectUser { get; set; } - //ChildList [JsonIgnore] public List EarlierSubjectUserList { get; set; } [JsonIgnore] @@ -39,7 +37,7 @@ public class SubjectUser : BaseFullAuditEntity public bool IsConfirmed { get; set; } = true; - //该属性有值 说明该医生被替换了 分配的时候 要过滤掉 + [Comment("该属性有值 说明该医生被替换了 分配的时候 要过滤掉")] public Guid? ReplacedSubjectUserId { get; set; } } diff --git a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs index 938041bc8..bc2bc0c75 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs @@ -27,7 +27,7 @@ public class TaskAllocationRule : BaseFullAuditEntity public Guid EnrollId { get; set; } - //是否是裁判医生 裁判医生单独加入 + [Comment("是否是裁判医生 裁判医生单独加入")] public bool IsJudgeDoctor { get; set; } public int PlanReadingRatio { get; set; } diff --git a/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs b/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs index 49074ea28..1b12bb51e 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs @@ -1,3 +1,5 @@ +using IRaCIS.Core.Domain.Share; + namespace IRaCIS.Core.Domain.Models; [Table("TaskInfluence")] @@ -16,20 +18,8 @@ public class TaskInfluence : BaseAddAuditEntity public Guid InfluenceTaskId { get; set; } - //对影响任务进行的操作 + [Comment("对影响任务进行的操作")] public ReReadingOrBackOptType OptType { get; set; } } -public enum ReReadingOrBackOptType -{ - //取消分配 - CancelAssign = 0, - //失效 - Abandon = 1, - - //重阅重置 - - Return = 2, - -} diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs index a401ea3e4..011a4a818 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs @@ -110,6 +110,5 @@ public class TaskMedicalReview : BaseFullAuditEntity public bool IsAutoGenerate { get; set; } - // | 分割 public string PDRelationTaskIdListStr { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs index f8bd16c36..d345010e4 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs @@ -5,7 +5,8 @@ public class TaskMedicalReviewRule : BaseFullAuditEntity { #region 导航属性 - + [JsonIgnore] + public User DoctorUser { get; set; } #endregion public Guid DoctorUserId { get; set; } @@ -24,7 +25,6 @@ public class TaskMedicalReviewRule : BaseFullAuditEntity public int PlanTumorCount { get; set; } - [JsonIgnore] - public User DoctorUser { get; set; } + } diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index 7a45a67d3..b1c875e05 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -34,21 +34,21 @@ public class VisitTask : BaseFullAuditEntity [ForeignKey("JudgeResultTaskId")] public VisitTask JudgeResultTask { get; set; } - //影像质量 等等第一层级问题答案 + [Comment("影像质量 等等第一层级问题答案")] [JsonIgnore] public List ReadingTaskQuestionAnswerList { get; set; } = new List(); - //病灶表 + [Comment("病灶表")] [JsonIgnore] public List LesionList { get; set; } = new List(); - //病灶答案表 + [Comment("病灶答案表")] [JsonIgnore] public List LesionAnswerList { get; set; } = new List(); - //重阅或者退回影像的记录中间表 + [Comment("重阅或者退回影像的记录中间表")] [JsonIgnore] public List TaskInfluenceList { get; set; } = new List(); [JsonIgnore] - //对于全局任务而言 才可以用的 关联的访视阅片结果 + [Comment("对于全局任务而言 才可以用的 关联的访视阅片结果")] public List GlobalVisitResultList { get; set; } = new List(); [Comment("裁判结果图片地址")] [NotMapped] @@ -138,11 +138,11 @@ public class VisitTask : BaseFullAuditEntity public string TaskName { get; set; } = string.Empty; public string TaskBlindName { get; set; } = string.Empty; - //任务来源访视Id 方便回更访视读片状态 + [Comment("任务来源访视Id 方便回更访视读片状态")] public Guid? SourceSubjectVisitId { get; set; } public Guid? SouceReadModuleId { get; set; } - /// 任务类型 + [Comment("任务类型")] public ReadingCategory ReadingCategory { get; set; } public Guid TrialId { get; set; } @@ -177,13 +177,13 @@ public class VisitTask : BaseFullAuditEntity public Guid? DoctorUserId { get; set; } public Guid TrialReadingCriterionId { get; set; } - //裁判任务的Id + [Comment("裁判任务的Id")] public Guid? JudgeVisitTaskId { get; set; } - //任务阅片状态 + [Comment("任务阅片状态")] public ReadingTaskState ReadingTaskState { get; set; } - //签名时间 + [Comment("签名时间")] public DateTime? SignTime { get; set; } public DateTime? SuggesteFinishedTime { get; set; } @@ -192,9 +192,9 @@ public class VisitTask : BaseFullAuditEntity [Comment("PM 对该任务进行了回退 影响的任务不设置")] public bool IsPMSetBack { get; set; } - /// 裁判结果的任务ID + [Comment("裁判结果的任务ID")] public Guid? JudgeResultTaskId { get; set; } - //随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定 + [Comment("随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定")] public decimal VisitTaskNum { get; set; } [Comment("首次阅片时间")] public DateTime? FirstReadingTime { get; set; } @@ -217,7 +217,7 @@ public class VisitTask : BaseFullAuditEntity #region 裁判任务特有 [JsonIgnore] - //对于裁判任务而言，触发裁判的列表 + [Comment("对于裁判任务而言，触发裁判的列表")] public List JudgeVisitList { get; set; } [Comment("裁判结果的备注")] @@ -261,15 +261,12 @@ public class VisitTask : BaseFullAuditEntity public string BlindSubjectCode { get; set; } = string.Empty; public string BlindTrialSiteCode { get; set; } = string.Empty; - //一致性分析规则Id 用于最后统计 - //public Guid? TaskConsistentRuleId { get; set; } [Comment("针对产生的一致性任务而言，这个字段存储的是原始任务")] public Guid? ConsistentAnalysisOriginalTaskId { get; set; } #endregion - //临床数据 - + [Comment("临床数据")] public bool IsNeedClinicalDataSign { get; set; } [Comment("临床数据是否签名")] diff --git a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs index 30d8b8a3b..7fe12fa3f 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs @@ -26,17 +26,17 @@ public class VisitTaskReReading : BaseFullAuditEntity public Guid TrialId { get; set; } - //重阅原始任务Id 重阅会产生新的任务 + [Comment("重阅原始任务Id 重阅会产生新的任务")] public Guid OriginalReReadingTaskId { get; set; } - //产生重阅的根任务Id + [Comment("产生重阅的根任务Id")] public Guid RootReReadingTaskId { get; set; } - //重阅申请 产生的新任务Id + [Comment("重阅申请 产生的新任务Id")] public Guid? NewReReadingTaskId { get; set; } public Guid RequestReReadingUserId { get; set; } public DateTime RequestReReadingTime { get; set; } - //申请回退类型 + [Comment("申请回退类型")] public RequestReReadingType RequestReReadingType { get; set; } public string RequestReReadingReason { get; set; } = string.Empty; @@ -47,7 +47,7 @@ public class VisitTaskReReading : BaseFullAuditEntity public Guid? RequestReReadingConfirmUserId { get; set; } public bool IsCopyOrigenalForms { get; set; } - //仅仅包括全局和访视 + [Comment("仅仅包括全局和访视")] public bool IsCopyFollowForms { get; set; } } diff --git a/IRaCIS.Core.Domain/BaseModel/Entity.cs b/IRaCIS.Core.Domain/BaseModel/Entity.cs index ae63d156b..b4d1f3b67 100644 --- a/IRaCIS.Core.Domain/BaseModel/Entity.cs +++ b/IRaCIS.Core.Domain/BaseModel/Entity.cs @@ -8,7 +8,6 @@ public interface IEntity } -//针对dicom public interface IEntitySeqId { public Guid SeqId { get; set; } diff --git a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs index ab450f753..617d20635 100644 --- a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs +++ b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs @@ -78,13 +78,4 @@ public class EmailNoticeUserType : Entity public EmailUserType EmailUserType { get; set; } } -public enum SysEmailLevel -{ - not_sys = 0, - //系统 不配置角色 - sys_not_role = 1, - - //系统需要配置角色的 - sys_Config_role = 2 -} diff --git a/IRaCIS.Core.Domain/Common/Internationalization.cs b/IRaCIS.Core.Domain/Common/Internationalization.cs index 75f11d8d6..86aacae7e 100644 --- a/IRaCIS.Core.Domain/Common/Internationalization.cs +++ b/IRaCIS.Core.Domain/Common/Internationalization.cs @@ -24,7 +24,7 @@ public class Internationalization : BaseFullAuditEntity public string FrontType { get; set; } = string.Empty; public string Module { get; set; } = string.Empty; - //关联版本历史记录表Id + [Comment("关联版本历史记录表Id")] public Guid? PublishLogId { get; set; } } diff --git a/IRaCIS.Core.Domain/Common/PublishLog.cs b/IRaCIS.Core.Domain/Common/PublishLog.cs index 262c2f8d9..d1759ff71 100644 --- a/IRaCIS.Core.Domain/Common/PublishLog.cs +++ b/IRaCIS.Core.Domain/Common/PublishLog.cs @@ -9,7 +9,7 @@ public class PublishLog : BaseFullAuditEntity public string UpdateContent { get; set; } = string.Empty; - //0 开发中 ，已发布 + [Comment("0 开发中 ，已发布")] public int State { get; set; } public bool IsCurrentVersion { get; set; } diff --git a/IRaCIS.Core.Domain/Common/VerificationCode.cs b/IRaCIS.Core.Domain/Common/VerificationCode.cs index 8d814a4b8..0270d9481 100644 --- a/IRaCIS.Core.Domain/Common/VerificationCode.cs +++ b/IRaCIS.Core.Domain/Common/VerificationCode.cs @@ -7,19 +7,18 @@ public class VerificationCode : BaseAddAuditEntity public Guid UserId { get; set; } = Guid.Empty; - //验证码 + [Comment("验证码")] public string Code { get; set; } = string.Empty; - //什么类型的验证码 邮箱|手机 - + [Comment("什么类型的验证码 邮箱|手机")] public VerifyType CodeType { get; set; } public bool HasSend { get; set; } - //发送的邮箱或者手机 + [Comment("发送的邮箱或者手机")] public string EmailOrPhone { get; set; } = string.Empty; - //过期时间 + [Comment("过期时间")] public DateTime ExpirationTime { get; set; } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Dcotor/Attachment.cs b/IRaCIS.Core.Domain/Dcotor/Attachment.cs index 9a20df2eb..defdd442a 100644 --- a/IRaCIS.Core.Domain/Dcotor/Attachment.cs +++ b/IRaCIS.Core.Domain/Dcotor/Attachment.cs @@ -1,15 +1,6 @@ namespace IRaCIS.Core.Domain.Models; -//public enum AttachmentType -//{ -// Avatar=1,//头像 -// Resume=2,//简历 -// GCP=3,//GCP证书 -// MedicalLicence=4,//医师资格证 -// PracticeCertificate=5,//执业资格证 -// LargeEquipmentWorkingCertificate=6,//大型器械上岗证 -// HighestDegreeCertificate=7//最高学历证书 -//} + [Comment("医生 - 简历|证书 文档表")] [Table("Attachment")] public class Attachment : BaseAddAuditEntity diff --git a/IRaCIS.Core.Domain/Dcotor/Doctor.cs b/IRaCIS.Core.Domain/Dcotor/Doctor.cs index c04a88369..b676a6dc3 100644 --- a/IRaCIS.Core.Domain/Dcotor/Doctor.cs +++ b/IRaCIS.Core.Domain/Dcotor/Doctor.cs @@ -8,7 +8,7 @@ public class Doctor : BaseFullAuditEntity { #region - // + [Comment("")] [JsonIgnore] public List DoctorDicRelationList { get; set; } = new List(); [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Document/TrialDocument.cs b/IRaCIS.Core.Domain/Document/TrialDocument.cs index 604f63596..b64d21ee6 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocument.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocument.cs @@ -15,7 +15,7 @@ public class TrialDocument : BaseFullDeleteAuditEntity [ForeignKey("FileTypeId")] public Dictionary FileType { get; set; } #endregion - //需要确认的项目用户 通过TrialId 关联 用中间表过滤 + [Comment("需要确认的项目用户 通过TrialId 关联 用中间表过滤")] public Guid FileTypeId { get; set; } public string Name { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj b/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj index d6a71a4f3..fefabf7ba 100644 --- a/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj +++ b/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj @@ -18,7 +18,5 @@ - - diff --git a/IRaCIS.Core.Domain/Image/DicomStudy.cs b/IRaCIS.Core.Domain/Image/DicomStudy.cs index 0bc511099..b9219ee78 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudy.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudy.cs @@ -4,8 +4,7 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId { #region 导航属性 - //一个检查 由多个人管理 - //public List TrialSiteUserList { get; set; } = new List(); + [JsonIgnore] public List DicomStudyMonitorList { get; set; } = new List(); [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Management/Menu.cs b/IRaCIS.Core.Domain/Management/Menu.cs index 9840a60ab..012399260 100644 --- a/IRaCIS.Core.Domain/Management/Menu.cs +++ b/IRaCIS.Core.Domain/Management/Menu.cs @@ -6,25 +6,25 @@ public class Menu : BaseFullAuditEntity [JsonIgnore] public List UserTypeMenuList { get; set; } #endregion - //上级菜单 + [Comment("上级菜单")] public Guid? ParentId { get; set; } = Guid.Empty; - // 类型（M目录 C菜单 F按钮 L链接） + [Comment("类型（M目录 C菜单 F按钮 L链接）")] public string MenuType { get; set; } = string.Empty; public string MenuIcon { get; set; } = string.Empty; public string MenuName { get; set; } = string.Empty; - //路由地址 + [Comment("路由地址")] public string Path { get; set; } = string.Empty; - //组件路径 + [Comment("组件路径")] public string Component { get; set; } = string.Empty; public int ShowOrder { get; set; } - //启用 禁用 + [Comment("启用 禁用")] public bool IsEnable { get; set; } = true; public bool IsCache { get; set; } = false; @@ -35,10 +35,10 @@ public class Menu : BaseFullAuditEntity public bool IsExternalLink { get; set; } - //权限点 + [Comment("权限点")] public string PermissionStr { get; set; } = string.Empty; - //Api 接口地址 + [Comment("Api 接口地址")] public string ApiPath { get; set; } = string.Empty; public string Note { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs index fbc323887..f5eb86724 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs @@ -1,4 +1,4 @@ -using IRaCIS.Core.Domain.Share.Management; +using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models; diff --git a/IRaCIS.Core.Domain/Management/Role.cs b/IRaCIS.Core.Domain/Management/Role.cs index d57a2ab1d..0c7f319c4 100644 --- a/IRaCIS.Core.Domain/Management/Role.cs +++ b/IRaCIS.Core.Domain/Management/Role.cs @@ -10,6 +10,8 @@ public partial class Role : BaseFullAuditEntity public string RoleDescription { get; set; } = string.Empty; public int Status { get; set; } - public int PrivilegeLevel { get; set; } //权限级别 + + [Comment("权限级别")] + public int PrivilegeLevel { get; set; } } diff --git a/IRaCIS.Core.Domain/Management/UserLog.cs b/IRaCIS.Core.Domain/Management/UserLog.cs index 93a342d2b..a81d14dfd 100644 --- a/IRaCIS.Core.Domain/Management/UserLog.cs +++ b/IRaCIS.Core.Domain/Management/UserLog.cs @@ -1,4 +1,4 @@ -using System.ComponentModel; +using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models; @@ -23,42 +23,5 @@ public class UserLog : BaseAddAuditEntity } -[Description("登录或者登出 锁定类型")] -public enum UserOptType -{ - [Description("用户登录")] - Login = 1, - - [Description("用户登出")] - LoginOut = 2, - - [Description("账号或者密码错误")] - AccountOrPasswordError = 3, - - [Description("账号锁定")] - AccountLocked = 4, - - //账号启用 - AccountEnable = 5, - - //登录锁定账户 - LoginLockedAccount = 6, - - //修改密码 - LoginModifyPassword = 7, - - UnloginModifyPasswoed = 8, - - //admin 重置密码 - ResetPassword = 9, - - DeleteUser = 10, - - UpdateUser = 11, - - MFALogin = 12, - - MFALoginFail = 13, -} diff --git a/IRaCIS.Core.Domain/QC/QCChallenge.cs b/IRaCIS.Core.Domain/QC/QCChallenge.cs index 93723e13d..cd6a41551 100644 --- a/IRaCIS.Core.Domain/QC/QCChallenge.cs +++ b/IRaCIS.Core.Domain/QC/QCChallenge.cs @@ -8,7 +8,7 @@ public class QCChallenge : BaseAddAuditEntity [ForeignKey("LatestReplyUserId")] public User LatestReplyUser { get; set; } [JsonIgnore] - //导航属性 + [Comment("导航属性")] [ForeignKey("SubjectVisitId")] public SubjectVisit SubjectVisit { get; set; } diff --git a/IRaCIS.Core.Domain/QC/QCQuestion.cs b/IRaCIS.Core.Domain/QC/QCQuestion.cs index 0b3d9f6b2..70000a5fe 100644 --- a/IRaCIS.Core.Domain/QC/QCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/QCQuestion.cs @@ -12,13 +12,13 @@ public class QCQuestion : BaseFullAuditEntity #endregion public string QuestionName { get; set; } = string.Empty; - /// 语言类型 + [Comment("语言类型")] public LanguageType LanguageType { get; set; } = LanguageType.Chinese; public bool IsRequired { get; set; } public bool IsEnable { get; set; } - /// 下拉框、文本、单选、多选 + [Comment("下拉框、文本、单选、多选")] public string Type { get; set; } = string.Empty; public string TypeValue { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs index 3a1ce9213..93aeda96a 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs @@ -17,13 +17,12 @@ public class TrialQCQuestion : BaseFullAuditEntity #endregion public Guid TrialId { get; set; } public string QuestionName { get; set; } = string.Empty; - /// 语言类型 - + [Comment("语言类型")] public LanguageType LanguageType { get; set; } = LanguageType.Chinese; public bool IsRequired { get; set; } public bool IsEnable { get; set; } - /// 下拉框、文本、单选、多选 + [Comment("下拉框、文本、单选、多选")] public string Type { get; set; } = string.Empty; public Guid? ParentId { get; set; } public string TypeValue { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs b/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs index a802ec7b3..96d40a317 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs @@ -14,7 +14,7 @@ public class TrialQCQuestionAnswer : BaseFullAuditEntity public TrialQCProcess QCProcessEnum { get; set; } - // 1代表第一个人QC数据 2 代表第二个人QC数据 + [Comment("1代表第一个人QC数据 2 代表第二个人QC数据")] public CurrentQC CurrentQCEnum { get; set; } public Guid SubjectVisitId { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs index 9e062ce7a..c4b0249f1 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs @@ -1,4 +1,4 @@ -using System.ComponentModel; +using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models; @@ -31,24 +31,4 @@ public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity } -[Description("影像确认结果")] -public enum ImageDeterminationResultState -{ - //待定 - None = 0, - //通过 - Passed = 1, -} - -[Description("影像筛选状态")] -public enum ImageFilterState -{ - //默认值 待筛选 - None = 0, - - Filtering = 1, - - //筛选已完成 - Finished = 2 -} diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs index 0811ad58f..fb7022db9 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs @@ -60,6 +60,6 @@ public class ReadingClinicalData : BaseAddAuditEntity [Comment("是否完整")] public bool? IsComplete { get; set; } public int FileCount { get; set; } - //临床数据状态 + [Comment("临床数据状态")] public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs index ce57a5dfb..98c259500 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs @@ -64,6 +64,6 @@ public class ReadingConsistentClinicalData : BaseAddAuditEntity [Comment("是否完整")] public bool? IsComplete { get; set; } = true; public int FileCount { get; set; } - //临床数据状态 + [Comment("临床数据状态")] public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs index 8de2b0b64..c1a9be033 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs @@ -10,11 +10,7 @@ public class ReadingMedicineSystemQuestion : BaseFullAuditEntity [ForeignKey("ParentId")] public ReadingMedicineSystemQuestion ParentQuestion { get; set; } - //// |1|2| 这种保存 - // public string CriterionEnumStr { get; set; } = string.Empty; - // [NotMapped] - // public List CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList( #endregion [Comment("类型")] public string Type { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs index 0280f6fb0..42c4dd3ee 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs @@ -11,7 +11,7 @@ public class ReadingMedicineTrialQuestion : BaseFullAuditEntity public ReadingMedicineTrialQuestion ParentQuestion { get; set; } #endregion - [Comment("类型")] + [Comment("类型")] public string Type { get; set; } = string.Empty; [Comment("父问题触发值")] diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs index 3d48fc91f..26956118d 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs @@ -120,31 +120,31 @@ public class ReadingQuestionCriterionTrial : BaseAddAuditEntity [Comment("任务展示访视 读片任务显示是否顺序")] public ReadingOrder IsReadingTaskViewInOrder { get; set; } = ReadingOrder.InOrder; - //任务分配对象 + [Comment("任务分配对象")] public TaskAllocateObj TaskAllocateObjEnum { get; set; } - //后续访视任务自动分配 + [Comment("后续访视任务自动分配")] public bool IsFollowVisitAutoAssign { get; set; } = true; - //后续全局自动分配 + [Comment("后续全局自动分配")] public bool IsFollowGlobalVisitAutoAssign { get; set; } = true; public bool IsFollowJudgeTaskAutoAssign { get; set; } = true; public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - //后续访视自动分配默认状态 + [Comment("后续访视自动分配默认状态")] public TaskAllocateDefaultState FollowVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - //后续全局自动分配默认状态 + [Comment("后续全局自动分配默认状态")] public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; [Comment("阅片信息签名时间")] public DateTime? ReadingInfoSignTime { get; set; } [Comment("是否必须全局阅片")] public bool IsMustGlobalReading { get; set; } = false; - //是否附加评估 + [Comment("是否附加评估")] public bool IsAdditionalAssessment { get; set; } - //自动 手动生成任务 + [Comment("自动 手动生成任务")] public bool IsAutoCreate { get; set; } = true; #endregion [Comment("阅片过程下载影像")] diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs index d84ae5af4..4111ba319 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs @@ -59,7 +59,7 @@ public class ReadingTableQuestionSystem : BaseAddAuditEntity [Comment("问题名称")] public string QuestionName { get; set; } = string.Empty; - + public IsRequired IsRequired { get; set; } [Comment("排序号")] diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs index 171c7c2e7..60559d309 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs @@ -24,7 +24,7 @@ public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity [JsonIgnore] [ForeignKey("QuestionId")] public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - //病灶答案表 + [Comment("病灶答案表")] [JsonIgnore] public List LesionAnswerList { get; set; } = new List(); #endregion @@ -99,7 +99,7 @@ public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity [Comment("报告页面显示来自于哪个标记")] public string ReportMark { get; set; } = string.Empty; public string OtherMeasureData { get; set; } = string.Empty; - //病灶编号 + [Comment("病灶编号")] public string RowMark { get; set; } = string.Empty; [Comment("标记工具")] diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs index 662bb4162..311b47ec5 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs @@ -4,9 +4,6 @@ namespace IRaCIS.Core.Domain.Models; public class ReadingPeriodPlan : BaseFullDeleteAuditEntity { #region 导航属性 - // - /// 访视 - /// [ForeignKey("SubjectVisitId")] [JsonIgnore] public SubjectVisit SubjectVisit { get; set; } diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs index 4f9746640..252b33ce0 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs @@ -6,7 +6,6 @@ public class TrialSiteSurvey : BaseFullDeleteAuditEntity { #region 导航属性 - // 必须 { get; set; } 否则 翻译出错 [JsonIgnore] public List TrialSiteUserSurveyList { get; set; } = new List(); [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 006c3d9f1..2c83ec941 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -62,10 +62,6 @@ public partial class Trial : BaseFullDeleteAuditEntity [ForeignKey("ReviewModeId")] public Dictionary ReviewMode { get; set; } - //[JsonIgnore] - - //public List TrialClinicalDataSetCriterionList { get; set; } - [JsonIgnore] public List ClinicalDataTrialSetList { get; set; } = new List { }; [JsonIgnore] @@ -91,11 +87,10 @@ public partial class Trial : BaseFullDeleteAuditEntity [StringLength(512)] public string Indication { get; set; } = string.Empty; - //入组那一块的状态 - //[ConcurrencyCheck] + [Comment("入组那一块的状态")] public int TrialEnrollStatus { get; set; } - //启动状态 + [Comment("启动状态")] [StringLength(500)] public string TrialStatusStr { get; set; } = StaticData.TrialState.TrialInitializing; @@ -171,7 +166,7 @@ public partial class Trial : BaseFullDeleteAuditEntity public bool IsImageExport { get; set; } = false; public bool IsSubjectSecondCodeView { get; set; } - //阅片方式 + [Comment("阅片方式")] public int ReadingMode { get; set; } = 1; public int ChangeDefalutDays { get; set; } = 5; @@ -186,19 +181,19 @@ public partial class Trial : BaseFullDeleteAuditEntity public string PreliminaryAuditReuploadText { get; set; } = string.Empty; public string ReviewAuditReuploadText { get; set; } = string.Empty; - //PD 进展是否显示 配置访视 是否显示 PD进展 (从而可以设置状态) + [Comment("PD 进展是否显示 配置访视 是否显示 PD进展 (从而可以设置状态)")] public bool IsPDProgressView { get; set; } - //研究方案号 + [Comment("研究方案号")] public string ResearchProgramNo { get; set; } = string.Empty; - //实验名称 + [Comment("实验名称")] public string ExperimentName { get; set; } = string.Empty; - //主研单位 + [Comment("主研单位")] public string MainResearchUnit { get; set; } = string.Empty; - // 负责人PI + [Comment("负责人PI")] public string HeadPI { get; set; } = string.Empty; public bool IsUrgent { get; set; } @@ -213,12 +208,11 @@ public partial class Trial : BaseFullDeleteAuditEntity public bool IsSubjectSexView { get; set; } = false; - //配置Suject Edit页面 是否显示 加急 + [Comment("配置Suject Edit页面 是否显示 加急")] public bool IsSubjectExpeditedView { get; set; } = false; public bool IsTrialStart { get; set; } = false; - //QC 问题流程 - + [Comment("QC 问题流程")] public User QCQuestionConfirmedUser { get; set; } public Guid? QCQuestionConfirmedUserId { get; set; } public DateTime? QCQuestionConfirmedTime { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/TrialSign.cs b/IRaCIS.Core.Domain/Trial/TrialSign.cs index 52a4ed8f2..2754c94e2 100644 --- a/IRaCIS.Core.Domain/Trial/TrialSign.cs +++ b/IRaCIS.Core.Domain/Trial/TrialSign.cs @@ -8,7 +8,6 @@ public class TrialSign : BaseAddAuditEntity #endregion public Guid? TrialId { get; set; } public Guid? SubjectVisitId { get; set; } - //关联基础数据 public Guid? SignCodeId { get; set; } public string SignCode { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs index 94d3870f4..de68bb740 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs @@ -14,8 +14,6 @@ public class TrialExternalUser : BaseFullAuditEntity public string Phone { get; set; } = String.Empty; - /// - public string Email { get; set; } = String.Empty; public string FirstName { get; set; } = String.Empty; diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs index cbd24e017..124fcb653 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs @@ -16,7 +16,7 @@ public class TrialSite : BaseFullDeleteAuditEntity public List SubjectVisitList { get; set; } [JsonIgnore] public List TrialSiteSurveyList { get; set; } - //Site 由多个人负责 + [Comment("Site 由多个人负责")] [JsonIgnore] public List CRCUserList { get; set; } diff --git a/IRaCIS.Core.Domain/Visit/Subject.cs b/IRaCIS.Core.Domain/Visit/Subject.cs index 07947f65f..d65f21d83 100644 --- a/IRaCIS.Core.Domain/Visit/Subject.cs +++ b/IRaCIS.Core.Domain/Visit/Subject.cs @@ -66,7 +66,8 @@ public class Subject : BaseFullDeleteAuditEntity public string MedicalNo { get; set; } = string.Empty; - public SubjectStatus Status { get; set; } = SubjectStatus.OnVisit;//1 访视中，2 出组 3 访视结束 + [Comment("1 访视中，2 出组 3 访视结束")] + public SubjectStatus Status { get; set; } = SubjectStatus.OnVisit; public string Reason { get; set; } = string.Empty; public bool IsEnrollment { get; set; } diff --git a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs index 21d799bb4..6b587b990 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs @@ -1,5 +1,4 @@ using IRaCIS.Core.Domain.Share; -using System.ComponentModel; namespace IRaCIS.Core.Domain.Models; [Comment("受试者访视")] @@ -30,8 +29,6 @@ public class SubjectVisit : BaseFullDeleteAuditEntity [JsonIgnore] [ForeignKey("SubmitUserId")] public User SubmitUser { get; set; } - - //导航属性 [JsonIgnore] [ForeignKey("TrialId")] public Trial Trial { get; set; } @@ -172,16 +169,4 @@ public class SubjectVisit : BaseFullDeleteAuditEntity public Guid? SubmitUserId { get; set; } public ReadingStatusEnum ReadingStatus { get; set; } } -[Description("影像下载打包状态")] -public enum PackState -{ - [Description("待打包")] - WaitPack = 0, - - [Description("打包中")] - Packing = 1, - - [Description("打包完成")] - Packed = 2 -} diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index 3c2d91347..27fd601e7 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -270,7 +270,6 @@ public class IRaCISDBContext : DbContext public virtual DbSet ReadModule { get; set; } - public virtual DbSet ReadModuleView { get; set; } public virtual DbSet ClinicalDataTrialSet { get; set; } diff --git a/IRaCIS.Core.Domain/Common/NotDefault.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/Attribute/NotDefault.cs similarity index 100% rename from IRaCIS.Core.Domain/Common/NotDefault.cs rename to IRaCIS.Core.Infrastructure/_IRaCIS/Attribute/NotDefault.cs