整理命名空间
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-09-20 00:00:13 +08:00
parent 42e4fe59ec
commit 0a1ce59670
47 changed files with 2501 additions and 2599 deletions

View File

@ -11,8 +11,8 @@ using System.Collections.Generic;
using System.ComponentModel;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 项目标准阅片医生配置表")]
[Table("SubjectUser")]
@ -59,6 +59,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -10,8 +10,8 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 分配规则")]
[Table("TaskAllocationRule")]
public class TaskAllocationRule : BaseFullAuditEntity
@ -50,6 +50,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -12,8 +12,8 @@ using System.Linq;
using Newtonsoft.Json;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
public class OSSImageInfo
{
public string FileName { get; set; } = string.Empty;
@ -190,7 +190,3 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -10,8 +10,8 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 一致性分析规则")]
[Table("TaskMedicalReviewRule")]
public class TaskMedicalReviewRule : BaseFullAuditEntity
@ -46,4 +46,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -8,8 +8,8 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 虚拟中心编号更新记录")]
[Table("TrialVirtualSiteCodeUpdate")]
public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity
@ -26,7 +26,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -11,8 +11,8 @@ using System.Collections.Generic;
using System.Linq;
using EntityFrameworkCore.Projectables;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
///<summary>
///VisitTask
///</summary>
@ -435,4 +435,3 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -4,8 +4,8 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace IRaCIS.Core.Domain.BaseModel
{
namespace IRaCIS.Core.Domain.BaseModel;
/// <summary>
/// 领域实体事件基类
/// </summary>
@ -21,4 +21,3 @@ namespace IRaCIS.Core.Domain.BaseModel
public string EventData { get; set; } = string.Empty;
public DateTime FailedAt { get; set; }
}
}

View File

@ -5,8 +5,8 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Security.Cryptography;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
public interface IAggregateRoot;
@ -124,5 +124,3 @@ namespace IRaCIS.Core.Domain.Models
#endregion
}

View File

@ -1,7 +1,7 @@
using System;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
public interface IAuditAdd<TKey> where TKey : struct
{
public TKey CreateUserId { get; set; }
@ -21,7 +21,3 @@ namespace IRaCIS.Core.Domain.Models
{
public string CreateUser { get; set; }
}
}

View File

@ -1,7 +1,7 @@
using System;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
public interface IAuditUpdate<TKey> where TKey : struct
{
public TKey UpdateUserId { get; set; }
@ -12,9 +12,3 @@ namespace IRaCIS.Core.Domain.Models
{
}
}

View File

@ -1,7 +1,7 @@
using System;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
public interface ISoftDelete<TKey> where TKey : struct
{
public TKey? DeleteUserId { get; set; }
@ -14,6 +14,3 @@ namespace IRaCIS.Core.Domain.Models
{
}
}

View File

@ -4,15 +4,14 @@
// 生成时间 2022-02-15 15:45:52
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
using IRaCIS.Core.Domain.Share;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///SystemBasicData
///</summary>
namespace IRaCIS.Core.Domain.Models;
[Comment("系统 - 签名模板场景配置 (需要同步)")]
[Table("SystemBasicData")]
public class SystemBasicData : BaseFullAuditEntity
{
@ -50,5 +49,3 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -1,26 +0,0 @@
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
/// <summary>
/// 用户与医生管理关联关系表 - 实体
/// </summary>
[Table("UserDoctor")]
public partial class UserDoctor : Entity
{
#region 导航属性
[JsonIgnore]
public Doctor Doctor { get; set; }
[JsonIgnore]
public User User { get; set; }
#endregion
[ForeignKey("User")]
public Guid UserId { get; set; }
[ForeignKey("Doctor")]
public Guid DoctorId { get; set; }
}
}

View File

@ -2,8 +2,8 @@
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("医生 - 假期安排")]
[Table("Vacation")]
public class Vacation : BaseFullAuditEntity
@ -17,4 +17,3 @@ namespace IRaCIS.Core.Domain.Models
public int Status { get; set; } = 1;
}
}

