From 42e4fe59eccbe86122e926681d50e90f0cf5b304 Mon Sep 17 00:00:00 2001 From: hang <87227557@qq.com> Date: Thu, 19 Sep 2024 23:45:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E5=92=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E5=85=B3=E7=B3=BB2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Domain/Allocation/SubjectUser.cs | 23 +- .../Allocation/TaskAllocationRule.cs | 22 +- .../Allocation/TaskConsistentRule.cs | 61 ++-- .../Allocation/TaskInfluence.cs | 65 ++-- .../Allocation/TaskMedicalReview.cs | 5 +- .../Allocation/TaskMedicalReviewRule.cs | 15 +- .../Allocation/TrialVirtualSiteCodeUpdate.cs | 15 +- .../Allocation/VisitTaskReReading.cs | 97 +++--- .../Common/Internationalization.cs | 2 +- IRaCIS.Core.Domain/Common/SystemBasicData.cs | 26 +- IRaCIS.Core.Domain/Common/VerificationCode.cs | 29 +- IRaCIS.Core.Domain/Dcotor/TrialExperience.cs | 6 +- IRaCIS.Core.Domain/Dcotor/Vacation.cs | 4 +- .../Document/SystemDocConfirmedUser.cs | 43 ++- .../SystemDocNeedConfirmedUserType.cs | 39 ++- IRaCIS.Core.Domain/Document/SystemDocument.cs | 12 +- .../Document/TrialDocConfirmedUser.cs | 13 +- .../Document/TrialDocNeedConfirmedUserType.cs | 37 ++- IRaCIS.Core.Domain/Document/TrialDocument.cs | 56 ++-- .../Document/TrialEmailNoticeConfig.cs | 149 ++++----- .../Document/TrialEmailNoticeUser.cs | 22 +- .../Financial/TrialPaymentPrice.cs | 48 +-- .../Financial/TrialRevenuesPrice.cs | 57 ++-- .../TrialRevenuesPriceVerification.cs | 46 +-- IRaCIS.Core.Domain/Financial/VolumeReward.cs | 22 +- .../Image/SystemAnonymization.cs | 57 ++-- IRaCIS.Core.Domain/Image/TrialDicomAE.cs | 35 +-- .../Image/TrialImageDownload.cs | 4 + .../Management/Notice/SystemNotice.cs | 55 ++-- .../Management/Notice/SystemNoticeUserRead.cs | 21 +- .../Management/Notice/SystemNoticeUserType.cs | 25 +- IRaCIS.Core.Domain/Management/UserFeedBack.cs | 72 ++--- IRaCIS.Core.Domain/Management/UserLog.cs | 147 +++++---- .../Management/UserPassWordLog.cs | 34 +- IRaCIS.Core.Domain/Management/UserType.cs | 55 ++-- .../Management/UserTypeGroup.cs | 39 ++- IRaCIS.Core.Domain/Management/UserTypeMenu.cs | 30 +- IRaCIS.Core.Domain/QC/TrialQCQuestion.cs | 75 +++-- .../QC/TrialQCQuestionAnswer.cs | 43 ++- .../SubjectAdditionalEvaluationResult.cs | 67 ++-- .../SubjectCriteriaEvaluation.cs | 28 +- .../SubjectCriteriaEvaluationVisitFilter.cs | 114 +++---- ...bjectCriteriaEvaluationVisitStudyFilter.cs | 24 +- .../TrialClinicalDataSetCriterion.cs | 23 +- .../SystemClinicalQuestion.cs | 245 ++++++++------- .../SystemClinicalTableQuestion.cs | 179 +++++------ .../ClinicalQuestion/TrialClinicalQuestion.cs | 292 +++++++++--------- .../SystemCriterionDictionaryCode.cs | 27 +- .../TrialCriterionAdditionalAssessmentType.cs | 43 ++- .../TrialCriterionDictionaryCode.cs | 9 +- .../ReadingQuestionTrial.cs | 4 +- .../Reading/ReadingPeriod/ReadingPeriodSet.cs | 79 +++-- .../Reading/ShortcutKey/UserWLTemplate.cs | 33 +- .../TumorAssessment_IRECIST1Point1.cs | 52 ++-- .../TumorAssessment_RECIST1Point1.cs | 49 ++- .../TumorAssessment_RECIST1Point1BM.cs | 31 +- .../SiteSurvey/TrialSiteEquipmentSurvey.cs | 43 ++- .../SiteSurvey/TrialSiteSurvey.cs | 86 +++--- .../SiteSurvey/TrialSiteUserSurvey.cs | 63 ++-- IRaCIS.Core.Domain/Trial/TrialBodyPart.cs | 40 ++- IRaCIS.Core.Domain/Trial/TrialDictionary.cs | 31 +- IRaCIS.Core.Domain/Trial/TrialSign.cs | 45 ++- IRaCIS.Core.Domain/Trial/TrialStateChange.cs | 33 +- IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs | 4 +- .../TrialSiteUser/TrialExternalUser.cs | 77 ++--- IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs | 70 +++-- .../TrialSiteUser/TrialSiteDicomAE.cs | 41 ++- .../TrialSiteUser/TrialSiteUser.cs | 49 ++- IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs | 40 ++- .../Visit/SubjectCanceDoctor.cs | 41 ++- .../Visit/VisitPlanInfluenceStat.cs | 29 +- .../Visit/VisitPlanInfluenceStudy.cs | 49 ++- IRaCIS.Core.Domain/Visit/VisitStage.cs | 48 +-- 73 files changed, 1760 insertions(+), 1934 deletions(-) diff --git a/IRaCIS.Core.Domain/Allocation/SubjectUser.cs b/IRaCIS.Core.Domain/Allocation/SubjectUser.cs index f4adcfcde..88bb43c73 100644 --- a/IRaCIS.Core.Domain/Allocation/SubjectUser.cs +++ b/IRaCIS.Core.Domain/Allocation/SubjectUser.cs @@ -9,11 +9,12 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; using System.ComponentModel; +using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models { - [Description("受试者某标准阅片用户中间关系表")] + [Comment("受试者 - 项目标准阅片医生配置表")] [Table("SubjectUser")] public class SubjectUser : BaseFullAuditEntity { @@ -39,25 +40,23 @@ namespace IRaCIS.Core.Domain.Models public Subject Subject { get; set; } #endregion - public Guid TrialId { get; set; } - - public Guid TrialReadingCriterionId { get; set; } + public Arm ArmEnum { get; set; } public DateTime? AssignTime { get; set; } - public Guid SubjectId { get; set; } - - public Guid DoctorUserId { get; set; } + public bool IsConfirmed { get; set; } - public Arm ArmEnum { get; set; } - - public bool IsConfirmed { get; set; } = true; - - //该属性有值 说明该医生被替换了 分配的时候 要过滤掉 + [Comment("该属性有值 说明该医生被替换了 分配的时候 要过滤掉")] public Guid? ReplacedSubjectUserId { get; set; } + public Guid SubjectId { get; set; } + + public Guid TrialId { get; set; } + + public Guid TrialReadingCriterionId { get; set; } + } diff --git a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs index ee8f0ca69..a2984edc6 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs @@ -8,12 +8,11 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; +using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models { - /// - ///TaskAllocationRule - /// + [Comment("项目阅片 - 分配规则")] [Table("TaskAllocationRule")] public class TaskAllocationRule : BaseFullAuditEntity { @@ -31,23 +30,22 @@ namespace IRaCIS.Core.Domain.Models #endregion public Guid TrialId { get; set; } - - public int PlanSubjectCount { get; set; } + public Guid DoctorUserId { get; set; } + [Comment(" 入组表Id 可以去掉 TrialId DoctorUserId")] + public Guid EnrollId { get; set; } public bool IsEnable { get; set; } - public string Note { get; set; } = string.Empty; - - public Guid DoctorUserId { get; set; } - - public Guid EnrollId { get; set; } - - //是否是裁判医生 裁判医生单独加入 public bool IsJudgeDoctor { get; set; } + public string Note { get; set; } = null!; + + [Comment(" 计划比率")] public int PlanReadingRatio { get; set; } + public int PlanSubjectCount { get; set; } + diff --git a/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs b/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs index c5c795538..b71cdd785 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs @@ -7,54 +7,53 @@ using System; using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; using System.Linq; +using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目阅片 - 一致性分析生成任务配置")] +[Table("TaskConsistentRule")] +public class TaskConsistentRule : BaseFullAuditEntity { - /// - ///TaskConsistentRule - /// - [Table("TaskConsistentRule")] - public class TaskConsistentRule : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("TrialReadingCriterionId")] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("TrialReadingCriterionId")] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion - public Guid TrialId { get; set; } - - public int PlanSubjectCount { get; set; } - - public int PlanVisitCount { get; set; } - - public int IntervalWeeks { get; set; } + public Guid TrialId { get; set; } - public bool IsHaveReadingPeriod { get; set; } + public int PlanSubjectCount { get; set; } - public bool IsGenerateGlobalTask { get; set; } + public int PlanVisitCount { get; set; } - public int BlindSubjectNumberOfPlaces { get; set; } + public int IntervalWeeks { get; set; } - public string BlindTrialSiteCode { get; set; } = string.Empty; + public bool IsHaveReadingPeriod { get; set; } - public bool IsSelfAnalysis { get; set; } + public bool IsGenerateGlobalTask { get; set; } - public bool IsEnable { get; set; } + public int BlindSubjectNumberOfPlaces { get; set; } - public string Note { get; set; }=string.Empty; + public string BlindTrialSiteCode { get; set; } = string.Empty; + + public bool IsSelfAnalysis { get; set; } + + public bool IsEnable { get; set; } + + public string Note { get; set; } = string.Empty; - public Guid TrialReadingCriterionId { get; set; } + public Guid TrialReadingCriterionId { get; set; } - } +} + -} diff --git a/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs b/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs index 9f0ce8173..b0af57dd4 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs @@ -7,47 +7,44 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +using Microsoft.EntityFrameworkCore; +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目阅片 - 退回重阅影响")] +[Table("TaskInfluence")] +public class TaskInfluence : BaseAddAuditEntity { - /// - ///TaskInfluence - /// - [Table("TaskInfluence")] - public class TaskInfluence : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - public VisitTask OriginalTask { get; set; } + #region 导航属性 + [JsonIgnore] + public VisitTask OriginalTask { get; set; } - [JsonIgnore] - public VisitTask InfluenceTask { get; set; } - #endregion + [JsonIgnore] + public VisitTask InfluenceTask { get; set; } + #endregion - public Guid OriginalTaskId { get; set; } + public Guid OriginalTaskId { get; set; } - public Guid InfluenceTaskId { get; set; } + public Guid InfluenceTaskId { get; set; } - //对影响任务进行的操作 - public ReReadingOrBackOptType OptType { get; set; } + [Comment(" 对影响任务进行的操作")] + public ReReadingOrBackOptType OptType { get; set; } - } - - - public enum ReReadingOrBackOptType - { - //取消分配 - CancelAssign = 0, - - //失效 - Abandon = 1, - - //重阅重置 - - Return = 2, - - } - +} + + +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 39c33a358..ebf5e908d 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs @@ -10,6 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; using System.Linq; using Newtonsoft.Json; +using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models { @@ -19,9 +20,7 @@ namespace IRaCIS.Core.Domain.Models public string ImagePath { get; set; } = string.Empty; } - /// - ///TaskMedicalReview - /// + [Comment("项目阅片 - 医学审核")] [Table("TaskMedicalReview")] public class TaskMedicalReview : BaseFullAuditEntity { diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs index 9c87902d3..a572146ef 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs @@ -8,18 +8,18 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; +using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models { - /// - ///TaskTaskMedicalReviewRule - /// - [Table("TaskMedicalReviewRule")] - public class TaskMedicalReviewRule :BaseFullAuditEntity + [Comment("项目阅片 - 一致性分析规则")] + [Table("TaskMedicalReviewRule")] + public class TaskMedicalReviewRule :BaseFullAuditEntity { #region 导航属性 - + [JsonIgnore] + public User DoctorUser { get; set; } #endregion public Guid DoctorUserId { get; set; } @@ -38,8 +38,7 @@ namespace IRaCIS.Core.Domain.Models public int PlanTumorCount { get; set; } - [JsonIgnore] - public User DoctorUser { get; set; } + diff --git a/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs b/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs index 45c629891..2fb83df57 100644 --- a/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs +++ b/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs @@ -7,13 +7,12 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models { - /// - ///TrialVirtualSiteCodeUpdate - /// - [Table("TrialVirtualSiteCodeUpdate")] - public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity + [Comment("项目 - 虚拟中心编号更新记录")] + [Table("TrialVirtualSiteCodeUpdate")] + public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity { #region 导航属性 @@ -21,13 +20,13 @@ namespace IRaCIS.Core.Domain.Models #endregion public Guid TrialId { get; set; } - - public string VirturalSiteCode { get; set; } = string.Empty; + [StringLength(250)] + public string VirturalSiteCode { get; set; } = string.Empty; } -} +} diff --git a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs index 0dc2897ef..28d6ed470 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs @@ -8,72 +8,67 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; +using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目阅片 - 阅片任务重阅表")] +[Table("VisitTaskReReading")] +public class VisitTaskReReading : BaseFullAuditEntity { - /// - ///重阅申请流程记录表 - /// - [Table("VisitTaskReReading")] - public class VisitTaskReReading : BaseFullAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - public User RequestReReadingUser { get; set; } + [JsonIgnore] + public User RequestReReadingUser { get; set; } - [JsonIgnore] - public VisitTask NewReReadingTask { get; set; } - [JsonIgnore] - public VisitTask RootReReadingTask { get; set; } - [JsonIgnore] - public VisitTask OriginalReReadingTask { get; set; } - [JsonIgnore] - public User RequestReReadingConfirmUser { get; set; } + [JsonIgnore] + public VisitTask NewReReadingTask { get; set; } + [JsonIgnore] + public VisitTask RootReReadingTask { get; set; } + [JsonIgnore] + public VisitTask OriginalReReadingTask { get; set; } + [JsonIgnore] + public User RequestReReadingConfirmUser { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } - #endregion + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } + [Comment(" 重阅原始任务Id")] + public Guid OriginalReReadingTaskId { get; set; } - //重阅原始任务Id 重阅会产生新的任务 - public Guid OriginalReReadingTaskId { get; set; } + [Comment(" 重阅确认人")] + public Guid? RequestReReadingConfirmUserId { get; set; } - //产生重阅的根任务Id - public Guid RootReReadingTaskId { get; set; } + [Comment(" 请求重阅人")] + public Guid RequestReReadingUserId { get; set; } - //重阅申请 产生的新任务Id - public Guid? NewReReadingTaskId { get; set; } + public Guid RootReReadingTaskId { get; set; } + [Comment("仅仅包括全局和访视")] + public bool IsCopyFollowForms { get; set; } - public Guid RequestReReadingUserId { get; set; } - + [Comment(" 是否复制之前任务表单数据")] + public bool IsCopyOrigenalForms { get; set; } - public DateTime RequestReReadingTime { get; set; } - - - //申请回退类型 - public RequestReReadingType RequestReReadingType { get; set; } - - - public string RequestReReadingReason { get; set; } = string.Empty; - - public string RequestReReadingRejectReason { get; set; } = string.Empty; - - public RequestReReadingResult RequestReReadingResultEnum { get; set; } - - public Guid? RequestReReadingConfirmUserId { get; set; } - - - public bool IsCopyOrigenalForms { get; set; } - - //仅仅包括全局和访视 - public bool IsCopyFollowForms { get; set; } + public Guid? NewReReadingTaskId { get; set; } + + + + [StringLength(512)] + public string RequestReReadingReason { get; set; } = null!; + + public string RequestReReadingRejectReason { get; set; } = null!; + + public RequestReReadingResult RequestReReadingResultEnum { get; set; } + + public DateTime? RequestReReadingTime { get; set; } + + public RequestReReadingType RequestReReadingType { get; set; } - } } diff --git a/IRaCIS.Core.Domain/Common/Internationalization.cs b/IRaCIS.Core.Domain/Common/Internationalization.cs index 15ec0c6f0..1aed3e697 100644 --- a/IRaCIS.Core.Domain/Common/Internationalization.cs +++ b/IRaCIS.Core.Domain/Common/Internationalization.cs @@ -41,7 +41,7 @@ public class Internationalization : BaseFullAuditEntity public int ShowOrder { get; set; } - [Comment(" 0 1 2 预翻译 已确认 废除")] + //[Comment(" 0 1 2 预翻译 已确认 废除")] public int State { get; set; } [StringLength(2000)] diff --git a/IRaCIS.Core.Domain/Common/SystemBasicData.cs b/IRaCIS.Core.Domain/Common/SystemBasicData.cs index 799565951..384d3cdfc 100644 --- a/IRaCIS.Core.Domain/Common/SystemBasicData.cs +++ b/IRaCIS.Core.Domain/Common/SystemBasicData.cs @@ -25,26 +25,30 @@ namespace IRaCIS.Core.Domain.Models #endregion - public string Name { get; set; }=string.Empty; - - public string Value { get; set; } = string.Empty; + public BasicDataTypeEnum BasicDataTypeEnum { get; set; } - public string Description { get; set; } = string.Empty; + [StringLength(512)] + public string Code { get; set; } = null!; - public int ShowOrder { get; set; } + [StringLength(512)] + public string Description { get; set; } = null!; - public string Code { get; set; } = string.Empty; + public bool IsEnable { get; set; } + + [StringLength(400)] + public string Name { get; set; } = null!; public Guid? ParentId { get; set; } + public int ShowOrder { get; set; } - public string ValueCN { get; set; } = string.Empty; + [StringLength(512)] + public string Value { get; set; } = null!; - public bool IsEnable { get; set; } + [StringLength(512)] + public string ValueCN { get; set; } = null!; - public BasicDataTypeEnum BasicDataTypeEnum { get; set; } - - } + } } diff --git a/IRaCIS.Core.Domain/Common/VerificationCode.cs b/IRaCIS.Core.Domain/Common/VerificationCode.cs index 9a7f41926..a12b5cef6 100644 --- a/IRaCIS.Core.Domain/Common/VerificationCode.cs +++ b/IRaCIS.Core.Domain/Common/VerificationCode.cs @@ -1,29 +1,26 @@ using IRaCIS.Core.Domain.Share; +using Microsoft.EntityFrameworkCore; using System; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("后台 - 验证码记录")] +[Table("VerificationCode")] +public class VerificationCode : BaseAddAuditEntity { - [Table("VerificationCode")] - public class VerificationCode:BaseAddAuditEntity - { - - public Guid UserId { get; set; } = Guid.Empty; - //验证码 - public string Code { get; set; } = string.Empty; + public Guid UserId { get; set; } = Guid.Empty; - //什么类型的验证码 邮箱|手机 + public string Code { get; set; } = string.Empty; - public VerifyType CodeType { get; set; } + [Comment("邮箱|手机")] + public VerifyType CodeType { get; set; } - public bool HasSend { get; set; } + public bool HasSend { get; set; } - //发送的邮箱或者手机 - public string EmailOrPhone { get; set; }=string.Empty; + public string EmailOrPhone { get; set; } = string.Empty; - //过期时间 - public DateTime ExpirationTime { get; set; } + public DateTime ExpirationTime { get; set; } - } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs b/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs index 831c52e13..7c0b4da9a 100644 --- a/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs +++ b/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs @@ -1,3 +1,4 @@ +using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -5,6 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { + [Comment("ҽ - Ŀٴ")] [Table("TrialExperience")] public partial class TrialExperience : BaseFullAuditEntity { @@ -12,6 +14,8 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public List ExperienceCriteriaList { get; set; } + [JsonIgnore] + public Dictionary Phase { get; set; } #endregion @@ -19,7 +23,7 @@ namespace IRaCIS.Core.Domain.Models public Guid? PhaseId { get; set; } - public Dictionary Phase { get; set; } + [StringLength(512)] public string EvaluationContent { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Dcotor/Vacation.cs b/IRaCIS.Core.Domain/Dcotor/Vacation.cs index 366b1f9ea..d135d35f3 100644 --- a/IRaCIS.Core.Domain/Dcotor/Vacation.cs +++ b/IRaCIS.Core.Domain/Dcotor/Vacation.cs @@ -1,8 +1,10 @@ -using System; +using Microsoft.EntityFrameworkCore; +using System; using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { + [Comment("医生 - 假期安排")] [Table("Vacation")] public class Vacation : BaseFullAuditEntity { diff --git a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs index 13b1121ef..5b9cf8e5a 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs @@ -3,41 +3,38 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-01-14 15:04:22 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 +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("SystemDocConfirmedUser")] +public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity + { - /// - ///SystemDocConfirmedUser - /// - [Table("SystemDocConfirmedUser")] - public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity + #region 导航属性 + [JsonIgnore] + public SystemDocument SystemDocument { get; set; } - { - #region 导航属性 - [JsonIgnore] - public SystemDocument SystemDocument { get; set; } - - [JsonIgnore] - [ForeignKey("ConfirmUserId")] - public User ConfirmUser { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("ConfirmUserId")] + public User ConfirmUser { get; set; } + #endregion - public Guid SystemDocumentId { get; set; } + public DateTime? ConfirmTime { get; set; } - public DateTime? ConfirmTime { get; set; } + public Guid ConfirmUserId { get; set; } + public DateTime? SignFirstViewTime { get; set; } - public Guid ConfirmUserId { get; set; } + [StringLength(1024)] + public string SignText { get; set; } = null!; - public DateTime? SignFirstViewTime { get; set; } + public Guid SystemDocumentId { get; set; } - public string SignText { get; set; } = string.Empty; - - - } } diff --git a/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs b/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs index 3b73c0d50..cc3c4de52 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs @@ -3,31 +3,30 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-01-14 15:04:23 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 +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("SystemDocNeedConfirmedUserType")] +public class SystemDocNeedConfirmedUserType : Entity { - /// - ///SystemDocNeedConfirmedUserType - /// - [Table("SystemDocNeedConfirmedUserType")] - public class SystemDocNeedConfirmedUserType : Entity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("NeedConfirmUserTypeId")] - public UserType UserTypeRole { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("NeedConfirmUserTypeId")] + public UserType UserTypeRole { get; set; } - [JsonIgnore] - public SystemDocument SystemDocument { get; set; } - #endregion + [JsonIgnore] + public SystemDocument SystemDocument { get; set; } + #endregion - public Guid SystemDocumentId { get; set; } - - public Guid NeedConfirmUserTypeId { get; set; } - - } + public Guid SystemDocumentId { get; set; } + + public Guid NeedConfirmUserTypeId { get; set; } + +} + -} diff --git a/IRaCIS.Core.Domain/Document/SystemDocument.cs b/IRaCIS.Core.Domain/Document/SystemDocument.cs index e1ea73e42..de68263a0 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocument.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocument.cs @@ -28,16 +28,16 @@ namespace IRaCIS.Core.Domain.Models public Guid FileTypeId { get; set; } + [StringLength(2000)] + public string Name { get; set; } = null!; - public string Name { get; set; } = string.Empty; + [StringLength(2000)] + public string Path { get; set; } = null!; - public int SignViewMinimumMinutes { get; set; } - - - public string Path { get; set; } = string.Empty; + public int SignViewMinimumMinutes { get; set; } - } + } } diff --git a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs index 67db8d33d..bd6b1c48c 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs @@ -3,16 +3,15 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-01-05 18:02:45 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 +using Microsoft.EntityFrameworkCore; using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { - /// - ///TrialDocUserTypeConfirmUser - /// - [Table("TrialDocConfirmedUser")] - public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity + [Comment("项目 - 项目文档签署记录")] + [Table("TrialDocConfirmedUser")] + public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity { #region 导航属性 @@ -37,8 +36,8 @@ namespace IRaCIS.Core.Domain.Models public DateTime? SignFirstViewTime { get; set; } - - public string SignText { get; set; } = string.Empty; + [StringLength(512)] + public string SignText { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs b/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs index 33942b727..3f281c363 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs @@ -3,34 +3,33 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-01-05 09:11:50 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 +using Microsoft.EntityFrameworkCore; using System; 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("TrialDocNeedConfirmedUserType")] +public class TrialDocNeedConfirmedUserType : Entity { - /// - ///TrialDocumentUserConfirm - /// - [Table("TrialDocNeedConfirmedUserType")] - public class TrialDocNeedConfirmedUserType : Entity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("NeedConfirmUserTypeId")] - public UserType UserTypeRole { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("NeedConfirmUserTypeId")] + public UserType UserTypeRole { get; set; } - [JsonIgnore] - public TrialDocument TrialDocument { get; set; } - #endregion + [JsonIgnore] + public TrialDocument TrialDocument { get; set; } + #endregion - public Guid TrialDocumentId { get; set; } - - public Guid NeedConfirmUserTypeId { get; set; } + public Guid TrialDocumentId { get; set; } + + public Guid NeedConfirmUserTypeId { get; set; } - } +} + -} diff --git a/IRaCIS.Core.Domain/Document/TrialDocument.cs b/IRaCIS.Core.Domain/Document/TrialDocument.cs index 1e8dad2fa..7a3eaed6b 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocument.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocument.cs @@ -3,47 +3,47 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-01-05 09:11:50 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 +using Microsoft.EntityFrameworkCore; using System; 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("TrialDocument")] +public class TrialDocument : BaseFullDeleteAuditEntity { - /// - ///TrialDocument - /// - [Table("TrialDocument")] - public class TrialDocument : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - public List TrialDocConfirmedUserList { get; set; } - [JsonIgnore] - public List NeedConfirmedUserTypeList { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } + #region 导航属性 + [JsonIgnore] + public List TrialDocConfirmedUserList { get; set; } + [JsonIgnore] + public List NeedConfirmedUserTypeList { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("FileTypeId")] - public Dictionary FileType { get; set; } - #endregion - //需要确认的项目用户 通过TrialId 关联 用中间表过滤 + [JsonIgnore] + [ForeignKey("FileTypeId")] + public Dictionary FileType { get; set; } + #endregion + //需要确认的项目用户 通过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; - public string Path { get; set; } = string.Empty; + public string Path { get; set; } = string.Empty; - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public string Description { get; set; } = string.Empty; + [StringLength(1000)] + public string Description { get; set; } = string.Empty; - public int SignViewMinimumMinutes { get; set; } + public int SignViewMinimumMinutes { get; set; } - - } -} +} + + diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs index 59f1c25c9..991b3a743 100644 --- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs +++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs @@ -9,124 +9,109 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; using System.Linq; +using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 项目发送邮件配置")] +[Table("TrialEmailNoticeConfig")] +public class TrialEmailNoticeConfig : BaseFullDeleteAuditEntity { - /// - ///TrialEmailNoticeConfig - /// - [Table("TrialEmailNoticeConfig")] - public class TrialEmailNoticeConfig : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] + #region 导航属性 + [JsonIgnore] - public Trial Trial { get; set; } + public Trial Trial { get; set; } - [JsonIgnore] - public List TrialEmailNoticeUserList { get; set; } = new List(); - [JsonIgnore] - public List TrialEmailBlackUserList { get; set; } = new List(); + [JsonIgnore] + public List TrialEmailNoticeUserList { get; set; } = new List(); + [JsonIgnore] + public List TrialEmailBlackUserList { get; set; } = new List(); - [JsonIgnore] + [JsonIgnore] - public EmailNoticeConfig SysEmailNoticeConfig { get; set; } - [ForeignKey("TrialReadingCriterionId")] - [JsonIgnore] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + public EmailNoticeConfig SysEmailNoticeConfig { get; set; } + [ForeignKey("TrialReadingCriterionId")] + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - #endregion + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } + public string AttachCNPath { get; set; } = null!; + public string AttachName { get; set; } = null!; - public string SMTPServerAddress { get; set; } = string.Empty; + public string AttachNameCN { get; set; } = null!; - public int SMTPServerPort { get; set; } + public string AttachPath { get; set; } = null!; - public string AuthorizationCode { get; set; } = string.Empty; + public string AuthorizationCode { get; set; } = null!; + public int BusinessLevelEnum { get; set; } - public string FromName { get; set; } = string.Empty; + public int BusinessModuleEnum { get; set; } + public EmailBusinessScenario BusinessScenarioEnum { get; set; } - public string FromEmail { get; set; } = string.Empty; + public string Code { get; set; } = null!; + public CriterionType? CriterionTypeEnum { get; set; } + public string Description { get; set; } = null!; - /// 业务模块 /// - public int BusinessModuleEnum { get; set; } + public string EmailCron { get; set; } = null!; - /// 业务层级 /// - public int BusinessLevelEnum { get; set; } + [MaxLength] + public string? EmailHtmlContent { get; set; } + [MaxLength] + public string? EmailHtmlContentCN { get; set; } - /// 邮件加急类型 /// - public int EmailUrgentEnum { get; set; } + public string EmailTopic { get; set; } = null!; - /// 定时周期 /// - public string EmailCron { get; set; } = string.Empty; + public string EmailTopicCN { get; set; } = null!; - /// 邮件主题 /// - public string EmailTopic { get; set; } = string.Empty; + public int EmailTypeEnum { get; set; } - public string EmailTopicCN { get; set; } = string.Empty; + public int EmailUrgentEnum { get; set; } - /// 附件 /// - public string AttachPath { get; set; } = string.Empty; + public string FromEmail { get; set; } = null!; - public string AttachCNPath { get; set; } = string.Empty; + public string FromName { get; set; } = null!; - public string Description { get; set; } = string.Empty; + public bool IsAutoSend { get; set; } + public bool IsDistinguishCriteria { get; set; } - public string AttachName { get; set; } = string.Empty; - public string AttachNameCN { get; set; } = string.Empty; + public bool IsEnable { get; set; } + public bool IsReturnRequired { get; set; } - public string EmailHtmlContent { get; set; } = string.Empty; - public string EmailHtmlContentCN { get; set; } = string.Empty; + public string SMTPServerAddress { get; set; } = null!; + public int SMTPServerPort { get; set; } - public Guid? SysEmailNoticeConfigId { get; set; } + public Guid? SysEmailNoticeConfigId { get; set; } - - [Required] - public string Code { get; set; } = string.Empty; - - [Required] - public bool IsReturnRequired { get; set; } - [Required] - public bool IsAutoSend { get; set; } - - public bool IsEnable { get; set; } - - - public EmailBusinessScenario BusinessScenarioEnum { get; set; } - - public CriterionType? CriterionTypeEnum { get; set; } - - - public Guid? TrialReadingCriterionId { get; set; } - - - } - - public class TrialEmailBlackUser : Entity - { - [JsonIgnore] - public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; } - - [JsonIgnore] - public User User { get; set; } - - - public Guid TrialEmailNoticeConfigId { get; set; } - - - public Guid UserId { get; set; } - } + public Guid? TrialReadingCriterionId { get; set; } } + +[Comment("项目 - 项目邮件用户黑名单")] +[Table("TrialEmailBlackUser")] +public class TrialEmailBlackUser : Entity +{ + [JsonIgnore] + public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; } + + [JsonIgnore] + public User User { get; set; } + + + public Guid TrialEmailNoticeConfigId { get; set; } + + + public Guid UserId { get; set; } +} diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs index 2c4852eda..c7c2e5023 100644 --- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs +++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs @@ -7,23 +7,19 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models { - /// - ///TrialEmailNoticeUser - /// - [Table("TrialEmailNoticeUser")] - public class TrialEmailNoticeUser : Entity + [Comment("项目 - 项目邮件收发配置用户类型")] + [Table("TrialEmailNoticeUser")] + public class TrialEmailNoticeUser : Entity { - #region 导航属性 + #region 导航属性 + [JsonIgnore] + public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; } + #endregion - #endregion - - [JsonIgnore] - public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; } - - - public UserTypeEnum UserType { get; set; } + public UserTypeEnum UserType { get; set; } public Guid TrialEmailNoticeConfigId { get; set; } diff --git a/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs b/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs index f902edd11..d511284fc 100644 --- a/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs +++ b/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs @@ -1,29 +1,35 @@ +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("TrialPaymentPrice")] +public class TrialPaymentPrice : BaseFullAuditEntity { - [Table("TrialPaymentPrice")] - public partial class TrialPaymentPrice : BaseFullAuditEntity - { - public Guid TrialId { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } - public Trial Trial { get; set; } - - [Column(TypeName = "decimal(18,2)")] - public decimal TrialAdditional { get; set; } = 0; - - public string SowName { get; set; } = string.Empty; - public string SowPath { get; set; } = string.Empty; - - [Column(TypeName = "decimal(18,2)")] - public decimal AdjustmentMultiple { get; set; } = 1; - - /// - /// Ƿ ΪĿ - /// - public bool? IsNewTrial { get; set; } = false; + public Guid TrialId { get; set; } - } + + + + [DecimalPrecision(18, 2)] + public decimal AdjustmentMultiple { get; set; } + + [Comment(" ǷΪĿ")] + public bool? IsNewTrial { get; set; } + + public string SowName { get; set; } = null!; + + [StringLength(500)] + public string SowPath { get; set; } = null!; + + [DecimalPrecision(18, 2)] + public decimal TrialAdditional { get; set; } + } diff --git a/IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs b/IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs index d5a15531d..9375d49ca 100644 --- a/IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs +++ b/IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs @@ -1,42 +1,45 @@ -using System; +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("TrialRevenuesPrice")] +public class TrialRevenuesPrice : BaseFullAuditEntity { - [Table("TrialRevenuesPrice")] - public class TrialRevenuesPrice : BaseFullAuditEntity - { - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - [Column(TypeName = "decimal(18,2)")] - public decimal Timepoint { get; set; } + [DecimalPrecision(18, 2)] + public decimal Adjudication { get; set; } - [Column(TypeName = "decimal(18,2)")] - public decimal TimepointIn24H { get; set; } + [DecimalPrecision(18, 2)] + public decimal AdjudicationIn24H { get; set; } - [Column(TypeName = "decimal(18,2)")] - public decimal TimepointIn48H { get; set; } + [DecimalPrecision(18, 2)] + public decimal AdjudicationIn48H { get; set; } - [Column(TypeName = "decimal(18,2)")] - public decimal Adjudication { get; set; } + [DecimalPrecision(18, 2)] + public decimal Downtime { get; set; } - [Column(TypeName = "decimal(18,2)")] - public decimal AdjudicationIn24H { get; set; } + [DecimalPrecision(18, 2)] + public decimal Global { get; set; } - [Column(TypeName = "decimal(18,2)")] - public decimal AdjudicationIn48H { get; set; } + [DecimalPrecision(18, 2)] + public decimal RefresherTraining { get; set; } - [Column(TypeName = "decimal(18,2)")] - public decimal Global { get; set; } + [DecimalPrecision(18, 2)] + public decimal Timepoint { get; set; } - [Column(TypeName = "decimal(18,2)")] - public decimal Training { get; set; } + [DecimalPrecision(18, 2)] + public decimal TimepointIn24H { get; set; } - [Column(TypeName = "decimal(18,2)")] - public decimal Downtime { get; set; } + [DecimalPrecision(18, 2)] + public decimal TimepointIn48H { get; set; } + + [DecimalPrecision(18, 2)] + public decimal Training { get; set; } - [Column(TypeName = "decimal(18,2)")] - public decimal RefresherTraining { get; set; } - } } diff --git a/IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs b/IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs index 039ba04de..ba71f2b13 100644 --- a/IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs +++ b/IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs @@ -1,33 +1,41 @@ -using System; +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("TrialRevenuesPriceVerification")] +public class TrialRevenuesPriceVerification : Entity { - public class TrialRevenuesPriceVerification : Entity - { - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public Guid ReviewerId { get; set; } + public bool Adjudication { get; set; } - public string YearMonth { get; set; } = string.Empty; + public bool AdjudicationIn24H { get; set; } - public bool Training { get; set; } = false; + public bool AdjudicationIn48H { get; set; } - public bool Downtime { get; set; } = false; + public bool Downtime { get; set; } - public bool Global { get; set; } = false; + public bool Global { get; set; } - public bool Timepoint { get; set; } = false; + public bool RefresherTraining { get; set; } - public bool TimepointIn24H { get; set; } = false; + public Guid ReviewerId { get; set; } - public bool TimepointIn48H { get; set; } = false; + [Comment(" false代表没有价格")] + public bool Timepoint { get; set; } - public bool Adjudication { get; set; } = false; + public bool TimepointIn24H { get; set; } - public bool AdjudicationIn24H { get; set; } = false; + public bool TimepointIn48H { get; set; } - public bool AdjudicationIn48H { get; set; } = false; - public bool RefresherTraining { get; set; } = false; - public DateTime WorkLoadDate { get; set; } - } + public bool Training { get; set; } + + public DateTime? WorkLoadDate { get; set; } + + [StringLength(400)] + public string YearMonth { get; set; } = null!; } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Financial/VolumeReward.cs b/IRaCIS.Core.Domain/Financial/VolumeReward.cs index 847148b91..da9706855 100644 --- a/IRaCIS.Core.Domain/Financial/VolumeReward.cs +++ b/IRaCIS.Core.Domain/Financial/VolumeReward.cs @@ -1,15 +1,17 @@ +using Microsoft.EntityFrameworkCore; using System; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models -{ - [Table("VolumeReward")] - public partial class VolumeReward : BaseFullAuditEntity - { - [Column(TypeName = "decimal(18,2)")] - public decimal Price { get; set; } - public int Min { get; set; } - public int Max { get; set; } +namespace IRaCIS.Core.Domain.Models; + +[Comment("ҽƷ - ")] +[Table("VolumeReward")] +public partial class VolumeReward : BaseFullAuditEntity +{ + [DecimalPrecision(18, 2)] + public decimal Price { get; set; } + public int Min { get; set; } + public int Max { get; set; } - } } diff --git a/IRaCIS.Core.Domain/Image/SystemAnonymization.cs b/IRaCIS.Core.Domain/Image/SystemAnonymization.cs index 8ae645fe1..4ef95af3d 100644 --- a/IRaCIS.Core.Domain/Image/SystemAnonymization.cs +++ b/IRaCIS.Core.Domain/Image/SystemAnonymization.cs @@ -3,45 +3,38 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-03-03 15:26:35 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 +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("SystemAnonymization")] +public class SystemAnonymization : BaseFullAuditEntity { - /// - ///SystemAnonymization - /// - [Table("SystemAnonymization")] - public class SystemAnonymization : BaseFullAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion - public string Group { get; set; } = String.Empty; + #endregion + public string Element { get; set; } = null!; - public string Element { get; set; } = String.Empty; + public string Group { get; set; } = null!; + + public bool IsAdd { get; set; } + + public bool IsEnable { get; set; } + + public bool IsFixed { get; set; } + + public string ReplaceValue { get; set; } = null!; + + public string TagDescription { get; set; } = null!; + + public string TagDescriptionCN { get; set; } = null!; + + public string ValueRepresentation { get; set; } = null!; - public string TagDescription { get; set; } = String.Empty; +} - public string TagDescriptionCN { get; set; } = string.Empty; - - - public string ReplaceValue { get; set; } = String.Empty; - - - public string ValueRepresentation { get; set; } = String.Empty; - - - public bool IsAdd { get; set; } - - public bool IsEnable { get; set; } - - - public bool IsFixed { get; set; } - - - } - -} diff --git a/IRaCIS.Core.Domain/Image/TrialDicomAE.cs b/IRaCIS.Core.Domain/Image/TrialDicomAE.cs index db3588e36..7469fb64d 100644 --- a/IRaCIS.Core.Domain/Image/TrialDicomAE.cs +++ b/IRaCIS.Core.Domain/Image/TrialDicomAE.cs @@ -7,38 +7,35 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +using Microsoft.EntityFrameworkCore; +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 项目DicomAE")] +[Table("TrialDicomAE")] +public class TrialDicomAE : BaseFullAuditEntity { - /// - ///DicomAE - /// - [Table("TrialDicomAE")] - public class TrialDicomAE : BaseFullAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion - public Guid TrialId { get; set; } + #endregion + public Guid TrialId { get; set; } - public string CalledAE { get; set; } = string.Empty; + public string CalledAE { get; set; } = string.Empty; - public string IP { get; set; } = string.Empty; + public string IP { get; set; } = string.Empty; - public int Port { get; set; } + public int Port { get; set; } - public string Modality { get; set; } = string.Empty; + public string Modality { get; set; } = string.Empty; - public string Description { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; - public DateTime? LatestTestTime { get; set; } + public DateTime? LatestTestTime { get; set; } - public bool? IsTestOK { get; set; } - - } + public bool? IsTestOK { get; set; } } diff --git a/IRaCIS.Core.Domain/Image/TrialImageDownload.cs b/IRaCIS.Core.Domain/Image/TrialImageDownload.cs index 72bacf5d0..3ede78094 100644 --- a/IRaCIS.Core.Domain/Image/TrialImageDownload.cs +++ b/IRaCIS.Core.Domain/Image/TrialImageDownload.cs @@ -1,6 +1,8 @@ using IRaCIS.Core.Domain.Models; +using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; @@ -8,6 +10,7 @@ using System.Threading.Tasks; namespace IRaCIS.Core.Domain.Models { + [Comment("项目 - 影像下载监控")] [Table("TrialImageDownload")] public class TrialImageDownload : BaseFullAuditEntity { @@ -26,6 +29,7 @@ namespace IRaCIS.Core.Domain.Models public DateTime DownloadStartTime { get; set; } public DateTime? DownloadEndTime { get; set; } + [StringLength(400)] public string VisitName { get; set; } public ImageType ImageType { get; set; } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs index 25ea4b33a..fd94e700f 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs @@ -9,51 +9,48 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using IRaCIS.Core.Domain.Share.Management; +using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("后台 - 系统通知")] +[Table("SystemNotice")] +public class SystemNotice : BaseFullAuditEntity { - /// - ///SystemNotice - /// - [Table("SystemNotice")] - public class SystemNotice : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public List NoticeUserTypeList { get; set; } = new List(); - [JsonIgnore] - public List NoticeUserReadList { get; set; } = new List(); + #region 导航属性 + [JsonIgnore] + public List NoticeUserTypeList { get; set; } = new List(); + [JsonIgnore] + public List NoticeUserReadList { get; set; } = new List(); - #endregion + #endregion + [MaxLength] + public string NoticeContent { get; set; } = string.Empty; - public string NoticeContent { get; set; } = string.Empty; + public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; } - public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; } + public SystemNotice_NoticeLevelEnum NoticeLevelEnum { get; set; } - public SystemNotice_NoticeLevelEnum NoticeLevelEnum { get; set; } + public SystemNotice_ApplicableProjectEnum ApplicableProjectEnum { get; set; } - public SystemNotice_ApplicableProjectEnum ApplicableProjectEnum { get; set; } + public SystemNotice_NoticeModeEnum NoticeModeEnum { get; set; } - public SystemNotice_NoticeModeEnum NoticeModeEnum { get; set; } + public SystemNotice_NoticeStateEnum NoticeStateEnum { get; set; } - public SystemNotice_NoticeStateEnum NoticeStateEnum { get; set; } + public DateTime? StartDate { get; set; } - public DateTime? StartDate { get; set; } + public DateTime? EndDate { get; set; } - public DateTime? EndDate { get; set; } + public string FileName { get; set; } = string.Empty; - public string FileName { get; set; } = string.Empty; + public string Path { get; set; } = string.Empty; - public string Path { get; set; } = string.Empty; + public Guid? PublishedUserId { get; set; } - public Guid? PublishedUserId { get; set; } + public User PublishedUser { get; set; } - public User PublishedUser { get; set; } - - public DateTime? PublishedTime { get; set; } - - } + public DateTime? PublishedTime { get; set; } } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs index 6a4a785ef..5d3b2c373 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs @@ -7,22 +7,19 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +using Microsoft.EntityFrameworkCore; +namespace IRaCIS.Core.Domain.Models; + +[Comment("后台 - 系统通知用户读取记录")] +[Table("SystemNoticeUserRead")] +public class SystemNoticeUserRead : BaseAddAuditEntity { - /// - ///SystemNoticeUserRead - /// - [Table("SystemNoticeUserRead")] - public class SystemNoticeUserRead : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion + #endregion - public Guid SystemNoticeId { get; set; } + public Guid SystemNoticeId { get; set; } - - } } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs index 0b478f79b..706965270 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs @@ -7,14 +7,13 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models { - /// - ///SystemNoticeUserType - /// - [Table("SystemNoticeUserType")] - public class SystemNoticeUserType : BaseAddAuditEntity - { + [Comment("后台 - 系统通知用户类型配置")] + [Table("SystemNoticeUserType")] + public class SystemNoticeUserType : BaseAddAuditEntity + { #region 导航属性 [JsonIgnore] @@ -24,12 +23,12 @@ namespace IRaCIS.Core.Domain.Models #endregion public Guid SystemNoticeId { get; set; } - - - public Guid UserTypeId { get; set; } - - - } -} + public Guid UserTypeId { get; set; } + + + + } + +} diff --git a/IRaCIS.Core.Domain/Management/UserFeedBack.cs b/IRaCIS.Core.Domain/Management/UserFeedBack.cs index b9006d951..37c6332e9 100644 --- a/IRaCIS.Core.Domain/Management/UserFeedBack.cs +++ b/IRaCIS.Core.Domain/Management/UserFeedBack.cs @@ -8,58 +8,54 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; -namespace IRaCIS.Core.Domain.Models +using Microsoft.EntityFrameworkCore; +namespace IRaCIS.Core.Domain.Models; + +[Comment("后台 - 用户反馈")] +[Table("UserFeedBack")] +public class UserFeedBack : BaseFullAuditEntity { - /// - ///UserFeedBack - /// - [Table("UserFeedBack")] - public class UserFeedBack : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } - [JsonIgnore] - public Subject Subject { get; set; } - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - public TrialSite TrialSite { get; set; } + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } + [JsonIgnore] + public Subject Subject { get; set; } + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } + [JsonIgnore] + public TrialSite TrialSite { get; set; } - [JsonIgnore] - public VisitTask VisitTask { get; set; } + [JsonIgnore] + public VisitTask VisitTask { get; set; } - [NotMapped] - public List FeedBackScreenshotList => JsonConvert.DeserializeObject>(ScreenshotListStr); - #endregion + [NotMapped] + public List FeedBackScreenshotList => JsonConvert.DeserializeObject>(ScreenshotListStr); + #endregion - public Guid? VisitTaskId { get; set; } + public Guid? VisitTaskId { get; set; } - public Guid? SubjectId { get; set; } + public Guid? SubjectId { get; set; } - public Guid? SubjectVisitId { get; set; } + public Guid? SubjectVisitId { get; set; } - public int QuestionType { get; set; } + public int QuestionType { get; set; } - public string QuestionDescription { get; set; } = string.Empty; + [MaxLength] + public string QuestionDescription { get; set; } = string.Empty; + + public int State { get; set; } + public Guid? TrialSiteId { get; set; } - - public int State { get; set; } - - - public Guid? TrialSiteId { get; set; } - - - public Guid? TrialId { get; set; } - - public string ScreenshotListStr { get; set; } = string.Empty; + public Guid? TrialId { get; set; } + [MaxLength] + public string ScreenshotListStr { get; set; } = string.Empty; @@ -67,5 +63,5 @@ namespace IRaCIS.Core.Domain.Models - } - } +} + diff --git a/IRaCIS.Core.Domain/Management/UserLog.cs b/IRaCIS.Core.Domain/Management/UserLog.cs index 0483ca1ce..03bcba22c 100644 --- a/IRaCIS.Core.Domain/Management/UserLog.cs +++ b/IRaCIS.Core.Domain/Management/UserLog.cs @@ -7,90 +7,89 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +using Microsoft.EntityFrameworkCore; +namespace IRaCIS.Core.Domain.Models; + +[Comment("后台 - 用户账户操作日志")] +[Table("UserLog")] +public class UserLog : BaseAddAuditEntity { - /// - ///UserLog - /// - [Table("UserLog")] - public class UserLog : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - public User LoginUser { get; set; } + #region 导航属性 + [JsonIgnore] + public User LoginUser { get; set; } - [JsonIgnore] - public User OptUser { get; set; } - #endregion - public string IP { get; set; } = string.Empty; + [JsonIgnore] + public User OptUser { get; set; } + #endregion + + [StringLength(400)] + public string IP { get; set; } = string.Empty; + + [StringLength(400)] + public string LoginFaildName { get; set; }=string.Empty; - public string LoginFaildName { get; set; }=string.Empty; + public UserOptType OptType { get; set; } - public UserOptType OptType { get; set; } + public string LoginPassword { get; set; } = string.Empty; - public string LoginPassword { get; set; } = string.Empty; + public Guid? LoginUserId { get;set; } + public Guid? OptUserId { get;set; } - public Guid? LoginUserId { get;set; } + - public Guid? OptUserId { get;set; } - - - - public string IPRegion { get; set; } = string.Empty; - - } - - /// - /// 登录或者登出 锁定类型 - /// - public enum UserOptType - { - - /// - /// 用户登录 - /// - Login = 1, - - /// - /// 用户登出 - /// - LoginOut = 2, - - /// - ///账号或者密码错误 - /// - AccountOrPasswordError = 3, - - /// - /// 账号锁定 - /// - AccountLocked = 4, - - //账号启用 - AccountEnable = 5, - - //登录锁定账户 - LoginLockedAccount=6, - - //修改密码 - LoginModifyPassword =7, - - UnloginModifyPasswoed=8, - - //admin 重置密码 - ResetPassword=9, - - DeleteUser=10, - - UpdateUser=11, - - MFALogin=12, - - MFALoginFail=13, - } + public string IPRegion { get; set; } = string.Empty; } + +/// +/// 登录或者登出 锁定类型 +/// +public enum UserOptType +{ + + /// + /// 用户登录 + /// + Login = 1, + + /// + /// 用户登出 + /// + LoginOut = 2, + + /// + ///账号或者密码错误 + /// + AccountOrPasswordError = 3, + + /// + /// 账号锁定 + /// + 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/Management/UserPassWordLog.cs b/IRaCIS.Core.Domain/Management/UserPassWordLog.cs index c76bd52b9..2df7a98b5 100644 --- a/IRaCIS.Core.Domain/Management/UserPassWordLog.cs +++ b/IRaCIS.Core.Domain/Management/UserPassWordLog.cs @@ -7,31 +7,25 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +using Microsoft.EntityFrameworkCore; +namespace IRaCIS.Core.Domain.Models; + +[Comment("后台 - 用户修改密码")] +[Table("UserPassWordLog")] +public class UserPassWordLog : BaseAddAuditEntity { - /// - ///UserPassWordLog - /// - [Table("UserPassWordLog")] - public class UserPassWordLog : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion + #endregion - /// - /// 用户Id - /// - public Guid UserId { get; set; } - - /// - /// 密码 - /// - public string PassWord { get; set; } = string.Empty; + + public Guid UserId { get; set; } + + public string PassWord { get; set; } = string.Empty; - } +} + -} diff --git a/IRaCIS.Core.Domain/Management/UserType.cs b/IRaCIS.Core.Domain/Management/UserType.cs index 02cc5c28a..e684613a4 100644 --- a/IRaCIS.Core.Domain/Management/UserType.cs +++ b/IRaCIS.Core.Domain/Management/UserType.cs @@ -1,43 +1,54 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; using IRaCIS.Core.Domain.Share; +using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + + +[Comment("后台 - 用户类型 （需要同步）")] +[Table("UserType")] +public class UserType : Entity { - public class UserType:Entity - { - #region 导航属性 - [JsonIgnore] - public List UserTypeMenuList { get; set; } - [JsonIgnore] - public List UserTypeGroupList { get; set; } + #region 导航属性 + [JsonIgnore] + public List UserTypeMenuList { get; set; } + [JsonIgnore] + public List UserTypeGroupList { get; set; } - [JsonIgnore] - public List SystemDocNeedConfirmedUserTypeList { get; set; } + [JsonIgnore] + public List SystemDocNeedConfirmedUserTypeList { get; set; } - [JsonIgnore] - public List UserList { get; set; } - #endregion - public UserTypeEnum UserTypeEnum { get; set; } - - public string UserTypeName { get; set; } = string.Empty; + [JsonIgnore] + public List UserList { get; set; } + #endregion - public string Description { get; set; } = string.Empty; + public string Description { get; set; } = null!; - public int Order { get; set; } + public bool IsEnable { get; set; } - public string UserTypeShortName { get; set; } = string.Empty; + [Comment(" 是否是内部用户类型")] + public bool IsInternal { get; set; } - public bool IsEnable { get; set; } = true; + [Comment(" 用于前端界面下拉框展示排序")] + public int Order { get; set; } + public string PermissionStr { get; set; } = null!; - public string PermissionStr { get; set; } = string.Empty; + [Comment(" 此数据固定，不能更改，和代码耦合")] + public UserTypeEnum UserTypeEnum { get; set; } + + [Comment(" 名称、描述可以更改")] + public string UserTypeName { get; set; } = null!; + + [Comment(" 用户类型名称简写")] + public string UserTypeShortName { get; set; } = null!; - } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Management/UserTypeGroup.cs b/IRaCIS.Core.Domain/Management/UserTypeGroup.cs index 1c6d6645f..329833b1b 100644 --- a/IRaCIS.Core.Domain/Management/UserTypeGroup.cs +++ b/IRaCIS.Core.Domain/Management/UserTypeGroup.cs @@ -7,32 +7,29 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +using Microsoft.EntityFrameworkCore; +namespace IRaCIS.Core.Domain.Models; + +[Comment("后台 - 用户类型组（需要同步）")] +[Table("UserTypeGroup")] +public class UserTypeGroup : Entity { - /// - ///UserTypeGroup - /// - [Table("UserTypeGroup")] - public class UserTypeGroup : Entity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("DictionaryId")] - public Dictionary Group { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("DictionaryId")] + public Dictionary Group { get; set; } - [JsonIgnore] - [ForeignKey("UserTypeId")] - public UserType UserType { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("UserTypeId")] + public UserType UserType { get; set; } + #endregion - public Guid UserTypeId { get; set; } - + public Guid UserTypeId { get; set; } - public Guid DictionaryId { get; set; } - + public Guid DictionaryId { get; set; } + +} - } -} diff --git a/IRaCIS.Core.Domain/Management/UserTypeMenu.cs b/IRaCIS.Core.Domain/Management/UserTypeMenu.cs index 654df3185..8466e1225 100644 --- a/IRaCIS.Core.Domain/Management/UserTypeMenu.cs +++ b/IRaCIS.Core.Domain/Management/UserTypeMenu.cs @@ -2,25 +2,21 @@ using System; using System.ComponentModel.DataAnnotations.Schema; using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("UserTypeMenu")] +public partial class UserTypeMenu : Entity { - [Table("UserTypeMenu")] - public partial class UserTypeMenu : Entity - { - #region + #region - [JsonIgnore] - [ForeignKey("UserTypeId")] - public UserType UserType { get; set; } - [JsonIgnore] - public Menu Menu { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("UserTypeId")] + public UserType UserType { get; set; } + [JsonIgnore] + public Menu Menu { get; set; } + #endregion - public Guid UserTypeId { get; set; } - public Guid MenuId { get; set; } + public Guid UserTypeId { get; set; } + public Guid MenuId { get; set; } - - - - } } diff --git a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs index 8fdac80c2..3191bd372 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs @@ -3,67 +3,62 @@ // 生成时间 2021-11-11 11:19:10 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 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 +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 质控问题")] +[Table("TrialQCQuestion")] +public class TrialQCQuestion : BaseFullAuditEntity { - /// - ///TrialQCQuestionConfigure - /// - [Table("TrialQCQuestion")] - public class TrialQCQuestion : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("ParentId")] - public TrialQCQuestion ParentQCQuestion { get; set; } + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } + [JsonIgnore] + [ForeignKey("ParentId")] + public TrialQCQuestion ParentQCQuestion { get; set; } - [JsonIgnore] - public List TrialQCQuestionAnswerList { get; set; } + [JsonIgnore] + public List TrialQCQuestionAnswerList { get; set; } - #endregion + #endregion - public Guid TrialId { get; set; } - + public Guid TrialId { get; set; } - public string QuestionName { get; set; } = string.Empty; - /// 语言类型 + [StringLength(500)] + public string QuestionName { get; set; } = string.Empty; - public LanguageType LanguageType { get; set; } = LanguageType.Chinese; + 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 bool IsRequired { get; set; } - - - public bool IsEnable { get; set; } - - /// 下拉框、文本、单选、多选 - public string Type { get; set; } = string.Empty; - - - public Guid? ParentId { get; set; } - - - public string TypeValue { get; set; } = string.Empty; + public Guid? ParentId { get; set; } - public string ParentTriggerValue { get; set; } = string.Empty; + public string TypeValue { get; set; } = string.Empty; - public int ShowOrder { get; set; } + public string ParentTriggerValue { get; set; } = string.Empty; - public bool? IsConfirm { get; set; } + + public int ShowOrder { get; set; } + + public bool? IsConfirm { get; set; } - } +} + + - -} diff --git a/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs b/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs index 998576725..24b2a33e5 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs @@ -4,40 +4,39 @@ // 生成时间 2021-11-11 17:01:49 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 using IRaCIS.Core.Domain.Share; +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("TrialQCQuestionAnswer")] +public class TrialQCQuestionAnswer : BaseFullAuditEntity { - /// - ///TrialQCQuestionRecord - /// - [Table("TrialQCQuestionAnswer")] - public class TrialQCQuestionAnswer : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public TrialQCQuestion TrialQCQuestionConfigure { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + public TrialQCQuestion TrialQCQuestionConfigure { get; set; } + #endregion - public Guid TrialId { get; set; } - - public string Answer { get; set; } = string.Empty; + public Guid TrialId { get; set; } - public TrialQCProcess QCProcessEnum { get; set; } + public string Answer { get; set; } = string.Empty; - // 1代表第一个人QC数据 2 代表第二个人QC数据 - public CurrentQC CurrentQCEnum { get; set; } + public TrialQCProcess QCProcessEnum { get; set; } - public Guid SubjectVisitId { get; set; } + [Comment("1代表第一个人QC数据 2 代表第二个人QC数据")] + public CurrentQC CurrentQCEnum { get; set; } + + public Guid SubjectVisitId { get; set; } - public Guid TrialQCQuestionConfigureId { get; set; } + public Guid TrialQCQuestionConfigureId { get; set; } - } +} + + - -} diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs index 93a4f7fa3..7342cf9d0 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs @@ -7,57 +7,44 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models -{ - /// - ///SubjectAdditionalEvaluationResult - /// - [Table("SubjectAdditionalEvaluationResult")] - public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity +using Microsoft.EntityFrameworkCore; +namespace IRaCIS.Core.Domain.Models; + +[Comment("受试者 - 附加评估标准结果")] +[Table("SubjectAdditionalEvaluationResult")] +public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialReadingQuestionId")] - public ReadingQuestionTrial TrialReadingQuestion { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialReadingQuestionId")] + public ReadingQuestionTrial TrialReadingQuestion { get; set; } - #endregion + #endregion + [Comment(" 附加评估答案")] + public string Answer { get; set; } = null!; - public Guid TrialReadingQuestionId { get; set; } + [Comment(" 最终结果")] + public string FinalAnswer { get; set; } = null!; - public Guid SubjectId { get; set; } - - public Guid TrialReadingCriterionId { get; set; } + [Comment(" 最终结果翻字典")] + public string FinalTranslateDictionaryCode { get; set; } = null!; - public Guid? VisitTaskId { get; set; } - - public string Answer { get; set; } = string.Empty; + [Comment(" 是否是最终结果")] + public bool IsFinalResult { get; set; } - /// - /// 附加评估答案翻译字典 - /// + public Guid SubjectId { get; set; } - public string TranslateDictionaryCode { get; set; }=string.Empty; - - /// - /// 是否是最终结果 - /// + [Comment(" 附加评估答案翻译字典")] + public string TranslateDictionaryCode { get; set; } = null!; - public bool IsFinalResult { get; set; } - - /// - /// 最终结果 - /// + public Guid TrialReadingCriterionId { get; set; } - public string FinalAnswer { get; set; } = string.Empty; + public Guid TrialReadingQuestionId { get; set; } - /// - /// 最终结果翻字典 - /// + public Guid? VisitTaskId { get; set; } - public string FinalTranslateDictionaryCode { get; set; } = string.Empty; +} - } - -} + diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs index 00cbd1ad6..ee2839dad 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs @@ -8,15 +8,14 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; +using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models { - /// - ///SubjectCriteriaEvaluation - /// - [Table("SubjectCriteriaEvaluation")] - public class SubjectCriteriaEvaluation : BaseFullAuditEntity - { + [Comment("受试者 - 参与附加评估标准配置")] + [Table("SubjectCriteriaEvaluation")] + public class SubjectCriteriaEvaluation : BaseFullAuditEntity + { #region 导航属性 [JsonIgnore] public Subject subject { get; set; } @@ -29,18 +28,15 @@ namespace IRaCIS.Core.Domain.Models public List SubjectCriteriaEvaluationVisitFilterList { get; set; } #endregion + [Comment(" 是否参与评估")] + public bool IsJoinEvaluation { get; set; } + + public Guid SubjectId { get; set; } + + public Guid TrialReadingCriterionId { get; set; } - public Guid SubjectId { get; set; } - - public Guid TrialReadingCriterionId { get; set; } - - /// - /// 是否参与评估 - /// - public bool IsJoinEvaluation { get; set; } - } -} +} diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs index f414c6c64..38fc5fe6f 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs @@ -8,81 +8,69 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; +using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("受试者 - 附加评估标准影像筛选")] +[Table("SubjectCriteriaEvaluationVisitFilter")] +public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity { - /// - ///SubjectCriteriaEvaluationVisitFilter - /// - [Table("SubjectCriteriaEvaluationVisitFilter")] - public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialReadingCriterionId")] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialReadingCriterionId")] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - [JsonIgnore] - public SubjectCriteriaEvaluation SubjectCriteriaEvaluation { get; set; } + [JsonIgnore] + public SubjectCriteriaEvaluation SubjectCriteriaEvaluation { get; set; } - [JsonIgnore] + [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - #endregion + public SubjectVisit SubjectVisit { get; set; } + #endregion - public Guid SubjectId { get; set; } + [Comment(" 影像判断结果")] + public ImageDeterminationResultState ImageDeterminationResultState { get; set; } + [Comment(" 影像筛选状态")] + public ImageFilterState ImageFilterState { get; set; } - public Guid TrialReadingCriterionId { get; set; } + [Comment(" 是否已生成任务")] + public bool IsGeneratedTask { get; set; } + public Guid SubjectId { get; set; } + public Guid SubjectVisitId { get; set; } - public Guid SubjectVisitId { get; set; } - - /// - /// 影像筛选状态 - /// - public ImageFilterState ImageFilterState { get; set; } - - /// - /// 影像判断结果 - /// - public ImageDeterminationResultState ImageDeterminationResultState { get; set; } - - /// - /// 是否已生成任务 - /// - public bool IsGeneratedTask { get; set; } - - } - - /// - /// 影像确认结果 - /// - public enum ImageDeterminationResultState - { - //待定 - None = 0, - - - //通过 - Passed = 1, - } - - /// - /// 影像筛选状态 - /// - public enum ImageFilterState - { - //默认值 待筛选 - None = 0, - - Filtering=1, - - //筛选已完成 - Finished = 2 - } + public Guid TrialReadingCriterionId { get; set; } } + +/// +/// 影像确认结果 +/// +public enum ImageDeterminationResultState +{ + //待定 + None = 0, + + + //通过 + Passed = 1, +} + +/// +/// 影像筛选状态 +/// +public enum ImageFilterState +{ + //默认值 待筛选 + None = 0, + + Filtering = 1, + + //筛选已完成 + Finished = 2 +} diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs index caff2e28f..c3076b21f 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs @@ -7,11 +7,10 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models { - /// - ///SubjectCriteriaEvaluationVisitStudyFilter - /// + [Comment("受试者 - 附加评估标准影像筛选检查")] [Table("SubjectCriteriaEvaluationVisitStudyFilter")] public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity { @@ -34,20 +33,19 @@ namespace IRaCIS.Core.Domain.Models #endregion - public Guid TrialReadingCriterionId { get; set; } - - public Guid SubjectVisitId { get; set; } - - - public Guid StudyId { get; set; } - - public Guid SeriesId { get; set; } - - + [Comment(" 是否确认")] public bool IsConfirmed { get; set; } public bool IsReading { get; set; } + public Guid SeriesId { get; set; } + + public Guid StudyId { get; set; } + + public Guid SubjectVisitId { get; set; } + + public Guid TrialReadingCriterionId { get; set; } + } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs index c687e7e6b..dc67f06a2 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs @@ -7,17 +7,16 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models { - /// - ///TrialClinicalDataSetCriterion - /// - [Table("TrialClinicalDataSetCriterion")] - public class TrialClinicalDataSetCriterion : BaseFullAuditEntity - { + [Comment("项目标准 - 临床数据配置")] + [Table("TrialClinicalDataSetCriterion")] + public class TrialClinicalDataSetCriterion : BaseFullAuditEntity + { - #region 导航属性 - [JsonIgnore] + #region 导航属性 + [JsonIgnore] [ForeignKey("TrialClinicalDataSetId")] public ClinicalDataTrialSet TrialClinicalDataSet { get; set; } @@ -27,12 +26,12 @@ namespace IRaCIS.Core.Domain.Models #endregion public Guid TrialClinicalDataSetId { get; set; } - - public Guid TrialReadingCriterionId { get; set; } + + public Guid TrialReadingCriterionId { get; set; } - } + } -} +} diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs index 55ba1071f..e489e295b 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs @@ -9,162 +9,159 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using IRaCIS.Core.Domain.Models; using System.Collections.Generic; +using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("系统临床数据问题 (需要同步)")] +[Table("SystemClinicalQuestion")] +public class SystemClinicalQuestion : BaseAddAuditEntity { - /// - ///系统临床数据问题 - /// - [Table("SystemClinicalQuestion")] - public class SystemClinicalQuestion : BaseAddAuditEntity - { - #region 导航属性 - /// - /// 分组 - /// - [JsonIgnore] - [ForeignKey("GroupId")] - public SystemClinicalQuestion GroupQuestin { get; set; } + #region 导航属性 + /// + /// 分组 + /// + [JsonIgnore] + [ForeignKey("GroupId")] + public SystemClinicalQuestion GroupQuestin { get; set; } - [NotMapped] - public List CalculateQuestionList + [NotMapped] + public List CalculateQuestionList + { + get { - get + + try + { + var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); + return result == null ? new List() : result; + } + catch (Exception) { - try - { - var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - + return new List(); } + } - #endregion - /// - /// 项目临床数据Id - /// - public Guid SystemClinicalId { get; set; } + } + #endregion - /// - /// 问题名称 - /// - public string QuestionName { get; set; } = string.Empty; + /// + /// 项目临床数据Id + /// + public Guid SystemClinicalId { get; set; } - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; + /// + /// 问题名称 + /// + public string QuestionName { get; set; } = string.Empty; - /// - /// 临床问题类型(分组，单选。) - /// - public string ClinicalQuestionType { get; set; } = string.Empty; + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; - /// - /// 问题标识 - /// - public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; } + /// + /// 临床问题类型(分组，单选。) + /// + public string ClinicalQuestionType { get; set; } = string.Empty; - /// - /// 最大长度 - /// - public int? MaxAnswerLength { get; set; } + /// + /// 问题标识 + /// + public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; } - /// - /// 最大行数 - /// - public int? MaxQuestionCount { get; set; } + /// + /// 最大长度 + /// + public int? MaxAnswerLength { get; set; } - /// - /// 临床数据选项类型(无，自定义) - /// - public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } + /// + /// 最大行数 + /// + public int? MaxQuestionCount { get; set; } - /// - /// 分组Id - /// - public Guid? GroupId { get; set; } + /// + /// 临床数据选项类型(无，自定义) + /// + public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } - /// - /// 自定义选项 - /// - public string TypeValue { get; set; } = string.Empty; + /// + /// 分组Id + /// + public Guid? GroupId { get; set; } - /// - /// 字典Code - /// - public string DictionaryCode { get; set; } = string.Empty; + /// + /// 自定义选项 + /// + public string TypeValue { get; set; } = string.Empty; - /// - /// 排序 - /// - public int ShowOrder { get; set; } = 0; + /// + /// 字典Code + /// + public string DictionaryCode { get; set; } = string.Empty; - /// - /// 是否必填 - /// - public IsRequired IsRequired { get; set; } + /// + /// 排序 + /// + public int ShowOrder { get; set; } = 0; - /// - /// 关联Value - /// - public string RelevanceValue { get; set; } = string.Empty; + /// + /// 是否必填 + /// + public IsRequired IsRequired { get; set; } - /// - /// 关联ID - /// - public Guid? RelevanceId { get; set; } + /// + /// 关联Value + /// + public string RelevanceValue { get; set; } = string.Empty; + + /// + /// 关联ID + /// + public Guid? RelevanceId { get; set; } - /// - /// 父问题Id - /// - public Guid? ParentId { get; set; } + /// + /// 父问题Id + /// + public Guid? ParentId { get; set; } - /// - /// 父问题触发值 - /// - public string ParentTriggerValue { get; set; } = string.Empty; + /// + /// 父问题触发值 + /// + public string ParentTriggerValue { get; set; } = string.Empty; - /// - /// 显示类型 - /// - public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show; + /// + /// 显示类型 + /// + public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show; - /// - /// 是否是检查日期 - /// - public bool IsCheckDate { get; set; } + /// + /// 是否是检查日期 + /// + public bool IsCheckDate { get; set; } - /// - /// 小数点位数 - /// - public int? DigitPlaces { get; set; } + /// + /// 小数点位数 + /// + public int? DigitPlaces { get; set; } - /// - /// 单位 - /// - public string Unit { get; set; } = string.Empty; + /// + /// 单位 + /// + public string Unit { get; set; } = string.Empty; - /// - /// 自定义计算标记 - /// - public ClinicalCalculateMark? CustomCalculateMark { get; set; } + /// + /// 自定义计算标记 + /// + public ClinicalCalculateMark? CustomCalculateMark { get; set; } - /// - /// 自定义计算问题 - /// - public string CalculateQuestions { get; set; } = "[]"; - - - } + /// + /// 自定义计算问题 + /// + public string CalculateQuestions { get; set; } = "[]"; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs index 7711509c5..328e95baa 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs @@ -9,118 +9,89 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; using System.Linq; +using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("系统临床表格问题 (需要同步)")] +[Table("SystemClinicalTableQuestion")] +public class SystemClinicalTableQuestion : BaseAddAuditEntity { - /// - /// 系统临床表格问题 - /// - [Table("SystemClinicalTableQuestion")] - public class SystemClinicalTableQuestion : BaseAddAuditEntity - { - #region 导航属性 - [NotMapped] - public List RelevanceValueList + #region 导航属性 + [NotMapped] + public List RelevanceValueList + { + get { - get + try { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } + return this.RelevanceValue.Split(',').ToList(); } + catch (Exception) + { + return new List(); + } } - #endregion - /// - /// 系统临床数据Id - /// - public Guid SystemClinicalId { get; set; } - - /// - /// 问题名称 - /// - public string QuestionName { get; set; } = string.Empty; - - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; - - /// - /// 临床问题类型(分组，单选。) - /// - public string ClinicalTableQuestionType { get; set; } = string.Empty; - - /// - /// 问题标识 - /// - public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; } - - /// - /// 最大长度 - /// - public int? MaxAnswerLength { get; set; } - - /// - /// 临床数据选项类型(无，自定义) - /// - public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } - - /// - /// 自定义选项 - /// - public string TypeValue { get; set; } = string.Empty; - - /// - /// 字典Code - /// - public string DictionaryCode { get; set; } = string.Empty; - - /// - /// 排序 - /// - public int ShowOrder { get; set; } - - /// - /// 是否必填 - /// - public IsRequired IsRequired { get; set; } - - - /// - /// 外层问题Id - /// - public Guid QuestionId { get; set; } - - /// - /// 小数点位数 - /// - public int? DigitPlaces { get; set; } - - /// - /// 单位 - /// - public string Unit { get; set; } = string.Empty; - - /// - /// 关联ID - /// - public Guid? RelevanceId { get; set; } - - /// - /// 关联Value - /// - public string RelevanceValue { get; set; } = string.Empty; - - } + #endregion + + [Comment(" 系统临床数据Id")] + public Guid SystemClinicalId { get; set; } + + [Comment(" 临床数据选项类型(无，自定义)")] + public int ClinicalOptionTypeEnum { get; set; } + + [Comment(" 问题标识")] + public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; } + + [Comment(" 临床问题类型(分组，单选。)")] + public string ClinicalTableQuestionType { get; set; } = null!; + + [Comment(" 字典Code")] + [StringLength(400)] + public string DictionaryCode { get; set; } = null!; + + public int? DigitPlaces { get; set; } + + [Comment(" 是否必填")] + public int IsRequired { get; set; } + + [Comment(" 最大长度")] + public int? MaxAnswerLength { get; set; } + + [Comment(" 问题英文名称")] + [StringLength(400)] + public string QuestionEnName { get; set; } = null!; + + [Comment(" 外层问题Id")] + public Guid QuestionId { get; set; } + + [Comment(" 问题名称")] + [StringLength(400)] + public string QuestionName { get; set; } = null!; + + [Comment(" 关联ID")] + public Guid? RelevanceId { get; set; } + + [Comment(" 关联Value")] + [StringLength(1000)] + public string RelevanceValue { get; set; } = null!; + + [Comment(" 排序")] + public int ShowOrder { get; set; } + + + [Comment(" 自定义选项")] + [StringLength(1000)] + public string TypeValue { get; set; } = null!; + + public string Unit { get; set; } = null!; + + + +} + -} diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs index 60a9faa97..7116213b7 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs @@ -9,173 +9,169 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using IRaCIS.Core.Domain.Models; using System.Collections.Generic; +using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 项目临床数据问题")] +[Table("TrialClinicalQuestion")] +public class TrialClinicalQuestion : BaseAddAuditEntity { - /// - ///项目临床数据问题 - /// - [Table("TrialClinicalQuestion")] - public class TrialClinicalQuestion : BaseAddAuditEntity + #region 导航属性 + [NotMapped] + public List CalculateQuestionList { - #region 导航属性 - [NotMapped] - public List CalculateQuestionList + get { - get + + try + { + var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); + return result == null ? new List() : result; + } + catch (Exception) { - try - { - var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - + return new List(); } + } + } + + /// + /// 分组 + /// + [JsonIgnore] + [ForeignKey("GroupId")] + public TrialClinicalQuestion GroupQuestin { get; set; } + + [JsonIgnore] + [ForeignKey("TrialClinicalId")] + public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } + #endregion + + /// + /// 项目临床数据Id + /// + public Guid TrialClinicalId { get; set; } + + /// + /// 问题名称 + /// + public string QuestionName { get; set; } = string.Empty; + + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; + + /// + /// 临床问题类型(分组，单选。) + /// + public string ClinicalQuestionType { get; set; } = string.Empty; + + /// + /// 问题标识 + /// + public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; } + + /// + /// 最大长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 最大行数 + /// + public int? MaxQuestionCount { get; set; } + + /// + /// 临床数据选项类型(无，自定义) + /// + public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } + + /// + /// 分组Id + /// + public Guid? GroupId { get; set; } + + /// + /// 自定义选项 + /// + public string TypeValue { get; set; } = string.Empty; + + /// + /// 字典Code + /// + public string DictionaryCode { get; set; } = string.Empty; + + /// + /// 排序 + /// + public int ShowOrder { get; set; } = 0; + + /// + /// 是否必填 + /// + public IsRequired IsRequired { get; set; } + + /// + /// 关联Value + /// + public string RelevanceValue { get; set; } = string.Empty; + + /// + /// 关联ID + /// + public Guid? RelevanceId { get; set; } + + /// + /// 系统临床问题Id + /// + public Guid? SystemClinicalQuestionId { get; set; } - [JsonIgnore] - [ForeignKey("TrialClinicalId")] - public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } - #endregion + /// + /// 父问题Id + /// + public Guid? ParentId { get; set; } - /// - /// 项目临床数据Id - /// - public Guid TrialClinicalId { get; set; } + /// + /// 父问题触发值 + /// + public string ParentTriggerValue { get; set; } = string.Empty; - /// - /// 问题名称 - /// - public string QuestionName { get; set; } = string.Empty; + /// + /// 显示类型 + /// + public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show; - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; + /// + /// 是否是检查日期 + /// + public bool IsCheckDate { get; set; } - /// - /// 临床问题类型(分组，单选。) - /// - public string ClinicalQuestionType { get; set; } = string.Empty; - - /// - /// 问题标识 - /// - public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; } - - /// - /// 最大长度 - /// - public int? MaxAnswerLength { get; set; } - - /// - /// 最大行数 - /// - public int? MaxQuestionCount { get; set; } - - /// - /// 临床数据选项类型(无，自定义) - /// - public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } - - /// - /// 分组Id - /// - public Guid? GroupId { get; set; } - - /// - /// 自定义选项 - /// - public string TypeValue { get; set; } = string.Empty; - - /// - /// 字典Code - /// - public string DictionaryCode { get; set; } = string.Empty; - - /// - /// 排序 - /// - public int ShowOrder { get; set; } = 0; - - /// - /// 是否必填 - /// - public IsRequired IsRequired { get; set; } - - /// - /// 关联Value - /// - public string RelevanceValue { get; set; } = string.Empty; - - /// - /// 关联ID - /// - public Guid? RelevanceId { get; set; } - - /// - /// 系统临床问题Id - /// - public Guid? SystemClinicalQuestionId { get; set; } + /// + /// 自定义计算标记 + /// + public ClinicalCalculateMark? CustomCalculateMark { get; set; } - /// - /// 父问题Id - /// - public Guid? ParentId { get; set; } + /// + /// 自定义计算问题 + /// + public string CalculateQuestions { get; set; } = "[]"; + /// + /// 小数点位数 + /// + public int? DigitPlaces { get; set; } - /// - /// 父问题触发值 - /// - public string ParentTriggerValue { get; set; } = string.Empty; - - /// - /// 显示类型 - /// - public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show; - - /// - /// 是否是检查日期 - /// - public bool IsCheckDate { get; set; } - - /// - /// 自定义计算标记 - /// - public ClinicalCalculateMark? CustomCalculateMark { get; set; } - - /// - /// 分组 - /// - [JsonIgnore] - [ForeignKey("GroupId")] - public TrialClinicalQuestion GroupQuestin { get; set; } - - /// - /// 自定义计算问题 - /// - public string CalculateQuestions { get; set; } = "[]"; - /// - /// 小数点位数 - /// - public int? DigitPlaces { get; set; } - - /// - /// 单位 - /// - public string Unit { get; set; } = string.Empty; - - - } + /// + /// 单位 + /// + public string Unit { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs index c7b533e91..865b48f2b 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs @@ -7,25 +7,24 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +using Microsoft.EntityFrameworkCore; +namespace IRaCIS.Core.Domain.Models; + +[Comment("系统标准 - 字典配置 （需要同步）")] +[Table("SystemCriterionDictionaryCode")] +public class SystemCriterionDictionaryCode : BaseAddAuditEntity { - /// - ///SystemCriterionDictionaryCode - /// - [Table("SystemCriterionDictionaryCode")] - public class SystemCriterionDictionaryCode : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion + #endregion - public Guid SystemCriterionId { get; set; } + public Guid SystemCriterionId { get; set; } - public string Code { get; set; } = string.Empty; + public string Code { get; set; } = string.Empty; - } +} + + - -} diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs index 78d196c08..be9e49aec 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs @@ -8,33 +8,32 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using IRaCIS.Core.Domain.Share.Reading; +using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 项目标准附加评估配置")] +[Table("TrialCriterionAdditionalAssessmentType")] +public class TrialCriterionAdditionalAssessmentType : BaseFullAuditEntity { - /// - ///TrialCriterionAdditionalAssessmentType - /// - [Table("TrialCriterionAdditionalAssessmentType")] - public class TrialCriterionAdditionalAssessmentType : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion - public Guid TrialReadingCriterionId { get; set; } - - public CriterionType CriterionType { get; set; } - + public Guid TrialReadingCriterionId { get; set; } - public AdditionalAssessmentType AdditionalAssessmentType { get; set; } - - public bool? IsSelected { get; set; } - + public CriterionType CriterionType { get; set; } - - } + public AdditionalAssessmentType AdditionalAssessmentType { get; set; } + + public bool? IsSelected { get; set; } + + + + +} + -} diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs index 7710591a4..c6b673c97 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs @@ -7,13 +7,12 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models { - /// - ///TrialCriterionDictionaryCode - /// - [Table("TrialCriterionDictionaryCode")] - public class TrialCriterionDictionaryCode : BaseAddAuditEntity + [Comment("项目 - 项目标准使用字典")] + [Table("TrialCriterionDictionaryCode")] + public class TrialCriterionDictionaryCode : BaseAddAuditEntity { #region 导航属性 [ForeignKey("TrialCriterionId")] diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs index b2c7e323c..4ea3cce02 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs @@ -11,8 +11,8 @@ using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models; -[Comment("项目标准 - 标准配置")] -[Table("ReadingQuestionCriterionTrial")] +[Comment("项目标准问题")] +[Table("ReadingQuestionTrial")] public class ReadingQuestionTrial : BaseAddAuditEntity { #region 导航属性 diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs index 458f14991..62f0b11af 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs @@ -7,58 +7,55 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 阅片期配置")] +[Table("ReadingPeriodSet")] +public class ReadingPeriodSet : BaseFullDeleteAuditEntity { - [Comment("项目 - 阅片期配置")] - [Table("ReadingPeriodSet")] - public class ReadingPeriodSet : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - public List ReadingPeriodSites { get; set; } = new List(); - [JsonIgnore] - /// - /// 访视模板 - /// - [ForeignKey("VisitStageId")] - public VisitStage VisitStage { get; set; } + #region 导航属性 + [JsonIgnore] + public List ReadingPeriodSites { get; set; } = new List(); + [JsonIgnore] + /// + /// 访视模板 + /// + [ForeignKey("VisitStageId")] + public VisitStage VisitStage { get; set; } - /// - /// 阅片期计划 - /// - [JsonIgnore] - public List ReadingPeriodPlanList { get; set; } = new List(); - #endregion + /// + /// 阅片期计划 + /// + [JsonIgnore] + public List ReadingPeriodPlanList { get; set; } = new List(); + #endregion - [Comment("生效时间")] - public DateTime? EffectOfTime { get; set; } - [Comment("")] - public DateTime? ExpirationDate { get; set; } - [Comment("截止访视")] - [DecimalPrecision(18, 0)] - public decimal? ExpirationVisitNum { get; set; } + [Comment("生效时间")] + public DateTime? EffectOfTime { get; set; } + public DateTime? ExpirationDate { get; set; } + [Comment("截止访视")] + [DecimalPrecision(18, 0)] + public decimal? ExpirationVisitNum { get; set; } - public bool IsGlobal { get; set; } + public bool IsGlobal { get; set; } - public ReadingPeriodStatus IsTakeEffect { get; set; } + public ReadingPeriodStatus IsTakeEffect { get; set; } - [StringLength(400)] - public string ReadingPeriodName { get; set; } = null!; - [Comment("阅片范围")] - public ReadingScopeEnum ReadingScope { get; set; } - [Comment("阅片配置的类型")] - public ReadingSetType ReadingSetType { get; set; } + [StringLength(400)] + public string ReadingPeriodName { get; set; } = null!; + [Comment("阅片范围")] + public ReadingScopeEnum ReadingScope { get; set; } + [Comment("阅片配置的类型")] + public ReadingSetType ReadingSetType { get; set; } - public Guid? SiteId { get; set; } + public Guid? SiteId { get; set; } - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public Guid TrialReadingCriterionId { get; set; } + public Guid TrialReadingCriterionId { get; set; } - public Guid? VisitStageId { get; set; } + public Guid? VisitStageId { get; set; } - } - } diff --git a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs index f5198f72f..ea015b8cb 100644 --- a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs +++ b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs @@ -7,40 +7,31 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models { - /// - ///UserWLTemplate - /// - [Table("UserWLTemplate")] - public class UserWLTemplate : BaseAddAuditEntity - { + [Comment("用户配置 - WL模板")] + [Table("UserWLTemplate")] + public class UserWLTemplate : BaseAddAuditEntity + { #region 导航属性 #endregion public string TemplateName { get; set; } = string.Empty; - public Guid UserId { get; set; } - - + public int WW { get; set; } - public int WW { get; set; } - + public int WL { get; set; } - public int WL { get; set; } + public int ShowOrder { get; set; } = 0; - public int ShowOrder { get; set; } = 0; + public bool IsPitchOn { get; set; } = true; - /// - /// 是否为默认 - /// - public bool IsPitchOn { get; set; } = true; - - } + } - -} + +} diff --git a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs index 8589b5833..d4b08018e 100644 --- a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs +++ b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs @@ -7,34 +7,26 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models -{ - /// - ///IRECIST1Point1肿瘤评估(系统标准) - /// - [Table("TumorAssessment_IRECIST1Point1")] - public class TumorAssessment_IRECIST1Point1 : Entity - { - - /// - /// 靶病灶 - /// - public TargetAssessment TargetLesion { get; set; } - - /// - /// 非靶病灶 - /// - public NoTargetAssessment NonTargetLesions { get; set; } - - /// - /// 新病灶 - /// - public NewLesionAssessment NewLesion { get; set; } - - /// - /// 整体疗效 - /// - public OverallAssessment OverallEfficacy { get; set; } - } +using Microsoft.EntityFrameworkCore; +namespace IRaCIS.Core.Domain.Models; + +[Comment("系统标准 - 疗效评估对照表 (需要同步)")] +[Table("TumorAssessment_IRECIST1Point1")] +public class TumorAssessment_IRECIST1Point1 : Entity +{ + + [Comment("靶病灶")] + public TargetAssessment TargetLesion { get; set; } + + [Comment("非靶病灶")] + public NoTargetAssessment NonTargetLesions { get; set; } + + [Comment("新病灶")] + public NewLesionAssessment NewLesion { get; set; } + + + [Comment("整体疗效")] + public OverallAssessment OverallEfficacy { get; set; } +} + -} diff --git a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs index 56a7fccd9..1821ad796 100644 --- a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs +++ b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs @@ -7,34 +7,27 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models { - /// - ///RECIST1Point1肿瘤评估(系统标准) - /// - [Table("TumorAssessment_RECIST1Point1")] - public class TumorAssessment_RECIST1Point1 : Entity - { - - /// - /// 靶病灶 - /// - public TargetAssessment TargetLesion { get; set; } - - /// - /// 非靶病灶 - /// - public NoTargetAssessment NonTargetLesions { get; set; } - - /// - /// 新病灶 - /// - public NewLesionAssessment NewLesion { get; set; } - - /// - /// 整体疗效 - /// - public OverallAssessment OverallEfficacy { get; set; } - } + /// + ///RECIST1Point1肿瘤评估(系统标准) + /// + [Table("TumorAssessment_RECIST1Point1")] + public class TumorAssessment_RECIST1Point1 : Entity + { -} + [Comment("靶病灶")] + public TargetAssessment TargetLesion { get; set; } + + [Comment("非靶病灶")] + public NoTargetAssessment NonTargetLesions { get; set; } + + [Comment("新病灶")] + public NewLesionAssessment NewLesion { get; set; } + + [Comment("整体疗效")] + public OverallAssessment OverallEfficacy { get; set; } + } + +} diff --git a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs index f49421233..7c25f362d 100644 --- a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs +++ b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs @@ -7,6 +7,7 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models { /// @@ -15,26 +16,18 @@ namespace IRaCIS.Core.Domain.Models [Table("TumorAssessment_RECIST1Point1BM")] public class TumorAssessment_RECIST1Point1BM : Entity { - - /// - /// 靶病灶 - /// - public TargetAssessment TargetLesion { get; set; } - - /// - /// 非靶病灶 - /// - public NoTargetAssessment NonTargetLesions { get; set; } - - /// - /// 新病灶 - /// + + [Comment("靶病灶")] + public TargetAssessment TargetLesion { get; set; } + + [Comment("非靶病灶")] + public NoTargetAssessment NonTargetLesions { get; set; } + + [Comment("新病灶")] public NewLesionAssessment NewLesion { get; set; } - - /// - /// 整体疗效 - /// - public OverallAssessment OverallEfficacy { get; set; } + + [Comment("整体疗效")] + public OverallAssessment OverallEfficacy { get; set; } } } diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs index 0a5dda331..5a0b1ff35 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs @@ -4,43 +4,40 @@ // 生成时间 2021-12-23 13:16:57 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 using IRaCIS.Core.Domain.Share; +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("TrialSiteEquipmentSurvey")] +public class TrialSiteEquipmentSurvey : BaseFullAuditEntity { - /// - ///TrialSiteEquipmentSurvey - /// - [Table("TrialSiteEquipmentSurvey")] - public class TrialSiteEquipmentSurvey : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialSiteSurveyId")] - public TrialSiteSurvey TrialSiteSurvey { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialSiteSurveyId")] + public TrialSiteSurvey TrialSiteSurvey { get; set; } - [JsonIgnore] - [ForeignKey("EquipmentTypeId")] - public Dictionary EquipmentType { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("EquipmentTypeId")] + public Dictionary EquipmentType { get; set; } + #endregion - public Guid TrialSiteSurveyId { get; set; } + public Guid TrialSiteSurveyId { get; set; } - public Guid EquipmentTypeId { get; set; } - public string Parameters { get; set; } = string.Empty; + public Guid EquipmentTypeId { get; set; } + public string Parameters { get; set; } = string.Empty; - public string ManufacturerName { get; set; } = string.Empty; + public string ManufacturerName { get; set; } = string.Empty; - public string ScannerType { get; set; } = string.Empty; + public string ScannerType { get; set; } = string.Empty; - public string Note { get; set; } = string.Empty; + public string Note { get; set; } = string.Empty; - } - } diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs index d612b9eaa..c5ccb5ab8 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs @@ -4,77 +4,77 @@ // 生成时间 2021-12-23 13:16:57 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 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 +namespace IRaCIS.Core.Domain.Models; + + +[Comment("项目 - 项目中心调研表")] +[Table("TrialSiteSurvey")] +public class TrialSiteSurvey : BaseFullDeleteAuditEntity { - /// - ///TrialSiteSurvey - /// - [Table("TrialSiteSurvey")] - public class TrialSiteSurvey : BaseFullDeleteAuditEntity - { - #region 导航属性 - // 必须 { get; set; } 否则 翻译出错 - [JsonIgnore] - public List TrialSiteUserSurveyList { get; set; } = new List(); - [JsonIgnore] - public List TrialSiteEquipmentSurveyList { get; set; } = new List(); + #region 导航属性 + // 必须 { get; set; } 否则 翻译出错 + [JsonIgnore] + public List TrialSiteUserSurveyList { get; set; } = new List(); + [JsonIgnore] + public List TrialSiteEquipmentSurveyList { get; set; } = new List(); - [JsonIgnore] - public TrialSite TrialSite { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - [JsonIgnore] - public User ReviewerUser { get; set; } - [JsonIgnore] - public User PreliminaryUser { get; set; } - #endregion + [JsonIgnore] + public TrialSite TrialSite { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } + [JsonIgnore] + public User ReviewerUser { get; set; } + [JsonIgnore] + public User PreliminaryUser { get; set; } + #endregion - public Guid TrialSiteId { get; set; } + public Guid TrialSiteId { get; set; } - public TrialSiteSurveyEnum State { get; set; } = TrialSiteSurveyEnum.ToSubmit; + public TrialSiteSurveyEnum State { get; set; } = TrialSiteSurveyEnum.ToSubmit; - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public string UserName { get; set; } = string.Empty; + public string UserName { get; set; } = string.Empty; - public string Phone { get; set; } = string.Empty; + public string Phone { get; set; } = string.Empty; - public string Email { get; set; } = string.Empty; + public string Email { get; set; } = string.Empty; - public int AverageEngravingCycle { get; set; } + public int AverageEngravingCycle { get; set; } - public bool IsConfirmImagingTechnologist { get; set; } + public bool IsConfirmImagingTechnologist { get; set; } - public string NotConfirmReson { get; set; } = string.Empty; + public string NotConfirmReson { get; set; } = string.Empty; - public int EfficacyEvaluatorType { get; set; } + public int EfficacyEvaluatorType { get; set; } - public bool IsFollowStudyParameters { get; set; } + public bool IsFollowStudyParameters { get; set; } - public string NotFollowReson { get; set; } = string.Empty; + public string NotFollowReson { get; set; } = string.Empty; - public string LatestBackReason { get; set; } = string.Empty; + public string LatestBackReason { get; set; } = string.Empty; - public Guid? PreliminaryUserId { get; set; } + public Guid? PreliminaryUserId { get; set; } - public Guid? ReviewerUserId { get; set; } + public Guid? ReviewerUserId { get; set; } - public DateTime? PreliminaryTime { get; set; } + public DateTime? PreliminaryTime { get; set; } - public DateTime? ReviewerTime { get; set; } - - + public DateTime? ReviewerTime { get; set; } - } -} + +} + + diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs index 07b950b62..359a79e54 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs @@ -4,64 +4,61 @@ // 生成时间 2021-12-23 13:16:57 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 using IRaCIS.Core.Domain.Share; +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("TrialSiteUserSurvey")] +public class TrialSiteUserSurvey : BaseFullAuditEntity { - /// - ///TrialSiteUserSurvey - /// - [Table("TrialSiteUserSurvey")] - public class TrialSiteUserSurvey : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialSiteSurveyId")] - public TrialSiteSurvey TrialSiteSurvey { get; set; } - [JsonIgnore] - [ForeignKey("UserTypeId")] - public UserType UserTypeRole { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialSiteSurveyId")] + public TrialSiteSurvey TrialSiteSurvey { get; set; } + [JsonIgnore] + [ForeignKey("UserTypeId")] + public UserType UserTypeRole { get; set; } + #endregion - public Guid TrialSiteSurveyId { get; set; } + public Guid TrialSiteSurveyId { get; set; } - public Guid? UserTypeId { get; set; } + public Guid? UserTypeId { get; set; } - public int? TrialRoleCode { get; set; } + public int? TrialRoleCode { get; set; } - public string Phone { get; set; } = string.Empty; + public string Phone { get; set; } = string.Empty; - public string Email { get; set; } = string.Empty; + public string Email { get; set; } = string.Empty; - public string FirstName { get; set; } = string.Empty; - public string LastName { get; set; } = string.Empty; + public string FirstName { get; set; } = string.Empty; + public string LastName { get; set; } = string.Empty; - public string OrganizationName { get; set; } = string.Empty; + public string OrganizationName { get; set; } = string.Empty; - public Guid? SystemUserId { get; set; } + public Guid? SystemUserId { get; set; } - public bool IsGenerateAccount { get; set; } + public bool IsGenerateAccount { get; set; } - public bool IsGenerateSuccess { get; set; } + public bool IsGenerateSuccess { get; set; } - public TrialSiteUserStateEnum InviteState { get; set; } = TrialSiteUserStateEnum.WaitSent; + public TrialSiteUserStateEnum InviteState { get; set; } = TrialSiteUserStateEnum.WaitSent; - public bool IsJoin { get; set; } + public bool IsJoin { get; set; } - public bool IsHistoryUser { get; set; } + public bool IsHistoryUser { get; set; } - public bool? IsHistoryUserDeleted { get; set; } + public bool? IsHistoryUserDeleted { get; set; } - public bool? IsHistoryUserOriginDeleted { get; set; } + public bool? IsHistoryUserOriginDeleted { get; set; } - } - } diff --git a/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs b/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs index 421b4b200..df435c8ae 100644 --- a/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs +++ b/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs @@ -8,35 +8,31 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; -namespace IRaCIS.Core.Domain.Models +using Microsoft.EntityFrameworkCore; +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 项目部位配置")] +[Table("TrialBodyPart")] +public class TrialBodyPart : BaseAddAuditEntity { - /// - ///TrialBodyPart - /// - [Table("TrialBodyPart")] - public class TrialBodyPart : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } - #endregion + #endregion - public string Code { get; set; } = string.Empty; + public string Code { get; set; } = null!; + public bool IsHandAdd { get; set; } - public string Name { get; set; } = string.Empty; + [StringLength(500)] + public string Name { get; set; } = null!; + [StringLength(500)] + public string NameCN { get; set; } = null!; - public string NameCN { get; set; } = string.Empty; + public Guid TrialId { get; set; } +} - - public Guid TrialId { get; set; } - - - public bool IsHandAdd { get; set; } - - } -} diff --git a/IRaCIS.Core.Domain/Trial/TrialDictionary.cs b/IRaCIS.Core.Domain/Trial/TrialDictionary.cs index 586bbd512..1eb052961 100644 --- a/IRaCIS.Core.Domain/Trial/TrialDictionary.cs +++ b/IRaCIS.Core.Domain/Trial/TrialDictionary.cs @@ -1,24 +1,25 @@ +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("TrialDictionary")] +public partial class TrialDictionary : Entity { - [Table("TrialDictionary")] - public partial class TrialDictionary : Entity - { - #region - [JsonIgnore] - public virtual Trial Trial { get; set; } - [JsonIgnore] - public virtual Dictionary Dictionary { get; set; } - #endregion + #region + [JsonIgnore] + public virtual Trial Trial { get; set; } + [JsonIgnore] + public virtual Dictionary Dictionary { get; set; } + #endregion + [StringLength(400)] + public string KeyName { get; set; } = string.Empty; - public string KeyName { get; set; } = string.Empty; + public Guid TrialId { get; set; } - public Guid TrialId { get; set; } - - public Guid DictionaryId { get; set; } - } + public Guid DictionaryId { get; set; } } diff --git a/IRaCIS.Core.Domain/Trial/TrialSign.cs b/IRaCIS.Core.Domain/Trial/TrialSign.cs index c5ec2ce7a..deab61307 100644 --- a/IRaCIS.Core.Domain/Trial/TrialSign.cs +++ b/IRaCIS.Core.Domain/Trial/TrialSign.cs @@ -4,36 +4,33 @@ // 生成时间 2022-02-16 16:23:57 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 using IRaCIS.Core.Domain.Share; +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("TrialSign")] +public class TrialSign : BaseAddAuditEntity { - /// - ///TrialSign - /// - [Table("TrialSign")] - public class TrialSign : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion - public Guid? TrialId { get; set; } - + #endregion + public Guid? TrialId { get; set; } - public Guid? SubjectVisitId { get; set; } + public Guid? SubjectVisitId { get; set; } + + public Guid? SignCodeId { get; set; } + + public string SignCode { get; set; } = string.Empty; + + [StringLength(1024)] + public string SignText { get; set; } = string.Empty; + + public bool IsCompleted { get; set; } + +} - //关联基础数据 - public Guid? SignCodeId { get; set; } - public string SignCode { get; set; } = string.Empty; - - public string SignText { get; set; } = string.Empty; - - public bool IsCompleted { get; set; } - - } - - -} diff --git a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs index 9bea5be22..3622c50e5 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs @@ -3,16 +3,15 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-02-25 14:21:48 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 +using Microsoft.EntityFrameworkCore; using System; using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { - /// - ///TrialStateChange - /// - [Table("TrialStateChange")] - public class TrialStateChange : BaseAddAuditEntity - { + [Comment("项目 - 项目状态变更记录表")] + [Table("TrialStateChange")] + public class TrialStateChange : BaseAddAuditEntity + { #region 导航属性 [JsonIgnore] [ForeignKey("TrialId")] @@ -21,18 +20,18 @@ namespace IRaCIS.Core.Domain.Models #endregion public Guid TrialId { get; set; } - - - public string OriginState { get; set; } = String.Empty; - - public string NowState { get; set; } = String.Empty; - - public string Reason { get; set; }=String.Empty; - + public string OriginState { get; set; } = String.Empty; - - } -} + public string NowState { get; set; } = String.Empty; + + + public string Reason { get; set; } = String.Empty; + + + + } + +} diff --git a/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs b/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs index 93677466d..0f8a7f51f 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs @@ -1,3 +1,4 @@ +using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -5,6 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { + [Comment("Ŀ - ̼¼")] [Table("TrialStatus")] public partial class TrialStatusDetail : BaseAddAuditEntity { @@ -19,7 +21,7 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialId { get; set; } public int TrialStatus { get; set; } - + [StringLength(400)] public string Memo { get; set; } = string.Empty; public int OptUserType { get; set; } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs index 034f3c020..1e1a59106 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs @@ -4,67 +4,56 @@ // 生成时间 2022-03-04 13:33:37 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 using IRaCIS.Core.Domain.Share; +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("TrialExternalUser")] +public class TrialExternalUser : BaseFullAuditEntity { - /// - ///TrialExternalUser - /// - [Table("TrialExternalUser")] - public class TrialExternalUser : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } + #endregion + public Guid TrialId { get; set; } - public Guid TrialId { get; set; } - - public Guid UserTypeId { get; set; } - - public string Phone { get; set; } = String.Empty; + public Guid UserTypeId { get; set; } - /// + public string Phone { get; set; } = String.Empty; - 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; - public string LastName { get; set; } = String.Empty; + public string LastName { get; set; } = String.Empty; - public string OrganizationName { get; set; }=String.Empty; + public string OrganizationName { get; set; } = String.Empty; + + public bool IsSystemUser { get; set; } - public bool IsSystemUser{ get; set; } + public Guid SystemUserId { get; set; } + + public bool IsJoin { get; set; } + + public DateTime? ExpireTime { get; set; } + + public DateTime? ConfirmTime { get; set; } + + [StringLength(512)] + public string RejectReason { get; set; } = String.Empty; - public Guid SystemUserId { get; set; } + [Comment(" 邀请状态")] + public TrialExternalUserStateEnum InviteState { get; set; } = TrialExternalUserStateEnum.WaitSent; + +} - - public bool IsJoin { get; set; } - - - - - public DateTime? ExpireTime { get; set; } - - public DateTime? ConfirmTime { get; set; } - - public string RejectReason { get; set; } = String.Empty; - - /// - /// 邀请状态 - /// - [Required] - public TrialExternalUserStateEnum InviteState { get; set; } = TrialExternalUserStateEnum.WaitSent; - - } - -} diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs index 405a61aec..a797294ba 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs @@ -1,53 +1,55 @@ -using System; +using Microsoft.EntityFrameworkCore; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 项目中心表")] +[Table("TrialSite")] +public class TrialSite : BaseFullDeleteAuditEntity { - public class TrialSite : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] + #region 导航属性 + [JsonIgnore] - [ForeignKey("SiteId")] - public Site Site { get; set; } + [ForeignKey("SiteId")] + public Site Site { get; set; } - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } - /// - /// Site 下面有多个访视记录 - /// - [JsonIgnore] - public List SubjectVisitList { get; set; } - [JsonIgnore] - public List TrialSiteSurveyList { get; set; } + /// + /// Site 下面有多个访视记录 + /// + [JsonIgnore] + public List SubjectVisitList { get; set; } + [JsonIgnore] + public List TrialSiteSurveyList { get; set; } - //Site 由多个人负责 - [JsonIgnore] - public List CRCUserList { get; set; } + //Site 由多个人负责 + [JsonIgnore] + public List CRCUserList { get; set; } - [JsonIgnore] - public List SubjectList { get; set; } + [JsonIgnore] + public List SubjectList { get; set; } - [JsonIgnore] + [JsonIgnore] - public List TrialSiteDicomAEList { get; set; } - #endregion - public Guid TrialId { get; set; } + public List TrialSiteDicomAEList { get; set; } + #endregion + public Guid TrialId { get; set; } - public Guid? SiteId { get; set; } + public Guid? SiteId { get; set; } - public string TrialSiteCode { get; set; } = String.Empty; + public string TrialSiteCode { get; set; } = String.Empty; - public string TrialSiteName { get; set; } = String.Empty; + public string TrialSiteName { get; set; } = String.Empty; + + public string TrialSiteAliasName { get; set; } = String.Empty; + public DateTime? EnabledTime { get; set; } - public string TrialSiteAliasName { get; set; }=String.Empty; - public DateTime? EnabledTime { get; set; } - - } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs index ee29aeb28..bc1d28312 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs @@ -7,40 +7,39 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +using Microsoft.EntityFrameworkCore; +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 项目中心DicomAE表")] +[Table("TrialSiteDicomAE")] +public class TrialSiteDicomAE : BaseFullDeleteAuditEntity { - /// - ///TrialSiteDicomAE - /// - [Table("TrialSiteDicomAE")] - public class TrialSiteDicomAE : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - public TrialSite TrialSite { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + public TrialSite TrialSite { get; set; } + #endregion - public Guid TrialId { get; set; } - - public Guid TrialSiteId { get; set; } - + public Guid TrialId { get; set; } - public string CallingAE { get; set; } = string.Empty; + public Guid TrialSiteId { get; set; } - public string IP { get; set; } = string.Empty; + public string CallingAE { get; set; } = string.Empty; - public string Port { get; set; } = string.Empty; + [StringLength(500)] + public string Description { get; set; } = null!; + public string IP { get; set; } = null!; - public string Description { get; set; } = string.Empty; + [StringLength(500)] + public string Port { get; set; } = null!; - } +} + -} diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs index ad366265a..9bd6587bc 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs @@ -4,42 +4,41 @@ // 生成时间 2021-11-23 15:40:27 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 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 +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 项目中心用户关系表")] +[Table("TrialSiteUser")] +public class TrialSiteUser : BaseFullDeleteAuditEntity { - /// - ///UserTrialSite - /// - [Table("TrialSiteUser")] - public class TrialSiteUser : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("UserId")] - public User User { get; set; } - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("UserId")] + public User User { get; set; } + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } - [JsonIgnore] - public TrialSite TrialSite { get; set; } + [JsonIgnore] + public TrialSite TrialSite { get; set; } - #endregion - public Guid TrialSiteId { get; set; } + #endregion + public Guid TrialSiteId { get; set; } - public Guid UserId { get; set; } + public Guid UserId { get; set; } - public Guid TrialId { get; set; } - - + public Guid TrialId { get; set; } + + + + +} - } - -} diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs index 9c4482a09..6e34ea8e3 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs @@ -2,32 +2,30 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using IRaCIS.Core.Domain.Share; +using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 项目参与人员中间表")] +[Table("TrialUser")] +public partial class TrialUser : BaseFullDeleteAuditEntity { - /// - /// 运维人员与项目关联关系表 - 实体 - /// - [Table("TrialUser")] - public partial class TrialUser : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("UserId")] - public User User { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("UserId")] + public User User { get; set; } + #endregion - public Guid UserId { get; set; } - public Guid TrialId { get; set; } - - public DateTime? RemoveTime { get; set; } + public Guid UserId { get; set; } + public Guid TrialId { get; set; } + + public DateTime? RemoveTime { get; set; } + + public DateTime? JoinTime { get; set; } - public DateTime? JoinTime { get; set; } - - } } diff --git a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs index 9e44aefd0..4b4a3de1b 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs @@ -7,28 +7,25 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +using Microsoft.EntityFrameworkCore; +namespace IRaCIS.Core.Domain.Models; + +[Comment("受试者 - 阅片标准取消分配医生记录")] +[Table("SubjectCanceDoctor")] +public class SubjectCanceDoctor : BaseAddAuditEntity { - /// - ///SubjectCanceDoctor - /// - [Table("SubjectCanceDoctor")] - public class SubjectCanceDoctor : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Subject Subject { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + public Subject Subject { get; set; } + #endregion + + [StringLength(512)] + public string Note { get; set; } = null!; + + public Guid SubjectId { get; set; } + + public Guid? TrialReadingCriterionId { get; set; } + +} - - public Guid SubjectId { get; set; } - - public string Note { get; set; } = string.Empty; - - public Guid? TrialReadingCriterionId { get; set; } - - - } - -} diff --git a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs index ad8b9aad9..9bd5ad6ee 100644 --- a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs +++ b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs @@ -3,30 +3,29 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2021-12-23 15:37:48 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 +using Microsoft.EntityFrameworkCore; using System; 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("VisitPlanInfluenceStat")] +public class VisitPlanInfluenceStat : BaseAddAuditEntity { - /// - ///VisitPlanInfluenceStudystat - /// - [Table("VisitPlanInfluenceStat")] - public class VisitPlanInfluenceStat : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - public List InfluenceStudyList { get; set; } = new List(); + [JsonIgnore] + public List InfluenceStudyList { get; set; } = new List(); - #endregion + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public int InconsistentCount { get; set; } + public int InconsistentCount { get; set; } - } +} + -} diff --git a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs index aaf77f1f2..c5db2db0b 100644 --- a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs +++ b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs @@ -3,45 +3,42 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2021-12-20 16:42:26 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 +using Microsoft.EntityFrameworkCore; using System; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目配置 - 访视计划调整影像检查")] +[Table("VisitPlanInfluenceStudy")] +public class VisitPlanInfluenceStudy : BaseAddAuditEntity { - /// - ///VisitPlanInfluenceSubjectVisit - /// - [Table("VisitPlanInfluenceStudy")] - public class VisitPlanInfluenceStudy : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("VisitPlanInfluenceStatId")] - public VisitPlanInfluenceStat VisitPlanInfluenceStat { get; set; } - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + [ForeignKey("VisitPlanInfluenceStatId")] + public VisitPlanInfluenceStat VisitPlanInfluenceStat { get; set; } + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } + #endregion - public Guid SubjectVisitId { get; set; } + public Guid SubjectVisitId { get; set; } - public Guid StudyId { get; set; } + public Guid StudyId { get; set; } - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public bool IsDicomStudy { get; set; } + public bool IsDicomStudy { get; set; } - public string Modality { get; set; } = string.Empty; + public string Modality { get; set; } = string.Empty; - public bool IsOverWindowNowNotOverWindow { get; set; } + public bool IsOverWindowNowNotOverWindow { get; set; } - public DateTime? StudyTime { get; set; } + public DateTime? StudyTime { get; set; } - public string HistoryWindow { get; set; } = string.Empty; + public string HistoryWindow { get; set; } = string.Empty; - public string NowWindow { get; set; } = string.Empty; + public string NowWindow { get; set; } = string.Empty; - public Guid VisitPlanInfluenceStatId { get; set; } - - } + public Guid VisitPlanInfluenceStatId { get; set; } } diff --git a/IRaCIS.Core.Domain/Visit/VisitStage.cs b/IRaCIS.Core.Domain/Visit/VisitStage.cs index a5dca24a4..6d8f31486 100644 --- a/IRaCIS.Core.Domain/Visit/VisitStage.cs +++ b/IRaCIS.Core.Domain/Visit/VisitStage.cs @@ -1,38 +1,40 @@ -using System; +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("VisitStage")] +public class VisitStage : BaseFullDeleteAuditEntity { - [Table("VisitStage")] - public class VisitStage : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public string BlindName { get; set; } = string.Empty; + public string BlindName { get; set; } = string.Empty; - [Column(TypeName = "decimal(18,1)")] - public decimal VisitNum { get; set; } - public string VisitName { get; set; } = string.Empty; - public int VisitDay { get; set; } - public string Description { get; set; } = string.Empty; + [DecimalPrecision(18, 1)] + public decimal VisitNum { get; set; } + public string VisitName { get; set; } = string.Empty; + public int VisitDay { get; set; } + public string Description { get; set; } = string.Empty; - public bool IsConfirmed { get; set; }=false; + public bool IsConfirmed { get; set; } = false; - public bool NeedGlobal { get; set; } = false; + public bool NeedGlobal { get; set; } = false; - public bool IsBaseLine { get; set; } = false; + public bool IsBaseLine { get; set; } = false; - public int VisitWindowLeft { get; set; } - public int VisitWindowRight { get; set; } + public int VisitWindowLeft { get; set; } + public int VisitWindowRight { get; set; } - public bool IsHaveFirstConfirmed { get; set; } + public bool IsHaveFirstConfirmed { get; set; } - } }