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 21:42:18 +08:00
parent 40c8a51a31
commit 3ee0c2ccc7
54 changed files with 359 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Domain/_Config/_AppSettings.cs → IRaCIS.Core.Application/BusinessFilter/_Config/_AppSettings.cs
View File

@ -1,5 +1,4 @@
using IRaCIS.Core.Domain.Models; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Json; using Microsoft.Extensions.Configuration.Json;
using System.ComponentModel; using System.ComponentModel;

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

@ -16038,6 +16038,161 @@
维护 IsFrontTaskNeedSignButNotSign 字段 另外附加评估结果 维护 IsFrontTaskNeedSignButNotSign 字段 另外附加评估结果
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.Id">
<summary>
Id(阅片期Id 或者 访视ID)
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.TrialId">
<summary>
项目ID
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.Name">
<summary>
名称
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.SubjectId">
<summary>
受试者ID
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.ModuleType">
<summary>
模块类型
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.IsUrgent">
<summary>
是否加急
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.IsCanChangeCutOffVisit">
<summary>
是否可改截止访视
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.SubjectVisitId">
<summary>
访视ID
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.SubjectVisitName">
<summary>
访视名称
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.CutOffVisitId">
<summary>
截止访视
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.CutOffVisitName">
<summary>
截止访视名称
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.ReadModuleId">
<summary>
对应阅片期
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.ReadModuleName">
<summary>
对应Name
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.CreateTime">
<summary>
创建时间
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.SubjectCode">
<summary>
受试者Code
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.TrialSiteCode">
<summary>
项目中心Id
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.IsFinalVisit">
<summary>
是否为末次访视
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.OutPlanPreviousVisitId">
<summary>
上一访视
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.OutPlanPreviousVisitName">
<summary>
上一访视名称
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.TrialSiteId">
<summary>
中心ID
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.IsVisit">
<summary>
是否为访视
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.VisitNum">
<summary>
访视Num
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.PDState">
<summary>
是否为PD进展
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.IsEnrollmentConfirm">
<summary>
入组确认评估
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.ReadingStatus">
<summary>
阅片状态
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.IsBaseLine">
<summary>
是否是基线
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.TrialReadingCriterionId">
<summary>
标准Id
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.CriterionName">
<summary>
标准名称
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.ReadingSetType">
<summary>
阅片配置的类型
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.NeedSignClinicalDataCount">
<summary>
需要签名的临床数据数量
</summary>
</member>
<member name="P:IRaCIS.Core.Domain.Models.ReadModuleView.SignClinicalDataCount">
<summary>
已经签名的临床数据数量
</summary>
</member>
<member name="T:IRaCIS.Application.Contracts.DoctorSearchDTO"> <member name="T:IRaCIS.Application.Contracts.DoctorSearchDTO">
<summary> <summary>
Reviewer 列表查询参数 Reviewer 列表查询参数

1
IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
View File

@ -8,7 +8,6 @@ using IRaCIS.Application.Contracts;
using IRaCIS.Core.Application.Interfaces; using IRaCIS.Core.Application.Interfaces;
using IRaCIS.Core.Application.ViewModel; using IRaCIS.Core.Application.ViewModel;
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Domain.Share.Management;
using IRaCIS.Core.Infra.EFCore.Common; using IRaCIS.Core.Infra.EFCore.Common;
using MassTransit; using MassTransit;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;

2
IRaCIS.Core.Application/Service/Management/DTO/SystemNoticeViewModel.cs
View File

@ -4,7 +4,7 @@
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//-------------------------------------------------------------------- //--------------------------------------------------------------------
using IRaCIS.Core.Application.Contracts; using IRaCIS.Core.Application.Contracts;
using IRaCIS.Core.Domain.Share.Management; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Application.ViewModel namespace IRaCIS.Core.Application.ViewModel
{ {

18
IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs
View File

@ -28,8 +28,8 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(inQuery.ApplicableProjectEnum != null, t => t.ApplicableProjectEnum == inQuery.ApplicableProjectEnum) .WhereIf(inQuery.ApplicableProjectEnum != null, t => t.ApplicableProjectEnum == inQuery.ApplicableProjectEnum)
.WhereIf(inQuery.NoticeLevelEnum != null, t => t.NoticeLevelEnum == inQuery.NoticeLevelEnum) .WhereIf(inQuery.NoticeLevelEnum != null, t => t.NoticeLevelEnum == inQuery.NoticeLevelEnum)
.WhereIf(inQuery.NoticeModeEnum != null, t => t.NoticeModeEnum == inQuery.NoticeModeEnum) .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.NoticeStateEnum != null && inQuery.NoticeStateEnum != Domain.Share.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.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(inQuery.NoticeTypeEnum != null, t => t.NoticeTypeEnum == inQuery.NoticeTypeEnum)
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.FileName), t => t.FileName.Contains(inQuery.FileName)) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.FileName), t => t.FileName.Contains(inQuery.FileName))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.NoticeContent), t => t.NoticeContent.Contains(inQuery.NoticeContent)) .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); 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.PublishedUserId = _userInfo.Id;
entity.PublishedTime = DateTime.Now; 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(); 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.PublishedUserId = _userInfo.Id;
systemNotice.PublishedTime = DateTime.Now; 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.PublishedUserId = null;
systemNotice.PublishedTime = null; systemNotice.PublishedTime = null;
@ -116,12 +116,12 @@ namespace IRaCIS.Core.Application.Service
var appDateTimeNow = DateTime.Now; var appDateTimeNow = DateTime.Now;
var systemNoticeQueryable = _systemNoticeRepository 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.ApplicableProjectEnum != null, t => t.ApplicableProjectEnum == inQuery.ApplicableProjectEnum)
.WhereIf(inQuery.NoticeLevelEnum != null, t => t.NoticeLevelEnum == inQuery.NoticeLevelEnum) .WhereIf(inQuery.NoticeLevelEnum != null, t => t.NoticeLevelEnum == inQuery.NoticeLevelEnum)
.WhereIf(inQuery.NoticeModeEnum != null, t => t.NoticeModeEnum == inQuery.NoticeModeEnum) .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.NoticeStateEnum != null && inQuery.NoticeStateEnum != Domain.Share.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.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(inQuery.NoticeTypeEnum != null, t => t.NoticeTypeEnum == inQuery.NoticeTypeEnum)
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.FileName), t => t.FileName.Contains(inQuery.FileName)) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.FileName), t => t.FileName.Contains(inQuery.FileName))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.NoticeContent), t => t.NoticeContent.Contains(inQuery.NoticeContent)) .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 appDateTimeNow = DateTime.Now;
var query = _systemNoticeRepository 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) .Where(t => t.EndDate == null || t.EndDate != null && t.EndDate > appDateTimeNow)
.ProjectTo<SystemNoticeView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, userId = _userInfo.Id }); .ProjectTo<SystemNoticeView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, userId = _userInfo.Id });