View File

@ -7,8 +7,8 @@ using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目文档签署记录")]
[Table("TrialDocConfirmedUser")]
public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity
@ -44,4 +44,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -8,8 +8,8 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目邮件收发配置用户类型")]
[Table("TrialEmailNoticeUser")]
public class TrialEmailNoticeUser : Entity
@ -28,4 +28,4 @@ namespace IRaCIS.Core.Domain.Models
public EmailUserType EmailUserType { get; set; }
}
}

View File

@ -2,8 +2,8 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Table("CalculateTask")]
public class CalculateTask : Entity
{
@ -13,4 +13,3 @@ namespace IRaCIS.Core.Domain.Models
public string YearMonth { get; set; } = string.Empty;
public bool IsLock { get; set; }
}
}

View File

@ -4,8 +4,8 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Table("DicomStudy")]
public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId
{
@ -108,5 +108,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -3,8 +3,8 @@ using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Table("SCPInstance")]
public class SCPInstance : BaseFullAuditEntity, IEntitySeqId
{
@ -73,5 +73,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -2,8 +2,8 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
public class TaskInstance : BaseFullAuditEntity, IEntitySeqId
{
#region 导航属性
@ -54,4 +54,3 @@ namespace IRaCIS.Core.Domain.Models
public long? FileSize { get; set; }
}
}

View File

@ -3,8 +3,8 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
public class TaskSeries : BaseFullDeleteAuditEntity, IEntitySeqId
{
#region 导航属性
@ -52,4 +52,3 @@ namespace IRaCIS.Core.Domain.Models
public string ImageResizePath { get; set; }=string.Empty;
}
}

View File

@ -3,8 +3,8 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
public class TaskStudy : BaseFullDeleteAuditEntity, IEntitySeqId
{
#region 导航属性
@ -80,5 +80,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -8,8 +8,8 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 影像下载监控")]
[Table("TrialImageDownload")]
public class TrialImageDownload : BaseFullAuditEntity
@ -53,4 +53,3 @@ namespace IRaCIS.Core.Domain.Models
DicomAndNoneDicom = 3
};
}

View File

@ -4,8 +4,8 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 系统菜单 (需要同步)")]
[Table("Menu")]
public class Menu : BaseFullAuditEntity
@ -58,4 +58,3 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -8,8 +8,8 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("后台 - 系统通知用户类型配置")]
[Table("SystemNoticeUserType")]
public class SystemNoticeUserType : BaseAddAuditEntity
@ -29,6 +29,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -2,8 +2,8 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Table("Role")]
public partial class Role : BaseFullAuditEntity
{
@ -18,4 +18,3 @@ namespace IRaCIS.Core.Domain.Models
public int PrivilegeLevel { get; set; } //权限级别
}
}

View File

@ -5,8 +5,8 @@ using System.ComponentModel.DataAnnotations.Schema;
using EntityFrameworkCore.Projectables;
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Table("User")]
public partial class User : BaseFullAuditEntity
{
@ -96,4 +96,3 @@ namespace IRaCIS.Core.Domain.Models
//[Projectable] public string FullName => $"{LastName} / {FirstName}";
}
}

View File

@ -10,8 +10,8 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 参与附加评估标准配置")]
[Table("SubjectCriteriaEvaluation")]
public class SubjectCriteriaEvaluation : BaseFullAuditEntity
@ -37,6 +37,3 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -8,8 +8,8 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 附加评估标准影像筛选检查")]
[Table("SubjectCriteriaEvaluationVisitStudyFilter")]
public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity
@ -48,6 +48,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -6,8 +6,8 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 临床数据PDF文件")]
[Table("ReadingClinicalDataPDF")]
public class ReadingClinicalDataPDF : BaseAddAuditEntity
@ -34,7 +34,3 @@ namespace IRaCIS.Core.Domain.Models
}

View File