1
IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs
View File

@ -3,6 +3,7 @@
// 生成时间 2023-03-17 11:58:25 // 生成时间 2023-03-17 11:58:25
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
//-------------------------------------------------------------------- //--------------------------------------------------------------------
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Core.Application.ViewModel namespace IRaCIS.Core.Application.ViewModel

0
IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs → IRaCIS.Core.Application/Service/Reading/Dto/ReadModuleView.cs
View File

4
IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
View File

@ -1148,7 +1148,7 @@ namespace IRaCIS.Core.Application
// !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null)).Count() > 0) // !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null)).Count() > 0)
// .Select(t=>new TrialDocNeedSign() // .Select(t=>new TrialDocNeedSign()
// { // {
// TrialId=t.Id, // TrialId=t.Id,
// TrialCode=t.TrialCode, // TrialCode=t.TrialCode,
// ExperimentName=t.ExperimentName, // ExperimentName=t.ExperimentName,
// ResearchProgramNo=t.ResearchProgramNo, // ResearchProgramNo=t.ResearchProgramNo,
@ -1172,7 +1172,7 @@ namespace IRaCIS.Core.Application
TrialSignedDocCount = signedTrialCount, TrialSignedDocCount = signedTrialCount,
SysSignedDocCount = signedSysDocCont, 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)) && !t.NoticeUserReadList.Any(t => t.CreateUserId == _userInfo.Id))
.Where(t => t.EndDate == null || t.EndDate != null && t.EndDate > appDateTimeNow) .Where(t => t.EndDate == null || t.EndDate != null && t.EndDate > appDateTimeNow)
.CountAsync(), .CountAsync(),

1
IRaCIS.Core.Domain.Share/IRaCIS.Core.Domain.Share.csproj
View File

@ -7,5 +7,4 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\bin</OutputPath> <OutputPath>..\bin</OutputPath>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

13
IRaCIS.Core.Domain.Share/Management/SystemNotice.cs
View File

@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Core.Domain.Share.Management namespace IRaCIS.Core.Domain.Share
{ {
public enum SystemNotice_NoticeModeEnum 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 public enum FrontAudit
{ {
/// <summary> /// <summary>

96
IRaCIS.Core.Domain.Share/Reading/ImageFilterState.cs Normal file
View File

@ -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,
}

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

@ -13,11 +13,9 @@ public class SubjectUser : BaseFullAuditEntity
public Trial Trial { get; set; } public Trial Trial { get; set; }
[JsonIgnore] [JsonIgnore]
//Parent
[ForeignKey("ReplacedSubjectUserId")] [ForeignKey("ReplacedSubjectUserId")]
public SubjectUser ReplacedSubjectUser { get; set; } public SubjectUser ReplacedSubjectUser { get; set; }
//ChildList
[JsonIgnore] [JsonIgnore]
public List<SubjectUser> EarlierSubjectUserList { get; set; } public List<SubjectUser> EarlierSubjectUserList { get; set; }
[JsonIgnore] [JsonIgnore]
@ -39,7 +37,7 @@ public class SubjectUser : BaseFullAuditEntity
public bool IsConfirmed { get; set; } = true; public bool IsConfirmed { get; set; } = true;
//该属性有值 说明该医生被替换了 分配的时候 要过滤掉 [Comment("该属性有值 说明该医生被替换了 分配的时候 要过滤掉")]
public Guid? ReplacedSubjectUserId { get; set; } public Guid? ReplacedSubjectUserId { get; set; }
} }

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

@ -27,7 +27,7 @@ public class TaskAllocationRule : BaseFullAuditEntity
public Guid EnrollId { get; set; } public Guid EnrollId { get; set; }
//是否是裁判医生 裁判医生单独加入 [Comment("是否是裁判医生 裁判医生单独加入")]
public bool IsJudgeDoctor { get; set; } public bool IsJudgeDoctor { get; set; }
public int PlanReadingRatio { get; set; } public int PlanReadingRatio { get; set; }

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

@ -1,3 +1,5 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models; namespace IRaCIS.Core.Domain.Models;
[Table("TaskInfluence")] [Table("TaskInfluence")]
@ -16,20 +18,8 @@ public class TaskInfluence : BaseAddAuditEntity
public Guid InfluenceTaskId { get; set; } public Guid InfluenceTaskId { get; set; }
//对影响任务进行的操作 [Comment("对影响任务进行的操作")]
public ReReadingOrBackOptType OptType { get; set; } public ReReadingOrBackOptType OptType { get; set; }
} }
public enum ReReadingOrBackOptType
{
//取消分配
CancelAssign = 0,
//失效
Abandon = 1,
//重阅重置
Return = 2,
}

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

@ -110,6 +110,5 @@ public class TaskMedicalReview : BaseFullAuditEntity
public bool IsAutoGenerate { get; set; } public bool IsAutoGenerate { get; set; }
// | 分割
public string PDRelationTaskIdListStr { get; set; } = string.Empty; public string PDRelationTaskIdListStr { get; set; } = string.Empty;
} }

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

@ -5,7 +5,8 @@ public class TaskMedicalReviewRule : BaseFullAuditEntity
{ {
#region 导航属性 #region 导航属性
[JsonIgnore]
public User DoctorUser { get; set; }
#endregion #endregion
public Guid DoctorUserId { get; set; } public Guid DoctorUserId { get; set; }
@ -24,7 +25,6 @@ public class TaskMedicalReviewRule : BaseFullAuditEntity
public int PlanTumorCount { get; set; } public int PlanTumorCount { get; set; }
[JsonIgnore]
public User DoctorUser { get; set; }
} }

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

@ -34,21 +34,21 @@ public class VisitTask : BaseFullAuditEntity
[ForeignKey("JudgeResultTaskId")] [ForeignKey("JudgeResultTaskId")]
public VisitTask JudgeResultTask { get; set; } public VisitTask JudgeResultTask { get; set; }
//影像质量 等等第一层级问题答案 [Comment("影像质量 等等第一层级问题答案")]
[JsonIgnore] [JsonIgnore]
public List<ReadingTaskQuestionAnswer> ReadingTaskQuestionAnswerList { get; set; } = new List<ReadingTaskQuestionAnswer>(); public List<ReadingTaskQuestionAnswer> ReadingTaskQuestionAnswerList { get; set; } = new List<ReadingTaskQuestionAnswer>();
//病灶表 [Comment("病灶表")]
[JsonIgnore] [JsonIgnore]
public List<ReadingTableAnswerRowInfo> LesionList { get; set; } = new List<ReadingTableAnswerRowInfo>(); public List<ReadingTableAnswerRowInfo> LesionList { get; set; } = new List<ReadingTableAnswerRowInfo>();
//病灶答案表 [Comment("病灶答案表")]
[JsonIgnore] [JsonIgnore]
public List<ReadingTableQuestionAnswer> LesionAnswerList { get; set; } = new List<ReadingTableQuestionAnswer>(); public List<ReadingTableQuestionAnswer> LesionAnswerList { get; set; } = new List<ReadingTableQuestionAnswer>();
//重阅或者退回影像的记录中间表 [Comment("重阅或者退回影像的记录中间表")]
[JsonIgnore] [JsonIgnore]
public List<TaskInfluence> TaskInfluenceList { get; set; } = new List<TaskInfluence>(); public List<TaskInfluence> TaskInfluenceList { get; set; } = new List<TaskInfluence>();
[JsonIgnore] [JsonIgnore]
//对于全局任务而言 才可以用的 关联的访视阅片结果 [Comment("对于全局任务而言 才可以用的 关联的访视阅片结果")]
public List<ReadingGlobalTaskInfo> GlobalVisitResultList { get; set; } = new List<ReadingGlobalTaskInfo>(); public List<ReadingGlobalTaskInfo> GlobalVisitResultList { get; set; } = new List<ReadingGlobalTaskInfo>();
[Comment("裁判结果图片地址")] [Comment("裁判结果图片地址")]
[NotMapped] [NotMapped]
@ -138,11 +138,11 @@ public class VisitTask : BaseFullAuditEntity
public string TaskName { get; set; } = string.Empty; public string TaskName { get; set; } = string.Empty;
public string TaskBlindName { get; set; } = string.Empty; public string TaskBlindName { get; set; } = string.Empty;
//任务来源访视Id 方便回更访视读片状态 [Comment("任务来源访视Id 方便回更访视读片状态")]
public Guid? SourceSubjectVisitId { get; set; } public Guid? SourceSubjectVisitId { get; set; }
public Guid? SouceReadModuleId { get; set; } public Guid? SouceReadModuleId { get; set; }
/// <summary> 任务类型 </summary> [Comment("任务类型")]
public ReadingCategory ReadingCategory { get; set; } public ReadingCategory ReadingCategory { get; set; }
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
@ -177,13 +177,13 @@ public class VisitTask : BaseFullAuditEntity
public Guid? DoctorUserId { get; set; } public Guid? DoctorUserId { get; set; }
public Guid TrialReadingCriterionId { get; set; } public Guid TrialReadingCriterionId { get; set; }
//裁判任务的Id [Comment("裁判任务的Id")]
public Guid? JudgeVisitTaskId { get; set; } public Guid? JudgeVisitTaskId { get; set; }
//任务阅片状态 [Comment("任务阅片状态")]
public ReadingTaskState ReadingTaskState { get; set; } public ReadingTaskState ReadingTaskState { get; set; }
//签名时间 [Comment("签名时间")]
public DateTime? SignTime { get; set; } public DateTime? SignTime { get; set; }
public DateTime? SuggesteFinishedTime { get; set; } public DateTime? SuggesteFinishedTime { get; set; }
@ -192,9 +192,9 @@ public class VisitTask : BaseFullAuditEntity
[Comment("PM 对该任务进行了回退 影响的任务不设置")] [Comment("PM 对该任务进行了回退 影响的任务不设置")]
public bool IsPMSetBack { get; set; } public bool IsPMSetBack { get; set; }
/// <summary> 裁判结果的任务ID </summary> [Comment("裁判结果的任务ID")]
public Guid? JudgeResultTaskId { get; set; } public Guid? JudgeResultTaskId { get; set; }
//随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定 [Comment("随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定")]
public decimal VisitTaskNum { get; set; } public decimal VisitTaskNum { get; set; }
[Comment("首次阅片时间")] [Comment("首次阅片时间")]
public DateTime? FirstReadingTime { get; set; } public DateTime? FirstReadingTime { get; set; }
@ -217,7 +217,7 @@ public class VisitTask : BaseFullAuditEntity
#region 裁判任务特有 #region 裁判任务特有
[JsonIgnore] [JsonIgnore]
//对于裁判任务而言，触发裁判的列表 [Comment("对于裁判任务而言，触发裁判的列表")]
public List<VisitTask> JudgeVisitList { get; set; } public List<VisitTask> JudgeVisitList { get; set; }
[Comment("裁判结果的备注")] [Comment("裁判结果的备注")]
@ -261,15 +261,12 @@ public class VisitTask : BaseFullAuditEntity
public string BlindSubjectCode { get; set; } = string.Empty; public string BlindSubjectCode { get; set; } = string.Empty;
public string BlindTrialSiteCode { get; set; } = string.Empty; public string BlindTrialSiteCode { get; set; } = string.Empty;
//一致性分析规则Id 用于最后统计
//public Guid? TaskConsistentRuleId { get; set; }
[Comment("针对产生的一致性任务而言，这个字段存储的是原始任务")] [Comment("针对产生的一致性任务而言，这个字段存储的是原始任务")]
public Guid? ConsistentAnalysisOriginalTaskId { get; set; } public Guid? ConsistentAnalysisOriginalTaskId { get; set; }
#endregion #endregion
//临床数据 [Comment("临床数据")]
public bool IsNeedClinicalDataSign { get; set; } public bool IsNeedClinicalDataSign { get; set; }
[Comment("临床数据是否签名")] [Comment("临床数据是否签名")]

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