@ -8,8 +8,8 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("项目标准 - 临床数据配置")]
[Table("TrialClinicalDataSetCriterion")]
public class TrialClinicalDataSetCriterion : BaseFullAuditEntity
@ -32,6 +32,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -10,8 +10,8 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.Linq;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
///<summary>
/// 项目临床表格问题
///</summary>
@ -137,4 +137,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -8,8 +8,8 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 阅片模块临床表单")]
[Table("ReadModuleCriterionFrom")]
public class ReadModuleCriterionFrom : BaseAddAuditEntity
@ -45,4 +45,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -6,8 +6,8 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
///<summary>
/// 项目阅片标准
///</summary>
@ -321,6 +321,3 @@ namespace IRaCIS.Core.Domain.Models
SubjectRandom = 2,
}
}

View File

@ -8,8 +8,8 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目标准使用字典")]
[Table("TrialCriterionDictionaryCode")]
public class TrialCriterionDictionaryCode : BaseAddAuditEntity
@ -30,4 +30,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -10,8 +10,8 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.Linq;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
///<summary>
///系统表格问题
///</summary>
@ -209,4 +209,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -10,8 +10,8 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Collections.Generic;
using System.Linq;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
///<summary>
/// 项目阅片问题
///</summary>
@ -220,4 +220,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -11,8 +11,8 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("项目阅片 - 表格问题行记录")]
[Table("ReadingTableAnswerRowInfo")]
public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity
@ -171,7 +171,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -8,8 +8,8 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("用户配置 - WL模板")]
[Table("UserWLTemplate")]
public class UserWLTemplate : BaseAddAuditEntity
@ -32,6 +32,3 @@ namespace IRaCIS.Core.Domain.Models
public bool IsPitchOn { get; set; } = true;
}
}

View File

@ -8,8 +8,8 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
///<summary>
///RECIST1Point1肿瘤评估(系统标准)
///</summary>
@ -29,5 +29,3 @@ namespace IRaCIS.Core.Domain.Models
[Comment("整体疗效")]
public OverallAssessment OverallEfficacy { get; set; }
}
}

View File

@ -8,8 +8,8 @@ using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
///<summary>
///RECIST1Point1BM肿瘤评估(系统标准)
///</summary>
@ -30,4 +30,4 @@ namespace IRaCIS.Core.Domain.Models
public OverallAssessment OverallEfficacy { get; set; }
}
}

View File

@ -6,8 +6,8 @@
using Microsoft.EntityFrameworkCore;
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("项目 - 项目状态变更记录表")]
[Table("TrialStateChange")]
public class TrialStateChange : BaseAddAuditEntity
@ -32,6 +32,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -4,8 +4,8 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Comment("ÏîÄ¿ - Èë×éÁ÷³Ì¼Ç¼")]
[Table("TrialStatus")]
public partial class TrialStatusDetail : BaseAddAuditEntity
@ -28,5 +28,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -1,8 +1,8 @@
using System;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
public class TrialAudit : Entity
{
#region 导航属性
@ -31,4 +31,3 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -7,8 +7,8 @@ using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
///<summary>
///TrialUserPreparation
///</summary>
@ -39,4 +39,4 @@ namespace IRaCIS.Core.Domain.Models
}
}

View File

@ -4,8 +4,8 @@ using System.ComponentModel.DataAnnotations.Schema;
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
namespace IRaCIS.Core.Domain.Models;
[Table("SubjectVisit")]
public class SubjectVisit : BaseFullDeleteAuditEntity
{
@ -250,4 +250,3 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
Packed = 2
}
}

View File

@ -227,7 +227,6 @@ public class IRaCISDBContext : DbContext
public virtual DbSet<ResearchPublication> ResearchPublications { get; set; }
public virtual DbSet<TrialExperience> TrialExperience { get; set; }
public virtual DbSet<UserDoctor> UserDoctor { get; set; }
public virtual DbSet<Vacation> Vacation { get; set; }
public virtual DbSet<Attachment> Attachment { get; set; }