@ -26,17 +26,17 @@ public class VisitTaskReReading : BaseFullAuditEntity
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
//重阅原始任务Id 重阅会产生新的任务 [Comment("重阅原始任务Id 重阅会产生新的任务")]
public Guid OriginalReReadingTaskId { get; set; } public Guid OriginalReReadingTaskId { get; set; }
//产生重阅的根任务Id [Comment("产生重阅的根任务Id")]
public Guid RootReReadingTaskId { get; set; } public Guid RootReReadingTaskId { get; set; }
//重阅申请 产生的新任务Id [Comment("重阅申请 产生的新任务Id")]
public Guid? NewReReadingTaskId { get; set; } public Guid? NewReReadingTaskId { get; set; }
public Guid RequestReReadingUserId { get; set; } public Guid RequestReReadingUserId { get; set; }
public DateTime RequestReReadingTime { get; set; } public DateTime RequestReReadingTime { get; set; }
//申请回退类型 [Comment("申请回退类型")]
public RequestReReadingType RequestReReadingType { get; set; } public RequestReReadingType RequestReReadingType { get; set; }
public string RequestReReadingReason { get; set; } = string.Empty; public string RequestReReadingReason { get; set; } = string.Empty;
@ -47,7 +47,7 @@ public class VisitTaskReReading : BaseFullAuditEntity
public Guid? RequestReReadingConfirmUserId { get; set; } public Guid? RequestReReadingConfirmUserId { get; set; }
public bool IsCopyOrigenalForms { get; set; } public bool IsCopyOrigenalForms { get; set; }
//仅仅包括全局和访视 [Comment("仅仅包括全局和访视")]
public bool IsCopyFollowForms { get; set; } public bool IsCopyFollowForms { get; set; }
} }

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

@ -8,7 +8,6 @@ public interface IEntity<TKey>
} }
//针对dicom
public interface IEntitySeqId public interface IEntitySeqId
{ {
public Guid SeqId { get; set; } public Guid SeqId { get; set; }

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

@ -78,13 +78,4 @@ public class EmailNoticeUserType : Entity
public EmailUserType EmailUserType { get; set; } public EmailUserType EmailUserType { get; set; }
} }
public enum SysEmailLevel
{
not_sys = 0,
//系统 不配置角色
sys_not_role = 1,
//系统需要配置角色的
sys_Config_role = 2
}

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

@ -24,7 +24,7 @@ public class Internationalization : BaseFullAuditEntity
public string FrontType { get; set; } = string.Empty; public string FrontType { get; set; } = string.Empty;
public string Module { get; set; } = string.Empty; public string Module { get; set; } = string.Empty;
//关联版本历史记录表Id [Comment("关联版本历史记录表Id")]
public Guid? PublishLogId { get; set; } public Guid? PublishLogId { get; set; }
} }

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

@ -9,7 +9,7 @@ public class PublishLog : BaseFullAuditEntity
public string UpdateContent { get; set; } = string.Empty; public string UpdateContent { get; set; } = string.Empty;
//0 开发中 ，已发布 [Comment("0 开发中 ，已发布")]
public int State { get; set; } public int State { get; set; }
public bool IsCurrentVersion { get; set; } public bool IsCurrentVersion { get; set; }

9
IRaCIS.Core.Domain/Common/VerificationCode.cs
View File

@ -7,19 +7,18 @@ public class VerificationCode : BaseAddAuditEntity
public Guid UserId { get; set; } = Guid.Empty; public Guid UserId { get; set; } = Guid.Empty;
//验证码 [Comment("验证码")]
public string Code { get; set; } = string.Empty; public string Code { get; set; } = string.Empty;
//什么类型的验证码 邮箱|手机 [Comment("什么类型的验证码 邮箱|手机")]
public VerifyType CodeType { get; set; } public VerifyType CodeType { get; set; }
public bool HasSend { get; set; } public bool HasSend { get; set; }
//发送的邮箱或者手机 [Comment("发送的邮箱或者手机")]
public string EmailOrPhone { get; set; } = string.Empty; public string EmailOrPhone { get; set; } = string.Empty;
//过期时间 [Comment("过期时间")]
public DateTime ExpirationTime { get; set; } public DateTime ExpirationTime { get; set; }
} }

11
IRaCIS.Core.Domain/Dcotor/Attachment.cs
View File

@ -1,15 +1,6 @@
namespace IRaCIS.Core.Domain.Models; namespace IRaCIS.Core.Domain.Models;
//public enum AttachmentType
//{
// Avatar=1,//头像
// Resume=2,//简历
// GCP=3,//GCP证书
// MedicalLicence=4,//医师资格证
// PracticeCertificate=5,//执业资格证
// LargeEquipmentWorkingCertificate=6,//大型器械上岗证
// HighestDegreeCertificate=7//最高学历证书
//}
[Comment("医生 - 简历|证书 文档表")] [Comment("医生 - 简历|证书 文档表")]
[Table("Attachment")] [Table("Attachment")]
public class Attachment : BaseAddAuditEntity public class Attachment : BaseAddAuditEntity

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

@ -8,7 +8,7 @@ public class Doctor : BaseFullAuditEntity
{ {
#region 导航属性 #region 导航属性
//导航属性 [Comment("导航属性")]
[JsonIgnore] [JsonIgnore]
public List<DoctorDictionary> DoctorDicRelationList { get; set; } = new List<DoctorDictionary>(); public List<DoctorDictionary> DoctorDicRelationList { get; set; } = new List<DoctorDictionary>();
[JsonIgnore] [JsonIgnore]

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

@ -15,7 +15,7 @@ public class TrialDocument : BaseFullDeleteAuditEntity
[ForeignKey("FileTypeId")] [ForeignKey("FileTypeId")]
public Dictionary FileType { get; set; } public Dictionary FileType { get; set; }
#endregion #endregion
//需要确认的项目用户 通过TrialId 关联 用中间表过滤 [Comment("需要确认的项目用户 通过TrialId 关联 用中间表过滤")]
public Guid FileTypeId { get; set; } public Guid FileTypeId { get; set; }
public string Name { get; set; } = string.Empty; public string Name { get; set; } = string.Empty;

2
IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj
View File

@ -18,7 +18,5 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="EntityFrameworkCore.Projectables.Abstractions" Version="3.0.4" /> <PackageReference Include="EntityFrameworkCore.Projectables.Abstractions" Version="3.0.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@ -4,8 +4,7 @@
public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId
{ {
#region 导航属性 #region 导航属性
//一个检查 由多个人管理
//public List<TrialSiteUser> TrialSiteUserList { get; set; } = new List<TrialSiteUser>();
[JsonIgnore] [JsonIgnore]
public List<StudyMonitor> DicomStudyMonitorList { get; set; } = new List<StudyMonitor>(); public List<StudyMonitor> DicomStudyMonitorList { get; set; } = new List<StudyMonitor>();
[JsonIgnore] [JsonIgnore]

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

@ -6,25 +6,25 @@ public class Menu : BaseFullAuditEntity
[JsonIgnore] [JsonIgnore]
public List<UserTypeMenu> UserTypeMenuList { get; set; } public List<UserTypeMenu> UserTypeMenuList { get; set; }
#endregion #endregion
//上级菜单 [Comment("上级菜单")]
public Guid? ParentId { get; set; } = Guid.Empty; 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 MenuType { get; set; } = string.Empty;
public string MenuIcon { get; set; } = string.Empty; public string MenuIcon { get; set; } = string.Empty;
public string MenuName { get; set; } = string.Empty; public string MenuName { get; set; } = string.Empty;
//路由地址 [Comment("路由地址")]
public string Path { get; set; } = string.Empty; public string Path { get; set; } = string.Empty;
//组件路径 [Comment("组件路径")]
public string Component { get; set; } = string.Empty; public string Component { get; set; } = string.Empty;
public int ShowOrder { get; set; } public int ShowOrder { get; set; }
//启用 禁用 [Comment("启用 禁用")]
public bool IsEnable { get; set; } = true; public bool IsEnable { get; set; } = true;
public bool IsCache { get; set; } = false; public bool IsCache { get; set; } = false;
@ -35,10 +35,10 @@ public class Menu : BaseFullAuditEntity
public bool IsExternalLink { get; set; } public bool IsExternalLink { get; set; }
//权限点 [Comment("权限点")]
public string PermissionStr { get; set; } = string.Empty; public string PermissionStr { get; set; } = string.Empty;
//Api 接口地址 [Comment("Api 接口地址")]
public string ApiPath { get; set; } = string.Empty; public string ApiPath { get; set; } = string.Empty;
public string Note { get; set; } = string.Empty; public string Note { get; set; } = string.Empty;

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

@ -1,4 +1,4 @@
using IRaCIS.Core.Domain.Share.Management; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models; namespace IRaCIS.Core.Domain.Models;

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

@ -10,6 +10,8 @@ public partial class Role : BaseFullAuditEntity
public string RoleDescription { get; set; } = string.Empty; public string RoleDescription { get; set; } = string.Empty;
public int Status { get; set; } public int Status { get; set; }
public int PrivilegeLevel { get; set; } //权限级别
[Comment("权限级别")]
public int PrivilegeLevel { get; set; }
} }

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

@ -1,4 +1,4 @@
using System.ComponentModel; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models; 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,
}

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

@ -8,7 +8,7 @@ public class QCChallenge : BaseAddAuditEntity
[ForeignKey("LatestReplyUserId")] [ForeignKey("LatestReplyUserId")]
public User LatestReplyUser { get; set; } public User LatestReplyUser { get; set; }
[JsonIgnore] [JsonIgnore]
//导航属性 [Comment("导航属性")]
[ForeignKey("SubjectVisitId")] [ForeignKey("SubjectVisitId")]
public SubjectVisit SubjectVisit { get; set; } public SubjectVisit SubjectVisit { get; set; }

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

@ -12,13 +12,13 @@ public class QCQuestion : BaseFullAuditEntity
#endregion #endregion
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> 语言类型 </summary> [Comment("语言类型")]
public LanguageType LanguageType { get; set; } = LanguageType.Chinese; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public bool IsRequired { get; set; } public bool IsRequired { get; set; }
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
/// <summary> 下拉框、文本、单选、多选 </summary> [Comment("下拉框、文本、单选、多选")]
public string Type { get; set; } = string.Empty; public string Type { get; set; } = string.Empty;
public string TypeValue { get; set; } = string.Empty; public string TypeValue { get; set; } = string.Empty;

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

@ -17,13 +17,12 @@ public class TrialQCQuestion : BaseFullAuditEntity
#endregion #endregion
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> 语言类型 </summary> [Comment("语言类型")]
public LanguageType LanguageType { get; set; } = LanguageType.Chinese; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public bool IsRequired { get; set; } public bool IsRequired { get; set; }
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
/// <summary> 下拉框、文本、单选、多选 </summary> [Comment("下拉框、文本、单选、多选")]
public string Type { get; set; } = string.Empty; public string Type { get; set; } = string.Empty;
public Guid? ParentId { get; set; } public Guid? ParentId { get; set; }
public string TypeValue { get; set; } = string.Empty; public string TypeValue { get; set; } = string.Empty;

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

@ -14,7 +14,7 @@ public class TrialQCQuestionAnswer : BaseFullAuditEntity
public TrialQCProcess QCProcessEnum { get; set; } public TrialQCProcess QCProcessEnum { get; set; }
// 1代表第一个人QC数据 2 代表第二个人QC数据 [Comment("1代表第一个人QC数据 2 代表第二个人QC数据")]
public CurrentQC CurrentQCEnum { get; set; } public CurrentQC CurrentQCEnum { get; set; }
public Guid SubjectVisitId { get; set; } public Guid SubjectVisitId { get; set; }

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

@ -1,4 +1,4 @@
using System.ComponentModel; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models; 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
}

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

@ -60,6 +60,6 @@ public class ReadingClinicalData : BaseAddAuditEntity
[Comment("是否完整")] [Comment("是否完整")]
public bool? IsComplete { get; set; } public bool? IsComplete { get; set; }
public int FileCount { get; set; } public int FileCount { get; set; }
//临床数据状态 [Comment("临床数据状态")]
public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; }
} }

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

@ -64,6 +64,6 @@ public class ReadingConsistentClinicalData : BaseAddAuditEntity
[Comment("是否完整")] [Comment("是否完整")]
public bool? IsComplete { get; set; } = true; public bool? IsComplete { get; set; } = true;
public int FileCount { get; set; } public int FileCount { get; set; }
//临床数据状态 [Comment("临床数据状态")]
public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; }
} }

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

@ -10,11 +10,7 @@ public class ReadingMedicineSystemQuestion : BaseFullAuditEntity
[ForeignKey("ParentId")] [ForeignKey("ParentId")]
public ReadingMedicineSystemQuestion ParentQuestion { get; set; } public ReadingMedicineSystemQuestion ParentQuestion { get; set; }
//// |1|2| 这种保存
// public string CriterionEnumStr { get; set; } = string.Empty;
// [NotMapped]
// public List<int> CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList(
#endregion #endregion
[Comment("类型")] [Comment("类型")]
public string Type { get; set; } = string.Empty; public string Type { get; set; } = string.Empty;

2
IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs
View File

@ -11,7 +11,7 @@ public class ReadingMedicineTrialQuestion : BaseFullAuditEntity
public ReadingMedicineTrialQuestion ParentQuestion { get; set; } public ReadingMedicineTrialQuestion ParentQuestion { get; set; }
#endregion #endregion
[Comment("类型")] [Comment("类型")]
public string Type { get; set; } = string.Empty; public string Type { get; set; } = string.Empty;
[Comment("父问题触发值")] [Comment("父问题触发值")]

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

@ -120,31 +120,31 @@ public class ReadingQuestionCriterionTrial : BaseAddAuditEntity
[Comment("任务展示访视 读片任务显示是否顺序")] [Comment("任务展示访视 读片任务显示是否顺序")]
public ReadingOrder IsReadingTaskViewInOrder { get; set; } = ReadingOrder.InOrder; public ReadingOrder IsReadingTaskViewInOrder { get; set; } = ReadingOrder.InOrder;
//任务分配对象 [Comment("任务分配对象")]
public TaskAllocateObj TaskAllocateObjEnum { get; set; } public TaskAllocateObj TaskAllocateObjEnum { get; set; }
//后续访视任务自动分配 [Comment("后续访视任务自动分配")]
public bool IsFollowVisitAutoAssign { get; set; } = true; public bool IsFollowVisitAutoAssign { get; set; } = true;
//后续全局自动分配 [Comment("后续全局自动分配")]
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;
//后续访视自动分配默认状态 [Comment("后续访视自动分配默认状态")]
public TaskAllocateDefaultState FollowVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; public TaskAllocateDefaultState FollowVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated;
//后续全局自动分配默认状态 [Comment("后续全局自动分配默认状态")]
public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated;
[Comment("阅片信息签名时间")] [Comment("阅片信息签名时间")]
public DateTime? ReadingInfoSignTime { get; set; } public DateTime? ReadingInfoSignTime { get; set; }
[Comment("是否必须全局阅片")] [Comment("是否必须全局阅片")]
public bool IsMustGlobalReading { get; set; } = false; public bool IsMustGlobalReading { get; set; } = false;
//是否附加评估 [Comment("是否附加评估")]
public bool IsAdditionalAssessment { get; set; } public bool IsAdditionalAssessment { get; set; }
//自动 手动生成任务 [Comment("自动 手动生成任务")]
public bool IsAutoCreate { get; set; } = true; public bool IsAutoCreate { get; set; } = true;
#endregion #endregion
[Comment("阅片过程下载影像")] [Comment("阅片过程下载影像")]

2
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs
View File

@ -59,7 +59,7 @@ public class ReadingTableQuestionSystem : BaseAddAuditEntity
[Comment("问题名称")] [Comment("问题名称")]
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
public IsRequired IsRequired { get; set; } public IsRequired IsRequired { get; set; }
[Comment("排序号")] [Comment("排序号")]

4
IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs
View File

@ -24,7 +24,7 @@ public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity
[JsonIgnore] [JsonIgnore]
[ForeignKey("QuestionId")] [ForeignKey("QuestionId")]
public ReadingQuestionTrial ReadingQuestionTrial { get; set; } public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
//病灶答案表 [Comment("病灶答案表")]
[JsonIgnore] [JsonIgnore]
public List<ReadingTableQuestionAnswer> LesionAnswerList { get; set; } = new List<ReadingTableQuestionAnswer>(); public List<ReadingTableQuestionAnswer> LesionAnswerList { get; set; } = new List<ReadingTableQuestionAnswer>();
#endregion #endregion
@ -99,7 +99,7 @@ public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity
[Comment("报告页面显示来自于哪个标记")] [Comment("报告页面显示来自于哪个标记")]
public string ReportMark { get; set; } = string.Empty; public string ReportMark { get; set; } = string.Empty;
public string OtherMeasureData { get; set; } = string.Empty; public string OtherMeasureData { get; set; } = string.Empty;
//病灶编号 [Comment("病灶编号")]
public string RowMark { get; set; } = string.Empty; public string RowMark { get; set; } = string.Empty;
[Comment("标记工具")] [Comment("标记工具")]

3
IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs
View File

@ -4,9 +4,6 @@ namespace IRaCIS.Core.Domain.Models;
public class ReadingPeriodPlan : BaseFullDeleteAuditEntity public class ReadingPeriodPlan : BaseFullDeleteAuditEntity
{ {
#region 导航属性 #region 导航属性
// <summary>
/// 访视
/// </summary>
[ForeignKey("SubjectVisitId")] [ForeignKey("SubjectVisitId")]
[JsonIgnore] [JsonIgnore]
public SubjectVisit SubjectVisit { get; set; } public SubjectVisit SubjectVisit { get; set; }

1
IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs
View File

@ -6,7 +6,6 @@ public class TrialSiteSurvey : BaseFullDeleteAuditEntity
{ {
#region 导航属性 #region 导航属性
// 必须 { get; set; } 否则 翻译出错
[JsonIgnore] [JsonIgnore]
public List<TrialSiteUserSurvey> TrialSiteUserSurveyList { get; set; } = new List<TrialSiteUserSurvey>(); public List<TrialSiteUserSurvey> TrialSiteUserSurveyList { get; set; } = new List<TrialSiteUserSurvey>();
[JsonIgnore] [JsonIgnore]

26
IRaCIS.Core.Domain/Trial/Trial.cs
View File

@ -62,10 +62,6 @@ public partial class Trial : BaseFullDeleteAuditEntity
[ForeignKey("ReviewModeId")] [ForeignKey("ReviewModeId")]
public Dictionary ReviewMode { get; set; } public Dictionary ReviewMode { get; set; }
//[JsonIgnore]
//public List<TrialClinicalDataSetCriterion> TrialClinicalDataSetCriterionList { get; set; }
[JsonIgnore] [JsonIgnore]
public List<ClinicalDataTrialSet> ClinicalDataTrialSetList { get; set; } = new List<ClinicalDataTrialSet> { }; public List<ClinicalDataTrialSet> ClinicalDataTrialSetList { get; set; } = new List<ClinicalDataTrialSet> { };
[JsonIgnore] [JsonIgnore]
@ -91,11 +87,10 @@ public partial class Trial : BaseFullDeleteAuditEntity
[StringLength(512)] [StringLength(512)]
public string Indication { get; set; } = string.Empty; public string Indication { get; set; } = string.Empty;
//入组那一块的状态 [Comment("入组那一块的状态")]
//[ConcurrencyCheck]
public int TrialEnrollStatus { get; set; } public int TrialEnrollStatus { get; set; }
//启动状态 [Comment("启动状态")]
[StringLength(500)] [StringLength(500)]
public string TrialStatusStr { get; set; } = StaticData.TrialState.TrialInitializing; 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 IsImageExport { get; set; } = false;
public bool IsSubjectSecondCodeView { get; set; } public bool IsSubjectSecondCodeView { get; set; }
//阅片方式 [Comment("阅片方式")]
public int ReadingMode { get; set; } = 1; public int ReadingMode { get; set; } = 1;
public int ChangeDefalutDays { get; set; } = 5; public int ChangeDefalutDays { get; set; } = 5;
@ -186,19 +181,19 @@ public partial class Trial : BaseFullDeleteAuditEntity
public string PreliminaryAuditReuploadText { get; set; } = string.Empty; public string PreliminaryAuditReuploadText { get; set; } = string.Empty;
public string ReviewAuditReuploadText { get; set; } = string.Empty; public string ReviewAuditReuploadText { get; set; } = string.Empty;
//PD 进展是否显示 配置访视 是否显示 PD进展 (从而可以设置状态) [Comment("PD 进展是否显示 配置访视 是否显示 PD进展 (从而可以设置状态)")]
public bool IsPDProgressView { get; set; } public bool IsPDProgressView { get; set; }
//研究方案号 [Comment("研究方案号")]
public string ResearchProgramNo { get; set; } = string.Empty; public string ResearchProgramNo { get; set; } = string.Empty;
//实验名称 [Comment("实验名称")]
public string ExperimentName { get; set; } = string.Empty; public string ExperimentName { get; set; } = string.Empty;
//主研单位 [Comment("主研单位")]
public string MainResearchUnit { get; set; } = string.Empty; public string MainResearchUnit { get; set; } = string.Empty;
// 负责人PI [Comment("负责人PI")]
public string HeadPI { get; set; } = string.Empty; public string HeadPI { get; set; } = string.Empty;
public bool IsUrgent { get; set; } public bool IsUrgent { get; set; }
@ -213,12 +208,11 @@ public partial class Trial : BaseFullDeleteAuditEntity
public bool IsSubjectSexView { get; set; } = false; public bool IsSubjectSexView { get; set; } = false;
//配置Suject Edit页面 是否显示 加急 [Comment("配置Suject Edit页面 是否显示 加急")]
public bool IsSubjectExpeditedView { get; set; } = false; public bool IsSubjectExpeditedView { get; set; } = false;
public bool IsTrialStart { get; set; } = false; public bool IsTrialStart { get; set; } = false;
//QC 问题流程 [Comment("QC 问题流程")]
public User QCQuestionConfirmedUser { get; set; } public User QCQuestionConfirmedUser { get; set; }
public Guid? QCQuestionConfirmedUserId { get; set; } public Guid? QCQuestionConfirmedUserId { get; set; }
public DateTime? QCQuestionConfirmedTime { get; set; } public DateTime? QCQuestionConfirmedTime { get; set; }

1
IRaCIS.Core.Domain/Trial/TrialSign.cs
View File

@ -8,7 +8,6 @@ public class TrialSign : BaseAddAuditEntity
#endregion #endregion
public Guid? TrialId { get; set; } public Guid? TrialId { get; set; }
public Guid? SubjectVisitId { get; set; } public Guid? SubjectVisitId { get; set; }
//关联基础数据
public Guid? SignCodeId { get; set; } public Guid? SignCodeId { get; set; }
public string SignCode { get; set; } = string.Empty; public string SignCode { get; set; } = string.Empty;

2
IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs
View File

@ -14,8 +14,6 @@ public class TrialExternalUser : BaseFullAuditEntity
public string Phone { get; set; } = String.Empty; public string Phone { get; set; } = String.Empty;
/// <summary>
public string Email { get; set; } = String.Empty; public string Email { get; set; } = String.Empty;
public string FirstName { get; set; } = String.Empty; public string FirstName { get; set; } = String.Empty;

2
IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs
View File

@ -16,7 +16,7 @@ public class TrialSite : BaseFullDeleteAuditEntity
public List<SubjectVisit> SubjectVisitList { get; set; } public List<SubjectVisit> SubjectVisitList { get; set; }
[JsonIgnore] [JsonIgnore]
public List<TrialSiteSurvey> TrialSiteSurveyList { get; set; } public List<TrialSiteSurvey> TrialSiteSurveyList { get; set; }
//Site 由多个人负责 [Comment("Site 由多个人负责")]
[JsonIgnore] [JsonIgnore]
public List<TrialSiteUser> CRCUserList { get; set; } public List<TrialSiteUser> CRCUserList { get; set; }

3
IRaCIS.Core.Domain/Visit/Subject.cs
View File

@ -66,7 +66,8 @@ public class Subject : BaseFullDeleteAuditEntity
public string MedicalNo { get; set; } = string.Empty; 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 string Reason { get; set; } = string.Empty;
public bool IsEnrollment { get; set; } public bool IsEnrollment { get; set; }

15
IRaCIS.Core.Domain/Visit/SubjectVisit.cs
View File

@ -1,5 +1,4 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using System.ComponentModel;
namespace IRaCIS.Core.Domain.Models; namespace IRaCIS.Core.Domain.Models;
[Comment("受试者访视")] [Comment("受试者访视")]
@ -30,8 +29,6 @@ public class SubjectVisit : BaseFullDeleteAuditEntity
[JsonIgnore] [JsonIgnore]
[ForeignKey("SubmitUserId")] [ForeignKey("SubmitUserId")]
public User SubmitUser { get; set; } public User SubmitUser { get; set; }
//导航属性
[JsonIgnore] [JsonIgnore]
[ForeignKey("TrialId")] [ForeignKey("TrialId")]
public Trial Trial { get; set; } public Trial Trial { get; set; }
@ -172,16 +169,4 @@ public class SubjectVisit : BaseFullDeleteAuditEntity
public Guid? SubmitUserId { get; set; } public Guid? SubmitUserId { get; set; }
public ReadingStatusEnum ReadingStatus { get; set; } public ReadingStatusEnum ReadingStatus { get; set; }
} }
[Description("影像下载打包状态")]
public enum PackState
{
[Description("待打包")]
WaitPack = 0,
[Description("打包中")]
Packing = 1,
[Description("打包完成")]
Packed = 2
}

1
IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
View File

@ -270,7 +270,6 @@ public class IRaCISDBContext : DbContext
public virtual DbSet<ReadModule> ReadModule { get; set; } public virtual DbSet<ReadModule> ReadModule { get; set; }
public virtual DbSet<ReadModuleView> ReadModuleView { get; set; }
public virtual DbSet<ClinicalDataTrialSet> ClinicalDataTrialSet { get; set; } public virtual DbSet<ClinicalDataTrialSet> ClinicalDataTrialSet { get; set; }

0
IRaCIS.Core.Domain/Common/NotDefault.cs → IRaCIS.Core.Infrastructure/_IRaCIS/Attribute/NotDefault.cs
View File