From 32931e155cbcee85401abb5dcdd235381a5fe22a Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 20 Sep 2024 09:20:04 +0800 Subject: [PATCH] =?UTF-8?q?GlobalUsings=20=E6=B8=85=E7=90=86=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/TestService.cs | 3 + IRaCIS.Core.Domain/Allocation/SubjectUser.cs | 77 +- .../Allocation/TaskAllocationRule.cs | 61 +- .../Allocation/TaskConsistentRule.cs | 61 +- .../Allocation/TaskInfluence.cs | 70 +- .../Allocation/TaskMedicalReview.cs | 344 ++++---- .../Allocation/TaskMedicalReviewRule.cs | 50 +- .../Allocation/TrialVirtualSiteCodeUpdate.cs | 31 +- IRaCIS.Core.Domain/Allocation/VisitTask.cs | 777 +++++++++-------- .../Allocation/VisitTaskReReading.cs | 101 +-- IRaCIS.Core.Domain/BaseModel/DomainEvent.cs | 33 +- IRaCIS.Core.Domain/BaseModel/Entity.cs | 217 +++-- IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs | 40 +- IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs | 24 +- IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs | 23 +- IRaCIS.Core.Domain/Common/CommonDocument.cs | 6 +- IRaCIS.Core.Domain/Common/Dictionary.cs | 6 +- .../Common/EmailNoticeConfig.cs | 12 +- IRaCIS.Core.Domain/Common/ExploreRecommend.cs | 6 - IRaCIS.Core.Domain/Common/FrontAuditConfig.cs | 10 +- .../Common/Internationalization.cs | 67 +- IRaCIS.Core.Domain/Common/PublishLog.cs | 39 +- IRaCIS.Core.Domain/Common/SystemBasicData.cs | 53 +- IRaCIS.Core.Domain/Common/VerificationCode.cs | 31 +- IRaCIS.Core.Domain/Dcotor/Attachment.cs | 7 +- IRaCIS.Core.Domain/Dcotor/Doctor.cs | 7 +- .../Dcotor/DoctorCriterionFile.cs | 4 - IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs | 7 +- IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs | 7 +- IRaCIS.Core.Domain/Dcotor/Education.cs | 7 +- .../Dcotor/EnrollReadingCriterion.cs | 40 +- IRaCIS.Core.Domain/Dcotor/Postgraduate.cs | 85 +- .../Dcotor/ResearchPublication.cs | 52 +- IRaCIS.Core.Domain/Dcotor/TrialExperience.cs | 11 +- .../Dcotor/TrialExperienceCriteria.cs | 7 +- IRaCIS.Core.Domain/Dcotor/Vacation.cs | 26 +- .../Document/SystemDocConfirmedUser.cs | 47 +- .../SystemDocNeedConfirmedUserType.cs | 39 +- IRaCIS.Core.Domain/Document/SystemDocument.cs | 27 +- .../Document/TrialDocConfirmedUser.cs | 53 +- .../Document/TrialDocNeedConfirmedUserType.cs | 40 +- IRaCIS.Core.Domain/Document/TrialDocument.cs | 59 +- .../Document/TrialEmailNoticeConfig.cs | 6 - .../Document/TrialEmailNoticeUser.cs | 37 +- IRaCIS.Core.Domain/Financial/CalculateTask.cs | 21 +- IRaCIS.Core.Domain/Financial/ExchangeRate.cs | 20 +- IRaCIS.Core.Domain/Financial/Payment.cs | 65 +- .../Financial/PaymentAdjustment.cs | 43 +- IRaCIS.Core.Domain/Financial/PaymentDetail.cs | 67 +- IRaCIS.Core.Domain/Financial/RankPrice.cs | 59 +- .../Financial/ReviewerPayInformation.cs | 5 - .../Financial/TrialPaymentPrice.cs | 51 +- .../Financial/TrialRevenuesPrice.cs | 58 +- .../TrialRevenuesPriceVerification.cs | 46 +- IRaCIS.Core.Domain/Financial/VolumeReward.cs | 23 +- IRaCIS.Core.Domain/GlobalUsings.cs | 7 + IRaCIS.Core.Domain/Image/DicomInstance.cs | 9 +- IRaCIS.Core.Domain/Image/DicomSeries.cs | 8 +- IRaCIS.Core.Domain/Image/DicomStudy.cs | 8 +- IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs | 5 - IRaCIS.Core.Domain/Image/ImageShare.cs | 29 +- IRaCIS.Core.Domain/Image/NoneDicomStudy.cs | 78 +- .../Image/NoneDicomStudyFile.cs | 65 +- IRaCIS.Core.Domain/Image/SCPImageUpload.cs | 67 +- IRaCIS.Core.Domain/Image/SCPInstance.cs | 113 +-- IRaCIS.Core.Domain/Image/SCPPatient.cs | 63 +- IRaCIS.Core.Domain/Image/SCPSeries.cs | 93 +-- IRaCIS.Core.Domain/Image/SCPStudy.cs | 121 ++- .../Image/SystemAnonymization.cs | 49 +- IRaCIS.Core.Domain/Image/TaskInstance.cs | 79 +- IRaCIS.Core.Domain/Image/TaskSeries.cs | 76 +- IRaCIS.Core.Domain/Image/TaskStudy.cs | 100 ++- IRaCIS.Core.Domain/Image/TrialDicomAE.cs | 40 +- .../Image/TrialImageDownload.cs | 71 +- IRaCIS.Core.Domain/Institution/CRO.cs | 5 - IRaCIS.Core.Domain/Institution/Hospital.cs | 61 +- IRaCIS.Core.Domain/Institution/Site.cs | 76 +- IRaCIS.Core.Domain/Institution/Sponsor.cs | 32 +- IRaCIS.Core.Domain/Management/Menu.cs | 97 ++- .../Management/Notice/SystemNotice.cs | 60 +- .../Management/Notice/SystemNoticeUserRead.cs | 26 +- .../Management/Notice/SystemNoticeUserType.cs | 34 +- IRaCIS.Core.Domain/Management/Role.cs | 25 +- IRaCIS.Core.Domain/Management/User.cs | 117 ++- IRaCIS.Core.Domain/Management/UserFeedBack.cs | 76 +- IRaCIS.Core.Domain/Management/UserLog.cs | 152 ++-- .../Management/UserPassWordLog.cs | 39 +- IRaCIS.Core.Domain/Management/UserType.cs | 57 +- .../Management/UserTypeGroup.cs | 44 +- IRaCIS.Core.Domain/Management/UserTypeMenu.cs | 34 +- IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs | 9 +- .../QC/ClinicalData/PreviousHistory.cs | 56 +- .../QC/ClinicalData/PreviousOther.cs | 58 +- .../QC/ClinicalData/PreviousPDF.cs | 65 +- .../QC/ClinicalData/PreviousSurgery.cs | 48 +- IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs | 40 +- IRaCIS.Core.Domain/QC/QCChallenge.cs | 105 +-- IRaCIS.Core.Domain/QC/QCChallengeDialog.cs | 30 +- IRaCIS.Core.Domain/QC/QCQuestion.cs | 57 +- IRaCIS.Core.Domain/QC/TrialQCQuestion.cs | 79 +- .../QC/TrialQCQuestionAnswer.cs | 44 +- .../SubjectAdditionalEvaluationResult.cs | 74 +- .../SubjectCriteriaEvaluation.cs | 52 +- .../SubjectCriteriaEvaluationVisitFilter.cs | 121 +-- ...bjectCriteriaEvaluationVisitStudyFilter.cs | 69 +- .../ClinicalData/ClinicalDataSystemSet.cs | 13 +- .../ClinicalData/ClinicalDataTrialSet.cs | 9 +- .../ClinicalData/ReadingClinicalData.cs | 125 +-- .../ClinicalData/ReadingClinicalDataPDF.cs | 52 +- .../ReadingConsistentClinicalData.cs | 137 +-- .../ReadingConsistentClinicalDataPDF.cs | 59 +- .../TrialClinicalDataSetCriterion.cs | 40 +- .../SystemClinicalQuestion.cs | 296 ++++--- .../SystemClinicalTableQuestion.cs | 179 ++-- .../ClinicalQuestion/TrialClinicalQuestion.cs | 317 ++++--- .../TrialClinicalTableQuestion.cs | 240 +++--- .../ClinicalAnswerRowInfo.cs | 10 +- .../ClinicalQuestionAnswer/ClinicalForm.cs | 10 +- .../ClinicalQuestionAnswer.cs | 12 +- .../ClinicalTableAnswer.cs | 10 +- .../ReadModuleCriterionFrom.cs | 63 +- .../ReadingMedicalReviewDialog.cs | 188 +++-- .../ReadingMedicineQuestionAnswer.cs | 53 +- .../ReadingMedicineSystemQuestion.cs | 116 ++- .../ReadingMedicineTrialQuestion.cs | 103 ++- .../ReadingCriterion/CriterionNidusSystem.cs | 8 +- .../ReadingCriterion/CriterionNidusTrial.cs | 8 +- .../Reading/ReadingCriterion/OrganInfo.cs | 103 ++- .../ReadingCriterion/OrganTrialInfo.cs | 115 ++- .../ReadingCriterion/ReadingCriterionPage.cs | 69 +- .../ReadingQuestionCriterionSystem.cs | 102 ++- .../ReadingQuestionCriterionTrial.cs | 467 ++++++----- .../SystemCriterionDictionaryCode.cs | 32 +- .../TrialCriterionAdditionalAssessmentType.cs | 36 +- .../TrialCriterionDictionaryCode.cs | 38 +- .../ReadingQuestionSystem.cs | 551 +++++++------ .../ReadingQuestionTrial.cs | 778 +++++++++--------- .../ReadingSystemCriterionDictionary.cs | 62 +- .../ReadingTableQuestionSystem.cs | 370 ++++----- .../ReadingTableQuestionTrial.cs | 402 +++++---- .../ReadingTrialCriterionDictionary.cs | 54 +- .../ReadingFormAnswer/ReadingCustomTag.cs | 42 +- .../ReadingGlobalTaskInfo.cs | 84 +- .../ReadingFormAnswer/ReadingJudgeInfo.cs | 54 +- .../ReadingOncologyTaskInfo.cs | 71 +- .../ReadingTableAnswerRowInfo.cs | 219 +++-- .../ReadingTableQuestionAnswer.cs | 79 +- .../ReadingTaskQuestionAnswer.cs | 89 +- .../ReadingTaskQuestionMark.cs | 100 +-- .../ReadingFormAnswer/ReadingTaskRelation.cs | 48 +- .../Reading/ReadingPeriod/ReadModule.cs | 153 ++-- .../ReadingPeriod/ReadingPeriodPlan.cs | 65 +- .../Reading/ReadingPeriod/ReadingPeriodSet.cs | 116 +-- .../ReadingPeriod/ReadingPeriodSite.cs | 49 +- .../Reading/ShortcutKey/DefaultShortcutKey.cs | 61 +- .../Reading/ShortcutKey/UserWLTemplate.cs | 53 +- .../TumorAssessment_IRECIST1Point1.cs | 43 +- .../TumorAssessment_RECIST1Point1.cs | 44 +- .../TumorAssessment_RECIST1Point1BM.cs | 46 +- .../Reading/View/ReadModuleView.cs | 22 +- .../SiteSurvey/TrialSiteEquipmentSurvey.cs | 48 +- .../SiteSurvey/TrialSiteSurvey.cs | 86 +- .../SiteSurvey/TrialSiteUserSurvey.cs | 66 +- IRaCIS.Core.Domain/Trial/DataInspection.cs | 6 - IRaCIS.Core.Domain/Trial/Enroll.cs | 112 +-- IRaCIS.Core.Domain/Trial/EnrollDetail.cs | 49 +- .../Trial/EnrollReadingCategory.cs | 34 +- IRaCIS.Core.Domain/Trial/Trial.cs | 9 +- IRaCIS.Core.Domain/Trial/TrialBodyPart.cs | 46 +- IRaCIS.Core.Domain/Trial/TrialDictionary.cs | 35 +- IRaCIS.Core.Domain/Trial/TrialSign.cs | 44 +- IRaCIS.Core.Domain/Trial/TrialStateChange.cs | 36 +- IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs | 38 +- .../TrialSiteUser/TrialAudit.cs | 42 +- .../TrialSiteUser/TrialExternalUser.cs | 80 +- IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs | 70 +- .../TrialSiteUser/TrialSiteDicomAE.cs | 50 +- .../TrialSiteUser/TrialSiteUser.cs | 53 +- IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs | 41 +- .../TrialSiteUser/TrialUserPreparation .cs | 47 +- IRaCIS.Core.Domain/Visit/Subject.cs | 95 +-- .../Visit/SubjectCanceDoctor.cs | 40 +- IRaCIS.Core.Domain/Visit/SubjectVisit.cs | 420 +++++----- .../Visit/VisitPlanInfluenceStat.cs | 34 +- .../Visit/VisitPlanInfluenceStudy.cs | 52 +- IRaCIS.Core.Domain/Visit/VisitStage.cs | 49 +- IRaCIS.Core.Domain/_Config/_AppSettings.cs | 11 +- 187 files changed, 7126 insertions(+), 7323 deletions(-) create mode 100644 IRaCIS.Core.Domain/GlobalUsings.cs diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index 9f0256df0..5bf264ac6 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -293,6 +293,9 @@ namespace IRaCIS.Application.Services Console.WriteLine(AesEncryption.Encrypt(MD5Helper.Md5("123456"), key)); + + Console.WriteLine(); + Console.WriteLine(AesEncryption.Encrypt("cyldev", key)); Console.WriteLine($"原始文本: {plainText}"); diff --git a/IRaCIS.Core.Domain/Allocation/SubjectUser.cs b/IRaCIS.Core.Domain/Allocation/SubjectUser.cs index 9bb15dbad..e5d4e5b4a 100644 --- a/IRaCIS.Core.Domain/Allocation/SubjectUser.cs +++ b/IRaCIS.Core.Domain/Allocation/SubjectUser.cs @@ -3,60 +3,59 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-06-10 11:59:27 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Collections.Generic; using System.ComponentModel; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - - -[Comment("受试者 - 项目标准阅片医生配置表")] -[Table("SubjectUser")] -public class SubjectUser : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } + [Description("受试者某标准阅片用户中间关系表")] + [Table("SubjectUser")] + public class SubjectUser : BaseFullAuditEntity + { - [JsonIgnore] - //Parent - [ForeignKey("ReplacedSubjectUserId")] - public SubjectUser ReplacedSubjectUser { get; set; } + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } - //ChildList - [JsonIgnore] - public List EarlierSubjectUserList { get; set; } + [JsonIgnore] + //Parent + [ForeignKey("ReplacedSubjectUserId")] + public SubjectUser ReplacedSubjectUser { get; set; } + + //ChildList + [JsonIgnore] + public List EarlierSubjectUserList { get; set; } - [JsonIgnore] - public User DoctorUser { get; set; } + [JsonIgnore] + public User DoctorUser { get; set; } - [JsonIgnore] - public Subject Subject { get; set; } - #endregion + [JsonIgnore] + public Subject Subject { get; set; } + #endregion - public Arm ArmEnum { get; set; } + public Guid TrialId { get; set; } - public DateTime? AssignTime { get; set; } + public Guid TrialReadingCriterionId { get; set; } - public Guid DoctorUserId { get; set; } + public DateTime? AssignTime { get; set; } - public bool IsConfirmed { get; set; } - - [Comment("该属性有值 说明该医生被替换了 分配的时候 要过滤掉")] - public Guid? ReplacedSubjectUserId { get; set; } - - public Guid SubjectId { get; set; } - - public Guid TrialId { get; set; } - - public Guid TrialReadingCriterionId { get; set; } + public Guid SubjectId { get; set; } + public Guid DoctorUserId { get; set; } + + + public Arm ArmEnum { get; set; } + + public bool IsConfirmed { get; set; } = true; + + //该属性有值 说明该医生被替换了 分配的时候 要过滤掉 + public Guid? ReplacedSubjectUserId { get; set; } + + + + } } diff --git a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs index 381ab3e14..50a118116 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs @@ -1,53 +1,50 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-06-07 13:13:13 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -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; - -[Comment("项目阅片 - 分配规则")] -[Table("TaskAllocationRule")] -public class TaskAllocationRule : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///TaskAllocationRule + /// + [Table("TaskAllocationRule")] + public class TaskAllocationRule : BaseFullAuditEntity + { + #region 导航属性 - [ForeignKey("DoctorUserId")] - [JsonIgnore] - public User DoctorUser { get; set; } + [ForeignKey("DoctorUserId")] + [JsonIgnore] + public User DoctorUser { get; set; } - [JsonIgnore] - public Enroll Enroll { get; set; } + [JsonIgnore] + public Enroll Enroll { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - #endregion + [JsonIgnore] + public Trial Trial { get; set; } + #endregion - public Guid TrialId { get; set; } - public Guid DoctorUserId { get; set; } + public Guid TrialId { get; set; } - [Comment(" 入组表Id 可以去掉 TrialId DoctorUserId")] - public Guid EnrollId { get; set; } + public int PlanSubjectCount { get; set; } - public bool IsEnable { get; set; } - public bool IsJudgeDoctor { get; set; } + public bool IsEnable { get; set; } - public string Note { get; set; } = null!; + public string Note { get; set; } = string.Empty; - [Comment(" 计划比率")] - public int PlanReadingRatio { get; set; } + public Guid DoctorUserId { get; set; } - public int PlanSubjectCount { get; set; } + public Guid EnrollId { get; set; } + + //是否是裁判医生 裁判医生单独加入 + public bool IsJudgeDoctor { get; set; } + + public int PlanReadingRatio { get; set; } + } + } diff --git a/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs b/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs index b71cdd785..c3b738d4c 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs @@ -1,59 +1,54 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-07-01 15:32:56 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using System.ComponentModel.DataAnnotations.Schema; -using System.Collections.Generic; -using System.Linq; -using Microsoft.EntityFrameworkCore; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目阅片 - 一致性分析生成任务配置")] -[Table("TaskConsistentRule")] -public class TaskConsistentRule : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///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 Guid TrialId { get; set; } - public int PlanSubjectCount { get; set; } + public int PlanSubjectCount { get; set; } - public int PlanVisitCount { get; set; } + public int PlanVisitCount { get; set; } - public int IntervalWeeks { get; set; } + public int IntervalWeeks { get; set; } - public bool IsHaveReadingPeriod { get; set; } + public bool IsHaveReadingPeriod { get; set; } - public bool IsGenerateGlobalTask { get; set; } + public bool IsGenerateGlobalTask { get; set; } - public int BlindSubjectNumberOfPlaces { get; set; } + public int BlindSubjectNumberOfPlaces { get; set; } - public string BlindTrialSiteCode { get; set; } = string.Empty; + public string BlindTrialSiteCode { get; set; } = string.Empty; - public bool IsSelfAnalysis { get; set; } + public bool IsSelfAnalysis { get; set; } - public bool IsEnable { get; set; } + public bool IsEnable { get; set; } - public string Note { get; set; } = string.Empty; + 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 b0af57dd4..8b6b67da0 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs @@ -1,50 +1,48 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-07-21 13:44:02 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目阅片 - 退回重阅影响")] -[Table("TaskInfluence")] -public class TaskInfluence : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///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; } - [Comment(" 对影响任务进行的操作")] - public ReReadingOrBackOptType OptType { get; set; } + //对影响任务进行的操作 + 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 310c6be98..1f3a46bb9 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs @@ -3,190 +3,190 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-06-29 10:56:50 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Collections.Generic; using System.Linq; -using Newtonsoft.Json; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -public class OSSImageInfo +namespace IRaCIS.Core.Domain.Models { - public string FileName { get; set; } = string.Empty; - - public string ImagePath { get; set; } = string.Empty; -} -[Comment("项目阅片 - 医学审核")] -[Table("TaskMedicalReview")] -public class TaskMedicalReview : BaseFullAuditEntity -{ - #region 导航属性 - - [JsonIgnore] - public User LatestReplyUser { get; set; } - - [JsonIgnore] - public User MedicalManagerUser { get; set; } - - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } - - [JsonIgnore] - public List ReadingMedicalReviewDialogList { get; set; } - - [JsonIgnore] - public Trial Trial { get; set; } - - - - - /// - /// 文件 - /// - [NotMapped] - public List FileList + public class OSSImageInfo { - get + public string FileName { get; set; } = string.Empty; + + public string ImagePath { get; set; } = string.Empty; + } + /// + ///TaskMedicalReview + /// + [Table("TaskMedicalReview")] + public class TaskMedicalReview : BaseFullAuditEntity + { + #region 导航属性 + + [JsonIgnore] + public User LatestReplyUser { get; set; } + + [JsonIgnore] + public User MedicalManagerUser { get; set; } + + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } + + [JsonIgnore] + public List ReadingMedicalReviewDialogList { get; set; } + + [JsonIgnore] + public Trial Trial { get; set; } + + + + + /// + /// 文件 + /// + [NotMapped] + public List FileList { - - - try - { - var result = JsonConvert.DeserializeObject>(this.ImagePath); - return result == null ? new List() : result; - } - catch (Exception) + get { - return new List(); - } + try + { + var result = JsonConvert.DeserializeObject>(this.ImagePath); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } } + + [NotMapped] + public List PDRelationTaskIdList => PDRelationTaskIdListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Select(t => Guid.Parse(t)).ToList(); + + #endregion + + public Guid? LatestReplyUserId { get; set; } + + + /// + /// 分配时间 + /// + public DateTime? AllocateTime { get; set; } + + /// + /// 审核状态 + /// + [Required] + public MedicalReviewAuditState AuditState { get; set; } + + /// + /// 审核通过时间 + /// + public DateTime? AuditSignTime { get; set; } + + /// + /// 阅片人是否认同 + /// + public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; } + + public Guid? MedicalManagerUserId { get; set; } + + + + public Guid VisitTaskId { get; set; } + + + public Guid TrialId { get; set; } + + /// + /// 是否有问题 + /// + public bool IsHaveQuestion { get; set; } = false; + + /// + /// 质询问题 + /// + public string Questioning { get; set; } = string.Empty; + + + /// + /// 图片路径 + /// + public string ImagePath { get; set; } = string.Empty; + + /// + /// 审核建议 + /// + public AuditAdvice AuditAdviceEnum { get; set; } + + /// + /// 是否关闭对话 + /// + public bool IsClosedDialog { get; set; } + + /// + /// 保存问题的时间 + /// + public DateTime? SaveQuestionTime { get; set; } + + + /// + /// 不同意重阅原因 + /// + public string DisagreeReason { get; set; } = string.Empty; + + + /// + /// 是否申请重阅 + /// + public bool IsApplyHeavyReading { get; set; } = false; + + + /// + /// 保存结论时间 + /// + public DateTime? SaveConclusionTime { get; set; } + + + /// + /// 文件名称 + /// + public string FileName { get; set; } = string.Empty; + + /// + /// 是否发送消息 + /// + public bool IsSendMessage { get; set; } = false; + + + /// + /// 医学审核对话关闭原因 + /// + public MedicalDialogClose MedicalDialogCloseEnum { get; set; } + + /// + /// 对话关闭原因 + /// + public string DialogCloseReason { get; set; } = string.Empty; + + /// + /// 无效的 为True无效 + /// + public bool IsInvalid { get; set; } + + public bool IsAutoGenerate { get; set; } + + // | 分割 + public string PDRelationTaskIdListStr { get; set; } = string.Empty; + + } - [NotMapped] - public List PDRelationTaskIdList => PDRelationTaskIdListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Select(t => Guid.Parse(t)).ToList(); - - #endregion - - public Guid? LatestReplyUserId { get; set; } - - - /// - /// 分配时间 - /// - public DateTime? AllocateTime { get; set; } - - /// - /// 审核状态 - /// - [Required] - public MedicalReviewAuditState AuditState { get; set; } - - /// - /// 审核通过时间 - /// - public DateTime? AuditSignTime { get; set; } - - /// - /// 阅片人是否认同 - /// - public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; } - - public Guid? MedicalManagerUserId { get; set; } - - - - public Guid VisitTaskId { get; set; } - - - public Guid TrialId { get; set; } - - /// - /// 是否有问题 - /// - public bool IsHaveQuestion { get; set; } = false; - - /// - /// 质询问题 - /// - public string Questioning { get; set; } = string.Empty; - - - /// - /// 图片路径 - /// - public string ImagePath { get; set; } = string.Empty; - - /// - /// 审核建议 - /// - public AuditAdvice AuditAdviceEnum { get; set; } - - /// - /// 是否关闭对话 - /// - public bool IsClosedDialog { get; set; } - - /// - /// 保存问题的时间 - /// - public DateTime? SaveQuestionTime { get; set; } - - - /// - /// 不同意重阅原因 - /// - public string DisagreeReason { get; set; } = string.Empty; - - - /// - /// 是否申请重阅 - /// - public bool IsApplyHeavyReading { get; set; } = false; - - - /// - /// 保存结论时间 - /// - public DateTime? SaveConclusionTime { get; set; } - - - /// - /// 文件名称 - /// - public string FileName { get; set; } = string.Empty; - - /// - /// 是否发送消息 - /// - public bool IsSendMessage { get; set; } = false; - - - /// - /// 医学审核对话关闭原因 - /// - public MedicalDialogClose MedicalDialogCloseEnum { get; set; } - - /// - /// 对话关闭原因 - /// - public string DialogCloseReason { get; set; } = string.Empty; - - /// - /// 无效的 为True无效 - /// - public bool IsInvalid { get; set; } - - public bool IsAutoGenerate { get; set; } - - // | 分割 - public string PDRelationTaskIdListStr { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs index 42fe2ea48..90912361c 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs @@ -1,49 +1,43 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-06-29 13:32:34 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -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; - -[Comment("项目阅片 - 一致性分析规则")] -[Table("TaskMedicalReviewRule")] -public class TaskMedicalReviewRule : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///TaskTaskMedicalReviewRule + /// + [Table("TaskMedicalReviewRule")] + public class TaskMedicalReviewRule : BaseFullAuditEntity + { - #region 导航属性 - [JsonIgnore] - public User DoctorUser { get; set; } - #endregion + #region 导航属性 - public Guid DoctorUserId { get; set; } + #endregion - public bool IsEnable { get; set; } + public Guid DoctorUserId { get; set; } - public string Note { get; set; } = string.Empty; + public bool IsEnable { get; set; } - public Guid TrialId { get; set; } + public string Note { get; set; } = string.Empty; - public int PlanVisitCount { get; set; } + public Guid TrialId { get; set; } - public int PlanJudgeCount { get; set; } + public int PlanVisitCount { get; set; } - public int PlanGlobalCount { get; set; } - - public int PlanTumorCount { get; set; } + public int PlanJudgeCount { get; set; } + public int PlanGlobalCount { get; set; } + + 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 7eb287b20..912dba361 100644 --- a/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs +++ b/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs @@ -1,29 +1,28 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2024-02-29 15:48:36 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目 - 虚拟中心编号更新记录")] -[Table("TrialVirtualSiteCodeUpdate")] -public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///TrialVirtualSiteCodeUpdate + /// + [Table("TrialVirtualSiteCodeUpdate")] + public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity + { - #region 导航属性 + #region 导航属性 - #endregion + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - [StringLength(250)] - public string VirturalSiteCode { get; set; } = string.Empty; + public string VirturalSiteCode { get; set; } = string.Empty; + + + + } } diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index c48fdd4a7..6f1af76aa 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -3,435 +3,432 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-06-07 14:09:29 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Collections.Generic; -using System.Linq; using EntityFrameworkCore.Projectables; +using IRaCIS.Core.Domain.Share; +using System.Linq; -namespace IRaCIS.Core.Domain.Models; - -/// -///VisitTask -/// -[Table("VisitTask")] -public class VisitTask : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public List TaskStudyList { get; set; } - - public List TaskNoneDicomStudyFileList { get; set; } - - [JsonIgnore] - [ForeignKey("TrialReadingCriterionId")] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - - - - [ForeignKey("DoctorUserId")] - public User DoctorUser { get; set; } - - [ForeignKey("SouceReadModuleId")] - public ReadModule ReadModule { get; set; } - - [ForeignKey("SourceSubjectVisitId")] - public SubjectVisit SourceSubjectVisit { get; set; } - [JsonIgnore] - [ForeignKey("JudgeVisitTaskId")] - public VisitTask JudgeVisitTask { get; set; } - - - - [JsonIgnore] - public Subject Subject { get; set; } - - - [JsonIgnore] - public List TaskMedicalReviewList { get; set; } - - [ForeignKey("JudgeResultTaskId")] - public VisitTask JudgeResultTask { get; set; } - - - - //影像质量 等等第一层级问题答案 - [JsonIgnore] - public List ReadingTaskQuestionAnswerList { get; set; } = new List(); - - - //病灶表 - [JsonIgnore] - public List LesionList { get; set; } = new List(); - - //病灶答案表 - [JsonIgnore] - public List LesionAnswerList { get; set; } = new List(); - - - - //重阅或者退回影像的记录中间表 - [JsonIgnore] - public List TaskInfluenceList { get; set; } = new List(); - - - [JsonIgnore] - //对于全局任务而言 才可以用的 关联的访视阅片结果 - public List GlobalVisitResultList { get; set; } = new List(); - - - /// - /// 裁判结果图片地址 - /// - [NotMapped] - public List JudgeResultImagePathList + /// + ///VisitTask + /// + [Table("VisitTask")] + public class VisitTask : BaseFullAuditEntity { - get + #region 导航属性 + [JsonIgnore] + public List TaskStudyList { get; set; } + + public List TaskNoneDicomStudyFileList { get; set; } + + [JsonIgnore] + [ForeignKey("TrialReadingCriterionId")] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + + + + [ForeignKey("DoctorUserId")] + public User DoctorUser { get; set; } + + [ForeignKey("SouceReadModuleId")] + public ReadModule ReadModule { get; set; } + + [ForeignKey("SourceSubjectVisitId")] + public SubjectVisit SourceSubjectVisit { get; set; } + [JsonIgnore] + [ForeignKey("JudgeVisitTaskId")] + public VisitTask JudgeVisitTask { get; set; } + + + + [JsonIgnore] + public Subject Subject { get; set; } + + + [JsonIgnore] + public List TaskMedicalReviewList { get; set; } + + [ForeignKey("JudgeResultTaskId")] + public VisitTask JudgeResultTask { get; set; } + + + + //影像质量 等等第一层级问题答案 + [JsonIgnore] + public List ReadingTaskQuestionAnswerList { get; set; } = new List(); + + + //病灶表 + [JsonIgnore] + public List LesionList { get; set; } = new List(); + + //病灶答案表 + [JsonIgnore] + public List LesionAnswerList { get; set; } = new List(); + + + + //重阅或者退回影像的记录中间表 + [JsonIgnore] + public List TaskInfluenceList { get; set; } = new List(); + + + [JsonIgnore] + //对于全局任务而言 才可以用的 关联的访视阅片结果 + public List GlobalVisitResultList { get; set; } = new List(); + + + /// + /// 裁判结果图片地址 + /// + [NotMapped] + public List JudgeResultImagePathList { - - try - { - return this.JudgeResultImagePath.Trim().Split(',').ToList(); - } - catch (Exception) + get { - return new List(); - } + try + { + return this.JudgeResultImagePath.Trim().Split(',').ToList(); + } + catch (Exception) + { + return new List(); + } + + } } - } - [JsonIgnore] + [JsonIgnore] - public Trial Trial { get; set; } + public Trial Trial { get; set; } - [JsonIgnore] - public List UserFeedBackList { get; set; } + [JsonIgnore] + public List UserFeedBackList { get; set; } - /// - /// 关联的访视任务ID (当前任务是访视任务的话会有自己)集合 - /// - [NotMapped] - public List RelatedVisitTaskIdList - { - get + /// + /// 关联的访视任务ID (当前任务是访视任务的话会有自己)集合 + /// + [NotMapped] + public List RelatedVisitTaskIdList { - - try + get { - return JsonConvert.DeserializeObject>(this.RelatedVisitTaskIds); - } - catch (Exception) - { + try + { - return new List(); - } + return JsonConvert.DeserializeObject>(this.RelatedVisitTaskIds); + } + catch (Exception) + { + return new List(); + } + + } } - } - /// - /// 报告任务关系 包含冻结 - /// - [NotMapped] - public List ReportRelatedTaskIdList - { - get + /// + /// 报告任务关系 包含冻结 + /// + [NotMapped] + public List ReportRelatedTaskIdList { - - try + get { - return JsonConvert.DeserializeObject>(this.ReportRelatedTaskIds); - } - catch (Exception) - { + try + { - return new List(); - } + return JsonConvert.DeserializeObject>(this.ReportRelatedTaskIds); + } + catch (Exception) + { + return new List(); + } + + } } - } - /// - /// 既往任务Id 不包括自己集合 - /// - [NotMapped] - public List PastResultTaskIdList - { - get + /// + /// 既往任务Id 不包括自己集合 + /// + [NotMapped] + public List PastResultTaskIdList { - - try - { - return JsonConvert.DeserializeObject>(this.PastResultTaskIds); - } - catch (Exception) + get { - return new List(); - } + try + { + return JsonConvert.DeserializeObject>(this.PastResultTaskIds); + } + catch (Exception) + { + return new List(); + } + + } } + + + #endregion + + + public string TaskName { get; set; } = string.Empty; + public string TaskBlindName { get; set; } = string.Empty; + + //任务来源访视Id 方便回更访视读片状态 + public Guid? SourceSubjectVisitId { get; set; } + public Guid? SouceReadModuleId { get; set; } + + /// 任务类型 + public ReadingCategory ReadingCategory { get; set; } + + public Guid TrialId { get; set; } + + + /// + /// 分配时间 + /// + public DateTime? AllocateTime { get; set; } + + public Guid SubjectId { get; set; } + + + public int Code { get; set; } + + public string TaskCode { get; set; } = string.Empty; + + public bool IsUrgent { get; set; } + + /// + /// 加急类型 + /// + public TaskUrgentType? TaskUrgentType { get; set; } + + /// + /// 任务加急类型 + /// + public string TaskUrgentRemake { get; set; } = string.Empty; + + /// + /// 是否和编辑加急状态 + /// + public bool IsCanEditUrgentState { get; set; } = true; + + /// + /// 0 代表 单重阅片 产生的任务 否则就是双重 任务 1 任务 2 + /// + [Required] + public Arm ArmEnum { get; set; } + + /// + /// 分配状态 + /// + public TaskAllocationState TaskAllocationState { get; set; } + + + public TaskState TaskState { get; set; } + + + /// + /// 重阅状态 + /// + public ReReadingApplyState ReReadingApplyState { get; set; } + + public Guid? DoctorUserId { get; set; } + + + public Guid TrialReadingCriterionId { get; set; } + + + + + //裁判任务的Id + public Guid? JudgeVisitTaskId { get; set; } + + //任务阅片状态 + public ReadingTaskState ReadingTaskState { get; set; } + + //签名时间 + public DateTime? SignTime { get; set; } + + public DateTime? SuggesteFinishedTime { get; set; } + + + /// + /// 是否是重阅产生的，方便过滤数据 + /// + public bool IsReReadingCreate { get; set; } + + /// + /// PM 对该任务进行了回退 影响的任务不设置 + /// + public bool IsPMSetBack { get; set; } + + + /// 裁判结果的任务ID + public Guid? JudgeResultTaskId { get; set; } + + + + //随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定 + public decimal VisitTaskNum { get; set; } + + + + /// + /// 首次阅片时间 + /// + public DateTime? FirstReadingTime { get; set; } + + /// + /// 全局是否有更新 + /// + public bool? IsGlobalHaveUpdate { get; set; } + + /// + /// IR是否阅读临床数据 + /// + public bool IsReadClinicalData { get; set; } = false; + + /// + /// 关联的访视任务ID (当前任务是访视任务的话会有自己) + /// + public string RelatedVisitTaskIds { get; set; } = "[]"; + + /// + /// 报告任务关系 包含冻结 + /// + public string ReportRelatedTaskIds { get; set; } = "[]"; + + /// + /// 既往任务Id 不包括自己 + /// + + public string PastResultTaskIds { get; set; } = "[]"; + + + + #region 裁判任务特有 + + [JsonIgnore] + //对于裁判任务而言，触发裁判的列表 + public List JudgeVisitList { get; set; } + + /// + /// 裁判结果的备注 + /// + public string JudgeResultRemark { get; set; } = string.Empty; + /// + /// 裁判结果的图片路径 + /// + public string JudgeResultImagePath { get; set; } = string.Empty; + + #endregion + + + #region 一致性分析的任务特有数据 + + /// + /// 阅片结果是否和原数据有差异 + /// + public bool? IsAnalysisDiffToOriginalData { get; set; } + + /// + /// 组件一致性和原Arm1是否有差异 + /// + public bool? IsGroupDiffArm1 { get; set; } + + /// + /// 组件一致性和原Arm2是否有差异 + /// + public bool? IsGroupDiffArm2 { get; set; } + + /// + /// 是否是一致性分析产生 + /// + public bool IsAnalysisCreate { get; set; } + + + + /// + /// 转换之前的任务Id(转化的任务才有该值) + /// + public Guid? BeforeConvertedTaskId { get; set; } + + + [Projectable] + [JsonIgnore] + public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask || Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId + && t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null + && t.TaskState == TaskState.Effect + && t.VisitTaskNum < VisitTaskNum + && t.IsSelfAnalysis == IsSelfAnalysis + && t.ArmEnum == ArmEnum + ).Any(); + + + /// + /// 是否修改了整体肿瘤评估 + /// + public bool IsChangeTumorEvaluate { get; set; } = false; + + + /// + /// 重阅重置任务的 标注是转化之前的 还是转化之后的 + /// + public bool IsHistoryConvertedTask { get; set; } = false; + + /// + /// 是否是自身一致性 + /// + public bool? IsSelfAnalysis { get; set; } + + public string BlindSubjectCode { get; set; } = string.Empty; + public string BlindTrialSiteCode { get; set; } = string.Empty; + + //一致性分析规则Id 用于最后统计 + //public Guid? TaskConsistentRuleId { get; set; } + + /// + /// 针对产生的一致性任务而言，这个字段存储的是原始任务 + /// + public Guid? ConsistentAnalysisOriginalTaskId { get; set; } + + #endregion + + + //临床数据 + + public bool IsNeedClinicalDataSign { get; set; } + + /// + /// 临床数据是否签名 + /// + public bool IsClinicalDataSign { get; set; } + + /// + /// 前序任务需要签名 但是未签名 + /// + public bool IsFrontTaskNeedSignButNotSign { get; set; } + + + public int ImageStudyState { get; set; } + + } - - - #endregion - - - public string TaskName { get; set; } = string.Empty; - public string TaskBlindName { get; set; } = string.Empty; - - //任务来源访视Id 方便回更访视读片状态 - public Guid? SourceSubjectVisitId { get; set; } - public Guid? SouceReadModuleId { get; set; } - - /// 任务类型 - public ReadingCategory ReadingCategory { get; set; } - - public Guid TrialId { get; set; } - - - /// - /// 分配时间 - /// - public DateTime? AllocateTime { get; set; } - - public Guid SubjectId { get; set; } - - - public int Code { get; set; } - - public string TaskCode { get; set; } = string.Empty; - - public bool IsUrgent { get; set; } - - /// - /// 加急类型 - /// - public TaskUrgentType? TaskUrgentType { get; set; } - - /// - /// 任务加急类型 - /// - public string TaskUrgentRemake { get; set; } = string.Empty; - - /// - /// 是否和编辑加急状态 - /// - public bool IsCanEditUrgentState { get; set; } = true; - - /// - /// 0 代表 单重阅片 产生的任务 否则就是双重 任务 1 任务 2 - /// - [Required] - public Arm ArmEnum { get; set; } - - /// - /// 分配状态 - /// - public TaskAllocationState TaskAllocationState { get; set; } - - - public TaskState TaskState { get; set; } - - - /// - /// 重阅状态 - /// - public ReReadingApplyState ReReadingApplyState { get; set; } - - public Guid? DoctorUserId { get; set; } - - - public Guid TrialReadingCriterionId { get; set; } - - - - - //裁判任务的Id - public Guid? JudgeVisitTaskId { get; set; } - - //任务阅片状态 - public ReadingTaskState ReadingTaskState { get; set; } - - //签名时间 - public DateTime? SignTime { get; set; } - - public DateTime? SuggesteFinishedTime { get; set; } - - - /// - /// 是否是重阅产生的，方便过滤数据 - /// - public bool IsReReadingCreate { get; set; } - - /// - /// PM 对该任务进行了回退 影响的任务不设置 - /// - public bool IsPMSetBack { get; set; } - - - /// 裁判结果的任务ID - public Guid? JudgeResultTaskId { get; set; } - - - - //随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定 - public decimal VisitTaskNum { get; set; } - - - - /// - /// 首次阅片时间 - /// - public DateTime? FirstReadingTime { get; set; } - - /// - /// 全局是否有更新 - /// - public bool? IsGlobalHaveUpdate { get; set; } - - /// - /// IR是否阅读临床数据 - /// - public bool IsReadClinicalData { get; set; } = false; - - /// - /// 关联的访视任务ID (当前任务是访视任务的话会有自己) - /// - public string RelatedVisitTaskIds { get; set; } = "[]"; - - /// - /// 报告任务关系 包含冻结 - /// - public string ReportRelatedTaskIds { get; set; } = "[]"; - - /// - /// 既往任务Id 不包括自己 - /// - - public string PastResultTaskIds { get; set; } = "[]"; - - - - #region 裁判任务特有 - - [JsonIgnore] - //对于裁判任务而言，触发裁判的列表 - public List JudgeVisitList { get; set; } - - /// - /// 裁判结果的备注 - /// - public string JudgeResultRemark { get; set; } = string.Empty; - /// - /// 裁判结果的图片路径 - /// - public string JudgeResultImagePath { get; set; } = string.Empty; - - #endregion - - - #region 一致性分析的任务特有数据 - - /// - /// 阅片结果是否和原数据有差异 - /// - public bool? IsAnalysisDiffToOriginalData { get; set; } - - /// - /// 组件一致性和原Arm1是否有差异 - /// - public bool? IsGroupDiffArm1 { get; set; } - - /// - /// 组件一致性和原Arm2是否有差异 - /// - public bool? IsGroupDiffArm2 { get; set; } - - /// - /// 是否是一致性分析产生 - /// - public bool IsAnalysisCreate { get; set; } - - - - /// - /// 转换之前的任务Id(转化的任务才有该值) - /// - public Guid? BeforeConvertedTaskId { get; set; } - - - [Projectable] - [JsonIgnore] - public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask || Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId - && t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null - && t.TaskState == TaskState.Effect - && t.VisitTaskNum < VisitTaskNum - && t.IsSelfAnalysis == IsSelfAnalysis - && t.ArmEnum == ArmEnum - ).Any(); - - - /// - /// 是否修改了整体肿瘤评估 - /// - public bool IsChangeTumorEvaluate { get; set; } = false; - - - /// - /// 重阅重置任务的 标注是转化之前的 还是转化之后的 - /// - public bool IsHistoryConvertedTask { get; set; } = false; - - /// - /// 是否是自身一致性 - /// - public bool? IsSelfAnalysis { get; set; } - - public string BlindSubjectCode { get; set; } = string.Empty; - public string BlindTrialSiteCode { get; set; } = string.Empty; - - //一致性分析规则Id 用于最后统计 - //public Guid? TaskConsistentRuleId { get; set; } - - /// - /// 针对产生的一致性任务而言，这个字段存储的是原始任务 - /// - public Guid? ConsistentAnalysisOriginalTaskId { get; set; } - - #endregion - - - //临床数据 - - public bool IsNeedClinicalDataSign { get; set; } - - /// - /// 临床数据是否签名 - /// - public bool IsClinicalDataSign { get; set; } - - /// - /// 前序任务需要签名 但是未签名 - /// - public bool IsFrontTaskNeedSignButNotSign { get; set; } - - - public int ImageStudyState { get; set; } - - } diff --git a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs index 28d6ed470..84a3d395e 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs @@ -3,72 +3,73 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-06-07 14:09:29 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; 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; - -[Comment("项目阅片 - 阅片任务重阅表")] -[Table("VisitTaskReReading")] -public class VisitTaskReReading : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///重阅申请流程记录表 + /// + [Table("VisitTaskReReading")] + public class VisitTaskReReading : BaseFullAuditEntity + { + #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; } - [Comment(" 重阅原始任务Id")] - public Guid OriginalReReadingTaskId { get; set; } + public Guid TrialId { get; set; } - [Comment(" 重阅确认人")] - public Guid? RequestReReadingConfirmUserId { get; set; } + //重阅原始任务Id 重阅会产生新的任务 + public Guid OriginalReReadingTaskId { get; set; } - [Comment(" 请求重阅人")] - public Guid RequestReReadingUserId { get; set; } + //产生重阅的根任务Id + public Guid RootReReadingTaskId { get; set; } - public Guid RootReReadingTaskId { get; set; } - [Comment("仅仅包括全局和访视")] - public bool IsCopyFollowForms { get; set; } + //重阅申请 产生的新任务Id + public Guid? NewReReadingTaskId { get; set; } - [Comment(" 是否复制之前任务表单数据")] - public bool IsCopyOrigenalForms { get; set; } + public Guid RequestReReadingUserId { 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; } + + 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; } + } } diff --git a/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs b/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs index 17389f20b..739c873e9 100644 --- a/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs +++ b/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs @@ -1,23 +1,18 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace IRaCIS.Core.Domain.BaseModel; - -/// -/// 领域实体事件基类 -/// -public abstract class DomainEvent +namespace IRaCIS.Core.Domain.BaseModel { + /// + /// 领域实体事件基类 + /// + public abstract class DomainEvent + { -} + } -public class FailedDomainEvent -{ - public Guid Id { get; set; } - public string EventType { get; set; } = string.Empty; - public string EventData { get; set; } = string.Empty; - public DateTime FailedAt { get; set; } + public class FailedDomainEvent + { + public Guid Id { get; set; } + public string EventType { get; set; } = string.Empty; + public string EventData { get; set; } = string.Empty; + public DateTime FailedAt { get; set; } + } } diff --git a/IRaCIS.Core.Domain/BaseModel/Entity.cs b/IRaCIS.Core.Domain/BaseModel/Entity.cs index 3ddc671b4..fa8e12ef7 100644 --- a/IRaCIS.Core.Domain/BaseModel/Entity.cs +++ b/IRaCIS.Core.Domain/BaseModel/Entity.cs @@ -1,126 +1,123 @@ using IRaCIS.Core.Domain.BaseModel; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Security.Cryptography; -namespace IRaCIS.Core.Domain.Models; - - - -public interface IAggregateRoot; -public interface IEntity +namespace IRaCIS.Core.Domain.Models { - abstract TKey Id { get; set; } - -} - -//针对dicom -public interface IEntitySeqId -{ - public Guid SeqId { get; set; } -} - -public abstract class Entity : IEntity -{ - [Key] - [Required] - [DatabaseGenerated(DatabaseGeneratedOption.None)] - public Guid Id { get; set; } - #region 领域事件 仅仅允许通过提供的方法进行操作 - [JsonIgnore] - private readonly List _domainEvents = []; - - [JsonIgnore] - [NotMapped] - public IReadOnlyCollection DomainEvents => _domainEvents.AsReadOnly(); - - - public void AddDomainEvent(DomainEvent domainEvent) + public interface IAggregateRoot; + public interface IEntity { - _domainEvents.Add(domainEvent); + abstract TKey Id { get; set; } + } - public void RemoveDomainEvent(DomainEvent domainEvent) + //针对dicom + public interface IEntitySeqId { - _domainEvents.Remove(domainEvent); + public Guid SeqId { get; set; } } - public void ClearDomainEvents() + public abstract class Entity : IEntity { - _domainEvents.Clear(); + [Key] + [Required] + [DatabaseGenerated(DatabaseGeneratedOption.None)] + public Guid Id { get; set; } + + + #region 领域事件 仅仅允许通过提供的方法进行操作 + [JsonIgnore] + private readonly List _domainEvents = []; + + [JsonIgnore] + [NotMapped] + public IReadOnlyCollection DomainEvents => _domainEvents.AsReadOnly(); + + + public void AddDomainEvent(DomainEvent domainEvent) + { + _domainEvents.Add(domainEvent); + } + + public void RemoveDomainEvent(DomainEvent domainEvent) + { + _domainEvents.Remove(domainEvent); + } + + public void ClearDomainEvents() + { + _domainEvents.Clear(); + } + #endregion + + } + + + + + #region 减少实体属性，增加基类 + + public abstract class BaseAddAuditEntity : Entity, IAuditAdd + { + + public Guid CreateUserId { get; set; } + public DateTime CreateTime { get; set; } + + [ForeignKey("CreateUserId")] + [JsonIgnore] + public virtual User CreateUser { get; set; } + } + + public abstract class BaseAddDeleteAuditEntity : Entity, IAuditAdd, ISoftDelete + { + + public Guid CreateUserId { get; set; } + public DateTime CreateTime { get; set; } + public Guid? DeleteUserId { get; set; } + public bool IsDeleted { get; set; } + public DateTime? DeletedTime { get; set; } + + [ForeignKey("CreateUserId")] + [JsonIgnore] + public User CreateUser { get; set; } + } + + public abstract class BaseFullAuditEntity : Entity, IAuditUpdate, IAuditAdd + { + public Guid CreateUserId { get; set; } + public DateTime CreateTime { get; set; } + public Guid UpdateUserId { get; set; } + public DateTime UpdateTime { get; set; } + + [ForeignKey("CreateUserId")] + [JsonIgnore] + public User CreateUser { get; set; } + } + + + public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete + { + public Guid? DeleteUserId { get; set; } + public bool IsDeleted { get; set; } + public DateTime? DeletedTime { get; set; } + public Guid CreateUserId { get; set; } + public DateTime CreateTime { get; set; } + public Guid UpdateUserId { get; set; } + public DateTime UpdateTime { get; set; } + + [ForeignKey("CreateUserId")] + [JsonIgnore] + public User CreateUser { get; set; } + } + + public abstract class BaseAuditUpdateEntity : Entity, IAuditUpdate + { + public Guid UpdateUserId { get; set; } + public DateTime UpdateTime { get; set; } + } + + #endregion - } - - - - -#region 减少实体属性，增加基类 - -public abstract class BaseAddAuditEntity : Entity, IAuditAdd -{ - - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } - - [ForeignKey("CreateUserId")] - [JsonIgnore] - public virtual User CreateUser { get; set; } -} - -public abstract class BaseAddDeleteAuditEntity : Entity, IAuditAdd, ISoftDelete -{ - - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } - public Guid? DeleteUserId { get; set; } - public bool IsDeleted { get; set; } - public DateTime? DeletedTime { get; set; } - - [ForeignKey("CreateUserId")] - [JsonIgnore] - public User CreateUser { get; set; } -} - -public abstract class BaseFullAuditEntity : Entity, IAuditUpdate, IAuditAdd -{ - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } - public Guid UpdateUserId { get; set; } - public DateTime UpdateTime { get; set; } - - [ForeignKey("CreateUserId")] - [JsonIgnore] - public User CreateUser { get; set; } -} - - -public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete -{ - public Guid? DeleteUserId { get; set; } - public bool IsDeleted { get; set; } - public DateTime? DeletedTime { get; set; } - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } - public Guid UpdateUserId { get; set; } - public DateTime UpdateTime { get; set; } - - [ForeignKey("CreateUserId")] - [JsonIgnore] - public User CreateUser { get; set; } -} - -public abstract class BaseAuditUpdateEntity : Entity, IAuditUpdate -{ - public Guid UpdateUserId { get; set; } - public DateTime UpdateTime { get; set; } -} - - -#endregion diff --git a/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs b/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs index dcdb3c469..f1473131c 100644 --- a/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs +++ b/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs @@ -1,23 +1,25 @@ -using System; - -namespace IRaCIS.Core.Domain.Models; - -public interface IAuditAdd where TKey : struct +namespace IRaCIS.Core.Domain.Models { - public TKey CreateUserId { get; set; } + public interface IAuditAdd where TKey : struct + { + public TKey CreateUserId { get; set; } + + public DateTime CreateTime { get; set; } + + } + + + + public interface IAuditAdd : IAuditAdd + { + + } + + public interface IAuditAddWithUserName : IAuditAdd + { + public string CreateUser { get; set; } + } + - public DateTime CreateTime { get; set; } } - - - -public interface IAuditAdd : IAuditAdd -{ - -} - -public interface IAuditAddWithUserName : IAuditAdd -{ - public string CreateUser { get; set; } -} diff --git a/IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs b/IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs index b77992d26..744b141b4 100644 --- a/IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs +++ b/IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs @@ -1,14 +1,18 @@ -using System; - -namespace IRaCIS.Core.Domain.Models; - -public interface IAuditUpdate where TKey : struct +namespace IRaCIS.Core.Domain.Models { - public TKey UpdateUserId { get; set; } - public DateTime UpdateTime { get; set; } -} + public interface IAuditUpdate where TKey : struct + { + public TKey UpdateUserId { get; set; } + public DateTime UpdateTime { get; set; } + } + + public interface IAuditUpdate : IAuditUpdate + { + + } + + + -public interface IAuditUpdate : IAuditUpdate -{ } diff --git a/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs b/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs index 00121d5a4..d7e743a71 100644 --- a/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs +++ b/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs @@ -1,16 +1,17 @@ -using System; - -namespace IRaCIS.Core.Domain.Models; - -public interface ISoftDelete where TKey : struct +namespace IRaCIS.Core.Domain.Models { - public TKey? DeleteUserId { get; set; } - public bool IsDeleted { get; set; } + public interface ISoftDelete where TKey : struct + { + public TKey? DeleteUserId { get; set; } + public bool IsDeleted { get; set; } - public DateTime? DeletedTime { get; set; } -} + public DateTime? DeletedTime { get; set; } + } + + public interface ISoftDelete : ISoftDelete + { + + } -public interface ISoftDelete : ISoftDelete -{ } diff --git a/IRaCIS.Core.Domain/Common/CommonDocument.cs b/IRaCIS.Core.Domain/Common/CommonDocument.cs index 6e7aad650..e835913bf 100644 --- a/IRaCIS.Core.Domain/Common/CommonDocument.cs +++ b/IRaCIS.Core.Domain/Common/CommonDocument.cs @@ -3,17 +3,13 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-03-31 13:18:42 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models; [Comment("数据上传 | 数据导出 | 邮件附件 文件记录表 （需要同步）")] [Table("CommonDocument")] -public class CommonDocument : BaseFullDeleteAuditEntity +public class CommonDocument : BaseFullDeleteAuditEntity { [Comment(" 业务场景")] public EmailBusinessScenario BusinessScenarioEnum { get; set; } diff --git a/IRaCIS.Core.Domain/Common/Dictionary.cs b/IRaCIS.Core.Domain/Common/Dictionary.cs index e8483c8fc..352751a64 100644 --- a/IRaCIS.Core.Domain/Common/Dictionary.cs +++ b/IRaCIS.Core.Domain/Common/Dictionary.cs @@ -1,9 +1,5 @@ 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; diff --git a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs index 0e20aafb0..70826b9ba 100644 --- a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs +++ b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs @@ -4,12 +4,6 @@ // 生成时间 2022-02-15 11:55:43 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 using IRaCIS.Core.Domain.Share; -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; namespace IRaCIS.Core.Domain.Models; @@ -104,11 +98,11 @@ public class EmailNoticeUserType : Entity public enum SysEmailLevel { - not_sys=0, + not_sys = 0, //系统 不配置角色 - sys_not_role=1, + sys_not_role = 1, //系统需要配置角色的 - sys_Config_role=2 + sys_Config_role = 2 } diff --git a/IRaCIS.Core.Domain/Common/ExploreRecommend.cs b/IRaCIS.Core.Domain/Common/ExploreRecommend.cs index b2e8a86bb..07d884925 100644 --- a/IRaCIS.Core.Domain/Common/ExploreRecommend.cs +++ b/IRaCIS.Core.Domain/Common/ExploreRecommend.cs @@ -1,13 +1,7 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2024-07-02 09:26:43 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models; [Comment("后台 - 浏览器推荐 （需要同步）")] diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs index b25b93c38..91a8d08c8 100644 --- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs +++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs @@ -1,15 +1,7 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-03-28 16:43:12 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -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; [Comment("稽查 - 配置表 （需要同步）")] @@ -177,7 +169,7 @@ public class TableConfig public bool IsNeedTransalate { get; set; } - public string TranslateDictionaryName { get; set; } = String.Empty; + public string TranslateDictionaryName { get; set; } = String.Empty; public bool IsDynamicTranslate { get; set; } diff --git a/IRaCIS.Core.Domain/Common/Internationalization.cs b/IRaCIS.Core.Domain/Common/Internationalization.cs index 1aed3e697..5ee30f1e5 100644 --- a/IRaCIS.Core.Domain/Common/Internationalization.cs +++ b/IRaCIS.Core.Domain/Common/Internationalization.cs @@ -1,55 +1,48 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-06-01 13:37: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; - -[Comment("后台 - 国际化配置表 （需要同步）")] -[Table("Internationalization")] -public class Internationalization : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public PublishLog PublishLog { get; set; } + /// + ///Internationalization + /// + [Table("Internationalization")] + public class Internationalization : BaseFullAuditEntity + { + #region 导航属性 + [JsonIgnore] + public PublishLog PublishLog { get; set; } - #endregion + #endregion + public int ShowOrder { get; set; } - [StringLength(400)] - public string Code { get; set; } = null!; + /// + /// 0 1 2 预翻译 已确认 废除 + /// + public int State { get; set; } - [StringLength(400)] - public string Description { get; set; } = null!; - [Comment(" 前端类型")] - [StringLength(1000)] - public string FrontType { get; set; } = null!; + public string Description { get; set; } = string.Empty; - [Comment(" 前端还是后端")] - public int InternationalizationType { get; set; } + public string Code { get; set; } = string.Empty; - [Comment(" 模块")] - public string Module { get; set; } = null!; + public string Value { get; set; } = string.Empty; - [Comment(" 版本")] - public Guid? PublishLogId { get; set; } + public string ValueCN { get; set; } = string.Empty; - public int ShowOrder { get; set; } + public int InternationalizationType { get; set; } - //[Comment(" 0 1 2 预翻译 已确认 废除")] - public int State { get; set; } + public string FrontType { get; set; } = string.Empty; - [StringLength(2000)] - public string Value { get; set; } = null!; - [StringLength(2000)] - public string ValueCN { get; set; } = null!; + public string Module { get; set; } = string.Empty; + //关联版本历史记录表Id + public Guid? PublishLogId { get; set; } + + + + + } } - - diff --git a/IRaCIS.Core.Domain/Common/PublishLog.cs b/IRaCIS.Core.Domain/Common/PublishLog.cs index a015a15d6..d6fc015aa 100644 --- a/IRaCIS.Core.Domain/Common/PublishLog.cs +++ b/IRaCIS.Core.Domain/Common/PublishLog.cs @@ -1,33 +1,28 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-06-27 15:46:59 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("后台 - 系统发布日志 （需要同步）")] -[Table("PublishLog")] -public class PublishLog : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - public bool IsCurrentVersion { get; set; } - - public DateTime? PublishTime { get; set; } - - [Comment("0 开发中 1已发布")] - public int State { get; set; } + /// + ///PublishLog + /// + [Table("PublishLog")] + public class PublishLog : BaseFullAuditEntity + { - [MaxLength] - public string? UpdateContent { get; set; } + public string Version { get; set; } = string.Empty; - public string Version { get; set; } = null!; + public DateTime? PublishTime { get; set; } + public string UpdateContent { get; set; } = string.Empty; + + //0 开发中 ，已发布 + public int State { get; set; } + + public bool IsCurrentVersion { get; set; } + + } } - - diff --git a/IRaCIS.Core.Domain/Common/SystemBasicData.cs b/IRaCIS.Core.Domain/Common/SystemBasicData.cs index aeee2c777..22e2e4f8f 100644 --- a/IRaCIS.Core.Domain/Common/SystemBasicData.cs +++ b/IRaCIS.Core.Domain/Common/SystemBasicData.cs @@ -4,48 +4,43 @@ // 生成时间 2022-02-15 15:45:52 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 using IRaCIS.Core.Domain.Share; -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models; - -[Comment("系统 - 签名模板场景配置 (需要同步)")] -[Table("SystemBasicData")] -public class SystemBasicData : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///SystemBasicData + /// + [Table("SystemBasicData")] + public class SystemBasicData : BaseFullAuditEntity + { - #region 导航属性 - [JsonIgnore] - [ForeignKey("ParentId")] - public SystemBasicData Parent { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("ParentId")] + public SystemBasicData Parent { get; set; } - #endregion + #endregion - public BasicDataTypeEnum BasicDataTypeEnum { get; set; } + public string Name { get; set; } = string.Empty; - [StringLength(512)] - public string Code { get; set; } = null!; + public string Value { get; set; } = string.Empty; - [StringLength(512)] - public string Description { get; set; } = null!; + public string Description { get; set; } = string.Empty; - public bool IsEnable { get; set; } + public int ShowOrder { get; set; } - [StringLength(400)] - public string Name { get; set; } = null!; + public string Code { get; set; } = string.Empty; - public Guid? ParentId { get; set; } + public Guid? ParentId { get; set; } - public int ShowOrder { get; set; } - [StringLength(512)] - public string Value { get; set; } = null!; + public string ValueCN { get; set; } = string.Empty; - [StringLength(512)] - public string ValueCN { get; set; } = null!; + public bool IsEnable { get; set; } + public BasicDataTypeEnum BasicDataTypeEnum { get; set; } + + + } } diff --git a/IRaCIS.Core.Domain/Common/VerificationCode.cs b/IRaCIS.Core.Domain/Common/VerificationCode.cs index a12b5cef6..12f585ec2 100644 --- a/IRaCIS.Core.Domain/Common/VerificationCode.cs +++ b/IRaCIS.Core.Domain/Common/VerificationCode.cs @@ -1,26 +1,27 @@ using IRaCIS.Core.Domain.Share; -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models; - -[Comment("后台 - 验证码记录")] -[Table("VerificationCode")] -public class VerificationCode : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { + [Table("VerificationCode")] + public class VerificationCode : BaseAddAuditEntity + { - public Guid UserId { get; set; } = Guid.Empty; + public Guid UserId { get; set; } = Guid.Empty; - public string Code { get; set; } = string.Empty; + //验证码 + public string Code { get; set; } = string.Empty; - [Comment("邮箱|手机")] - public VerifyType CodeType { get; set; } + //什么类型的验证码 邮箱|手机 - public bool HasSend { get; set; } + public VerifyType CodeType { get; set; } - public string EmailOrPhone { get; set; } = string.Empty; + public bool HasSend { get; set; } - public DateTime ExpirationTime { get; set; } + //发送的邮箱或者手机 + public string EmailOrPhone { get; set; } = string.Empty; + //过期时间 + public DateTime ExpirationTime { get; set; } + + } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Dcotor/Attachment.cs b/IRaCIS.Core.Domain/Dcotor/Attachment.cs index 858043679..793719d2a 100644 --- a/IRaCIS.Core.Domain/Dcotor/Attachment.cs +++ b/IRaCIS.Core.Domain/Dcotor/Attachment.cs @@ -1,8 +1,3 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - namespace IRaCIS.Core.Domain.Models; //public enum AttachmentType @@ -17,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models; //} [Comment("医生 - 简历|证书 文档表")] [Table("Attachment")] -public class Attachment : BaseAddAuditEntity +public class Attachment : BaseAddAuditEntity { [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Dcotor/Doctor.cs b/IRaCIS.Core.Domain/Dcotor/Doctor.cs index d05e5b886..961bebc07 100644 --- a/IRaCIS.Core.Domain/Dcotor/Doctor.cs +++ b/IRaCIS.Core.Domain/Dcotor/Doctor.cs @@ -1,15 +1,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; [Comment("ҽ - Ϣ")] [Table("Doctor")] -public class Doctor : BaseFullAuditEntity +public class Doctor : BaseFullAuditEntity { #region diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs index 2b9f421ab..0d969eaa0 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs +++ b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs @@ -3,11 +3,7 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-01-09 14:34:17 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models; [Comment("医生 - 项目标准签名文档")] diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs b/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs index 48920c6f5..9d5dd89f3 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs +++ b/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs @@ -1,14 +1,9 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - namespace IRaCIS.Core.Domain.Models; [Comment("ҽ - ҽֵ")] [Table("DoctorDictionary")] -public class DoctorDictionary : Entity +public class DoctorDictionary : Entity { #region [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs b/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs index a5ed3cefd..d15ee31af 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs +++ b/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs @@ -1,13 +1,8 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - namespace IRaCIS.Core.Domain.Models; [Comment("ҽƷ - ¼")] [Table("DoctorWorkload")] -public partial class Workload :BaseFullAuditEntity +public partial class Workload : BaseFullAuditEntity { #region diff --git a/IRaCIS.Core.Domain/Dcotor/Education.cs b/IRaCIS.Core.Domain/Dcotor/Education.cs index 830176315..dd824a4c8 100644 --- a/IRaCIS.Core.Domain/Dcotor/Education.cs +++ b/IRaCIS.Core.Domain/Dcotor/Education.cs @@ -1,13 +1,8 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - namespace IRaCIS.Core.Domain.Models; [Comment("ҽ - Ϣ")] [Table("Education")] -public class Education : BaseFullAuditEntity +public class Education : BaseFullAuditEntity { #region diff --git a/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs b/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs index 958850e8b..70626b8d2 100644 --- a/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs +++ b/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs @@ -1,36 +1,32 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2024-02-29 15:51:46 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("医生 - 项目阅片标准参与一致性分析配置表")] -[Table("EnrollReadingCriterion")] -public class EnrollReadingCriterion : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///EnrollReadingCriterion + /// + [Table("EnrollReadingCriterion")] + public class EnrollReadingCriterion : BaseAddAuditEntity + { + #region 导航属性 - [JsonIgnore] - [ForeignKey("EnrollId")] - public Enroll Enroll { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("EnrollId")] + public Enroll Enroll { get; set; } + #endregion - public Guid EnrollId { get; set; } + public Guid EnrollId { get; set; } - public Guid TrialReadingCriterionId { get; set; } + public Guid TrialReadingCriterionId { get; set; } - public bool IsJoinAnalysis { get; set; } + public bool IsJoinAnalysis { get; set; } + } + + } - - - diff --git a/IRaCIS.Core.Domain/Dcotor/Postgraduate.cs b/IRaCIS.Core.Domain/Dcotor/Postgraduate.cs index df04d8e6f..a6c5629d9 100644 --- a/IRaCIS.Core.Domain/Dcotor/Postgraduate.cs +++ b/IRaCIS.Core.Domain/Dcotor/Postgraduate.cs @@ -1,63 +1,58 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("ҽ - ")] -[Table("Postgraduate")] -public class Postgraduate : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region + [Table("Postgraduate")] + public partial class Postgraduate : BaseFullAuditEntity + { + #region - #endregion + #endregion - public DateOnly? BeginDate { get; set; } + public Guid DoctorId { get; set; } - [StringLength(400)] - public string City { get; set; } = null!; + [Column(TypeName = "date")] + public DateTime? BeginDate { get; set; } - [StringLength(400)] - public string CityCN { get; set; } = null!; + [Column(TypeName = "date")] + public DateTime? EndDate { get; set; } - [StringLength(400)] - public string Country { get; set; } = null!; + [StringLength(50)] + public string Training { get; set; } = string.Empty; - [StringLength(400)] - public string CountryCN { get; set; } = null!; + [StringLength(100)] + public string Major { get; set; } = string.Empty; - public Guid DoctorId { get; set; } + [StringLength(100)] + public string Hospital { get; set; } = string.Empty; - public DateOnly? EndDate { get; set; } + [StringLength(100)] + public string School { get; set; } = string.Empty; + [StringLength(100)] + public string Country { get; set; } = string.Empty; - [StringLength(400)] - public string Hospital { get; set; } = null!; + [StringLength(100)] + public string Province { get; set; } = string.Empty; - [StringLength(400)] - public string HospitalCN { get; set; } = null!; + [StringLength(100)] + public string City { get; set; } = string.Empty; - [StringLength(400)] - public string Major { get; set; } = null!; + [StringLength(50)] + public string TrainingCN { get; set; } = string.Empty; - [StringLength(400)] - public string MajorCN { get; set; } = null!; + [StringLength(100)] + public string MajorCN { get; set; } = string.Empty; - [StringLength(400)] - public string Province { get; set; } = null!; + [StringLength(100)] + public string HospitalCN { get; set; } = string.Empty; - [StringLength(400)] - public string ProvinceCN { get; set; } = null!; + [StringLength(100)] + public string SchoolCN { get; set; } = string.Empty; + [StringLength(100)] + public string CountryCN { get; set; } = string.Empty; - [StringLength(400)] - public string School { get; set; } = null!; + [StringLength(100)] + public string ProvinceCN { get; set; } = string.Empty; - [StringLength(400)] - public string SchoolCN { get; set; } = null!; - - [StringLength(400)] - public string Training { get; set; } = null!; - - [StringLength(400)] - public string TrainingCN { get; set; } = null!; + [StringLength(100)] + public string CityCN { get; set; } = string.Empty; + } } diff --git a/IRaCIS.Core.Domain/Dcotor/ResearchPublication.cs b/IRaCIS.Core.Domain/Dcotor/ResearchPublication.cs index 0172b07b7..74992475f 100644 --- a/IRaCIS.Core.Domain/Dcotor/ResearchPublication.cs +++ b/IRaCIS.Core.Domain/Dcotor/ResearchPublication.cs @@ -1,40 +1,20 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("ҽ - ѧ¼")] -[Table("ResearchPublication")] -public partial class ResearchPublication : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region + [Table("ResearchPublication")] + public partial class ResearchPublication : BaseFullAuditEntity + { + #region - #endregion - [MaxLength] - public string? AwardsHonors { get; set; } + #endregion + public Guid DoctorId { get; set; } + public string Research { get; set; } = string.Empty; + public string Grants { get; set; } = string.Empty; + public string Publications { get; set; } = string.Empty; + public string AwardsHonors { get; set; } = string.Empty; - [MaxLength] - public string? AwardsHonorsCN { get; set; } - - public Guid DoctorId { get; set; } - - [MaxLength] - public string? Grants { get; set; } - - [MaxLength] - public string? GrantsCN { get; set; } - - [MaxLength] - public string? Publications { get; set; } - - [MaxLength] - public string? PublicationsCN { get; set; } - - [MaxLength] - public string? Research { get; set; } - - [MaxLength] - public string? ResearchCN { get; set; } + public string ResearchCN { get; set; } = string.Empty; + public string GrantsCN { get; set; } = string.Empty; + public string PublicationsCN { get; set; } = string.Empty; + public string AwardsHonorsCN { get; set; } = string.Empty; + } } diff --git a/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs b/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs index 7c0b4da9a..2f8fd3a21 100644 --- a/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs +++ b/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs @@ -1,12 +1,5 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - namespace IRaCIS.Core.Domain.Models { - [Comment("ҽ - Ŀٴ")] [Table("TrialExperience")] public partial class TrialExperience : BaseFullAuditEntity { @@ -14,8 +7,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public List ExperienceCriteriaList { get; set; } - [JsonIgnore] - public Dictionary Phase { get; set; } #endregion @@ -23,7 +14,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/TrialExperienceCriteria.cs b/IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs index 42fb7b460..19613c319 100644 --- a/IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs +++ b/IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs @@ -1,9 +1,6 @@ -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models { - public class TrialExperienceCriteria:Entity + public class TrialExperienceCriteria : Entity { #region 导航属性 [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Dcotor/Vacation.cs b/IRaCIS.Core.Domain/Dcotor/Vacation.cs index 569edcdc6..42f3782cf 100644 --- a/IRaCIS.Core.Domain/Dcotor/Vacation.cs +++ b/IRaCIS.Core.Domain/Dcotor/Vacation.cs @@ -1,19 +1,15 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("医生 - 假期安排")] -[Table("Vacation")] -public class Vacation : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + [Table("Vacation")] + public class Vacation : BaseFullAuditEntity + { + #region 导航属性 - #endregion - public Guid DoctorId { get; set; } - public DateTime StartDate { get; set; } - public DateTime EndDate { get; set; } - public int Status { get; set; } = 1; + #endregion + public Guid DoctorId { get; set; } + public DateTime StartDate { get; set; } + public DateTime EndDate { get; set; } + public int Status { get; set; } = 1; + } } diff --git a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs index 5b9cf8e5a..89a7b33f9 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs @@ -1,40 +1,39 @@ - //-------------------------------------------------------------------- // 此代码由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; - -[Comment("后台 - 系统文档签署记录")] -[Table("SystemDocConfirmedUser")] -public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity - +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public SystemDocument SystemDocument { get; set; } + /// + ///SystemDocConfirmedUser + /// + [Table("SystemDocConfirmedUser")] + public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity - [JsonIgnore] - [ForeignKey("ConfirmUserId")] - public User ConfirmUser { get; set; } - #endregion + { + #region 导航属性 + [JsonIgnore] + public SystemDocument SystemDocument { get; set; } + + [JsonIgnore] + [ForeignKey("ConfirmUserId")] + public User ConfirmUser { get; set; } + #endregion - public DateTime? ConfirmTime { get; set; } + public Guid SystemDocumentId { get; set; } - public Guid ConfirmUserId { get; set; } + public DateTime? ConfirmTime { get; set; } - public DateTime? SignFirstViewTime { get; set; } - [StringLength(1024)] - public string SignText { get; set; } = null!; + public Guid ConfirmUserId { get; set; } - public Guid SystemDocumentId { get; set; } + public DateTime? SignFirstViewTime { 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 cc3c4de52..be39a4d32 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs @@ -1,32 +1,29 @@ - //-------------------------------------------------------------------- // 此代码由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; - -[Comment("后台 - 系统文档需要签署用户类型")] -[Table("SystemDocNeedConfirmedUserType")] -public class SystemDocNeedConfirmedUserType : Entity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("NeedConfirmUserTypeId")] - public UserType UserTypeRole { get; set; } + /// + ///SystemDocNeedConfirmedUserType + /// + [Table("SystemDocNeedConfirmedUserType")] + public class SystemDocNeedConfirmedUserType : Entity + { + #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 SystemDocumentId { get; set; } - public Guid NeedConfirmUserTypeId { get; set; } + public Guid NeedConfirmUserTypeId { get; set; } + + } } - - diff --git a/IRaCIS.Core.Domain/Document/SystemDocument.cs b/IRaCIS.Core.Domain/Document/SystemDocument.cs index de68263a0..d6e09ab35 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocument.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocument.cs @@ -1,20 +1,15 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-01-05 09:11:49 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { - /// - ///SystemDocument - /// - [Table("SystemDocument")] - public class SystemDocument : BaseFullDeleteAuditEntity - { + /// + ///SystemDocument + /// + [Table("SystemDocument")] + public class SystemDocument : BaseFullDeleteAuditEntity + { #region 导航属性 [JsonIgnore] public List SystemDocConfirmedUserList { get; set; } @@ -28,16 +23,16 @@ namespace IRaCIS.Core.Domain.Models public Guid FileTypeId { get; set; } - [StringLength(2000)] - public string Name { get; set; } = null!; - [StringLength(2000)] - public string Path { get; set; } = null!; + public string Name { get; set; } = string.Empty; public int SignViewMinimumMinutes { get; set; } + public string Path { get; set; } = string.Empty; + + } -} +} diff --git a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs index 7330f38f9..eebdefd06 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs @@ -1,47 +1,44 @@ - //-------------------------------------------------------------------- // 此代码由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; - -[Comment("项目 - 项目文档签署记录")] -[Table("TrialDocConfirmedUser")] -public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///TrialDocUserTypeConfirmUser + /// + [Table("TrialDocConfirmedUser")] + public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity + { + #region 导航属性 - [JsonIgnore] - [ForeignKey("ConfirmUserId")] - public User User { get; set; } - [JsonIgnore] - public TrialDocument TrialDocument { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("ConfirmUserId")] + public User User { get; set; } + [JsonIgnore] + public TrialDocument TrialDocument { get; set; } + #endregion - public Guid TrialDocumentId { get; set; } + public Guid TrialDocumentId { get; set; } - public DateTime? ConfirmTime { get; set; } - - - public Guid ConfirmUserId { get; set; } + public DateTime? ConfirmTime { get; set; } - public DateTime? SignFirstViewTime { get; set; } + public Guid ConfirmUserId { get; set; } - [StringLength(512)] - public string SignText { get; set; } = string.Empty; + + public DateTime? SignFirstViewTime { get; set; } + + + public string SignText { get; set; } = string.Empty; - } + } - - + +} diff --git a/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs b/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs index 3f281c363..a2817b93d 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs @@ -1,35 +1,31 @@ - //-------------------------------------------------------------------- // 此代码由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; - -[Comment("项目 - 项目文档需要签署的用户类型")] -[Table("TrialDocNeedConfirmedUserType")] -public class TrialDocNeedConfirmedUserType : Entity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("NeedConfirmUserTypeId")] - public UserType UserTypeRole { get; set; } + /// + ///TrialDocumentUserConfirm + /// + [Table("TrialDocNeedConfirmedUserType")] + public class TrialDocNeedConfirmedUserType : Entity + { + #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 TrialDocumentId { get; set; } - public Guid NeedConfirmUserTypeId { get; set; } + public Guid NeedConfirmUserTypeId { get; set; } + } + } - - diff --git a/IRaCIS.Core.Domain/Document/TrialDocument.cs b/IRaCIS.Core.Domain/Document/TrialDocument.cs index 7a3eaed6b..355ffc652 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocument.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocument.cs @@ -1,49 +1,44 @@ - //-------------------------------------------------------------------- // 此代码由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; - -[Comment("项目 - 项目文档")] -[Table("TrialDocument")] -public class TrialDocument : BaseFullDeleteAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public List TrialDocConfirmedUserList { get; set; } - [JsonIgnore] - public List NeedConfirmedUserTypeList { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } + /// + ///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; } - [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; } - [StringLength(1000)] - public string Description { get; set; } = string.Empty; + 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 991b3a743..9944a9f16 100644 --- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs +++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs @@ -3,13 +3,7 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-10-20 11:51:58 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Collections.Generic; -using System.Linq; -using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models; diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs index 526ece800..afad87a94 100644 --- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs +++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs @@ -3,29 +3,30 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-10-21 16:06:20 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目 - 项目邮件收发配置用户类型")] -[Table("TrialEmailNoticeUser")] -public class TrialEmailNoticeUser : Entity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; } - #endregion + /// + ///TrialEmailNoticeUser + /// + [Table("TrialEmailNoticeUser")] + public class TrialEmailNoticeUser : Entity + { + #region 导航属性 - public UserTypeEnum UserType { get; set; } + #endregion + + [JsonIgnore] + public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; } - public Guid TrialEmailNoticeConfigId { get; set; } + public UserTypeEnum UserType { get; set; } - public EmailUserType EmailUserType { get; set; } + public Guid TrialEmailNoticeConfigId { get; set; } + + + public EmailUserType EmailUserType { get; set; } + } + } - - diff --git a/IRaCIS.Core.Domain/Financial/CalculateTask.cs b/IRaCIS.Core.Domain/Financial/CalculateTask.cs index d516d9a2f..56eb3ae35 100644 --- a/IRaCIS.Core.Domain/Financial/CalculateTask.cs +++ b/IRaCIS.Core.Domain/Financial/CalculateTask.cs @@ -1,15 +1,12 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Table("CalculateTask")] -public class CalculateTask : Entity +namespace IRaCIS.Core.Domain.Models { - public Guid ReviewerId { get; set; } + [Table("CalculateTask")] + public class CalculateTask : Entity + { + public Guid ReviewerId { get; set; } - [Required] - public string YearMonth { get; set; } = string.Empty; - public bool IsLock { get; set; } + [Required] + public string YearMonth { get; set; } = string.Empty; + public bool IsLock { get; set; } + } } diff --git a/IRaCIS.Core.Domain/Financial/ExchangeRate.cs b/IRaCIS.Core.Domain/Financial/ExchangeRate.cs index 98b9bcdee..82d7c370b 100644 --- a/IRaCIS.Core.Domain/Financial/ExchangeRate.cs +++ b/IRaCIS.Core.Domain/Financial/ExchangeRate.cs @@ -1,16 +1,12 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Table("ExchangeRate")] -public class ExchangeRate : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - [StringLength(400)] - public string YearMonth { get; set; } = string.Empty; + [Table("ExchangeRate")] + public class ExchangeRate : BaseFullAuditEntity + { + public string YearMonth { get; set; } = string.Empty; - [DecimalPrecision(18, 2)] - public decimal Rate { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal Rate { get; set; } + } } diff --git a/IRaCIS.Core.Domain/Financial/Payment.cs b/IRaCIS.Core.Domain/Financial/Payment.cs index 45467f6b6..2d5a08aa3 100644 --- a/IRaCIS.Core.Domain/Financial/Payment.cs +++ b/IRaCIS.Core.Domain/Financial/Payment.cs @@ -1,54 +1,37 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - - -[Comment("ҽƷ - ÿ֧¼")] -[Table("Payment")] -public class Payment : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - [DecimalPrecision(18, 4)] - public decimal ActuallyPaidCNY { get; set; } - [DecimalPrecision(18, 4)] - public decimal AdjustmentCNY { get; set; } + [Table("Payment")] + public partial class Payment : BaseFullAuditEntity + { + public Guid DoctorId { get; set; } + public string YearMonth { get; set; } = string.Empty; + public bool IsLock { get; set; } + public DateTime YearMonthDate { get; set; } - [DecimalPrecision(18, 2)] - public decimal AdjustmentUSD { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal PaymentUSD { get; set; } - [DecimalPrecision(18, 4)] - public decimal BankTransferCNY { get; set; } + [Column(TypeName = "decimal(18,4)")] + public decimal PaymentCNY { get; set; } - public DateTime CalculateTime { get; set; } = DateTime.Now; + [Column(TypeName = "decimal(18,2)")] + public decimal ExchangeRate { get; set; } - [StringLength(400)] - public string CalculateUser { get; set; } = null!; - public Guid DoctorId { get; set; } + [Column(TypeName = "decimal(18,4)")] + public decimal AdjustmentCNY { get; set; } - [DecimalPrecision(18, 2)] - public decimal ExchangeRate { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal AdjustmentUSD { get; set; } + public DateTime CalculateTime { get; set; } = DateTime.Now; - public bool IsLock { get; set; } + [StringLength(100)] + public string CalculateUser { get; set; } = string.Empty; - [StringLength(1000)] - public string Note { get; set; } = null!; + [StringLength(500)] + public string Note { get; set; } = string.Empty; - [DecimalPrecision(18, 4)] - public decimal PaymentCNY { get; set; } - - [DecimalPrecision(18, 2)] - public decimal PaymentUSD { get; set; } - - [DecimalPrecision(18, 4)] - public decimal TaxCNY { get; set; } - - [StringLength(400)] - public string YearMonth { get; set; } = null!; - - public DateTime YearMonthDate { get; set; } + } } diff --git a/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs b/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs index 7d7c5fdd5..e1efc17ba 100644 --- a/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs +++ b/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs @@ -1,35 +1,26 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("ҽƷ - Ŀÿµ¼")] -[Table("PaymentAdjustment")] -public partial class PaymentAdjustment : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - [DecimalPrecision(18, 4)] - public decimal AdjustmentCNY { get; set; } + [Table("PaymentAdjustment")] + public partial class PaymentAdjustment : BaseFullAuditEntity + { + public Guid ReviewerId { get; set; } - [DecimalPrecision(18, 2)] - public decimal AdjustmentUSD { get; set; } + public DateTime YearMonthDate { get; set; } + public string YearMonth { get; set; } = string.Empty; - [DecimalPrecision(18, 2)] - public decimal ExchangeRate { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal AdjustmentUSD { get; set; } - public bool IsLock { get; set; } + [Column(TypeName = "decimal(18,4)")] + public decimal AdjustmentCNY { get; set; } - [StringLength(1000)] - public string Note { get; set; } = null!; - public Guid ReviewerId { get; set; } + public Guid TrialId { get; set; } = Guid.Empty; - public Guid TrialId { get; set; } - - [StringLength(400)] - public string YearMonth { get; set; } = null!; - - public DateTime YearMonthDate { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal ExchangeRate { get; set; } + public bool IsLock { get; set; } = false; + public string Note { get; set; } = string.Empty; + } } diff --git a/IRaCIS.Core.Domain/Financial/PaymentDetail.cs b/IRaCIS.Core.Domain/Financial/PaymentDetail.cs index 44daf1a6c..91f002eed 100644 --- a/IRaCIS.Core.Domain/Financial/PaymentDetail.cs +++ b/IRaCIS.Core.Domain/Financial/PaymentDetail.cs @@ -1,51 +1,40 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("ҽƷ - ÿ֧")] -[Table("PaymentDetail")] -public class PaymentDetail : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - [DecimalPrecision(18, 2)] - public decimal BasePrice { get; set; } + [Table("PaymentDetail")] + public partial class PaymentDetail : BaseFullAuditEntity + { + public Guid PaymentId { get; set; } + public Guid DoctorId { get; set; } + public string YearMonth { get; set; } = string.Empty; + public Guid TrialId { get; set; } - public int Count { get; set; } + [StringLength(50)] + public string TrialCode { get; set; } = string.Empty; - public Guid DoctorId { get; set; } + [StringLength(50)] + public string PaymentType { get; set; } = string.Empty; + public int Count { get; set; } - [DecimalPrecision(18, 2)] - public decimal ExchangeRate { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal BasePrice { get; set; } - [DecimalPrecision(18, 4)] - public decimal PaymentCNY { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal PersonalAdditional { get; set; } - public Guid PaymentId { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal TrialAdditional { get; set; } - [StringLength(400)] - public string PaymentType { get; set; } = null!; + [Column(TypeName = "decimal(18,2)")] + public decimal ExchangeRate { get; set; } - [DecimalPrecision(18, 2)] - public decimal PaymentUSD { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal PaymentUSD { get; set; } - [DecimalPrecision(18, 2)] - public decimal PersonalAdditional { get; set; } + [Column(TypeName = "decimal(18,4)")] + public decimal PaymentCNY { get; set; } - public int ShowCodeOrder { get; set; } - - public int ShowTypeOrder { get; set; } - - [DecimalPrecision(18, 2)] - public decimal TrialAdditional { get; set; } - - [StringLength(400)] - public string TrialCode { get; set; } = null!; - - public Guid TrialId { get; set; } - - [StringLength(400)] - public string YearMonth { get; set; } = null!; + public int ShowTypeOrder { get; set; } + public int ShowCodeOrder { get; set; } + } } diff --git a/IRaCIS.Core.Domain/Financial/RankPrice.cs b/IRaCIS.Core.Domain/Financial/RankPrice.cs index 6e6d533d0..18e54d999 100644 --- a/IRaCIS.Core.Domain/Financial/RankPrice.cs +++ b/IRaCIS.Core.Domain/Financial/RankPrice.cs @@ -1,43 +1,40 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Table("RankPrice")] -public partial class RankPrice : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - [DecimalPrecision(18, 2)] - public decimal Adjudication { get; set; } + [Table("RankPrice")] + public partial class RankPrice : BaseFullAuditEntity + { + [StringLength(200)] + public string RankName { get; set; } = string.Empty; - [DecimalPrecision(18, 2)] - public decimal AdjudicationIn24H { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal Timepoint { get; set; } - [DecimalPrecision(18, 2)] - public decimal AdjudicationIn48H { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal TimepointIn24H { get; set; } - [DecimalPrecision(18, 2)] - public decimal Downtime { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal TimepointIn48H { get; set; } - [DecimalPrecision(18, 2)] - public decimal Global { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal Adjudication { get; set; } - public string RankName { get; set; } = null!; + [Column(TypeName = "decimal(18,2)")] + public decimal AdjudicationIn24H { get; set; } - [DecimalPrecision(18, 2)] - public decimal RefresherTraining { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal AdjudicationIn48H { get; set; } - public int ShowOrder { 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; } + public int ShowOrder { get; set; } + } } diff --git a/IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs b/IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs index 4a8b87375..b3463fc7a 100644 --- a/IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs +++ b/IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs @@ -1,8 +1,3 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - namespace IRaCIS.Core.Domain.Models; [Comment("ҽƷ - ֧Ϣ")] diff --git a/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs b/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs index d511284fc..098cbb490 100644 --- a/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs +++ b/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs @@ -1,35 +1,26 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("ҽƷ - Ŀ֧")] -[Table("TrialPaymentPrice")] -public class TrialPaymentPrice : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - [JsonIgnore] - public Trial Trial { get; set; } + [Table("TrialPaymentPrice")] + public partial class TrialPaymentPrice : BaseFullAuditEntity + { + public Guid TrialId { get; set; } - public Guid TrialId { 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; - - - - [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 9375d49ca..bed8eb9bc 100644 --- a/IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs +++ b/IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs @@ -1,45 +1,39 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("医生计费 - 项目工作量收入单价")] -[Table("TrialRevenuesPrice")] -public class TrialRevenuesPrice : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - public Guid TrialId { get; set; } + [Table("TrialRevenuesPrice")] + public class TrialRevenuesPrice : BaseFullAuditEntity + { + public Guid TrialId { get; set; } - [DecimalPrecision(18, 2)] - public decimal Adjudication { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal Timepoint { get; set; } - [DecimalPrecision(18, 2)] - public decimal AdjudicationIn24H { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal TimepointIn24H { get; set; } - [DecimalPrecision(18, 2)] - public decimal AdjudicationIn48H { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal TimepointIn48H { get; set; } - [DecimalPrecision(18, 2)] - public decimal Downtime { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal Adjudication { get; set; } - [DecimalPrecision(18, 2)] - public decimal Global { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal AdjudicationIn24H { get; set; } - [DecimalPrecision(18, 2)] - public decimal RefresherTraining { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal AdjudicationIn48H { get; set; } - [DecimalPrecision(18, 2)] - public decimal Timepoint { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal Global { get; set; } - [DecimalPrecision(18, 2)] - public decimal TimepointIn24H { get; set; } + [Column(TypeName = "decimal(18,2)")] + public decimal Training { 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 Downtime { 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 ba71f2b13..9655a2642 100644 --- a/IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs +++ b/IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs @@ -1,41 +1,31 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("医生计费 - 项目收入价格验证")] -[Table("TrialRevenuesPriceVerification")] -public class TrialRevenuesPriceVerification : Entity +namespace IRaCIS.Core.Domain.Models { - public Guid TrialId { get; set; } + public class TrialRevenuesPriceVerification : Entity + { + public Guid TrialId { get; set; } - public bool Adjudication { get; set; } + public Guid ReviewerId { get; set; } - public bool AdjudicationIn24H { get; set; } + public string YearMonth { get; set; } = string.Empty; - public bool AdjudicationIn48H { get; set; } + public bool Training { get; set; } = false; - public bool Downtime { get; set; } + public bool Downtime { get; set; } = false; - public bool Global { get; set; } + public bool Global { get; set; } = false; - public bool RefresherTraining { get; set; } + public bool Timepoint { get; set; } = false; - public Guid ReviewerId { get; set; } + public bool TimepointIn24H { get; set; } = false; - [Comment(" false代表没有价格")] - public bool Timepoint { get; set; } + public bool TimepointIn48H { get; set; } = false; - public bool TimepointIn24H { get; set; } + public bool Adjudication { get; set; } = false; - public bool TimepointIn48H { get; set; } + public bool AdjudicationIn24H { get; set; } = false; - public bool Training { get; set; } - - public DateTime? WorkLoadDate { get; set; } - - [StringLength(400)] - public string YearMonth { get; set; } = null!; + public bool AdjudicationIn48H { get; set; } = false; + public bool RefresherTraining { get; set; } = false; + public DateTime WorkLoadDate { get; set; } + } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Financial/VolumeReward.cs b/IRaCIS.Core.Domain/Financial/VolumeReward.cs index da9706855..fc99d4bb9 100644 --- a/IRaCIS.Core.Domain/Financial/VolumeReward.cs +++ b/IRaCIS.Core.Domain/Financial/VolumeReward.cs @@ -1,17 +1,12 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("ҽƷ - ")] -[Table("VolumeReward")] -public partial class VolumeReward : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - [DecimalPrecision(18, 2)] - public decimal Price { get; set; } - public int Min { get; set; } - public int Max { get; set; } + [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; } + } } diff --git a/IRaCIS.Core.Domain/GlobalUsings.cs b/IRaCIS.Core.Domain/GlobalUsings.cs new file mode 100644 index 000000000..cf790c1af --- /dev/null +++ b/IRaCIS.Core.Domain/GlobalUsings.cs @@ -0,0 +1,7 @@ +global using Microsoft.EntityFrameworkCore; +global using System; +global using System.Collections.Generic; +global using System.ComponentModel.DataAnnotations; +global using System.ComponentModel.DataAnnotations.Schema; + + diff --git a/IRaCIS.Core.Domain/Image/DicomInstance.cs b/IRaCIS.Core.Domain/Image/DicomInstance.cs index 4931c820d..dc10718ff 100644 --- a/IRaCIS.Core.Domain/Image/DicomInstance.cs +++ b/IRaCIS.Core.Domain/Image/DicomInstance.cs @@ -1,13 +1,8 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; +namespace IRaCIS.Core.Domain.Models; [Comment("归档 - Instance表")] [Table("DicomInstance")] -public class DicomInstance : BaseFullAuditEntity, IEntitySeqId +public class DicomInstance : BaseFullAuditEntity, IEntitySeqId { #region 导航属性 [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Image/DicomSeries.cs b/IRaCIS.Core.Domain/Image/DicomSeries.cs index 7ac515c26..2b09cda26 100644 --- a/IRaCIS.Core.Domain/Image/DicomSeries.cs +++ b/IRaCIS.Core.Domain/Image/DicomSeries.cs @@ -1,10 +1,4 @@ -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("归档 - 序列表")] public partial class DicomSeries : BaseFullDeleteAuditEntity, IEntitySeqId diff --git a/IRaCIS.Core.Domain/Image/DicomStudy.cs b/IRaCIS.Core.Domain/Image/DicomStudy.cs index 471b31089..e82cc8a0a 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudy.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudy.cs @@ -1,10 +1,4 @@ -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; [Table("DicomStudy")] public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId diff --git a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs index 47d3f0737..de24ec6f2 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs @@ -1,12 +1,7 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-01-25 13:26:03 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models; [Comment("项目 - 影像上传监控")] diff --git a/IRaCIS.Core.Domain/Image/ImageShare.cs b/IRaCIS.Core.Domain/Image/ImageShare.cs index 6b1e7a286..9ef10ef53 100644 --- a/IRaCIS.Core.Domain/Image/ImageShare.cs +++ b/IRaCIS.Core.Domain/Image/ImageShare.cs @@ -1,24 +1,17 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("影像 - 影像分享记录表")] -[Table("ImageShare")] -public class ImageShare: Entity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + public class ImageShare : Entity + { + #region 导航属性 - #endregion - public DateTime ExpireTime { get; set; } + #endregion + public Guid TrialId { get; set; } + public Guid SubjectId { get; set; } + public Guid StudyId { get; set; } - public string Password { get; set; } = null!; + public DateTime ExpireTime { get; set; } - public Guid StudyId { get; set; } - - public Guid SubjectId { get; set; } - - public Guid TrialId { get; set; } + public string Password { get; set; } = string.Empty; + } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs b/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs index 1df005894..3696f6e5d 100644 --- a/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs +++ b/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs @@ -1,62 +1,66 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2021-12-06 10:49:39 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models; - -[Comment("影像 - 非dicom检查")] -[Table("NoneDicomStudy")] -public class NoneDicomStudy : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public List NoneDicomFileList { get; set; } + /// + ///NoneDicomStudy + /// + [Table("NoneDicomStudy")] + public class NoneDicomStudy : BaseFullAuditEntity + { + #region 导航属性 + [JsonIgnore] + public List NoneDicomFileList { get; set; } - [JsonIgnore] - public List TaskNoneDicomFileList { get; set; } + [JsonIgnore] + public List TaskNoneDicomFileList { get; set; } - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - public Subject Subject { get; set; } + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } + [JsonIgnore] + public Subject Subject { get; set; } - #endregion + #endregion - public string BodyPart { get; set; } = null!; - public int Code { get; set; } + public string StudyCode { get; set; } = string.Empty; - public string Description { get; set; } = null!; + public int FileCount { get; set; } - public int FileCount { get; set; } + public int Code { get; set; } - public DateTime ImageDate { get; set; } + public Guid TrialId { get; set; } - public string Modality { get; set; } = null!; - public string StudyCode { get; set; } = null!; + public Guid SubjectId { get; set; } - public Guid SubjectId { get; set; } - public Guid SubjectVisitId { get; set; } + public Guid SubjectVisitId { get; set; } - public Guid TrialId { get; set; } - public DateTime? UploadVideoTime { get; set; } - public string VideoName { get; set; } = null!; + public string BodyPart { get; set; } = string.Empty; - public string VideoObjectName { get; set; } = null!; - public string VideoUrl { get; set; } = null!; + public string Modality { get; set; } = string.Empty; + + public DateTime ImageDate { get; set; } + + + public string Description { get; set; } = string.Empty; + + + public string VideoName { get; set; } = string.Empty; + + public string VideoObjectName { get; set; } = string.Empty; + + public DateTime? UploadVideoTime { get; set; } + + public string VideoUrl { get; set; } = string.Empty; + + } } - - diff --git a/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs b/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs index 91cef823a..1d1474e56 100644 --- a/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs +++ b/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs @@ -1,50 +1,53 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2021-12-06 10:49:39 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models; - - -[Comment("影像 - 非dicom检查关联文件表")] -[Table("NoneDicomStudyFile")] -public class NoneDicomStudyFile : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [ForeignKey("NoneDicomStudyId")] - [JsonIgnore] - public NoneDicomStudy NoneDicomStudy { get; set; } + + [Table("NoneDicomStudyFile")] + public class NoneDicomStudyFile : BaseAddAuditEntity + { + #region 导航属性 + [ForeignKey("NoneDicomStudyId")] + [JsonIgnore] + public NoneDicomStudy NoneDicomStudy { get; set; } - [JsonIgnore] - public VisitTask VisitTask { get; set; } + [JsonIgnore] + public VisitTask VisitTask { get; set; } - [ForeignKey("OriginNoneDicomStudyId")] - [JsonIgnore] - public NoneDicomStudy OriginNoneDicomStudy { get; set; } - #endregion + [ForeignKey("OriginNoneDicomStudyId")] + [JsonIgnore] + public NoneDicomStudy OriginNoneDicomStudy { get; set; } + #endregion - public string FileName { get; set; } = null!; + public Guid NoneDicomStudyId { get; set; } - public long? FileSize { get; set; } - public string FileType { get; set; } = null!; + public string Path { get; set; } = string.Empty; - public Guid NoneDicomStudyId { get; set; } - [Comment("为了不影响原始检查，跟任务绑定的 NoneDicomStudyId 为guid空 这个字段记录跟原始检查绑")] - public Guid? OriginNoneDicomStudyId { get; set; } + public string FileName { get; set; } = string.Empty; - [StringLength(512)] - public string Path { get; set; } = null!; + public string FileType { get; set; } = string.Empty; - [Comment("任务Id,配合OriginNoneDicomStudyId 一起使用")] - public Guid? VisitTaskId { get; set; } + public long? FileSize { get; set; } + #region 跟任务绑定 同时区分检查 + + public Guid? VisitTaskId { get; set; } + + + /// + /// 为了不影响原始检查，跟任务绑定的 NoneDicomStudyId 为guid空 这个字段记录跟原始检查绑 + /// + public Guid? OriginNoneDicomStudyId { get; set; } + #endregion + + + } + } diff --git a/IRaCIS.Core.Domain/Image/SCPImageUpload.cs b/IRaCIS.Core.Domain/Image/SCPImageUpload.cs index 7a3604ef7..b73d70610 100644 --- a/IRaCIS.Core.Domain/Image/SCPImageUpload.cs +++ b/IRaCIS.Core.Domain/Image/SCPImageUpload.cs @@ -1,49 +1,60 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2024-05-24 14:31:45 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -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; - -[Comment("项目中心 - 影像推送记录")] -[Table("SCPImageUpload")] -public class SCPImageUpload : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } + /// + ///SCPImageUpload + /// + [Table("SCPImageUpload")] + public class SCPImageUpload : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } - [JsonIgnore] - public TrialSite TrialSite { get; set; } - #endregion + [JsonIgnore] + public TrialSite TrialSite { get; set; } + #endregion - public string CalledAE { get; set; } = null!; + public string CallingAE { get; set; } = string.Empty; - public string CallingAE { get; set; } = null!; - public string CallingAEIP { get; set; } = null!; + public string CalledAE { get; set; } = string.Empty; - public DateTime EndTime { get; set; } - public int FileCount { get; set; } - public long FileSize { get; set; } + public string CallingAEIP { get; set; } = string.Empty; - public DateTime StartTime { get; set; } - public int StudyCount { get; set; } - public Guid TrialId { get; set; } + public DateTime StartTime { get; set; } - public Guid TrialSiteId { get; set; } + public DateTime EndTime { get; set; } + + + + public int FileCount { get; set; } + + + + public long FileSize { get; set; } + + + public int StudyCount { get; set; } + + + + + public Guid TrialId { get; set; } + public Guid TrialSiteId { get; set; } + + + + } } diff --git a/IRaCIS.Core.Domain/Image/SCPInstance.cs b/IRaCIS.Core.Domain/Image/SCPInstance.cs index 00945c007..82aefc326 100644 --- a/IRaCIS.Core.Domain/Image/SCPInstance.cs +++ b/IRaCIS.Core.Domain/Image/SCPInstance.cs @@ -1,76 +1,49 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Table("SCPInstance")] -public class SCPInstance : BaseFullAuditEntity, IEntitySeqId +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("SeriesId")] - public SCPSeries SCPSeries { get; set; } + [Table("SCPInstance")] + public class SCPInstance : BaseFullAuditEntity, IEntitySeqId + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("SeriesId")] + public SCPSeries SCPSeries { get; set; } - [JsonIgnore] - [ForeignKey("StudyId")] - public SCPStudy SCPStudy { get; set; } - #endregion - - public bool Anonymize { get; set; } - - public bool CPIStatus { get; set; } - - public long? FileSize { get; set; } - - [StringLength(500)] - public string FrameOfReferenceUID { get; set; } = null!; - - public int ImageColumns { get; set; } - - public int ImageRows { get; set; } - - [StringLength(400)] - public string ImagerPixelSpacing { get; set; } = null!; - - public int InstanceNumber { get; set; } - - public DateTime? InstanceTime { get; set; } - - public int NumberOfFrames { get; set; } - - - [MaxLength] - [Unicode(false)] - public string Path { get; set; } = null!; - - [StringLength(400)] - public string PixelSpacing { get; set; } = null!; - - public Guid SeqId { get; set; } - - public Guid SeriesId { get; set; } - - public string SeriesInstanceUid { get; set; } = null!; - - public int SliceLocation { get; set; } - - [StringLength(400)] - public string SliceThickness { get; set; } = null!; - - public string SopInstanceUid { get; set; } = null!; - - public Guid StudyId { get; set; } - - public string StudyInstanceUid { get; set; } = null!; - - [StringLength(400)] - public string WindowCenter { get; set; } = null!; - - [StringLength(400)] - public string WindowWidth { get; set; } = null!; + [JsonIgnore] + [ForeignKey("StudyId")] + public SCPStudy SCPStudy { get; set; } + #endregion + public Guid SeqId { get; set; } + public Guid StudyId { get; set; } + public Guid SeriesId { get; set; } + public string StudyInstanceUid { get; set; } = string.Empty; + public string SeriesInstanceUid { get; set; } = string.Empty; + public string SopInstanceUid { get; set; } = string.Empty; + public int InstanceNumber { get; set; } + public DateTime? InstanceTime { get; set; } + public bool CPIStatus { get; set; } + public int ImageRows { get; set; } + public int ImageColumns { get; set; } + public int SliceLocation { get; set; } + + + public string SliceThickness { get; set; } = string.Empty; + public int NumberOfFrames { get; set; } + public string PixelSpacing { get; set; } = string.Empty; + + public string ImagerPixelSpacing { get; set; } = string.Empty; + public string FrameOfReferenceUID { get; set; } = string.Empty; + public string WindowCenter { get; set; } = string.Empty; + public string WindowWidth { get; set; } = string.Empty; + + public bool Anonymize { get; set; } + public string Path { get; set; } = string.Empty; + + public long? FileSize { get; set; } + + + + } } diff --git a/IRaCIS.Core.Domain/Image/SCPPatient.cs b/IRaCIS.Core.Domain/Image/SCPPatient.cs index e4fcf088b..05aa5bc5b 100644 --- a/IRaCIS.Core.Domain/Image/SCPPatient.cs +++ b/IRaCIS.Core.Domain/Image/SCPPatient.cs @@ -1,48 +1,39 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目中心 - 推送检查患者")] -[Table("SCPPatient")] -public class SCPPatient : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public List SCPStudyList { get; set; } - [JsonIgnore] - public Subject Subject { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - [JsonIgnore] - public TrialSite TrialSite { get; set; } - #endregion + [Table("SCPPatient")] + public class SCPPatient : BaseFullAuditEntity + { + #region 导航属性 + [JsonIgnore] + public List SCPStudyList { get; set; } + [JsonIgnore] + public Subject Subject { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } + [JsonIgnore] + public TrialSite TrialSite { get; set; } + #endregion - public DateTime? EarliestStudyTime { get; set; } - public DateTime LatestPushTime { get; set; } + public string PatientIdStr { get; set; } = string.Empty; + public string PatientName { get; set; } = string.Empty; + public string PatientAge { get; set; } = string.Empty; + public string PatientSex { get; set; } = string.Empty; + public string PatientBirthDate { get; set; } = string.Empty; - public DateTime? LatestStudyTime { get; set; } + public DateTime? EarliestStudyTime { get; set; } - public string PatientAge { get; set; } = null!; + public DateTime? LatestStudyTime { get; set; } - public string PatientBirthDate { get; set; } = null!; + public DateTime LatestPushTime { get; set; } - public string PatientIdStr { get; set; } = null!; - public string PatientName { get; set; } = null!; - - public string PatientSex { get; set; } = null!; - - public Guid? SubjectId { get; set; } - - public Guid TrialId { get; set; } - - public Guid TrialSiteId { get; set; } + public Guid? SubjectId { get; set; } + public Guid TrialId { get; set; } + public Guid TrialSiteId { get; set; } + + } } diff --git a/IRaCIS.Core.Domain/Image/SCPSeries.cs b/IRaCIS.Core.Domain/Image/SCPSeries.cs index 6e442414e..f7ceddf24 100644 --- a/IRaCIS.Core.Domain/Image/SCPSeries.cs +++ b/IRaCIS.Core.Domain/Image/SCPSeries.cs @@ -1,70 +1,45 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目中心 - 推送序列")] -[Table("SCPSeries")] -public class SCPSeries : BaseFullDeleteAuditEntity, IEntitySeqId +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("StudyId")] - public SCPStudy SCPStudy { get; set; } + [Table("SCPSeries")] + public class SCPSeries : BaseFullDeleteAuditEntity, IEntitySeqId + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("StudyId")] + public SCPStudy SCPStudy { get; set; } - [JsonIgnore] - public List SCPInstanceList { get; set; } - #endregion + [JsonIgnore] + public List SCPInstanceList { get; set; } + #endregion - public string AcquisitionNumber { get; set; } = null!; + public Guid SeqId { get; set; } + public Guid StudyId { get; set; } + public string StudyInstanceUid { get; set; } = string.Empty; + public string SeriesInstanceUid { get; set; } = string.Empty; + public int SeriesNumber { get; set; } + public DateTime? SeriesTime { get; set; } + public string Modality { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; + public int InstanceCount { get; set; } + public string SliceThickness { get; set; } = string.Empty; - public string AcquisitionTime { get; set; } = null!; + public string ImagePositionPatient { get; set; } = string.Empty; + public string ImageOrientationPatient { get; set; } = string.Empty; + public string BodyPartExamined { get; set; } = string.Empty; + public string SequenceName { get; set; } = string.Empty; + public string ProtocolName { get; set; } = string.Empty; + public string ImagerPixelSpacing { get; set; } = string.Empty; - public string BodyPartExamined { get; set; } = null!; + public string AcquisitionTime { get; set; } = string.Empty; + public string AcquisitionNumber { get; set; } = string.Empty; + public string TriggerTime { get; set; } = string.Empty; - public string BodyPartForEdit { get; set; } = null!; + public string BodyPartForEdit { get; set; } = string.Empty; - [StringLength(500)] - public string Description { get; set; } = null!; + public bool IsReading { get; set; } = true; - public string ImageOrientationPatient { get; set; } = null!; - - public string ImagePositionPatient { get; set; } = null!; - - [StringLength(520)] - public string ImageResizePath { get; set; } = null!; - - public string ImagerPixelSpacing { get; set; } = null!; - - public int InstanceCount { get; set; } - - public bool? IsReading { get; set; } - - public string Modality { get; set; } = null!; - - [StringLength(500)] - public string ProtocolName { get; set; } = null!; - - public Guid SeqId { get; set; } - - public string SequenceName { get; set; } = null!; - - public string SeriesInstanceUid { get; set; } = null!; - - public int SeriesNumber { get; set; } - - public DateTime? SeriesTime { get; set; } - - public string SliceThickness { get; set; } = null!; - - public Guid StudyId { get; set; } - - public string StudyInstanceUid { get; set; } = null!; - - public string TriggerTime { get; set; } = null!; + public string ImageResizePath { get; set; } = string.Empty; + } } diff --git a/IRaCIS.Core.Domain/Image/SCPStudy.cs b/IRaCIS.Core.Domain/Image/SCPStudy.cs index e615c0aab..07992eabd 100644 --- a/IRaCIS.Core.Domain/Image/SCPStudy.cs +++ b/IRaCIS.Core.Domain/Image/SCPStudy.cs @@ -1,103 +1,82 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目中心 - 推送检查")] -[Table("SCPStudy")] -public class SCPStudy : BaseFullDeleteAuditEntity, IEntitySeqId +namespace IRaCIS.Core.Domain.Models { + [Table("SCPStudy")] + public class SCPStudy : BaseFullDeleteAuditEntity, IEntitySeqId + { - #region 导航属性 - [JsonIgnore] - public List InstanceList { get; set; } + #region 导航属性 + [JsonIgnore] + public List InstanceList { get; set; } - [JsonIgnore] - public List SeriesList { get; set; } - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } + [JsonIgnore] + public List SeriesList { get; set; } + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } - [JsonIgnore] - public TrialSite TrialSite { get; set; } + [JsonIgnore] + public TrialSite TrialSite { get; set; } - [ForeignKey("PatientId")] - [JsonIgnore] - public SCPPatient Patient { get; set; } + #endregion - #endregion - public string AccessionNumber { get; set; } = null!; - public string AcquisitionNumber { get; set; } = null!; + //0 未知 1 单重 2 双重 + public bool IsDoubleReview { get; set; } - public string AcquisitionTime { get; set; } = null!; + public Guid SeqId { get; set; } - [StringLength(512)] - public string BodyPartExamined { get; set; } = null!; + [ForeignKey("PatientId")] + [JsonIgnore] + public SCPPatient Patient { get; set; } + public Guid PatientId { get; set; } - public string BodyPartForEdit { get; set; } = null!; + public string StudyInstanceUid { get; set; } = string.Empty; + public DateTime? StudyTime { get; set; } + public string Modalities { get; set; } = string.Empty; - public string CalledAE { get; set; } = null!; + public string Description { get; set; } = string.Empty; + public int SeriesCount { get; set; } = 0; + public int InstanceCount { get; set; } = 0; - public string CallingAE { get; set; } = null!; - [StringLength(1000)] - public string Description { get; set; } = null!; + public string InstitutionName { get; set; } = string.Empty; + public string PatientIdStr { get; set; } = string.Empty; + public string PatientName { get; set; } = string.Empty; + public string PatientAge { get; set; } = string.Empty; + public string PatientSex { get; set; } = string.Empty; - public int InstanceCount { get; set; } + public string StudyId { get; set; } = string.Empty; + public string AccessionNumber { get; set; } = string.Empty; + public string PatientBirthDate { get; set; } = string.Empty; + public string AcquisitionTime { get; set; } = string.Empty; + public string AcquisitionNumber { get; set; } = string.Empty; + public string TriggerTime { get; set; } = string.Empty; - public string InstitutionName { get; set; } = null!; + public string BodyPartExamined { get; set; } = string.Empty; - public bool IsDoubleReview { get; set; } + public string BodyPartForEdit { get; set; } = string.Empty; - public bool IsUploadFinished { get; set; } + public string ModalityForEdit { get; set; } = string.Empty; - public string Modalities { get; set; } = null!; - public string ModalityForEdit { get; set; } = null!; - public string PatientAge { get; set; } = null!; + public string CallingAE { get; set; } = string.Empty; - public string PatientBirthDate { get; set; } = null!; + public string CalledAE { get; set; } = string.Empty; - public Guid PatientId { get; set; } + public bool IsUploadFinished { get; set; } - public string PatientIdStr { get; set; } = null!; - public string PatientName { get; set; } = null!; + public Guid TrialId { get; set; } + public Guid TrialSiteId { get; set; } - public string PatientSex { get; set; } = null!; + public Guid? SubjectVisitId { get; set; } - [Comment(" 序列Id 避免内存移动")] - public Guid SeqId { get; set; } - public int SeriesCount { get; set; } - [Comment(" DicomTag.StudyID")] - public string StudyId { get; set; } = null!; - - [StringLength(500)] - public string StudyInstanceUid { get; set; } = null!; - - public DateTime? StudyTime { get; set; } - - public Guid? SubjectVisitId { get; set; } - - public Guid TrialId { get; set; } - - public Guid TrialSiteId { get; set; } - - public string TriggerTime { get; set; } = null!; - - [Comment(" 上传时间")] - public DateTime? UploadedTime { get; set; } - - public string Uploader { get; set; } = null!; + } } diff --git a/IRaCIS.Core.Domain/Image/SystemAnonymization.cs b/IRaCIS.Core.Domain/Image/SystemAnonymization.cs index 4ef95af3d..511472ba5 100644 --- a/IRaCIS.Core.Domain/Image/SystemAnonymization.cs +++ b/IRaCIS.Core.Domain/Image/SystemAnonymization.cs @@ -1,40 +1,43 @@ - //-------------------------------------------------------------------- // 此代码由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; - -[Comment("系统 - 匿名化配置（需要同步）")] -[Table("SystemAnonymization")] -public class SystemAnonymization : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///SystemAnonymization + /// + [Table("SystemAnonymization")] + public class SystemAnonymization : BaseFullAuditEntity + { + #region 导航属性 - #endregion - public string Element { get; set; } = null!; + #endregion + public string Group { get; set; } = String.Empty; - public string Group { get; set; } = null!; + public string Element { get; set; } = String.Empty; - public bool IsAdd { get; set; } - public bool IsEnable { get; set; } + public string TagDescription { get; set; } = String.Empty; - public bool IsFixed { get; set; } - public string ReplaceValue { get; set; } = null!; + public string TagDescriptionCN { get; set; } = string.Empty; - public string TagDescription { get; set; } = null!; - public string TagDescriptionCN { get; set; } = null!; + public string ReplaceValue { get; set; } = String.Empty; - public string ValueRepresentation { get; set; } = null!; + 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/TaskInstance.cs b/IRaCIS.Core.Domain/Image/TaskInstance.cs index 11dff6416..3f493ebcb 100644 --- a/IRaCIS.Core.Domain/Image/TaskInstance.cs +++ b/IRaCIS.Core.Domain/Image/TaskInstance.cs @@ -1,56 +1,53 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -public class TaskInstance : BaseFullAuditEntity, IEntitySeqId +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("SeriesId")] - public TaskSeries TaskSeries { get; set; } + public class TaskInstance : BaseFullAuditEntity, IEntitySeqId + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("SeriesId")] + public TaskSeries TaskSeries { get; set; } - [JsonIgnore] - [ForeignKey("StudyId")] - public TaskStudy TaskStudy { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("StudyId")] + public TaskStudy TaskStudy { get; set; } + #endregion - public Guid SeqId { get; set; } - public Guid StudyId { get; set; } - public Guid SeriesId { get; set; } - public string StudyInstanceUid { get; set; } = string.Empty; - public string SeriesInstanceUid { get; set; } = string.Empty; - public string SopInstanceUid { get; set; } = string.Empty; - public int InstanceNumber { get; set; } - public DateTime? InstanceTime { get; set; } - public bool CPIStatus { get; set; } - public int ImageRows { get; set; } - public int ImageColumns { get; set; } - public int SliceLocation { get; set; } + public Guid SeqId { get; set; } + public Guid StudyId { get; set; } + public Guid SeriesId { get; set; } + public string StudyInstanceUid { get; set; } = string.Empty; + public string SeriesInstanceUid { get; set; } = string.Empty; + public string SopInstanceUid { get; set; } = string.Empty; + public int InstanceNumber { get; set; } + public DateTime? InstanceTime { get; set; } + public bool CPIStatus { get; set; } + public int ImageRows { get; set; } + public int ImageColumns { get; set; } + public int SliceLocation { get; set; } - public string SliceThickness { get; set; } = string.Empty; - public int NumberOfFrames { get; set; } - public string PixelSpacing { get; set; } = string.Empty; + public string SliceThickness { get; set; } = string.Empty; + public int NumberOfFrames { get; set; } + public string PixelSpacing { get; set; } = string.Empty; - public string ImagerPixelSpacing { get; set; } = string.Empty; - public string FrameOfReferenceUID { get; set; } = string.Empty; - public string WindowCenter { get; set; } = string.Empty; - public string WindowWidth { get; set; } = string.Empty; + public string ImagerPixelSpacing { get; set; } = string.Empty; + public string FrameOfReferenceUID { get; set; } = string.Empty; + public string WindowCenter { get; set; } = string.Empty; + public string WindowWidth { get; set; } = string.Empty; - public Guid TrialId { get; set; } - public Guid SubjectId { get; set; } - public Guid VisitTaskId { get; set; } - public bool Anonymize { get; set; } - public string Path { get; set; } = string.Empty; + public Guid TrialId { get; set; } + public Guid SubjectId { get; set; } + public Guid VisitTaskId { get; set; } + public bool Anonymize { get; set; } + public string Path { get; set; } = string.Empty; - public string HtmlPath { get; set; }=string.Empty; + public string HtmlPath { get; set; } = string.Empty; - public long? FileSize { get; set; } + public long? FileSize { get; set; } + } } diff --git a/IRaCIS.Core.Domain/Image/TaskSeries.cs b/IRaCIS.Core.Domain/Image/TaskSeries.cs index cf5ca01a7..db3376ae0 100644 --- a/IRaCIS.Core.Domain/Image/TaskSeries.cs +++ b/IRaCIS.Core.Domain/Image/TaskSeries.cs @@ -1,54 +1,50 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -public class TaskSeries : BaseFullDeleteAuditEntity, IEntitySeqId +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("StudyId")] - public TaskStudy TaskStudy { get; set; } + public class TaskSeries : BaseFullDeleteAuditEntity, IEntitySeqId + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("StudyId")] + public TaskStudy TaskStudy { get; set; } - [JsonIgnore] - public List InstanceList { get; set; } - #endregion + [JsonIgnore] + public List InstanceList { get; set; } + #endregion - public Guid SeqId { get; set; } - public Guid StudyId { get; set; } - public string StudyInstanceUid { get; set; } = String.Empty; - public string SeriesInstanceUid { get; set; } = String.Empty; - public int SeriesNumber { get; set; } - public DateTime? SeriesTime { get; set; } - public string Modality { get; set; } = String.Empty; - public string Description { get; set; } = String.Empty; - public int InstanceCount { get; set; } - public string SliceThickness { get; set; } = String.Empty; + public Guid SeqId { get; set; } + public Guid StudyId { get; set; } + public string StudyInstanceUid { get; set; } = String.Empty; + public string SeriesInstanceUid { get; set; } = String.Empty; + public int SeriesNumber { get; set; } + public DateTime? SeriesTime { get; set; } + public string Modality { get; set; } = String.Empty; + public string Description { get; set; } = String.Empty; + public int InstanceCount { get; set; } + public string SliceThickness { get; set; } = String.Empty; - public string ImagePositionPatient { get; set; } = String.Empty; - public string ImageOrientationPatient { get; set; } = String.Empty; - public string BodyPartExamined { get; set; } = String.Empty; - public string SequenceName { get; set; } = String.Empty; - public string ProtocolName { get; set; } = String.Empty; - public string ImagerPixelSpacing { get; set; } = String.Empty; + public string ImagePositionPatient { get; set; } = String.Empty; + public string ImageOrientationPatient { get; set; } = String.Empty; + public string BodyPartExamined { get; set; } = String.Empty; + public string SequenceName { get; set; } = String.Empty; + public string ProtocolName { get; set; } = String.Empty; + public string ImagerPixelSpacing { get; set; } = String.Empty; - public string AcquisitionTime { get; set; } = string.Empty; - public string AcquisitionNumber { get; set; } = string.Empty; - public string TriggerTime { get; set; } = string.Empty; + public string AcquisitionTime { get; set; } = string.Empty; + public string AcquisitionNumber { get; set; } = string.Empty; + public string TriggerTime { get; set; } = string.Empty; - public Guid TrialId { get; set; } - public Guid SubjectId { get; set; } - public Guid VisitTaskId { get; set; } + public Guid TrialId { get; set; } + public Guid SubjectId { get; set; } + public Guid VisitTaskId { get; set; } - public string BodyPartForEdit { get; set; } = string.Empty; + public string BodyPartForEdit { get; set; } = string.Empty; - public bool IsReading { get; set; } = true; + public bool IsReading { get; set; } = true; - public string ImageResizePath { get; set; }=string.Empty; + public string ImageResizePath { get; set; } = string.Empty; + } } diff --git a/IRaCIS.Core.Domain/Image/TaskStudy.cs b/IRaCIS.Core.Domain/Image/TaskStudy.cs index 2ea8fcc9d..196591630 100644 --- a/IRaCIS.Core.Domain/Image/TaskStudy.cs +++ b/IRaCIS.Core.Domain/Image/TaskStudy.cs @@ -1,83 +1,79 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -public class TaskStudy : BaseFullDeleteAuditEntity, IEntitySeqId +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } + public class TaskStudy : BaseFullDeleteAuditEntity, IEntitySeqId + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } - [JsonIgnore] - public List DicomStudyMonitorList { get; set; } = new List(); + [JsonIgnore] + public List DicomStudyMonitorList { get; set; } = new List(); - [JsonIgnore] - public List InstanceList { get; set; } + [JsonIgnore] + public List InstanceList { get; set; } - [JsonIgnore] - public List SeriesList { get; set; } + [JsonIgnore] + public List SeriesList { get; set; } - [JsonIgnore] - [ForeignKey("SubjectId")] - public Subject Subject { get; set; } + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } - #endregion + #endregion - public Guid SeqId { get; set; } + public Guid SeqId { get; set; } - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public Guid SubjectId { get; set; } + public Guid SubjectId { get; set; } - public Guid VisitTaskId { get; set; } + public Guid VisitTaskId { get; set; } - public int Code { get; set; } = 0; + public int Code { get; set; } = 0; - public string StudyCode { get; set; } = string.Empty; + public string StudyCode { get; set; } = string.Empty; - public string StudyInstanceUid { get; set; } = string.Empty; - public DateTime? StudyTime { get; set; } - public string Modalities { get; set; } = string.Empty; + public string StudyInstanceUid { get; set; } = string.Empty; + public DateTime? StudyTime { get; set; } + public string Modalities { get; set; } = string.Empty; - public string Description { get; set; } = string.Empty; - public int SeriesCount { get; set; } = 0; - public int InstanceCount { get; set; } = 0; + public string Description { get; set; } = string.Empty; + public int SeriesCount { get; set; } = 0; + public int InstanceCount { get; set; } = 0; - public string InstitutionName { get; set; } = string.Empty; - public string PatientId { get; set; } = string.Empty; - public string PatientName { get; set; } = string.Empty; - public string PatientAge { get; set; } = string.Empty; - public string PatientSex { get; set; } = string.Empty; + public string InstitutionName { get; set; } = string.Empty; + public string PatientId { get; set; } = string.Empty; + public string PatientName { get; set; } = string.Empty; + public string PatientAge { get; set; } = string.Empty; + public string PatientSex { get; set; } = string.Empty; - public string StudyId { get; set; } = string.Empty; - public string AccessionNumber { get; set; } = string.Empty; - public string PatientBirthDate { get; set; } = string.Empty; - public string AcquisitionTime { get; set; } = string.Empty; - public string AcquisitionNumber { get; set; } = string.Empty; - public string TriggerTime { get; set; } = string.Empty; + public string StudyId { get; set; } = string.Empty; + public string AccessionNumber { get; set; } = string.Empty; + public string PatientBirthDate { get; set; } = string.Empty; + public string AcquisitionTime { get; set; } = string.Empty; + public string AcquisitionNumber { get; set; } = string.Empty; + public string TriggerTime { get; set; } = string.Empty; - public string BodyPartExamined { get; set; } = string.Empty; + public string BodyPartExamined { get; set; } = string.Empty; - public string BodyPartForEdit { get; set; } = string.Empty; + public string BodyPartForEdit { get; set; } = string.Empty; - public string ModalityForEdit { get; set; } = string.Empty; + public string ModalityForEdit { get; set; } = string.Empty; - //0 未知 1 单重 2 双重 - public bool IsDoubleReview { get; set; } - - + //0 未知 1 单重 2 双重 + public bool IsDoubleReview { get; set; } + + + } } diff --git a/IRaCIS.Core.Domain/Image/TrialDicomAE.cs b/IRaCIS.Core.Domain/Image/TrialDicomAE.cs index 7469fb64d..4c49c86f5 100644 --- a/IRaCIS.Core.Domain/Image/TrialDicomAE.cs +++ b/IRaCIS.Core.Domain/Image/TrialDicomAE.cs @@ -1,41 +1,39 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2024-03-22 15:44:11 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目 - 项目DicomAE")] -[Table("TrialDicomAE")] -public class TrialDicomAE : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///DicomAE + /// + [Table("TrialDicomAE")] + public class TrialDicomAE : BaseFullAuditEntity + { + #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 43f3da43d..893392557 100644 --- a/IRaCIS.Core.Domain/Image/TrialImageDownload.cs +++ b/IRaCIS.Core.Domain/Image/TrialImageDownload.cs @@ -1,55 +1,44 @@ -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; -using System.Threading.Tasks; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目 - 影像下载监控")] -[Table("TrialImageDownload")] -public class TrialImageDownload : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } + [Table("TrialImageDownload")] + public class TrialImageDownload : BaseFullAuditEntity + { + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } - #endregion + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public string SubjectCode { get; set; } + public string SubjectCode { get; set; } - public bool IsSuccess { get; set; } + public bool IsSuccess { get; set; } - public DateTime DownloadStartTime { get; set; } - public DateTime? DownloadEndTime { get; set; } + public DateTime DownloadStartTime { get; set; } + public DateTime? DownloadEndTime { get; set; } - [StringLength(400)] - public string VisitName { get; set; } + public string VisitName { get; set; } - public ImageType ImageType { get; set; } + public ImageType ImageType { get; set; } - public int NoneDicomStudyCount { get; set; } + public int NoneDicomStudyCount { get; set; } - public int DicomStudyCount { get; set; } + public int DicomStudyCount { get; set; } - public int ImageCount { get; set; } - public long ImageSize { get; set; } + public int ImageCount { get; set; } + public long ImageSize { get; set; } - public string IP { get; set; } + public string IP { get; set; } + } + + public enum ImageType + { + Dicom = 1, + + NoneDicom = 2, + + DicomAndNoneDicom = 3 + }; } - -public enum ImageType -{ - Dicom = 1, - - NoneDicom = 2, - - DicomAndNoneDicom = 3 -}; diff --git a/IRaCIS.Core.Domain/Institution/CRO.cs b/IRaCIS.Core.Domain/Institution/CRO.cs index 8d988648f..aa4525826 100644 --- a/IRaCIS.Core.Domain/Institution/CRO.cs +++ b/IRaCIS.Core.Domain/Institution/CRO.cs @@ -1,8 +1,3 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - namespace IRaCIS.Core.Domain.Models; [Comment(" - CRO")] diff --git a/IRaCIS.Core.Domain/Institution/Hospital.cs b/IRaCIS.Core.Domain/Institution/Hospital.cs index 0a2e34b95..a90c7014f 100644 --- a/IRaCIS.Core.Domain/Institution/Hospital.cs +++ b/IRaCIS.Core.Domain/Institution/Hospital.cs @@ -1,47 +1,38 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("机构 - 医院")] -[Table("Hospital")] -public class Hospital : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("SiteId")] - public Site Site { get; set; } + [Table("Hospital")] + public class Hospital : BaseFullAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("SiteId")] + public Site Site { get; set; } - [JsonIgnore] - public List DoctorList { get; set; } - #endregion + [JsonIgnore] + public List DoctorList { get; set; } + #endregion - public string City { get; set; } = null!; + public string HospitalName { get; set; } = string.Empty; + public string UniversityAffiliated { get; set; } = string.Empty; + public string Country { get; set; } = string.Empty; + public string Province { get; set; } = string.Empty; + public string City { get; set; } = string.Empty; - public string CityCN { get; set; } = null!; + public string HospitalNameCN { get; set; } = string.Empty; + public string UniversityAffiliatedCN { get; set; } = string.Empty; + public string CountryCN { get; set; } = string.Empty; + public string ProvinceCN { get; set; } = string.Empty; + public string CityCN { get; set; } = string.Empty; - public string Country { get; set; } = null!; - public string CountryCN { get; set; } = null!; - - public string HospitalName { get; set; } = null!; - - public string HospitalNameCN { get; set; } = null!; - - public string Province { get; set; } = null!; - - public string ProvinceCN { get; set; } = null!; - - public Guid? SiteId { get; set; } - - public string UniversityAffiliated { get; set; } = null!; - - public string UniversityAffiliatedCN { get; set; } = null!; + /// + /// 中心Id + /// + public Guid? SiteId { get; set; } = Guid.Empty; + } } diff --git a/IRaCIS.Core.Domain/Institution/Site.cs b/IRaCIS.Core.Domain/Institution/Site.cs index 6c8050ed5..1cf0ab8da 100644 --- a/IRaCIS.Core.Domain/Institution/Site.cs +++ b/IRaCIS.Core.Domain/Institution/Site.cs @@ -1,62 +1,42 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment(" - Site")] -[Table("Site")] -public partial class Site : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region - [JsonIgnore] - [ForeignKey("HospitalId")] - public Hospital Hospital { get; set; } - [JsonIgnore] - public List TrialSiteList { get; set; } - #endregion + [Table("Site")] + public partial class Site : BaseFullAuditEntity + { + #region + [JsonIgnore] + [ForeignKey("HospitalId")] + public Hospital Hospital { get; set; } + [JsonIgnore] + public List TrialSiteList { get; set; } + #endregion - [StringLength(500)] - public string Address { get; set; } = null!; + public string SiteName { get; set; } = string.Empty; + public string SiteNameCN { get; set; } = string.Empty; + public string AliasName { get; set; } = string.Empty; + public string SiteCode { get; set; } = string.Empty; - public string AliasName { get; set; } = null!; + public int Code { get; set; } - public string City { get; set; } = null!; + public string City { get; set; } = string.Empty; + public string Country { get; set; } = string.Empty; + public Guid? HospitalId { get; set; } + public int State { get; set; } - public int Code { get; set; } + public string Province { get; set; } = string.Empty; - public string ContactName { get; set; } = null!; + public string UniqueCode { get; set; } = string.Empty; - public string ContactPhone { get; set; } = null!; + public string Address { get; set; } = string.Empty; - public string Country { get; set; } = null!; - - public string DirectorName { get; set; } = null!; - - public string DirectorPhone { get; set; } = null!; - - public Guid? HospitalId { get; set; } - - public string Province { get; set; } = null!; - - [StringLength(500)] - public string SiteCode { get; set; } = null!; - - [StringLength(500)] - public string SiteName { get; set; } = null!; - - [StringLength(400)] - public string SiteNameCN { get; set; } = null!; - - [Comment(" ʱδ")] - public int State { get; set; } - - public string UniqueCode { get; set; } = null!; + public string DirectorName { get; set; } = string.Empty; + public string DirectorPhone { get; set; } = string.Empty; + public string ContactName { get; set; } = string.Empty; + public string ContactPhone { get; set; } = string.Empty; + } } diff --git a/IRaCIS.Core.Domain/Institution/Sponsor.cs b/IRaCIS.Core.Domain/Institution/Sponsor.cs index 527bfb06d..4c7ff4b25 100644 --- a/IRaCIS.Core.Domain/Institution/Sponsor.cs +++ b/IRaCIS.Core.Domain/Institution/Sponsor.cs @@ -1,27 +1,19 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment(" - Sponsor")] -[Table("Sponsor")] -public partial class Sponsor : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region + [Table("Sponsor")] + public partial class Sponsor : BaseFullAuditEntity + { + #region - #endregion + #endregion + public string SponsorName { get; set; } = String.Empty; + public string SponsorNameCN { get; set; } = String.Empty; - public bool IsTrialLevel { get; set; } + public string SponsorCode { get; set; } = String.Empty; - public string SponsorCode { get; set; } = null!; + public bool IsTrialLevel { get; set; } - [StringLength(1000)] - public string SponsorName { get; set; } = null!; - [StringLength(1000)] - public string SponsorNameCN { get; set; } = null!; - - public Guid? TrialId { get; set; } + public Guid? TrialId { get; set; } + } } diff --git a/IRaCIS.Core.Domain/Management/Menu.cs b/IRaCIS.Core.Domain/Management/Menu.cs index 8f9c7d301..88cacbb59 100644 --- a/IRaCIS.Core.Domain/Management/Menu.cs +++ b/IRaCIS.Core.Domain/Management/Menu.cs @@ -1,60 +1,59 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("后台 - 系统菜单 （需要同步）")] -[Table("Menu")] -public class Menu : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public List UserTypeMenuList { get; set; } - #endregion - - public string ApiPath { get; set; } = null!; - - [StringLength(400)] - public string Component { get; set; } = null!; - - public bool IsCache { get; set; } - - public bool IsDisplay { get; set; } - - public bool IsEnable { get; set; } - - public bool IsExternalLink { get; set; } - - public bool? IsInTabDisplay { get; set; } - - public string LanguageMark { get; set; } = null!; - - public string MenuIcon { get; set; } = null!; - - public string MenuName { get; set; } = null!; - [Comment("类型（M目录 C菜单 F按钮 L链接）")] - public string MenuType { get; set; } = null!; - - public string Meta { get; set; } = null!; + [Table("Menu")] + public class Menu : BaseFullAuditEntity + { + #region 导航属性 + [JsonIgnore] + public List UserTypeMenuList { get; set; } + #endregion - [MaxLength] - public string Note { get; set; } - public Guid ParentId { get; set; } + //上级菜单 + public Guid? ParentId { get; set; } = Guid.Empty; - [Comment("路由地址")] - [StringLength(500)] - public string Path { get; set; } = null!; + // 类型（M目录 C菜单 F按钮 L链接） + public string MenuType { get; set; } = string.Empty; - public string PermissionStr { get; set; } = null!; + public string MenuIcon { get; set; } = string.Empty; - public string Redirect { get; set; } = null!; + public string MenuName { get; set; } = string.Empty; - public int ShowOrder { get; set; } + //路由地址 + public string Path { get; set; } = string.Empty; + + //组件路径 + public string Component { get; set; } = string.Empty; + + public int ShowOrder { get; set; } + + //启用 禁用 + public bool IsEnable { get; set; } = true; + + public bool IsCache { get; set; } = false; + + public bool IsDisplay { get; set; } + + public bool IsInTabDisplay { get; set; } + + public bool IsExternalLink { get; set; } + + //权限点 + public string PermissionStr { get; set; } = string.Empty; + + //Api 接口地址 + public string ApiPath { get; set; } = string.Empty; + + public string Note { get; set; } = string.Empty; + + public string Meta { get; set; } = string.Empty; + + public string Redirect { get; set; } = string.Empty; + public string LanguageMark { get; set; } = string.Empty; + + + } } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs index fd94e700f..03d122993 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs @@ -3,54 +3,52 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-04-25 09:46:09 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using System.Collections.Generic; -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; - -[Comment("后台 - 系统通知")] -[Table("SystemNotice")] -public class SystemNotice : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public List NoticeUserTypeList { get; set; } = new List(); - [JsonIgnore] - public List NoticeUserReadList { get; set; } = new List(); + /// + ///SystemNotice + /// + [Table("SystemNotice")] + public class SystemNotice : BaseFullAuditEntity + { + #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 SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; } + public string NoticeContent { get; set; } = string.Empty; - public SystemNotice_NoticeLevelEnum NoticeLevelEnum { get; set; } + public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; } - public SystemNotice_ApplicableProjectEnum ApplicableProjectEnum { get; set; } + public SystemNotice_NoticeLevelEnum NoticeLevelEnum { get; set; } - public SystemNotice_NoticeModeEnum NoticeModeEnum { get; set; } + public SystemNotice_ApplicableProjectEnum ApplicableProjectEnum { get; set; } - public SystemNotice_NoticeStateEnum NoticeStateEnum { get; set; } + public SystemNotice_NoticeModeEnum NoticeModeEnum { get; set; } - public DateTime? StartDate { get; set; } + public SystemNotice_NoticeStateEnum NoticeStateEnum { get; set; } - public DateTime? EndDate { get; set; } + public DateTime? StartDate { get; set; } - public string FileName { get; set; } = string.Empty; + public DateTime? EndDate { get; set; } - public string Path { get; set; } = string.Empty; + public string FileName { get; set; } = string.Empty; - public Guid? PublishedUserId { get; set; } + public string Path { get; set; } = string.Empty; - public User PublishedUser { get; set; } + public Guid? PublishedUserId { get; set; } - public DateTime? PublishedTime { get; set; } + public User PublishedUser { 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 5d3b2c373..0e77eb764 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs @@ -1,25 +1,23 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-04-25 09:46:09 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("后台 - 系统通知用户读取记录")] -[Table("SystemNoticeUserRead")] -public class SystemNoticeUserRead : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///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 a5357a3b0..aadd226f3 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs @@ -1,32 +1,30 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-04-25 09:46:09 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("后台 - 系统通知用户类型配置")] -[Table("SystemNoticeUserType")] -public class SystemNoticeUserType : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///SystemNoticeUserType + /// + [Table("SystemNoticeUserType")] + public class SystemNoticeUserType : BaseAddAuditEntity + { - #region 导航属性 - [JsonIgnore] + #region 导航属性 + [JsonIgnore] - [ForeignKey("UserTypeId")] - public UserType NoticeUserType { get; set; } - #endregion + [ForeignKey("UserTypeId")] + public UserType NoticeUserType { get; set; } + #endregion - public Guid SystemNoticeId { get; set; } + public Guid SystemNoticeId { get; set; } - public Guid UserTypeId { get; set; } + public Guid UserTypeId { get; set; } + } + } diff --git a/IRaCIS.Core.Domain/Management/Role.cs b/IRaCIS.Core.Domain/Management/Role.cs index 853559f26..cf33589c6 100644 --- a/IRaCIS.Core.Domain/Management/Role.cs +++ b/IRaCIS.Core.Domain/Management/Role.cs @@ -1,20 +1,17 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Table("Role")] -public partial class Role : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + [Table("Role")] + public partial class Role : BaseFullAuditEntity + { + #region 导航属性 - #endregion - public string RoleName { get; set; } = string.Empty; + #endregion + public string RoleName { get; set; } = string.Empty; - public string RoleDescription { get; set; } = string.Empty; + public string RoleDescription { get; set; } = string.Empty; - public int Status { get; set; } - public int PrivilegeLevel { get; set; } //权限级别 + public int Status { get; set; } + public int PrivilegeLevel { get; set; } //权限级别 + } } diff --git a/IRaCIS.Core.Domain/Management/User.cs b/IRaCIS.Core.Domain/Management/User.cs index cef183178..53b27509a 100644 --- a/IRaCIS.Core.Domain/Management/User.cs +++ b/IRaCIS.Core.Domain/Management/User.cs @@ -1,98 +1,95 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; using EntityFrameworkCore.Projectables; using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models; - -[Table("User")] -public partial class User : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region - [ForeignKey("UserTypeId")] - public UserType UserTypeRole { get; set; } + [Table("User")] + public partial class User : BaseFullAuditEntity + { + #region + [ForeignKey("UserTypeId")] + public UserType UserTypeRole { get; set; } - [JsonIgnore] - public List SystemDocConfirmedList { get; set; } + [JsonIgnore] + public List SystemDocConfirmedList { get; set; } - [JsonIgnore] - public List UserTrials { get; set; } = new List(); + [JsonIgnore] + public List UserTrials { get; set; } = new List(); - [JsonIgnore] - public List VisitTaskList { get; set; } + [JsonIgnore] + public List VisitTaskList { get; set; } - #endregion + #endregion - [StringLength(255)] - public string UserName { get; set; } = String.Empty; + [StringLength(255)] + public string UserName { get; set; } = String.Empty; - [StringLength(255)] - public string Password { get; set; } = String.Empty; - [StringLength(255)] + [StringLength(255)] + public string Password { get; set; } = String.Empty; + [StringLength(255)] - public string LastName { 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 Phone { get; set; } = string.Empty; - public string EMail { get; set; } = string.Empty; - public int? Sex { get; set; } - public UserStateEnum Status { get; set; } = UserStateEnum.Enable; + public string Phone { get; set; } = string.Empty; + public string EMail { get; set; } = string.Empty; + public int? Sex { get; set; } + public UserStateEnum Status { get; set; } = UserStateEnum.Enable; - public DateTime? LastLoginTime { get; set; } + public DateTime? LastLoginTime { get; set; } - public Guid UserTypeId { get; set; } = Guid.Empty; + public Guid UserTypeId { get; set; } = Guid.Empty; - // ڲû ⲿû - public bool IsZhiZhun { get; set; } + // ڲû ⲿû + public bool IsZhiZhun { get; set; } - public UserTypeEnum UserTypeEnum { get; set; } + public UserTypeEnum UserTypeEnum { get; set; } - public string OrganizationName { get; set; } = String.Empty; + public string OrganizationName { get; set; } = String.Empty; - public bool PasswordChanged { get; set; } + public bool PasswordChanged { get; set; } - public string UserCode { get; set; } = string.Empty; + public string UserCode { get; set; } = string.Empty; - public int Code { get; set; } + public int Code { get; set; } - public string DepartmentName { get; set; } = String.Empty; + public string DepartmentName { get; set; } = String.Empty; - public string PositionName { get; set; } = String.Empty; + public string PositionName { get; set; } = String.Empty; - public bool IsFirstAdd { get; set; } = true; + public bool IsFirstAdd { get; set; } = true; - public string EmailToken { get; set; } = string.Empty; + public string EmailToken { get; set; } = string.Empty; - /// - /// һ޸ʱ - /// - public DateTime? LastChangePassWordTime { get; set; } + /// + /// һ޸ʱ + /// + public DateTime? LastChangePassWordTime { get; set; } - /// - /// LastLoginIP - /// - public string LastLoginIP { get; set; } = string.Empty; + /// + /// LastLoginIP + /// + public string LastLoginIP { get; set; } = string.Empty; - //ҽ˺ź󣬻ֵ - public Guid? DoctorId { get; set; } + //ҽ˺ź󣬻ֵ + public Guid? DoctorId { get; set; } - public bool IsTestUser { get; set; } + public bool IsTestUser { get; set; } - /// - /// Զлһ - /// - public bool AutoCutNextTask { get; set; } = false; + /// + /// Զлһ + /// + public bool AutoCutNextTask { get; set; } = false; - [Projectable] - public string FullName => LastName + " / " + FirstName; + [Projectable] + public string FullName => LastName + " / " + FirstName; - //[Projectable] public string FullName => $"{LastName} / {FirstName}"; + //[Projectable] public string FullName => $"{LastName} / {FirstName}"; + } } diff --git a/IRaCIS.Core.Domain/Management/UserFeedBack.cs b/IRaCIS.Core.Domain/Management/UserFeedBack.cs index 37c6332e9..3ec0db338 100644 --- a/IRaCIS.Core.Domain/Management/UserFeedBack.cs +++ b/IRaCIS.Core.Domain/Management/UserFeedBack.cs @@ -1,61 +1,59 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2024-07-30 10:39:01 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -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; - -[Comment("后台 - 用户反馈")] -[Table("UserFeedBack")] -public class UserFeedBack : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #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; } + /// + ///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; } - [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; } - [MaxLength] - public string QuestionDescription { get; set; } = string.Empty; - - public int State { get; set; } + public string QuestionDescription { get; set; } = string.Empty; - public Guid? TrialSiteId { get; set; } - public Guid? TrialId { get; set; } - [MaxLength] - public string ScreenshotListStr { get; set; } = string.Empty; + + public int State { get; set; } + + + public Guid? TrialSiteId { get; set; } + + + public Guid? TrialId { get; set; } + + public string ScreenshotListStr { get; set; } = string.Empty; @@ -63,5 +61,5 @@ public class UserFeedBack : BaseFullAuditEntity + } } - diff --git a/IRaCIS.Core.Domain/Management/UserLog.cs b/IRaCIS.Core.Domain/Management/UserLog.cs index 03bcba22c..d038e2098 100644 --- a/IRaCIS.Core.Domain/Management/UserLog.cs +++ b/IRaCIS.Core.Domain/Management/UserLog.cs @@ -1,95 +1,91 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-07-04 16:10:43 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("后台 - 用户账户操作日志")] -[Table("UserLog")] -public class UserLog : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public User LoginUser { get; set; } + /// + ///UserLog + /// + [Table("UserLog")] + public class UserLog : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + public User LoginUser { get; set; } - [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; + [JsonIgnore] + public User OptUser { get; set; } + #endregion + public string IP { get; set; } = string.Empty; - public UserOptType OptType { get; set; } + public string LoginFaildName { get; set; } = string.Empty; - public string LoginPassword { get; set; } = string.Empty; + public UserOptType OptType { get; set; } - public Guid? LoginUserId { get;set; } + public string LoginPassword { get; set; } = string.Empty; - public Guid? OptUserId { get;set; } - + public Guid? LoginUserId { get; set; } - public string IPRegion { get; set; } = string.Empty; + 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 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 2df7a98b5..58041c6a4 100644 --- a/IRaCIS.Core.Domain/Management/UserPassWordLog.cs +++ b/IRaCIS.Core.Domain/Management/UserPassWordLog.cs @@ -1,31 +1,32 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2024-05-07 13:47:08 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("后台 - 用户修改密码")] -[Table("UserPassWordLog")] -public class UserPassWordLog : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///UserPassWordLog + /// + [Table("UserPassWordLog")] + public class UserPassWordLog : BaseAddAuditEntity + { + #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 e684613a4..20d3ade27 100644 --- a/IRaCIS.Core.Domain/Management/UserType.cs +++ b/IRaCIS.Core.Domain/Management/UserType.cs @@ -1,54 +1,41 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using IRaCIS.Core.Domain.Share; -using Microsoft.EntityFrameworkCore; +using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models; - - -[Comment("后台 - 用户类型 （需要同步）")] -[Table("UserType")] -public class UserType : Entity +namespace IRaCIS.Core.Domain.Models { + 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 + [JsonIgnore] + public List UserList { get; set; } + #endregion + public UserTypeEnum UserTypeEnum { get; set; } - public string Description { get; set; } = null!; + public string UserTypeName { get; set; } = string.Empty; - public bool IsEnable { get; set; } + public string Description { get; set; } = string.Empty; - [Comment(" 是否是内部用户类型")] - public bool IsInternal { get; set; } + public int Order { get; set; } - [Comment(" 用于前端界面下拉框展示排序")] - public int Order { get; set; } + public string UserTypeShortName { get; set; } = string.Empty; - public string PermissionStr { get; set; } = null!; + public bool IsEnable { get; set; } = true; - [Comment(" 此数据固定，不能更改，和代码耦合")] - public UserTypeEnum UserTypeEnum { get; set; } - [Comment(" 名称、描述可以更改")] - public string UserTypeName { get; set; } = null!; - - [Comment(" 用户类型名称简写")] - public string UserTypeShortName { get; set; } = null!; + public string PermissionStr { get; set; } = string.Empty; + } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Management/UserTypeGroup.cs b/IRaCIS.Core.Domain/Management/UserTypeGroup.cs index 329833b1b..64f4c2405 100644 --- a/IRaCIS.Core.Domain/Management/UserTypeGroup.cs +++ b/IRaCIS.Core.Domain/Management/UserTypeGroup.cs @@ -1,35 +1,33 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-03-16 09:50:51 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("后台 - 用户类型组（需要同步）")] -[Table("UserTypeGroup")] -public class UserTypeGroup : Entity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("DictionaryId")] - public Dictionary Group { get; set; } + /// + ///UserTypeGroup + /// + [Table("UserTypeGroup")] + public class UserTypeGroup : Entity + { + #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 8466e1225..6aa316d93 100644 --- a/IRaCIS.Core.Domain/Management/UserTypeMenu.cs +++ b/IRaCIS.Core.Domain/Management/UserTypeMenu.cs @@ -1,22 +1,22 @@ -using System; -using System.ComponentModel.DataAnnotations.Schema; -using IRaCIS.Core.Domain.Share; - -namespace IRaCIS.Core.Domain.Models; - -[Table("UserTypeMenu")] -public partial class UserTypeMenu : Entity +namespace IRaCIS.Core.Domain.Models { - #region + [Table("UserTypeMenu")] + public partial class UserTypeMenu : Entity + { + #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/CheckChallengeDialog.cs b/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs index 7e60e00dc..8759bd78c 100644 --- a/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs +++ b/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs @@ -1,11 +1,4 @@ -using IRaCIS.Core.Domain.Models; -using IRaCIS.Core.Domain.Share; -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text; +using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models; diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs index 721a07652..322d984e6 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs @@ -1,44 +1,48 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2021-11-22 11:15:18 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models; - -[Comment("受试者访视 - 既往放疗史")] -[Table("PreviousHistory")] -public class PreviousHistory : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - #endregion + /// + ///PreviousHistory + /// + [Table("PreviousHistory")] + public class PreviousHistory : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } + #endregion - [Comment(" 临床数据类型Id")] - public Guid ClinicalDataTrialSetId { get; set; } + public DateTime? StartTime { get; set; } - public DateTime? EndTime { get; set; } + public DateTime? EndTime { get; set; } - public string FileName { get; set; } = null!; - public int IsPD { get; set; } + public int? IsPD { get; set; } - public bool IsSubjectLevel { get; set; } - public string Path { get; set; } = null!; + public Guid SubjectVisitId { get; set; } - public string Position { get; set; } = null!; - public DateTime? StartTime { get; set; } + public bool IsSubjectLevel { get; set; } - public Guid SubjectVisitId { get; set; } + public string Path { get; set; } = String.Empty; + + + public string FileName { get; set; } = String.Empty; + + + public string Position { get; set; } = String.Empty; + + + + public Guid ClinicalDataTrialSetId { get; set; } + + + } } - - diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs index 549c3d1b9..25701a93b 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs @@ -1,43 +1,49 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2021-11-22 11:15:18 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models; - -[Comment("受试者访视 - 既往其他治疗史")] -[Table("PreviousOther")] -public class PreviousOther : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///PreviousOther + /// + [Table("PreviousOther")] + public class PreviousOther : BaseAddAuditEntity + { + #region 导航属性 - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - #endregion + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } + #endregion - [Comment(" 临床数据类型Id")] - public Guid ClinicalDataTrialSetId { get; set; } + public DateTime? StartTime { get; set; } - public DateTime? EndTime { get; set; } - public string FileName { get; set; } = null!; + public DateTime? EndTime { get; set; } - public bool? IsPD { get; set; } - public bool IsSubjectLevel { get; set; } + public bool IsPD { get; set; } - public string Path { get; set; } = null!; + public Guid SubjectVisitId { get; set; } - public DateTime? StartTime { get; set; } - public Guid SubjectVisitId { get; set; } + public bool IsSubjectLevel { get; set; } - public string TreatmentType { get; set; } = null!; + + public string Path { get; set; } = String.Empty; + + + public string FileName { get; set; } = String.Empty; + + + public string TreatmentType { get; set; } = String.Empty; + + /// + /// 临床数据类型Id + /// + [Required] + public Guid ClinicalDataTrialSetId { get; set; } + + } } - - diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs index 167a8ec2f..f4d2b5a64 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs @@ -4,47 +4,52 @@ // 生成时间 2021-12-09 11:35:31 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 using IRaCIS.Core.Domain.Share; -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models; - -[Comment("受试者访视 - 临床数据配置")] -[Table("PreviousPDF")] -public class PreviousPDF : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } + /// + ///PreviousPDF + /// + [Table("PreviousPDF")] + public class PreviousPDF : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } - #endregion + #endregion - [Comment("临床级别")] - public ClinicalLevel? ClinicalLevel { get; set; } + public Guid SubjectVisitId { get; set; } - public ClinicalDataType? DataType { get; set; } + public string Path { get; set; } = string.Empty; - public string FileName { get; set; } = null!; + public string FileName { get; set; } = string.Empty; - public bool? IsVisist { get; set; } - [StringLength(512)] - public string Path { get; set; } = null!; + public bool? IsVisist { get; set; } - public Guid? SubjectId { get; set; } + /// + /// 临床级别 + /// + public ClinicalLevel? ClinicalLevel { get; set; } + + /// + /// 数据类型 + /// + public ClinicalDataType? DataType { get; set; } + + /// + /// 上传方式 + /// + public ClinicalUploadType? UploadType { get; set; } + + public Guid? TrialId { get; set; } + + public Guid? SubjectId { get; set; } + + } - public Guid SubjectVisitId { get; set; } - public Guid? TrialId { get; set; } - [Comment("上传方式")] - public ClinicalUploadType? UploadType { get; set; } } - - - - - diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs index 808fd7710..d341258ad 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs @@ -1,41 +1,43 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2021-11-22 11:15:18 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models; - -[Comment("受试者访视 - 既往手术史")] -[Table("PreviousSurgery")] -public class PreviousSurgery : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///PreviousSurgery + /// + [Table("PreviousSurgery")] + public class PreviousSurgery : BaseAddAuditEntity + { - #region 导航属性 + #region 导航属性 - #endregion + #endregion - [Comment(" 临床数据类型Id")] - public Guid ClinicalDataTrialSetId { get; set; } - public string FileName { get; set; } = null!; - public bool IsSubjectLevel { get; set; } + public DateTime? OperationTime { get; set; } - public string OperationName { get; set; } = null!; + public Guid SubjectVisitId { get; set; } - public DateTime? OperationTime { get; set; } + public bool IsSubjectLevel { get; set; } - public string Path { get; set; } = null!; + public string Path { get; set; } = String.Empty; - public Guid SubjectVisitId { get; set; } + public string FileName { get; set; } = String.Empty; + public string OperationName { get; set; } = String.Empty; + + /// + /// 临床数据类型Id + /// + [Required] + public Guid ClinicalDataTrialSetId { get; set; } + + + + } } - - - diff --git a/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs b/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs index a216fba73..fc0c9e734 100644 --- a/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs +++ b/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs @@ -1,31 +1,25 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models; - -[Comment("稽查 - 后端接收前端上传 文件记录表")] -[Table("InspectionFile")] -public class InspectionFile : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + /// 一致性核查文件 + /// + [Table("InspectionFile")] + public class InspectionFile : BaseAddAuditEntity + { + #region 导航属性 - #endregion + #endregion - [Comment(" 文件名称")] - [StringLength(400)] - public string FileName { get; set; } = null!; + public string FileName { get; set; } = string.Empty; - [Comment(" 相对路径")] - [StringLength(400)] - public string RelativePath { get; set; } = null!; - [Comment(" 项目ID")] - public Guid TrialId { get; set; } + public string RelativePath { get; set; } = string.Empty; + + public Guid TrialId { get; set; } + + + + } } - - - diff --git a/IRaCIS.Core.Domain/QC/QCChallenge.cs b/IRaCIS.Core.Domain/QC/QCChallenge.cs index 2adb09051..d4ee34017 100644 --- a/IRaCIS.Core.Domain/QC/QCChallenge.cs +++ b/IRaCIS.Core.Domain/QC/QCChallenge.cs @@ -1,81 +1,82 @@ 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; - -[Comment("受试者访视 - QC质疑")] -[Table("QCChallenge")] -public class QCChallenge : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("LatestReplyUserId")] - public User LatestReplyUser { get; set; } - [JsonIgnore] - //导航属性 - [ForeignKey("SubjectVisitId")] - public SubjectVisit SubjectVisit { get; set; } + public class QCChallenge : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("LatestReplyUserId")] + public User LatestReplyUser { get; set; } + [JsonIgnore] + //导航属性 + [ForeignKey("SubjectVisitId")] + public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - public List DialogList { get; set; } = new List(); + [JsonIgnore] + public List DialogList { get; set; } = new List(); - #endregion + #endregion - [Comment(" 行动事项")] - [StringLength(1024)] - public string ActionContent { get; set; } = null!; - public string ChallengeCode { get; set; } = null!; - [StringLength(1024)] - public string ChallengeType { get; set; } = null!; - public DateTime? ClosedTime { get; set; } + public Guid TrialId { get; set; } + public Guid SubjectVisitId { get; set; } - public string ClosedUser { get; set; } = null!; + public DateTime? DeadlineTime { get; set; } - public QCChallengeCloseEnum CloseResonEnum { get; set; } + public string Note { get; set; } = string.Empty; - public int Code { get; set; } + public QCChanllengeReuploadEnum ReuploadEnum { get; set; } - [Comment(" 质疑内容")] - [StringLength(1024)] - public string Content { get; set; } = null!; - [Comment(" 用于双审的时候 区分 第一个人和第二个人的数据")] - public CurrentQC CurrentQCEnum { get; set; } + public DateTime? ReUploadedTime { get; set; } - public DateTime? DeadlineTime { get; set; } + public string ReUploader { get; set; } = string.Empty; - public bool IsClosed { get; set; } + public Guid? ReUploadUserId { get; set; } - public DateTime? LatestMsgTime { get; set; } + public TrialQCProcess QCProcessEnum { get; set; } - public Guid? LatestReplyUserId { get; set; } + public CurrentQC CurrentQCEnum { get; set; } - [Comment(" 额外补充")] - [StringLength(1024)] - public string Note { get; set; } = null!; + public DateTime? LatestMsgTime { get; set; } - public TrialQCProcess QCProcessEnum { get; set; } - public DateTime? ReUploadedTime { get; set; } + public Guid? LatestReplyUserId { get; set; } - public QCChanllengeReuploadEnum? ReuploadEnum { get; set; } - [Comment(" 记录重传人")] - public string ReUploader { get; set; } = null!; + public string ChallengeCode { get; set; } = string.Empty; - public Guid? ReUploadUserId { get; set; } + public int Code { get; set; } - public Guid SubjectVisitId { get; set; } - public Guid TrialId { get; set; } - public UserTypeEnum UserTypeEnum { get; set; } + public bool IsClosed { get; set; } + public DateTime? ClosedTime { get; set; } + + public string ClosedUser { get; set; } = string.Empty; + + + + public QCChallengeCloseEnum CloseResonEnum { get; set; } + + public string Content { get; set; } = string.Empty; + + public string ActionContent { get; set; } = string.Empty; + + public UserTypeEnum UserTypeEnum { get; set; } + + + public string ChallengeType { get; set; } = string.Empty; + + + + + + + + } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs b/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs index 618db0437..605b3e895 100644 --- a/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs +++ b/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs @@ -1,26 +1,20 @@ using IRaCIS.Core.Domain.Share; -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models; - -[Comment("受试者访视 - QC质疑对话")] -[Table("QCChallengeDialog")] -public class QCChallengeDialog : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public QCChallenge QCChallenge { get; set; } - #endregion + public class QCChallengeDialog : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + public QCChallenge QCChallenge { get; set; } + #endregion - public Guid QCChallengeId { get; set; } + public string TalkContent { get; set; } = string.Empty; - public Guid SubjectVisitId { get; set; } + public Guid QCChallengeId { get; set; } - [StringLength(500)] - public string TalkContent { get; set; } = null!; + public Guid SubjectVisitId { get; set; } - public UserTypeEnum UserTypeEnum { get; set; } + public UserTypeEnum UserTypeEnum { get; set; } + } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/QC/QCQuestion.cs b/IRaCIS.Core.Domain/QC/QCQuestion.cs index f520fd511..c3ab47479 100644 --- a/IRaCIS.Core.Domain/QC/QCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/QCQuestion.cs @@ -3,45 +3,46 @@ // 生成时间 2021-11-11 11:19:10 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 using IRaCIS.Core.Domain.Share; -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models; - -[Comment("后台 - QC质控问题（需要同步）")] -[Table("QCQuestion")] -public class QCQuestion : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///QCQuestionConfigure + /// + [Table("QCQuestion")] + public class QCQuestion : BaseFullAuditEntity + { + #region 导航属性 - [JsonIgnore] - [ForeignKey("ParentId")] - public QCQuestion ParentQuestion { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("ParentId")] + public QCQuestion ParentQuestion { get; set; } + #endregion - public bool IsEnable { get; set; } + public string QuestionName { get; set; } = string.Empty; - public bool IsRequired { get; set; } - public LanguageType LanguageType { get; set; } + /// 语言类型 + public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - public Guid? ParentId { get; set; } - public string ParentTriggerValue { get; set; } = null!; + public bool IsRequired { get; set; } - [StringLength(510)] - public string QuestionName { get; set; } = null!; + public bool IsEnable { get; set; } - public int ShowOrder { get; set; } + /// 下拉框、文本、单选、多选 + public string Type { get; set; } = string.Empty; - [Comment(" 下拉框、文本、单选、多选")] - public string Type { get; set; } = null!; + public string TypeValue { get; set; } = string.Empty; - public string TypeValue { get; set; } = null!; + public string ParentTriggerValue { get; set; } = string.Empty; + public Guid? ParentId { get; set; } + + + public int ShowOrder { get; set; } + + + + } } - - - diff --git a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs index 3191bd372..8f6e408c2 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs @@ -3,62 +3,63 @@ // 生成时间 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; - -[Comment("项目 - 质控问题")] -[Table("TrialQCQuestion")] -public class TrialQCQuestion : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("ParentId")] - public TrialQCQuestion ParentQCQuestion { get; set; } + /// + ///TrialQCQuestionConfigure + /// + [Table("TrialQCQuestion")] + public class TrialQCQuestion : BaseFullAuditEntity + { + #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; } - - [StringLength(500)] - public string QuestionName { get; set; } = string.Empty; - - public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - - public bool IsRequired { get; set; } - - public bool IsEnable { get; set; } - [Comment(" 下拉框、文本、单选、多选")] - public string Type { get; set; } = string.Empty; + public Guid TrialId { get; set; } - public Guid? ParentId { get; set; } + public string QuestionName { get; set; } = string.Empty; + /// 语言类型 + + public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - public string TypeValue { get; set; } = string.Empty; + public bool IsRequired { get; set; } - public string ParentTriggerValue { get; set; } = string.Empty; + public bool IsEnable { get; set; } + + /// 下拉框、文本、单选、多选 + public string Type { get; set; } = string.Empty; - public int ShowOrder { get; set; } + public Guid? ParentId { get; set; } - public bool? IsConfirm { get; set; } + + public string TypeValue { get; set; } = string.Empty; + + + public string ParentTriggerValue { get; set; } = string.Empty; + + + 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 24b2a33e5..1fa27eeb5 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs @@ -4,39 +4,37 @@ // 生成时间 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; - -[Comment("项目 - 质控问题表单答案")] -[Table("TrialQCQuestionAnswer")] -public class TrialQCQuestionAnswer : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public TrialQCQuestion TrialQCQuestionConfigure { get; set; } - #endregion + /// + ///TrialQCQuestionRecord + /// + [Table("TrialQCQuestionAnswer")] + public class TrialQCQuestionAnswer : BaseFullAuditEntity + { + #region 导航属性 + [JsonIgnore] + public TrialQCQuestion TrialQCQuestionConfigure { get; set; } + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public string Answer { get; set; } = string.Empty; + public string Answer { get; set; } = string.Empty; - public TrialQCProcess QCProcessEnum { get; set; } + public TrialQCProcess QCProcessEnum { get; set; } - [Comment("1代表第一个人QC数据 2 代表第二个人QC数据")] - public CurrentQC CurrentQCEnum { get; set; } + // 1代表第一个人QC数据 2 代表第二个人QC数据 + public CurrentQC CurrentQCEnum { get; set; } - public Guid SubjectVisitId { 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 7342cf9d0..65432651a 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs @@ -1,50 +1,58 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-03-17 11:50: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; +namespace IRaCIS.Core.Domain.Models +{ + /// + ///SubjectAdditionalEvaluationResult + /// + [Table("SubjectAdditionalEvaluationResult")] + public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialReadingQuestionId")] + public ReadingQuestionTrial TrialReadingQuestion { get; set; } -[Comment("受试者 - 附加评估标准结果")] -[Table("SubjectAdditionalEvaluationResult")] -public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialReadingQuestionId")] - public ReadingQuestionTrial TrialReadingQuestion { get; set; } - - #endregion + #endregion - [Comment(" 附加评估答案")] - public string Answer { get; set; } = null!; - [Comment(" 最终结果")] - public string FinalAnswer { get; set; } = null!; + public Guid TrialReadingQuestionId { get; set; } - [Comment(" 最终结果翻字典")] - public string FinalTranslateDictionaryCode { get; set; } = null!; + public Guid SubjectId { get; set; } - [Comment(" 是否是最终结果")] - public bool IsFinalResult { get; set; } + public Guid TrialReadingCriterionId { get; set; } - public Guid SubjectId { get; set; } + public Guid? VisitTaskId { get; set; } - [Comment(" 附加评估答案翻译字典")] - public string TranslateDictionaryCode { get; set; } = null!; + public string Answer { get; set; } = string.Empty; - public Guid TrialReadingCriterionId { get; set; } + /// + /// 附加评估答案翻译字典 + /// - public Guid TrialReadingQuestionId { get; set; } + public string TranslateDictionaryCode { get; set; } = string.Empty; - public Guid? VisitTaskId { get; set; } + /// + /// 是否是最终结果 + /// + + public bool IsFinalResult { get; set; } + + /// + /// 最终结果 + /// + + public string FinalAnswer { get; set; } = string.Empty; + + /// + /// 最终结果翻字典 + /// + + 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 a7978baf3..e017fb527 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs @@ -1,39 +1,39 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-03-17 11:46:55 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -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; - -[Comment("受试者 - 参与附加评估标准配置")] -[Table("SubjectCriteriaEvaluation")] -public class SubjectCriteriaEvaluation : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public Subject subject { get; set; } + /// + ///SubjectCriteriaEvaluation + /// + [Table("SubjectCriteriaEvaluation")] + public class SubjectCriteriaEvaluation : BaseFullAuditEntity + { + #region 导航属性 + [JsonIgnore] + public Subject subject { get; set; } - [JsonIgnore] - [ForeignKey("TrialReadingCriterionId")] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + [JsonIgnore] + [ForeignKey("TrialReadingCriterionId")] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - [JsonIgnore] - public List SubjectCriteriaEvaluationVisitFilterList { get; set; } - #endregion + [JsonIgnore] + public List SubjectCriteriaEvaluationVisitFilterList { get; set; } + #endregion - [Comment(" 是否参与评估")] - public bool IsJoinEvaluation { get; set; } - public Guid SubjectId { get; set; } + public Guid SubjectId { get; set; } - public Guid TrialReadingCriterionId { 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 38fc5fe6f..2ec9cf49a 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs @@ -1,76 +1,81 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-03-17 11:51:12 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -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; - -[Comment("受试者 - 附加评估标准影像筛选")] -[Table("SubjectCriteriaEvaluationVisitFilter")] -public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialReadingCriterionId")] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + /// + ///SubjectCriteriaEvaluationVisitFilter + /// + [Table("SubjectCriteriaEvaluationVisitFilter")] + public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity + { + #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 - [Comment(" 影像判断结果")] - public ImageDeterminationResultState ImageDeterminationResultState { get; set; } + public Guid SubjectId { get; set; } - [Comment(" 影像筛选状态")] - public ImageFilterState ImageFilterState { get; set; } - [Comment(" 是否已生成任务")] - public bool IsGeneratedTask { get; set; } + public Guid TrialReadingCriterionId { get; set; } - public Guid SubjectId { get; set; } - public Guid SubjectVisitId { get; set; } - public Guid TrialReadingCriterionId { 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 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 13bcd4eb7..da812ff6c 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs @@ -1,51 +1,50 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-03-17 11:51: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; - -[Comment("受试者 - 附加评估标准影像筛选检查")] -[Table("SubjectCriteriaEvaluationVisitStudyFilter")] -public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialReadingCriterionId")] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + /// + ///SubjectCriteriaEvaluationVisitStudyFilter + /// + [Table("SubjectCriteriaEvaluationVisitStudyFilter")] + public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialReadingCriterionId")] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } - [ForeignKey("SeriesId")] - [JsonIgnore] - public DicomSeries Series { get; set; } + [ForeignKey("SeriesId")] + [JsonIgnore] + public DicomSeries Series { get; set; } - [ForeignKey("StudyId")] - [JsonIgnore] - public DicomStudy Study { get; set; } - #endregion + [ForeignKey("StudyId")] + [JsonIgnore] + public DicomStudy Study { get; set; } + #endregion - [Comment(" 是否确认")] - public bool IsConfirmed { get; set; } + public Guid TrialReadingCriterionId { 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; } + public Guid SubjectVisitId { get; set; } + public Guid StudyId { get; set; } + + public Guid SeriesId { get; set; } + + + public bool IsConfirmed { get; set; } + + public bool IsReading { get; set; } + + + + } } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs index 09e241534..a48ac65f3 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs @@ -1,18 +1,13 @@ using IRaCIS.Core.Domain.Share; -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; using System.Linq; namespace IRaCIS.Core.Domain.Models; [Comment("系统 - 临床数据配置")] [Table("ClinicalDataSystemSet")] -public class ClinicalDataSystemSet : BaseAddAuditEntity +public class ClinicalDataSystemSet : BaseAddAuditEntity { #region 导航属性 @@ -26,14 +21,14 @@ public class ClinicalDataSystemSet : BaseAddAuditEntity [StringLength(400)] public string ClinicalDataSetEnName { get; set; } = null!; - - [Comment(" 枚举(字典里面取的)")] + + [Comment(" 枚举(字典里面取的)")] public int ClinicalDataSetEnum { get; set; } public string ClinicalDataSetName { get; set; } = null!; - [Comment("上传方式")] + [Comment("上传方式")] public ClinicalUploadType ClinicalUploadType { get; set; } [StringLength(512)] diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs index e67d254b0..d989f7816 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs @@ -1,18 +1,11 @@ - - -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Collections.Generic; using System.Linq; -using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models; [Comment("项目 - 临床数据适应标准配置")] [Table("ClinicalDataTrialSet")] -public class ClinicalDataTrialSet : BaseAddAuditEntity +public class ClinicalDataTrialSet : BaseAddAuditEntity { #region 导航属性 diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs index c9c1c9dd2..37d85e112 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs @@ -1,81 +1,102 @@ - - -using System; 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; - -[Comment("项目阅片 - 临床数据")] -[Table("ReadingClinicalData")] -public class ReadingClinicalData : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + /// 项目的临床数据 + /// + [Table("ReadingClinicalData")] + public class ReadingClinicalData : BaseAddAuditEntity + { + #region 导航属性 - [JsonIgnore] - [ForeignKey("ClinicalDataTrialSetId")] + [JsonIgnore] + [ForeignKey("ClinicalDataTrialSetId")] - public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } + public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } - [JsonIgnore] - [ForeignKey("StudyId")] - public DicomStudy DicomStudy { get; set; } + [JsonIgnore] + [ForeignKey("StudyId")] + public DicomStudy DicomStudy { get; set; } - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("ReadingId")] - public SubjectVisit SubjectVisit { get; set; } + [JsonIgnore] + [ForeignKey("ReadingId")] + public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - [ForeignKey("SubjectId")] - public Subject Subject { get; set; } + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } - [JsonIgnore] - [ForeignKey("ReadingId")] + [JsonIgnore] + [ForeignKey("ReadingId")] - public ReadModule ReadModule { get; set; } + public ReadModule ReadModule { get; set; } - /// - /// PDF文件 - /// - [JsonIgnore] - public List ReadingClinicalDataPDFList { get; set; } - #endregion + /// + /// PDF文件 + /// + [JsonIgnore] + public List ReadingClinicalDataPDFList { get; set; } + #endregion - [Comment("临床数据类型Id")] - public Guid ClinicalDataTrialSetId { get; set; } + public Guid TrialId { get; set; } - public int FileCount { get; set; } + /// + /// 访视Id 或者模块Id + /// + public Guid ReadingId { get; set; } - public bool? IsBlind { get; set; } + public Guid? StudyId { get; set; } - public bool? IsComplete { get; set; } - public bool IsSign { get; set; } + public Guid SubjectId { get; set; } - public bool IsVisit { get; set; } + /// + /// 临床数据类型Id + /// + public Guid ClinicalDataTrialSetId { get; set; } - public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } + /// + /// 是否为访视 + /// xiu + public bool IsVisit { get; set; } - public Guid ReadingId { get; set; } - public Guid? StudyId { get; set; } + /// + /// 是否签名 + /// + public bool IsSign { get; set; } - public Guid SubjectId { get; set; } + /// + /// 是否盲化 + /// + public bool? IsBlind { get; set; } + + /// + /// 是否完整 + /// + public bool? IsComplete { get; set; } + + + public int FileCount { get; set; } + + + //临床数据状态 + public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } + + + + + + } - public Guid TrialId { get; set; } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs index 2d1168cc7..6405e36fe 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs @@ -1,36 +1,36 @@ +namespace IRaCIS.Core.Domain.Models +{ + /// + /// 项目的临床数据 + /// + [Table("ReadingClinicalDataPDF")] + public class ReadingClinicalDataPDF : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("ReadingClinicalDataId")] + public ReadingClinicalData ReadingClinicalData { get; set; } + #endregion + + /// + /// 阅片临床数据ID + /// + public Guid ReadingClinicalDataId { get; set; } + + public string Path { get; set; } = string.Empty; -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; + public string FileName { get; set; } = string.Empty; -namespace IRaCIS.Core.Domain.Models; -[Comment("项目阅片 - 临床数据PDF文件")] -[Table("ReadingClinicalDataPDF")] -public class ReadingClinicalDataPDF : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("ReadingClinicalDataId")] - public ReadingClinicalData ReadingClinicalData { get; set; } - #endregion + public int Size { get; set; } = 0; + + public string Type { get; set; } = string.Empty; + } + - [StringLength(1000)] - public string FileName { get; set; } = null!; - [StringLength(2000)] - public string Path { get; set; } = null!; - [Comment("阅片临床数据ID")] - public Guid ReadingClinicalDataId { get; set; } - public int Size { get; set; } - public string Type { get; set; } = null!; } - - - diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs index 7062ea35e..898988961 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs @@ -1,78 +1,109 @@ - - -using System; 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; - -[Comment("项目阅片 - 一致性分析临床数据")] -[Table("ReadingConsistentClinicalData")] -public class ReadingConsistentClinicalData : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("ClinicalDataTrialSetId")] + /// + /// 一致性分析临床数据 + /// + [Table("ReadingConsistentClinicalData")] + public class ReadingConsistentClinicalData : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("ClinicalDataTrialSetId")] - public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } + public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } - [JsonIgnore] - [ForeignKey("StudyId")] - public DicomStudy DicomStudy { get; set; } + [JsonIgnore] + [ForeignKey("StudyId")] + public DicomStudy DicomStudy { get; set; } - [JsonIgnore] - [ForeignKey("TrialId")] + [JsonIgnore] + [ForeignKey("TrialId")] - public Trial Trial { get; set; } + public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("ReadingId")] + [JsonIgnore] + [ForeignKey("ReadingId")] - public SubjectVisit SubjectVisit { get; set; } + public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - [ForeignKey("SubjectId")] + [JsonIgnore] + [ForeignKey("SubjectId")] - public Subject Subject { get; set; } + public Subject Subject { get; set; } - [JsonIgnore] - [ForeignKey("ReadingId")] + [JsonIgnore] + [ForeignKey("ReadingId")] - public ReadModule ReadModule { get; set; } + public ReadModule ReadModule { get; set; } - /// - /// PDF文件 - /// - [JsonIgnore] - public List ReadingClinicalDataPDFList { get; set; } - #endregion + /// + /// PDF文件 + /// + [JsonIgnore] + public List ReadingClinicalDataPDFList { get; set; } + #endregion + /// + /// 项目ID + /// + public Guid TrialId { get; set; } - public Guid ClinicalDataTrialSetId { get; set; } + /// + /// 访视Id 或者模块Id + /// + public Guid ReadingId { get; set; } - public int FileCount { get; set; } - [Comment("是否盲化")] - public bool? IsBlind { get; set; } - [Comment("是否完整")] - public bool? IsComplete { get; set; } + public Guid? StudyId { get; set; } - public bool IsSign { get; set; } + /// + /// 受试者ID + /// + public Guid SubjectId { get; set; } - public bool IsVisit { get; set; } + /// + /// 临床数据类型Id + /// + public Guid ClinicalDataTrialSetId { get; set; } + + /// + /// 是否为访视 + /// xiu + public bool IsVisit { get; set; } + + + /// + /// 是否签名 + /// + public bool IsSign { get; set; } + + /// + /// 是否盲化 + /// + public bool? IsBlind { get; set; } = false; + + /// + /// 是否完整 + /// + public bool? IsComplete { get; set; } = true; + + + public int FileCount { get; set; } + + + //临床数据状态 + public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } + + + + + + + } - public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } - public Guid ReadingId { get; set; } - public Guid? StudyId { get; set; } - public Guid SubjectId { get; set; } - public Guid TrialId { get; set; } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs index b333d9b24..0c49f12f5 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs @@ -1,37 +1,40 @@ - - -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目阅片 - 一致性分析临床数据PDF")] -[Table("ReadingConsistentClinicalDataPDF")] -public class ReadingConsistentClinicalDataPDF : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("ReadingConsistentClinicalDataId")] - public ReadingConsistentClinicalData ReadingConsistentClinicalData { get; set; } - #endregion + /// + /// 一致性分析临床数据 + /// + [Table("ReadingConsistentClinicalDataPDF")] + public class ReadingConsistentClinicalDataPDF : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("ReadingConsistentClinicalDataId")] + public ReadingConsistentClinicalData ReadingConsistentClinicalData { get; set; } + #endregion - [StringLength(1000)] - public string FileName { get; set; } = null!; + /// + /// 阅片临床数据ID + /// + public Guid ReadingConsistentClinicalDataId { get; set; } + + public string Path { get; set; } = string.Empty; + + + public string FileName { get; set; } = string.Empty; + + public int Size { get; set; } = 0; + + /// + /// 文件类型 + /// + public string Type { get; set; } = string.Empty; + + + } - [StringLength(2000)] - public string Path { get; set; } = null!; - public Guid ReadingConsistentClinicalDataId { get; set; } - public int Size { get; set; } - public string Type { get; set; } = null!; } - - - diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs index a2d48686a..05ef73406 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs @@ -1,35 +1,33 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-01-29 13:40:06 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目标准 - 临床数据配置")] -[Table("TrialClinicalDataSetCriterion")] -public class TrialClinicalDataSetCriterion : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///TrialClinicalDataSetCriterion + /// + [Table("TrialClinicalDataSetCriterion")] + public class TrialClinicalDataSetCriterion : BaseFullAuditEntity + { - #region 导航属性 - [JsonIgnore] + #region 导航属性 + [JsonIgnore] - [ForeignKey("TrialClinicalDataSetId")] - public ClinicalDataTrialSet TrialClinicalDataSet { get; set; } - [JsonIgnore] - [ForeignKey("TrialReadingCriterionId")] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - #endregion + [ForeignKey("TrialClinicalDataSetId")] + public ClinicalDataTrialSet TrialClinicalDataSet { get; set; } + [JsonIgnore] + [ForeignKey("TrialReadingCriterionId")] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion - public Guid TrialClinicalDataSetId { get; set; } + 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 e489e295b..7ef9a092d 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs @@ -3,165 +3,163 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-06-16 13:37:24 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -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; - -[Comment("系统临床数据问题 (需要同步)")] -[Table("SystemClinicalQuestion")] -public class SystemClinicalQuestion : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - /// - /// 分组 - /// - [JsonIgnore] - [ForeignKey("GroupId")] - public SystemClinicalQuestion GroupQuestin { get; set; } - - [NotMapped] - public List CalculateQuestionList + /// + ///系统临床数据问题 + /// + [Table("SystemClinicalQuestion")] + public class SystemClinicalQuestion : BaseAddAuditEntity { - get + #region 导航属性 + /// + /// 分组 + /// + [JsonIgnore] + [ForeignKey("GroupId")] + public SystemClinicalQuestion GroupQuestin { get; set; } + + [NotMapped] + public List CalculateQuestionList { - - try - { - var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); - return result == null ? new List() : result; - } - catch (Exception) + get { - return new List(); - } + try + { + var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); + return result == null ? new List() : result; + } + 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 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? ParentId { get; set; } + + /// + /// 父问题触发值 + /// + public string ParentTriggerValue { get; set; } = string.Empty; + + /// + /// 显示类型 + /// + public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show; + + /// + /// 是否是检查日期 + /// + public bool IsCheckDate { get; set; } + + /// + /// 小数点位数 + /// + public int? DigitPlaces { get; set; } + + /// + /// 单位 + /// + public string Unit { get; set; } = string.Empty; + + /// + /// 自定义计算标记 + /// + public ClinicalCalculateMark? CustomCalculateMark { get; set; } + + /// + /// 自定义计算问题 + /// + public string CalculateQuestions { get; set; } = "[]"; + + } - #endregion - - /// - /// 项目临床数据Id - /// - public Guid SystemClinicalId { 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? ParentId { get; set; } - - /// - /// 父问题触发值 - /// - public string ParentTriggerValue { get; set; } = string.Empty; - - /// - /// 显示类型 - /// - public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show; - - /// - /// 是否是检查日期 - /// - public bool IsCheckDate { get; set; } - - /// - /// 小数点位数 - /// - public int? DigitPlaces { get; set; } - - /// - /// 单位 - /// - public string Unit { get; set; } = string.Empty; - - /// - /// 自定义计算标记 - /// - public ClinicalCalculateMark? CustomCalculateMark { 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 328e95baa..7557e4e55 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs @@ -3,95 +3,120 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-06-19 11:32:48 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Collections.Generic; using System.Linq; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("系统临床表格问题 (需要同步)")] -[Table("SystemClinicalTableQuestion")] -public class SystemClinicalTableQuestion : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [NotMapped] - public List RelevanceValueList + /// + /// 系统临床表格问题 + /// + [Table("SystemClinicalTableQuestion")] + public class SystemClinicalTableQuestion : BaseAddAuditEntity { - get + #region 导航属性 + [NotMapped] + public List RelevanceValueList { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) + get { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { - return new List(); + 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 7116213b7..3f9d10859 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs @@ -3,175 +3,174 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-06-16 13:37:24 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -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; - -[Comment("项目 - 项目临床数据问题")] -[Table("TrialClinicalQuestion")] -public class TrialClinicalQuestion : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [NotMapped] - public List CalculateQuestionList + /// + ///项目临床数据问题 + /// + [Table("TrialClinicalQuestion")] + public class TrialClinicalQuestion : BaseAddAuditEntity { - get + #region 导航属性 + [NotMapped] + public List CalculateQuestionList { - - try - { - var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); - return result == null ? new List() : result; - } - catch (Exception) + get { - return new List(); - } + try + { + var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); + return result == null ? new List() : result; + } + catch (Exception) + { + return new List(); + } + + } } + + + + [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; } + + + + /// + /// 父问题Id + /// + public Guid? ParentId { 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; + + } - /// - /// 分组 - /// - [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; } - - - - /// - /// 父问题Id - /// - public Guid? ParentId { 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; } - - - - /// - /// 自定义计算问题 - /// - public string CalculateQuestions { get; set; } = "[]"; - /// - /// 小数点位数 - /// - public int? DigitPlaces { get; set; } - - /// - /// 单位 - /// - public string Unit { get; set; } = string.Empty; - } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs index 8c791d0a3..c192c3f0d 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs @@ -3,138 +3,134 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-06-19 11:32:48 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Collections.Generic; using System.Linq; -namespace IRaCIS.Core.Domain.Models; - -/// -/// 项目临床表格问题 -/// -[Table("TrialClinicalTableQuestion")] -public class TrialClinicalTableQuestion : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - - [NotMapped] - public List RelevanceValueList + /// + /// 项目临床表格问题 + /// + [Table("TrialClinicalTableQuestion")] + public class TrialClinicalTableQuestion : BaseAddAuditEntity { - get - { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { + #region 导航属性 - return new List(); + [NotMapped] + public List RelevanceValueList + { + get + { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } } + } + #endregion + /// + /// 项目临床数据Id + /// + public Guid TrialClinicalId { 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; } + + /// + /// 系统表格问题Id + /// + public Guid? SystemTableQuestionId { get; set; } + + /// + /// 自定义计算标记 + /// + public ClinicalCalculateMark? ClinicalCalculateMarkEnum { get; set; } + + /// + /// 自定义计算问题 + /// + public string CalculateQuestions { 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 - /// - /// 项目临床数据Id - /// - public Guid TrialClinicalId { 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; } - - /// - /// 系统表格问题Id - /// - public Guid? SystemTableQuestionId { get; set; } - - /// - /// 自定义计算标记 - /// - public ClinicalCalculateMark? ClinicalCalculateMarkEnum { get; set; } - - /// - /// 自定义计算问题 - /// - public string CalculateQuestions { 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; } - - - diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs index e036c418b..0aa85cfc6 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs @@ -1,20 +1,14 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-06-26 11:01:54 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models; [Comment("受试者 - 临床表单表格问题行记录")] [Table("ClinicalAnswerRowInfo")] -public class ClinicalAnswerRowInfo : BaseAddAuditEntity +public class ClinicalAnswerRowInfo : BaseAddAuditEntity { #region 导航属性 @@ -34,4 +28,4 @@ public class ClinicalAnswerRowInfo : BaseAddAuditEntity } - + diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs index 2143151fb..00916abfa 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs @@ -1,19 +1,13 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-06-26 11:39:53 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models; [Comment("受试者 - 临床表单")] [Table("ClinicalForm")] -public class ClinicalForm : BaseAddAuditEntity +public class ClinicalForm : BaseAddAuditEntity { #region 导航属性 [JsonIgnore] @@ -45,4 +39,4 @@ public class ClinicalForm : BaseAddAuditEntity } - + diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs index 74feb333b..4df3720dc 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs @@ -1,18 +1,12 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-06-26 10:58:41 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models; [Comment("受试者 - 临床表单问题答案")] [Table("ClinicalQuestionAnswer")] -public class ClinicalQuestionAnswer : BaseAddAuditEntity +public class ClinicalQuestionAnswer : BaseAddAuditEntity { #region 导航属性 @@ -38,5 +32,5 @@ public class ClinicalQuestionAnswer : BaseAddAuditEntity } - - + + diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs index 11aa95f8b..fdbce1c62 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs @@ -1,13 +1,7 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-06-26 11:03:26 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models; [Comment("受试者 - 临床表单表格问题答案")] @@ -40,5 +34,5 @@ public partial class ClinicalTableAnswer : BaseAddAuditEntity } - - + + diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs index 34132419e..bf9abd729 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs @@ -1,48 +1,39 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-06-29 16:36:05 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; +namespace IRaCIS.Core.Domain.Models +{ + /// + ///ReadModuleCriterionFrom + /// + [Table("ReadModuleCriterionFrom")] + public class ReadModuleCriterionFrom : BaseAddAuditEntity + { + #region 导航属性 + [ForeignKey("ReadModuleId")] + public Guid ReadModuleId { get; set; } -[Comment("受试者 - 阅片模块临床表单")] -[Table("ReadModuleCriterionFrom")] -public class ReadModuleCriterionFrom : BaseAddAuditEntity - { - #region 导航属性 - - [JsonIgnore] - [ForeignKey("ClinicalFormId")] - public ClinicalForm ClinicalForm { get; set; } - #endregion - - [Comment(" 表单Id")] - public Guid ClinicalFormId { get; set; } - - [ForeignKey("ReadModuleId")] - - [Comment(" 阅片期Id")] - public Guid ReadModuleId { get; set; } - - [Comment(" 受试者Id")] - public Guid SubjectId { get; set; } - - [Comment(" 项目Id")] - public Guid TrialId { get; set; } + [JsonIgnore] + [ForeignKey("ClinicalFormId")] + public ClinicalForm ClinicalForm { get; set; } + #endregion - - + public Guid SubjectId { get; set; } + + public Guid TrialId { get; set; } + + /// + /// 表单Id + /// + public Guid ClinicalFormId { get; set; } - } - - + } + + +} diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs index 0f30098b6..b1186512f 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs @@ -3,95 +3,125 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-07-01 10:28:40 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目阅片 - 医学审核对话")] -[Table("ReadingMedicalReviewDialog")] -public class ReadingMedicalReviewDialog : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TaskMedicalReviewId")] - public TaskMedicalReview TaskMedicalReview { get; set; } - - - /// - /// 文件 - /// - [NotMapped] - public List FileList + /// + ///阅片医学审核对话 + /// + [Table("ReadingMedicalReviewDialog")] + public class ReadingMedicalReviewDialog : BaseAddAuditEntity { - get + #region 导航属性 + [JsonIgnore] + [ForeignKey("TaskMedicalReviewId")] + public TaskMedicalReview TaskMedicalReview { get; set; } + + + /// + /// 文件 + /// + [NotMapped] + public List FileList { - - - try - { - var result = JsonConvert.DeserializeObject>(this.ImagePath); - return result == null ? new List() : result; - } - catch (Exception) + get { - return new List(); - } + try + { + var result = JsonConvert.DeserializeObject>(this.ImagePath); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } } + + #endregion + /// + /// 医学审核Id + /// + public Guid TaskMedicalReviewId { get; set; } + + /// + /// 任务Id + /// + public Guid VisitTaskId { get; set; } + + /// + /// 对话内容 + /// + public string Content { get; set; } = string.Empty; + + /// + /// 用户角色 + /// + public string UserTypeShortName { get; set; } = string.Empty; + + /// + /// 医学审核对话关闭原因 + /// + public MedicalDialogClose? MedicalDialogCloseEnum { get; set; } + + /// + /// 用户角色枚举 + /// + public int UserTypeEnumInt { get; set; } + + + /// + /// 阅片人是否认同 + /// + public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; } = MedicalReviewDoctorUserIdea.defalut; + + /// + /// 是否有问题 + /// + public bool IsHaveQuestion { get; set; } = false; + + /// + /// 质询问题 + /// + public string Questioning { get; set; } = string.Empty; + + /// + /// 审核建议 + /// + public AuditAdvice AuditAdviceEnum { get; set; } = AuditAdvice.None; + + /// + /// 不同意重阅原因 + /// + public string DisagreeReason { get; set; } = string.Empty; + + + /// + /// 是否申请重阅 + /// + public bool? IsApplyHeavyReading { get; set; } + + + + /// + /// 图片路径 + /// + public string ImagePath { get; set; } = string.Empty; + + /// + /// 文件名称 + /// + public string FileName { get; set; } = string.Empty; + + + + } - #endregion - - public AuditAdvice AuditAdviceEnum { get; set; } - - [StringLength(4000)] - public string Content { get; set; } = null!; - - [StringLength(400)] - public string DisagreeReason { get; set; } = null!; - - public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; } - - - [MaxLength] - public string FileName { get; set; } = null!; - - - [MaxLength] - public string ImagePath { get; set; } = null!; - - [Comment("是否申请重阅")] - public bool? IsApplyHeavyReading { get; set; } - - [Comment("是否有问题")] - public bool IsHaveQuestion { get; set; } - - [Comment("医学审核对话关闭原因")] - public MedicalDialogClose? MedicalDialogCloseEnum { get; set; } - - [Comment("质询问题")] - [StringLength(1000)] - public string Questioning { get; set; } = null!; - - public Guid TaskMedicalReviewId { get; set; } - - public int UserTypeEnumInt { get; set; } - - public string UserTypeShortName { get; set; } = null!; - - public Guid VisitTaskId { get; set; } - - - } - - - diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs index 310894c9b..69dedba2f 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs @@ -1,35 +1,38 @@ - -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目阅片 - 医学审核任务问题答案")] -[Table("ReadingMedicineQuestionAnswer")] -public class ReadingMedicineQuestionAnswer : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + /// 阅片医学问题答案 + /// + [Table("ReadingMedicineQuestionAnswer")] + public class ReadingMedicineQuestionAnswer : BaseFullAuditEntity + { + #region 导航属性 - [JsonIgnore] - [ForeignKey("TaskMedicalReviewId")] - public TaskMedicalReview TaskMedicalReview { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("TaskMedicalReviewId")] + public TaskMedicalReview TaskMedicalReview { get; set; } + #endregion - [StringLength(400)] - public string Answer { get; set; } = null!; - [Comment("医学审核问题Id")] - public Guid ReadingMedicineQuestionId { get; set; } + /// + /// 医学审核问题Id + /// + public Guid ReadingMedicineQuestionId { get; set; } - public Guid TaskMedicalReviewId { get; set; } + /// + /// 医学审核Id + /// - public Guid VisitTaskId { get; set; } + public Guid TaskMedicalReviewId { get; set; } + public Guid VisitTaskId { get; set; } + + + public string Answer { get; set; } = string.Empty; + + + + } } - - - diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs index 4467bda10..0b211bb78 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs @@ -3,57 +3,89 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-06-29 13:54:08 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Collections.Generic; -using System.Linq; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("系统标准 - 医学审核问题 (需要同步)")] -[Table("ReadingMedicineSystemQuestion")] -public class ReadingMedicineSystemQuestion : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] + /// + /// 阅片医学审核系统问题 + /// + [Table("ReadingMedicineSystemQuestion")] + public class ReadingMedicineSystemQuestion : BaseFullAuditEntity + { + #region 导航属性 + [JsonIgnore] - [ForeignKey("ParentId")] - public ReadingMedicineSystemQuestion ParentQuestion { get; set; } - //// |1|2| 这种保存 - // public string CriterionEnumStr { get; set; } = string.Empty; + [ForeignKey("ParentId")] + public ReadingMedicineSystemQuestion ParentQuestion { get; set; } + //// |1|2| 这种保存 + // public string CriterionEnumStr { get; set; } = string.Empty; - // [NotMapped] - // public List CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList( - #endregion + // [NotMapped] + // public List CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList( + #endregion + /// + /// 类型 + /// + public string Type { get; set; } = string.Empty; - public CriterionType? CriterionTypeEnum { get; set; } + /// + /// 父问题触发 + /// + public string ParentTriggerValue { get; set; } = string.Empty; - public bool IsEnable { get; set; } + /// + /// 问题名称 + /// + public string QuestionName { get; set; } = string.Empty; - public bool IsGeneral { get; set; } + /// + /// 语言类型 + /// + public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - public bool IsRequired { get; set; } - - public LanguageType LanguageType { get; set; } - - public Guid? ParentId { get; set; } - - public string ParentTriggerValue { get; set; } = null!; - - [StringLength(510)] - public string QuestionName { get; set; } = null!; - - public ReadingCategory ReadingCategory { get; set; } - - public int ShowOrder { get; set; } - - public string Type { get; set; } = null!; - - public string TypeValue { get; set; } = null!; + /// + /// 是否是必须 + /// + public bool IsRequired { get; set; } + /// + /// 排序 + /// + public int ShowOrder { get; set; } + + /// + /// 父问题ID + /// + public Guid? ParentId { get; set; } + + + /// + /// 类型值 + /// + public string TypeValue { get; set; } = string.Empty; + + + + /// + /// 是否启用 + /// + public bool IsEnable { get; set; } + + /// + /// 任务类型 + /// + public ReadingCategory ReadingCategory { get; set; } + + + + + + public CriterionType? CriterionTypeEnum { get; set; } + + public bool IsGeneral { get; set; } + + + } } - diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs index de8638a14..39be9ce88 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs @@ -3,56 +3,95 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-06-29 14:04:36 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目标准 - 医学审核问题")] -[Table("ReadingMedicineTrialQuestion")] -public class ReadingMedicineTrialQuestion : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///阅片医学审核项目问题 + /// + [Table("ReadingMedicineTrialQuestion")] + public class ReadingMedicineTrialQuestion : BaseFullAuditEntity + { - #region 导航属性 - [JsonIgnore] - [ForeignKey("ParentId")] - public ReadingMedicineTrialQuestion ParentQuestion { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + [ForeignKey("ParentId")] + public ReadingMedicineTrialQuestion ParentQuestion { get; set; } + #endregion - public bool IsConfirm { get; set; } + /// + /// 类型 + /// + public string Type { get; set; } = string.Empty; - public bool IsEnable { get; set; } + /// + /// 父问题触发值 + /// + public string ParentTriggerValue { get; set; } = string.Empty; - public bool IsRequired { get; set; } + /// + /// 问题名称 + /// + public string QuestionName { get; set; } = string.Empty; - public LanguageType LanguageType { get; set; } + /// + /// 语言类型 + /// + public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - public Guid? ParentId { get; set; } - public string ParentTriggerValue { get; set; } = null!; - [StringLength(510)] - public string QuestionName { get; set; } = null!; + /// + /// 类型值 + /// + public string TypeValue { get; set; } = string.Empty; - public ReadingCategory ReadingCategory { get; set; } - public int ShowOrder { get; set; } + /// + /// 项目ID + /// + public Guid TrialId { get; set; } - public Guid? SystemQuestionId { get; set; } + /// + /// 是否启用 + /// + public bool IsEnable { get; set; } - public Guid TrialId { get; set; } + /// + /// 是否必须 + /// + public bool IsRequired { get; set; } - public Guid TrialReadingCriterionId { get; set; } + /// + /// 排序 + /// + public int ShowOrder { get; set; } - public string Type { get; set; } = null!; + /// + /// 父问题 + /// + public Guid? ParentId { get; set; } - public string TypeValue { get; set; } = null!; + /// + /// 是否确认 + /// + public bool IsConfirm { get; set; } + /// + /// 任务类型 + /// + public ReadingCategory ReadingCategory { get; set; } + + /// + /// 项目标准 + /// + public Guid TrialReadingCriterionId { get; set; } + + public Guid? SystemQuestionId { get; set; } + + + + } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs index f27caeccc..d60510dc4 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs @@ -3,18 +3,14 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-08-16 15:47:47 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models; [Comment("系统标准 - 病灶器官表 （需要同步）")] [Table("CriterionNidusSystem")] -public class CriterionNidusSystem : BaseAddAuditEntity +public class CriterionNidusSystem : BaseAddAuditEntity { #region 导航属性 [ForeignKey("CriterionId")] @@ -34,4 +30,4 @@ public class CriterionNidusSystem : BaseAddAuditEntity } - + diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs index 78146a97f..b52640265 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs @@ -3,16 +3,12 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-04-24 09:29:54 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models; [Comment("项目标准 - 病灶器官表")] [Table("CriterionNidusTrial")] -public class CriterionNidusTrial : BaseAddAuditEntity +public class CriterionNidusTrial : BaseAddAuditEntity { #region 导航属性 @@ -27,4 +23,4 @@ public class CriterionNidusTrial : BaseAddAuditEntity - + diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs index ba6e7c567..320757694 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs @@ -3,58 +3,95 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-08-12 13:58:25 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("后台 - 系统标准器官 (需要同步)")] -[Table("OrganInfo")] -public class OrganInfo : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///OrganInfo + /// + [Table("OrganInfo")] + public class OrganInfo : BaseAddAuditEntity + { - #region 导航属性 + #region 导航属性 - #endregion + #endregion + /// + /// 分类 + /// + public string Classification { get; set; } = string.Empty; - [Comment("分类")] - public string Classification { get; set; } = null!; + /// + /// 分类 英文 + /// + public string ClassificationEN { get; set; } = string.Empty; - public string ClassificationEN { get; set; } = null!; + /// + /// 部位 + /// + public string Part { get; set; } = string.Empty; - [Comment("是否可编辑位置")] - public bool IsCanEditPosition { get; set; } + /// + /// 部位 英文 + /// + public string PartEN { get; set; } = string.Empty; - [Comment("是否是淋巴结")] - public IsLymph IsLymphNodes { get; set; } + /// + /// TULOC 器官 + /// + public string TULOC { get; set; } = string.Empty; - public OrganType OrganType { get; set; } + /// + /// TULOC 器官 英文 + /// + public string TULOCEN { get; set; } = string.Empty; - [Comment(" 部位")] - public string Part { get; set; } = null!; + /// + /// 位置 + /// + public string TULAT { get; set; } = string.Empty; - public string PartEN { get; set; } = null!; - public string Remark { get; set; } = null!; + /// + /// 位置 英文 + /// + public string TULATEN { get; set; } = string.Empty; - public int ShowOrder { get; set; } + /// + /// 备注 + /// + public string Remark { get; set; } = string.Empty; - public Guid SystemCriterionId { get; set; } - [Comment(" 位置")] - public string TULAT { get; set; } = null!; + /// + /// 是否是淋巴结 + /// + public IsLymph IsLymphNodes { get; set; } - public string TULATEN { get; set; } = null!; + /// + /// 器官类型 + /// + public OrganType OrganType { get; set; } - public string TULOC { get; set; } = null!; + /// + /// 标准Id + /// + public Guid SystemCriterionId { get; set; } - public string TULOCEN { get; set; } = null!; + /// + /// 是否可编辑位置 + /// + public bool IsCanEditPosition { get; set; } + + /// + /// 序号 + /// + public int ShowOrder { get; set; } = 0; + + + + } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs index 37040917a..27e3da135 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs @@ -3,61 +3,102 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-08-12 14:29:17 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目标准 - 器官")] -[Table("OrganTrialInfo")] -public class OrganTrialInfo : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///OrganTrialInfo + /// + [Table("OrganTrialInfo")] + public class OrganTrialInfo : BaseAddAuditEntity + { + #region 导航属性 - [JsonIgnore] - [ForeignKey("OrganInfoId")] - public OrganInfo OrganInfo { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("OrganInfoId")] + public OrganInfo OrganInfo { get; set; } + #endregion + /// + /// 器官Id + /// + public Guid OrganInfoId { get; set; } - [Comment("分类")] - public string Classification { get; set; } = null!; + /// + /// 项目Id + /// + public Guid TrialId { get; set; } - public string ClassificationEN { get; set; } = null!; + public bool IsEnable { get; set; } - [Comment("是否可编辑位置")] - public bool IsCanEditPosition { get; set; } - public bool IsEnable { get; set; } + /// + /// 标准Id + /// + public Guid TrialCriterionId { get; set; } - public IsLymph IsLymphNodes { get; set; } + /// + /// 部位 + /// + public string Part { get; set; } = string.Empty; - [Comment(" 器官Id")] - public Guid OrganInfoId { get; set; } + /// + /// 部位 英文 + /// + public string PartEN { get; set; } = string.Empty; - public OrganType? OrganType { get; set; } + /// + /// TULOC 器官 + /// + public string TULOC { get; set; } = string.Empty; - public string Part { get; set; } = null!; + /// + /// TULOC 器官 英文 + /// + public string TULOCEN { get; set; } = string.Empty; - public string PartEN { get; set; } = null!; + /// + /// 位置 + /// + public string TULAT { get; set; } = string.Empty; - public int ShowOrder { get; set; } - public Guid TrialCriterionId { get; set; } + /// + /// 位置 英文 + /// + public string TULATEN { get; set; } = string.Empty; - [Comment(" 项目Id")] - public Guid TrialId { get; set; } + /// + /// 是否是淋巴结 + /// + public IsLymph IsLymphNodes { get; set; } - public string TULAT { get; set; } = null!; + /// + /// 是否可编辑位置 + /// + public bool IsCanEditPosition { get; set; } - public string TULATEN { get; set; } = null!; + /// + /// 分类 + /// + public string Classification { get; set; } = string.Empty; - public string TULOC { get; set; } = null!; + /// + /// 分类 英文 + /// + public string ClassificationEN { get; set; } = string.Empty; + + /// + /// 序号 + /// + public int ShowOrder { get; set; } = 0; + + /// + /// 器官类型 + /// + public OrganType? OrganType { get; set; } + + + } - public string TULOCEN { get; set; } = null!; } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs index 14f88e47c..e38d9dbff 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs @@ -1,39 +1,52 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-07-13 09:48:30 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -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; - -[Comment("项目标准 - 分页")] -[Table("ReadingCriterionPage")] -public class ReadingCriterionPage : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public List ReadingQuestionList { get; set; } = new List(); - #endregion - public bool IsEnable { get; set; } + /// + ///阅片标准分页 + /// + [Table("ReadingCriterionPage")] + public class ReadingCriterionPage : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + public List ReadingQuestionList { get; set; } = new List(); + #endregion + /// + /// 项目ID + /// + public Guid TrialId { get; set; } - [Comment("是否公共分页")] - public bool IsPublicPage { get; set; } + /// + /// 分页名称 + /// + public string PageName { get; set; } = string.Empty; - public string PageName { get; set; } = null!; - - public Guid ReadingQuestionCriterionTrialId { get; set; } - - public int ShowOrder { get; set; } - - public Guid TrialId { get; set; } + /// + /// 是否启用 + /// + public bool IsEnable { get; set; } + + /// + /// 是否公共分页 + /// + public bool IsPublicPage { get; set; } = false; + + /// + /// 排序 + /// + public int ShowOrder { get; set; } = 0; + + + public Guid ReadingQuestionCriterionTrialId { get; set; } + + + + + } } - diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs index 8fcda0ee5..8430346b5 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs @@ -1,45 +1,81 @@ - - -using System; 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; - -[Comment("系统标准 - 标准配置 （需要同步）")] -[Table("ReadingQuestionCriterionSystem")] -public class ReadingQuestionCriterionSystem : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public List ReadingQuestionSystemList { get; set; } = new List(); - #endregion - public DateTime ConfirmTime { get; set; } + /// + /// 系统阅片标准 + /// + [Table("ReadingQuestionCriterionSystem")] + public class ReadingQuestionCriterionSystem : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + public List ReadingQuestionSystemList { get; set; } = new List(); + #endregion + /// + /// 标准 + /// + public string CriterionName { get; set; } = string.Empty; - [StringLength(400)] - public string CriterionName { get; set; } = null!; + /// + /// 是否启用 + /// + public bool IsEnable { get; set; } - public CriterionType CriterionType { get; set; } + /// + /// 排序 + /// + public int ShowOrder { get; set; } + + /// + /// 是否完成配置 + /// + public bool IsCompleteConfig { get; set; } + + + /// + /// 确认时间 + /// + public DateTime ConfirmTime { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } = string.Empty; + + + + /// + /// 标准类型 + /// + public CriterionType CriterionType { get; set; } + + + /// + /// 肿瘤学阅片 + /// + public bool IsOncologyReading { get; set; } = false; + + /// + /// eCRF报告是否显示在图像页面 + /// + public bool IseCRFShowInDicomReading { get; set; } = false; + + /// + /// 是否必须全局阅片 + /// + public bool IsMustGlobalReading { get; set; } = false; + + + + + + + } - [StringLength(600)] - public string Description { get; set; } = null!; - public bool IsCompleteConfig { get; set; } - [Comment("eCRF报告是否显示在图像页面")] - public bool IseCRFShowInDicomReading { get; set; } - public bool IsEnable { get; set; } - [Comment("是否必须全局阅片")] - public bool IsMustGlobalReading { get; set; } - public bool IsOncologyReading { get; set; } - public int ShowOrder { get; set; } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs index d1961913d..3a79093bc 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs @@ -1,323 +1,320 @@ - - -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Collections.Generic; -namespace IRaCIS.Core.Domain.Models; - -/// -/// 项目阅片标准 -/// -[Table("ReadingQuestionCriterionTrial")] -public class ReadingQuestionCriterionTrial : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [ForeignKey("TrialId")] - [JsonIgnore] - public Trial Trial { get; set; } + /// + /// 项目阅片标准 + /// + [Table("ReadingQuestionCriterionTrial")] + public class ReadingQuestionCriterionTrial : BaseAddAuditEntity + { + #region 导航属性 + [ForeignKey("TrialId")] + [JsonIgnore] + public Trial Trial { get; set; } - [JsonIgnore] + [JsonIgnore] - public List ReadingQuestionTrialList = new List(); + public List ReadingQuestionTrialList = new List(); - [JsonIgnore] + [JsonIgnore] - public List TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List(); + public List TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List(); - [JsonIgnore] + [JsonIgnore] - public List VisitTaskList { get; set; } + public List VisitTaskList { get; set; } - [JsonIgnore] + [JsonIgnore] - public List TrialClinicalDataSetCriterionList { get; set; } + public List TrialClinicalDataSetCriterionList { get; set; } - #endregion - /// - /// 系统标准ID - /// - public Guid? ReadingQuestionCriterionSystemId { get; set; } + #endregion + /// + /// 系统标准ID + /// + public Guid? ReadingQuestionCriterionSystemId { get; set; } - /// - /// 项目Id - /// - public Guid TrialId { get; set; } + /// + /// 项目Id + /// + public Guid TrialId { get; set; } - /// - /// 标准 - /// - public string CriterionName { get; set; } = string.Empty; + /// + /// 标准 + /// + public string CriterionName { get; set; } = string.Empty; - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } + /// + /// 是否启用 + /// + public bool IsEnable { get; set; } - /// - /// 排序 - /// - public int ShowOrder { get; set; } + /// + /// 排序 + /// + public int ShowOrder { get; set; } - /// - /// 是否完成配置 - /// - public bool IsCompleteConfig { get; set; } + /// + /// 是否完成配置 + /// + public bool IsCompleteConfig { get; set; } - /// - /// 描述 - /// - public string Description { get; set; } = string.Empty; + /// + /// 描述 + /// + public string Description { get; set; } = string.Empty; - /// - /// 是否确认 - /// - public bool IsConfirm { get; set; } + /// + /// 是否确认 + /// + public bool IsConfirm { get; set; } - /// - /// 表单类型 - /// + /// + /// 表单类型 + /// - public FormType FormType { get; set; } = FormType.SinglePage; + public FormType FormType { get; set; } = FormType.SinglePage; - /// - /// 修约小数点 - /// - public int? DigitPlaces { get; set; } = 1; + /// + /// 修约小数点 + /// + public int? DigitPlaces { get; set; } = 1; - /// - /// 评估结果 - /// - public string EvaluationResult { get; set; } = string.Empty; + /// + /// 评估结果 + /// + public string EvaluationResult { get; set; } = string.Empty; - /// - /// 全局阅片评估更新类型 - /// - public string GlobalUpdateType { get; set; } = string.Empty; + /// + /// 全局阅片评估更新类型 + /// + public string GlobalUpdateType { get; set; } = string.Empty; - /// - /// 评估原因 - /// - public string EvaluationReason { get; set; } = StaticData.International("CriterionTrial_EvaluationReason"); + /// + /// 评估原因 + /// + public string EvaluationReason { get; set; } = StaticData.International("CriterionTrial_EvaluationReason"); - /// - /// 是否显示详情 - /// - public bool IsShowDetail { get; set; } = true; + /// + /// 是否显示详情 + /// + public bool IsShowDetail { get; set; } = true; - /// - /// 同步时间 - /// - public DateTime SynchronizeTime { get; set; } + /// + /// 同步时间 + /// + public DateTime SynchronizeTime { get; set; } - /// - /// 同步器官时间 - /// - public DateTime? SynchronizeOriginalTime { get; set; } + /// + /// 同步器官时间 + /// + public DateTime? SynchronizeOriginalTime { get; set; } - /// - /// 标准类型 - /// - public CriterionType CriterionType { get; set; } + /// + /// 标准类型 + /// + public CriterionType CriterionType { get; set; } - /// - /// 是否加急 - /// - public bool IsUrgent { get; set; } = false; + /// + /// 是否加急 + /// + public bool IsUrgent { get; set; } = false; - /// - /// eCRF报告是否显示在图像页面 - /// - public bool IseCRFShowInDicomReading { get; set; } = false; + /// + /// eCRF报告是否显示在图像页面 + /// + public bool IseCRFShowInDicomReading { get; set; } = false; - #region 阅片单元配置 新加 + #region 阅片单元配置 新加 - public string CriterionModalitys { get; set; } = string.Empty; + public string CriterionModalitys { get; set; } = string.Empty; - /// - /// 阅片平台 - /// - public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.PACS; + /// + /// 阅片平台 + /// + public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.PACS; - /// - /// 阅片工具 - /// - public ReadingTool? ReadingTool { get; set; } + /// + /// 阅片工具 + /// + public ReadingTool? ReadingTool { get; set; } - /// - /// 任务组织级别 - /// - public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } + /// + /// 任务组织级别 + /// + public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } - /// - /// 阅片是否显示受试者信息 - /// - public bool IsReadingShowSubjectInfo { get; set; } = true; + /// + /// 阅片是否显示受试者信息 + /// + public bool IsReadingShowSubjectInfo { get; set; } = true; - /// - /// IR阅片页面是否可以查看既往任务结果 - /// - public bool IsReadingShowPreviousResults { get; set; } = true; + /// + /// IR阅片页面是否可以查看既往任务结果 + /// + public bool IsReadingShowPreviousResults { get; set; } = true; - /// - /// 是确认医学审核问题 - /// + /// + /// 是确认医学审核问题 + /// - public bool IsConfirmMedicineQuestion { get; set; } = false; + public bool IsConfirmMedicineQuestion { get; set; } = false; - /// - /// 仲裁对象 - /// - public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading; + /// + /// 仲裁对象 + /// + public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading; - /// - /// 阅片模式 - /// - public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; + /// + /// 阅片模式 + /// + public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; - /// - /// 存在阅片期 - /// - public bool IsReadingPeriod { get; set; } = true; + /// + /// 存在阅片期 + /// + public bool IsReadingPeriod { get; set; } = true; - /// - /// 是否生成全局阅片任务 - /// - public bool IsGlobalReading { get; set; } = true; + /// + /// 是否生成全局阅片任务 + /// + public bool IsGlobalReading { get; set; } = true; - /// - /// 是否签名 - /// - public bool IsSigned { get; set; } = false; + /// + /// 是否签名 + /// + public bool IsSigned { get; set; } = false; - /// - /// 仲裁阅片 - /// - public bool IsArbitrationReading { get; set; } = true; + /// + /// 仲裁阅片 + /// + public bool IsArbitrationReading { get; set; } = true; - /// - /// 肿瘤学阅片 原字段 IsClinicalReading - /// - public bool IsOncologyReading { get; set; } + /// + /// 肿瘤学阅片 原字段 IsClinicalReading + /// + public bool IsOncologyReading { get; set; } - /// - /// 是否系统设置了 肿瘤学 - /// - public bool IsSystemSetOncology { get; set; } = true; + /// + /// 是否系统设置了 肿瘤学 + /// + public bool IsSystemSetOncology { get; set; } = true; - /// - /// 任务展示访视 读片任务显示是否顺序 - /// - public ReadingOrder IsReadingTaskViewInOrder { get; set; } = ReadingOrder.InOrder; + /// + /// 任务展示访视 读片任务显示是否顺序 + /// + public ReadingOrder IsReadingTaskViewInOrder { get; set; } = ReadingOrder.InOrder; - //任务分配对象 - public TaskAllocateObj TaskAllocateObjEnum { get; set; } + //任务分配对象 + public TaskAllocateObj TaskAllocateObjEnum { get; set; } - //后续访视任务自动分配 - public bool IsFollowVisitAutoAssign { get; set; } = true; + //后续访视任务自动分配 + public bool IsFollowVisitAutoAssign { get; set; } = true; - //后续全局自动分配 - public bool IsFollowGlobalVisitAutoAssign { get; set; } = true; + //后续全局自动分配 + public bool IsFollowGlobalVisitAutoAssign { get; set; } = true; - public bool IsFollowJudgeTaskAutoAssign { get; set; } = true; + public bool IsFollowJudgeTaskAutoAssign { get; set; } = true; - public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; + public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - //后续访视自动分配默认状态 - public TaskAllocateDefaultState FollowVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; + //后续访视自动分配默认状态 + public TaskAllocateDefaultState FollowVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - //后续全局自动分配默认状态 - public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; + //后续全局自动分配默认状态 + public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - /// - /// 阅片信息签名时间 - /// - public DateTime? ReadingInfoSignTime { get; set; } + /// + /// 阅片信息签名时间 + /// + public DateTime? ReadingInfoSignTime { get; set; } - /// - /// 是否必须全局阅片 - /// - public bool IsMustGlobalReading { get; set; } = false; + /// + /// 是否必须全局阅片 + /// + public bool IsMustGlobalReading { get; set; } = false; - //是否附加评估 - public bool IsAdditionalAssessment { get; set; } + //是否附加评估 + public bool IsAdditionalAssessment { get; set; } - //自动 手动生成任务 - public bool IsAutoCreate { get; set; } = true; - #endregion + //自动 手动生成任务 + public bool IsAutoCreate { get; set; } = true; + #endregion - /// - /// 阅片过程下载影像 - /// - public ReadingImageDownload ImageDownloadEnum { get; set; } + /// + /// 阅片过程下载影像 + /// + public ReadingImageDownload ImageDownloadEnum { get; set; } + + /// + /// 阅片过程上传影像 + /// + public ReadingImageUpload ImageUploadEnum { get; set; } + + /// + /// 是否影像筛选 + /// + public bool IsImageFilter { get; set; } + } + + public enum ReadingImageDownload + { + None = 0, + + /// + /// 按病例 + /// + Subejct = 1, + Visit = 2, + } + + public enum ReadingImageUpload + { + None = 0, + + /// + /// 按病例 + /// + IRReadingSubejctEnable = 1, + + IRReadingVisitEnable = 2, + } + + + + public enum ReadingOrder + { + Random = 0, + + InOrder = 1, + + SubjectRandom = 2, + } - /// - /// 阅片过程上传影像 - /// - public ReadingImageUpload ImageUploadEnum { get; set; } - /// - /// 是否影像筛选 - /// - public bool IsImageFilter { get; set; } -} - -public enum ReadingImageDownload -{ - None = 0, - - /// - /// 按病例 - /// - Subejct = 1, - Visit = 2, -} - -public enum ReadingImageUpload -{ - None = 0, - - /// - /// 按病例 - /// - IRReadingSubejctEnable = 1, - - IRReadingVisitEnable = 2, -} - - - -public enum ReadingOrder -{ - Random = 0, - - InOrder = 1, - - SubjectRandom = 2, } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs index 865b48f2b..aca119c55 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs @@ -1,30 +1,26 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-02-03 11:20:54 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("系统标准 - 字典配置 （需要同步）")] -[Table("SystemCriterionDictionaryCode")] -public class SystemCriterionDictionaryCode : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///SystemCriterionDictionaryCode + /// + [Table("SystemCriterionDictionaryCode")] + public class SystemCriterionDictionaryCode : BaseAddAuditEntity + { + #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 be9e49aec..d3738667d 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs @@ -3,37 +3,35 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-03-16 13:21:14 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; 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; - -[Comment("项目 - 项目标准附加评估配置")] -[Table("TrialCriterionAdditionalAssessmentType")] -public class TrialCriterionAdditionalAssessmentType : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - #endregion + /// + ///TrialCriterionAdditionalAssessmentType + /// + [Table("TrialCriterionAdditionalAssessmentType")] + public class TrialCriterionAdditionalAssessmentType : BaseFullAuditEntity + { + #region 导航属性 + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion - public Guid TrialReadingCriterionId { get; set; } + public Guid TrialReadingCriterionId { get; set; } - public CriterionType CriterionType { get; set; } + public CriterionType CriterionType { get; set; } - public AdditionalAssessmentType AdditionalAssessmentType { get; set; } + public AdditionalAssessmentType AdditionalAssessmentType { get; set; } - public bool? IsSelected { 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 756d7d17d..366fab88c 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs @@ -1,33 +1,29 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-02-03 11:21:56 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目 - 项目标准使用字典")] -[Table("TrialCriterionDictionaryCode")] -public class TrialCriterionDictionaryCode : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [ForeignKey("TrialCriterionId")] - [JsonIgnore] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - #endregion + /// + ///TrialCriterionDictionaryCode + /// + [Table("TrialCriterionDictionaryCode")] + public class TrialCriterionDictionaryCode : BaseAddAuditEntity + { + #region 导航属性 + [ForeignKey("TrialCriterionId")] + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion - public Guid TrialCriterionId { get; set; } + public Guid TrialCriterionId { get; set; } - public string Code { get; set; } = string.Empty; + public string Code { get; set; } = string.Empty; + } + + } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs index 47e292f70..9a50cdba3 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs @@ -1,297 +1,296 @@ - - -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Collections.Generic; using System.Linq; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("系统标准问题 （需要同步）")] -[Table("ReadingQuestionSystem")] -public class ReadingQuestionSystem : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("GroupId")] - public ReadingQuestionSystem GroupInfo { get; set; } - - - [JsonIgnore] - [ForeignKey("ReadingQuestionCriterionSystemId")] - public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; } - - [JsonIgnore] - [ForeignKey("ParentId")] - public ReadingQuestionSystem ParentReadingQuestionSystem { get; set; } - - - [JsonIgnore] - [ForeignKey("RelevanceId")] - public ReadingQuestionSystem RelevanceReadingQuestionSystem { get; set; } - - [NotMapped] - public List ParentTriggerValueList + /// + /// 系统阅片问题 + /// + [Table("ReadingQuestionSystem")] + public class ReadingQuestionSystem : BaseAddAuditEntity { - get + #region 导航属性 + [JsonIgnore] + [ForeignKey("GroupId")] + public ReadingQuestionSystem GroupInfo { get; set; } + + + [JsonIgnore] + [ForeignKey("ReadingQuestionCriterionSystemId")] + public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; } + + [JsonIgnore] + [ForeignKey("ParentId")] + public ReadingQuestionSystem ParentReadingQuestionSystem { get; set; } + + + [JsonIgnore] + [ForeignKey("RelevanceId")] + public ReadingQuestionSystem RelevanceReadingQuestionSystem { get; set; } + + [NotMapped] + public List ParentTriggerValueList { - try + get { - return this.ParentTriggerValue.Split(',').ToList(); + try + { + return this.ParentTriggerValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } } - catch (Exception) + + } + + + [NotMapped] + public List RelevanceValueList + { + get + { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + + [NotMapped] + public List HighlightAnswerList + { + get { - return new List(); + try + { + var result = JsonConvert.DeserializeObject>(this.HighlightAnswer); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + } } + #endregion + /// + /// 系统标准Id + /// + public Guid ReadingQuestionCriterionSystemId { get; set; } + + /// + /// 类型 + /// + public string Type { get; set; } = string.Empty; + + /// + /// 父问题触发 + /// + public string ParentTriggerValue { get; set; } = string.Empty; + + /// + /// 问题名称 + /// + public string QuestionName { get; set; } = string.Empty; + + /// + /// 是否是必须 + /// + public IsRequired IsRequired { get; set; } + + /// + /// 排序 + /// + public int ShowOrder { get; set; } + + /// + /// 父问题ID + /// + public Guid? ParentId { get; set; } + + /// + /// 类型值 + /// + public string TypeValue { get; set; } = string.Empty; + + /// + /// 是否启用 + /// + public bool IsEnable { get; set; } + + + /// + /// 是否是裁判问题 + /// + public bool IsJudgeQuestion { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } = string.Empty; + + /// + /// 关联ID + /// + public Guid? RelevanceId { get; set; } + + /// + /// 关联Value + /// + public string RelevanceValue { get; set; } = string.Empty; + + /// + /// 分组 + /// + public string GroupName { get; set; } = string.Empty; + + /// + /// 图片数量 + /// + public int ImageCount { get; set; } = 1; + + /// + /// 是否显示 + /// + public ShowQuestion ShowQuestion { get; set; } = ShowQuestion.Show; + + /// + /// 最大问题数 + /// + public int? MaxQuestionCount { get; set; } + + /// + /// 病灶类型 + /// + public LesionType? LesionType { get; set; } + + /// + /// 问题类型 + /// + public QuestionType? QuestionType { get; set; } + + /// + /// 是否显示在Dicom阅片中 + /// + public bool IsShowInDicom { get; set; } = false; + + /// + /// 序号标记 + /// + public string OrderMark { get; set; } = string.Empty; + + /// + /// 字典code + /// + public string DictionaryCode { get; set; } = string.Empty; + + + + /// + /// 问题类型 + /// + public TableQuestionType? QuestionGenre { get; set; } + + /// + /// 全局阅片显示类型 + /// + public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow; + + /// + /// 转化显示类型 + /// + public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All; + + /// + /// 默认值 + /// + public string DefaultValue { get; set; } = string.Empty; + + /// + /// 数值类型 + /// + public ValueOfType? ValueType { get; set; } + + /// + /// 单位 + /// + public ValueUnit? Unit { get; set; } + + + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; + + /// + /// 问题英文分组 + /// + public string GroupEnName { get; set; } = string.Empty; + + /// + /// 限制编辑 + /// + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + + /// + /// 限制显示 + /// + public LimitShow LimitShow { get; set; } = LimitShow.AllShow; + + /// + /// 数据来源 + /// + public DataSources DataSource { get; set; } = DataSources.ManualEntry; + + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 分组ID + /// + public Guid? GroupId { get; set; } + + /// + /// 文件类型 + /// + public string FileType { get; set; } = string.Empty; + + /// + /// 分组分类 + /// + public GroupClassify? GroupClassify { get; set; } + + /// + /// 问题分类 + /// + public QuestionClassify? QuestionClassify { get; set; } + + /// + /// 高亮问题的答案 + /// + public string HighlightAnswer { get; set; } = "[]"; + + } - [NotMapped] - public List RelevanceValueList - { - get - { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - return new List(); - } - } - - } - - [NotMapped] - public List HighlightAnswerList - { - get - { - - try - { - var result = JsonConvert.DeserializeObject>(this.HighlightAnswer); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - - } - } - #endregion - /// - /// 系统标准Id - /// - public Guid ReadingQuestionCriterionSystemId { get; set; } - - /// - /// 类型 - /// - public string Type { get; set; } = string.Empty; - - /// - /// 父问题触发 - /// - public string ParentTriggerValue { get; set; } = string.Empty; - - /// - /// 问题名称 - /// - public string QuestionName { get; set; } = string.Empty; - - /// - /// 是否是必须 - /// - public IsRequired IsRequired { get; set; } - - /// - /// 排序 - /// - public int ShowOrder { get; set; } - - /// - /// 父问题ID - /// - public Guid? ParentId { get; set; } - - /// - /// 类型值 - /// - public string TypeValue { get; set; } = string.Empty; - - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } - - - /// - /// 是否是裁判问题 - /// - public bool IsJudgeQuestion { get; set; } - - /// - /// 备注 - /// - public string Remark { get; set; } = string.Empty; - - /// - /// 关联ID - /// - public Guid? RelevanceId { get; set; } - - /// - /// 关联Value - /// - public string RelevanceValue { get; set; } = string.Empty; - - /// - /// 分组 - /// - public string GroupName { get; set; } = string.Empty; - - /// - /// 图片数量 - /// - public int ImageCount { get; set; } = 1; - - /// - /// 是否显示 - /// - public ShowQuestion ShowQuestion { get; set; } = ShowQuestion.Show; - - /// - /// 最大问题数 - /// - public int? MaxQuestionCount { get; set; } - - /// - /// 病灶类型 - /// - public LesionType? LesionType { get; set; } - - /// - /// 问题类型 - /// - public QuestionType? QuestionType { get; set; } - - /// - /// 是否显示在Dicom阅片中 - /// - public bool IsShowInDicom { get; set; } = false; - - /// - /// 序号标记 - /// - public string OrderMark { get; set; } = string.Empty; - - /// - /// 字典code - /// - public string DictionaryCode { get; set; } = string.Empty; - - - - /// - /// 问题类型 - /// - public TableQuestionType? QuestionGenre { get; set; } - - /// - /// 全局阅片显示类型 - /// - public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow; - - /// - /// 转化显示类型 - /// - public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All; - - /// - /// 默认值 - /// - public string DefaultValue { get; set; } = string.Empty; - - /// - /// 数值类型 - /// - public ValueOfType? ValueType { get; set; } - - /// - /// 单位 - /// - public ValueUnit? Unit { get; set; } - - - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; - - /// - /// 问题英文分组 - /// - public string GroupEnName { get; set; } = string.Empty; - - /// - /// 限制编辑 - /// - public LimitEdit LimitEdit { get; set; } = LimitEdit.None; - - /// - /// 限制显示 - /// - public LimitShow LimitShow { get; set; } = LimitShow.AllShow; - - /// - /// 数据来源 - /// - public DataSources DataSource { get; set; } = DataSources.ManualEntry; - - /// - /// 最大答案长度 - /// - public int? MaxAnswerLength { get; set; } - - /// - /// 分组ID - /// - public Guid? GroupId { get; set; } - - /// - /// 文件类型 - /// - public string FileType { get; set; } = string.Empty; - - /// - /// 分组分类 - /// - public GroupClassify? GroupClassify { get; set; } - - /// - /// 问题分类 - /// - public QuestionClassify? QuestionClassify { get; set; } - - /// - /// 高亮问题的答案 - /// - public string HighlightAnswer { get; set; } = "[]"; } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs index 4ea3cce02..5b1f0e149 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs @@ -1,414 +1,412 @@ - - -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Collections.Generic; using System.Linq; -using IRaCIS.Core.Domain.Share.Reading; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目标准问题")] -[Table("ReadingQuestionTrial")] -public class ReadingQuestionTrial : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - /// - /// 分页标准 - /// - [ForeignKey("ReadingCriterionPageId")] - [JsonIgnore] - public ReadingCriterionPage ReadingCriterionPage { get; set; } - [JsonIgnore] - [ForeignKey("ParentId")] - public ReadingQuestionTrial ParentReadingQuestionTrial { get; set; } - [JsonIgnore] - [ForeignKey("RelevanceId")] - public ReadingQuestionTrial RelevanceReadingQuestionTrial { get; set; } - [JsonIgnore] - [ForeignKey("ReadingQuestionCriterionTrialId")] - public ReadingQuestionCriterionTrial ReadingQuestionCriterionTrial { get; set; } - - [JsonIgnore] - public List ReadingTableQuestionTrialList { get; set; } - [JsonIgnore] - [ForeignKey("GroupId")] - public ReadingQuestionTrial GroupInfo { get; set; } - - [NotMapped] - public List ParentTriggerValueList + /// + /// 项目阅片问题 + /// + [Table("ReadingQuestionTrial")] + public class ReadingQuestionTrial : BaseAddAuditEntity { - get + #region 导航属性 + /// + /// 分页标准 + /// + [ForeignKey("ReadingCriterionPageId")] + [JsonIgnore] + public ReadingCriterionPage ReadingCriterionPage { get; set; } + [JsonIgnore] + [ForeignKey("ParentId")] + public ReadingQuestionTrial ParentReadingQuestionTrial { get; set; } + [JsonIgnore] + [ForeignKey("RelevanceId")] + public ReadingQuestionTrial RelevanceReadingQuestionTrial { get; set; } + [JsonIgnore] + [ForeignKey("ReadingQuestionCriterionTrialId")] + public ReadingQuestionCriterionTrial ReadingQuestionCriterionTrial { get; set; } + + [JsonIgnore] + public List ReadingTableQuestionTrialList { get; set; } + [JsonIgnore] + [ForeignKey("GroupId")] + public ReadingQuestionTrial GroupInfo { get; set; } + + [NotMapped] + public List ParentTriggerValueList { - try + get { - return this.ParentTriggerValue.Split(',').ToList(); + try + { + return this.ParentTriggerValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } } - catch (Exception) + + } + + + [NotMapped] + public List RelevanceValueList + { + get + { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + + + [NotMapped] + public List CalculateQuestionList + { + get { - return new List(); + try + { + var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + } } + [NotMapped] + public List HighlightAnswerList + { + get + { + + try + { + var result = JsonConvert.DeserializeObject>(this.HighlightAnswer); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } + } + #endregion + public bool IsAdditional { get; set; } + + + /// + /// 项目标准Id + /// + public Guid ReadingQuestionCriterionTrialId { get; set; } + + /// + /// 项目Id + /// + public Guid TrialId { get; set; } + + /// + /// 类型 + /// + public string Type { get; set; } = string.Empty; + + /// + /// 父问题触发 + /// + public string ParentTriggerValue { get; set; } = string.Empty; + + /// + /// 问题名称 + /// + public string QuestionName { get; set; } = string.Empty; + + /// + /// 是否是必须 + /// + public IsRequired IsRequired { get; set; } + + /// + /// 排序 + /// + public int ShowOrder { get; set; } + + /// + /// 父问题ID + /// + public Guid? ParentId { get; set; } + + + /// + /// 类型值 + /// + public string TypeValue { get; set; } = string.Empty; + + public bool IsEnable { get; set; } + + /// + /// 是否是裁判问题 + /// + public bool IsJudgeQuestion { get; set; } + + /// + /// 病灶类型 + /// + public LesionType? LesionType { get; set; } + + /// + /// 问题类型 + /// + public QuestionType? QuestionType { get; set; } + + /// + /// 全局阅片显示类型 + /// + public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow; + + + /// + /// 转化显示类型 + /// + public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All; + + /// + /// 备注 + /// + public string Remark { get; set; } = string.Empty; + + /// + /// 分组 + /// + public string GroupName { get; set; } = string.Empty; + + + + /// + /// 系统问题ID + /// + public Guid? ReadingQuestionSystemId { get; set; } + + /// + /// 系统标准的ParentId + /// + public Guid? SystemParentId { get; set; } + + /// + /// 答案分组 + /// + public string AnswerGroup { get; set; } = string.Empty; + + /// + /// 答案组合 + /// + public string AnswerCombination { get; set; } = string.Empty; + + /// + /// 裁判类型 + /// + public JudgeTypeEnum JudgeType { get; set; } = JudgeTypeEnum.AnswerDisaffinity; + + /// + /// 裁判百分比或绝对值的相差值 + /// + public decimal? JudgeDifferenceValue { get; set; } + + /// + /// 裁判百分比或绝对值的相差值匹配规则 + /// + public JudgeDifferenceType JudgeDifferenceType { get; set; } + + + + /// + /// 标准分页Id + /// + public Guid? ReadingCriterionPageId { get; set; } + + /// + /// 关联ID + /// + public Guid? RelevanceId { get; set; } + + /// + /// 关联Value + /// + public string RelevanceValue { get; set; } = string.Empty; + + /// + /// 图片数量 + /// + public int ImageCount { get; set; } = 1; + + /// + /// 是否显示 + /// + public ShowQuestion ShowQuestion { get; set; } = ShowQuestion.Show; + + /// + /// 默认值 + /// + public string DefaultValue { get; set; } = string.Empty; + + /// + /// 最大问题数 + /// + public int? MaxQuestionCount { get; set; } + + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 文件类型 + /// + public string FileType { get; set; } = string.Empty; + + /// + /// 是否显示在Dicom阅片中 + /// + public bool IsShowInDicom { get; set; } = false; + + + /// + /// 序号标记 + /// + public string OrderMark { get; set; } = string.Empty; + + /// + /// 字典code + /// + public string DictionaryCode { get; set; } = string.Empty; + + /// + /// 问题类型 + /// + public TableQuestionType? QuestionGenre { get; set; } + + /// + /// 数值类型 + /// + public ValueOfType? ValueType { get; set; } + + /// + /// 单位 + /// + public ValueUnit? Unit { get; set; } + + /// + /// 自定义单位 + /// + public string CustomUnit { get; set; } = string.Empty; + + + /// + /// 自定义计算标记 + /// + public CustomCalculateMark? CustomCalculateMark { get; set; } + + /// + /// 限制编辑 + /// + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + + /// + /// 限制显示 + /// + public LimitShow LimitShow { get; set; } = LimitShow.AllShow; + + /// + /// 自定义计算标记 + /// + public string CalculateQuestions { get; set; } = "[]"; + + /// + /// 数据来源 + /// + public DataSources DataSource { get; set; } = DataSources.ManualEntry; + + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; + + /// + /// 问题英文分组 + /// + public string GroupEnName { get; set; } = string.Empty; + + /// + /// 分类算法 + /// + public string ClassifyAlgorithms { get; set; } = string.Empty; + + /// + /// 分类问题Id + /// + public Guid? ClassifyQuestionId { get; set; } + + /// + /// 是否复制病灶 + /// + public bool IsCopyLesions { get; set; } = false; + + /// + /// 分组ID + /// + public Guid? GroupId { get; set; } + + + /// + /// 分组分类 + /// + public GroupClassify? GroupClassify { get; set; } + + + /// + /// 问题分类 + /// + public QuestionClassify? QuestionClassify { get; set; } + + + + /// + /// 高亮问题的答案 + /// + public string HighlightAnswer { get; set; } = "[]"; + + + } - [NotMapped] - public List RelevanceValueList + public class CalculateInfo { - get - { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { + public bool IsTable { get; set; } - return new List(); - } - } + public Guid? QuestionId { get; set; } + + public Guid? TableQuestionId { get; set; } } - [NotMapped] - public List CalculateQuestionList - { - get - { - - try - { - var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - - } - } - - [NotMapped] - public List HighlightAnswerList - { - get - { - - try - { - var result = JsonConvert.DeserializeObject>(this.HighlightAnswer); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - - } - } - #endregion - public bool IsAdditional { get; set; } - - - /// - /// 项目标准Id - /// - public Guid ReadingQuestionCriterionTrialId { get; set; } - - /// - /// 项目Id - /// - public Guid TrialId { get; set; } - - /// - /// 类型 - /// - public string Type { get; set; } = string.Empty; - - /// - /// 父问题触发 - /// - public string ParentTriggerValue { get; set; } = string.Empty; - - /// - /// 问题名称 - /// - public string QuestionName { get; set; } = string.Empty; - - /// - /// 是否是必须 - /// - public IsRequired IsRequired { get; set; } - - /// - /// 排序 - /// - public int ShowOrder { get; set; } - - /// - /// 父问题ID - /// - public Guid? ParentId { get; set; } - - - /// - /// 类型值 - /// - public string TypeValue { get; set; } = string.Empty; - - public bool IsEnable { get; set; } - - /// - /// 是否是裁判问题 - /// - public bool IsJudgeQuestion { get; set; } - - /// - /// 病灶类型 - /// - public LesionType? LesionType { get; set; } - - /// - /// 问题类型 - /// - public QuestionType? QuestionType { get; set; } - - /// - /// 全局阅片显示类型 - /// - public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow; - - - /// - /// 转化显示类型 - /// - public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All; - - /// - /// 备注 - /// - public string Remark { get; set; } = string.Empty; - - /// - /// 分组 - /// - public string GroupName { get; set; } = string.Empty; - - - - /// - /// 系统问题ID - /// - public Guid? ReadingQuestionSystemId { get; set; } - - /// - /// 系统标准的ParentId - /// - public Guid? SystemParentId { get; set; } - - /// - /// 答案分组 - /// - public string AnswerGroup { get; set; } = string.Empty; - - /// - /// 答案组合 - /// - public string AnswerCombination { get; set; } = string.Empty; - - /// - /// 裁判类型 - /// - public JudgeTypeEnum JudgeType { get; set; } = JudgeTypeEnum.AnswerDisaffinity; - - /// - /// 裁判百分比或绝对值的相差值 - /// - public decimal? JudgeDifferenceValue { get; set; } - - /// - /// 裁判百分比或绝对值的相差值匹配规则 - /// - public JudgeDifferenceType JudgeDifferenceType { get; set; } - - - - /// - /// 标准分页Id - /// - public Guid? ReadingCriterionPageId { get; set; } - - /// - /// 关联ID - /// - public Guid? RelevanceId { get; set; } - - /// - /// 关联Value - /// - public string RelevanceValue { get; set; } = string.Empty; - - /// - /// 图片数量 - /// - public int ImageCount { get; set; } = 1; - - /// - /// 是否显示 - /// - public ShowQuestion ShowQuestion { get; set; } = ShowQuestion.Show; - - /// - /// 默认值 - /// - public string DefaultValue { get; set; } = string.Empty; - - /// - /// 最大问题数 - /// - public int? MaxQuestionCount { get; set; } - - /// - /// 最大答案长度 - /// - public int? MaxAnswerLength { get; set; } - - /// - /// 文件类型 - /// - public string FileType { get; set; } = string.Empty; - - /// - /// 是否显示在Dicom阅片中 - /// - public bool IsShowInDicom { get; set; } = false; - - - /// - /// 序号标记 - /// - public string OrderMark { get; set; } = string.Empty; - - /// - /// 字典code - /// - public string DictionaryCode { get; set; } = string.Empty; - - /// - /// 问题类型 - /// - public TableQuestionType? QuestionGenre { get; set; } - - /// - /// 数值类型 - /// - public ValueOfType? ValueType { get; set; } - - /// - /// 单位 - /// - public ValueUnit? Unit { get; set; } - - /// - /// 自定义单位 - /// - public string CustomUnit { get; set; } = string.Empty; - - - /// - /// 自定义计算标记 - /// - public CustomCalculateMark? CustomCalculateMark { get; set; } - - /// - /// 限制编辑 - /// - public LimitEdit LimitEdit { get; set; } = LimitEdit.None; - - /// - /// 限制显示 - /// - public LimitShow LimitShow { get; set; } = LimitShow.AllShow; - - /// - /// 自定义计算标记 - /// - public string CalculateQuestions { get; set; } = "[]"; - - /// - /// 数据来源 - /// - public DataSources DataSource { get; set; } = DataSources.ManualEntry; - - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; - - /// - /// 问题英文分组 - /// - public string GroupEnName { get; set; } = string.Empty; - - /// - /// 分类算法 - /// - public string ClassifyAlgorithms { get; set; } = string.Empty; - - /// - /// 分类问题Id - /// - public Guid? ClassifyQuestionId { get; set; } - - /// - /// 是否复制病灶 - /// - public bool IsCopyLesions { get; set; } = false; - - /// - /// 分组ID - /// - public Guid? GroupId { get; set; } - - - /// - /// 分组分类 - /// - public GroupClassify? GroupClassify { get; set; } - - - /// - /// 问题分类 - /// - public QuestionClassify? QuestionClassify { get; set; } - - - - /// - /// 高亮问题的答案 - /// - public string HighlightAnswer { get; set; } = "[]"; - - - -} - - -public class CalculateInfo -{ - public bool IsTable { get; set; } - - public Guid? QuestionId { get; set; } - - public Guid? TableQuestionId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs index 3d3792b74..405b0a8f1 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs @@ -1,39 +1,47 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; using IRaCIS.Core.Domain.Share; -using Microsoft.EntityFrameworkCore; -using Newtonsoft.Json; -namespace IRaCIS.Core.Domain.Models; - -[Comment("ϵͳ׼ - ȫ Ҫͬ")] -[Table("ReadingSystemCriterionDictionary")] -public class ReadingSystemCriterionDictionary : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region + /// + ///ReadingCriterionDictionary + /// + [Table("ReadingSystemCriterionDictionary")] + public class ReadingSystemCriterionDictionary : BaseAddAuditEntity + { + #region - [JsonIgnore] - [ForeignKey("DictionaryId")] - public Dictionary Dictionary { get; set; } - #endregion - public Guid CriterionId { get; set; } - [Comment("׼ֵ")] - public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = CrterionDictionaryGroup.General; + [JsonIgnore] + [ForeignKey("DictionaryId")] + public Dictionary Dictionary { get; set; } + #endregion + public Guid CriterionId { get; set; } - public Guid DictionaryId { get; set; } - public bool IsBaseLineUse { get; set; } + public Guid DictionaryId { get; set; } - public bool IsFollowVisitUse { get; set; } - public bool IsSystemCriterion { get; set; } - public string ParentCode { get; set; } = null!; + + public bool IsSystemCriterion { get; set; } = false; + + public string ParentCode { get; set; } = string.Empty; + + + public bool IsBaseLineUse { get; set; } = false; + + + public bool IsFollowVisitUse { get; set; } = false; + + /// + /// ׼ֵ + /// + public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = CrterionDictionaryGroup.General; + + + + + + } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs index 27ab206eb..8ac8b4f50 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs @@ -3,210 +3,206 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-08-11 14:15:27 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Collections.Generic; using System.Linq; -namespace IRaCIS.Core.Domain.Models; - -/// -///系统表格问题 -/// -[Table("ReadingTableQuestionSystem")] -public class ReadingTableQuestionSystem : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [ForeignKey("DependParentId")] - [JsonIgnore] - public ReadingTableQuestionSystem DependParentQuestion { get; set; } - - [NotMapped] - public List ParentTriggerValueList + /// + ///系统表格问题 + /// + [Table("ReadingTableQuestionSystem")] + public class ReadingTableQuestionSystem : BaseAddAuditEntity { - get - { - try - { - return this.ParentTriggerValue.Split(',').ToList(); - } - catch (Exception) - { + #region 导航属性 + [ForeignKey("DependParentId")] + [JsonIgnore] + public ReadingTableQuestionSystem DependParentQuestion { get; set; } - return new List(); + [NotMapped] + public List ParentTriggerValueList + { + get + { + try + { + return this.ParentTriggerValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } } + } - } - - [NotMapped] - public List RelevanceValueList - { - get + [NotMapped] + public List RelevanceValueList { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) + get { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { - return new List(); + return new List(); + } } + } + #endregion + + /// + /// 系统表的问题Id ReadingQuestionSystem的Id + /// + public Guid ReadingQuestionId { get; set; } + + public string Type { get; set; } = string.Empty; + + + public Guid? ParentId { get; set; } + + /// + ///父问题触发值 + /// + public string ParentTriggerValue { get; set; } = string.Empty; + + /// + /// 问题名称 + /// + public string QuestionName { get; set; } = string.Empty; + + /// + /// IsRequired + /// + public IsRequired IsRequired { get; set; } + + /// + /// 排序号 + /// + public int ShowOrder { get; set; } + + /// + /// 值 + /// + public string TypeValue { get; set; } = string.Empty; + + /// + /// 是否启用 + /// + public bool IsEnable { get; set; } + + public string Remark { get; set; } = string.Empty; + + /// + /// 显示父问题 + /// + public Guid? RelevanceId { get; set; } + + /// + /// 显示父问题的值 + /// + public string RelevanceValue { get; set; } = string.Empty; + + /// + /// 是否显示 + /// + public int ShowQuestion { get; set; } + + /// + /// 最大问题数 + /// + public int? MaxRowCount { get; set; } + + /// + /// 数据表名称 + /// + public string DataTableName { get; set; } = string.Empty; + + /// + /// 数据列 + /// + public string DataTableColumn { get; set; } = string.Empty; + + + /// + /// 关联父问题 + /// + public Guid? DependParentId { get; set; } + + /// + /// 是否关联 + /// + public IsDepend IsDepend { get; set; } + + /// + /// 表格问题类型 + /// + public TableQuestionType? TableQuestionType { get; set; } + + /// + /// 系统标准Id + /// + public Guid SystemCriterionId { get; set; } + + /// + /// 问题标识 + /// + public QuestionMark? QuestionMark { get; set; } + + /// + /// 字典code + /// + public string DictionaryCode { get; set; } = string.Empty; + + + /// + /// 数值类型 + /// + public ValueOfType? ValueType { get; set; } + + /// + /// 单位 + /// + public ValueUnit? Unit { get; set; } + + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; + + /// + /// 数据来源 + /// + public DataSources DataSource { get; set; } = DataSources.ManualEntry; + + /// + /// 限制编辑 + /// + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 文件类型 + /// + public string? FileType { get; set; } = string.Empty; + + /// + /// 问题分类 + /// + public QuestionClassify? QuestionClassify { get; set; } + } - #endregion - - /// - /// 系统表的问题Id ReadingQuestionSystem的Id - /// - public Guid ReadingQuestionId { get; set; } - - public string Type { get; set; } = string.Empty; - - - public Guid? ParentId { get; set; } - - /// - ///父问题触发值 - /// - public string ParentTriggerValue { get; set; } = string.Empty; - - /// - /// 问题名称 - /// - public string QuestionName { get; set; } = string.Empty; - - /// - /// IsRequired - /// - public IsRequired IsRequired { get; set; } - - /// - /// 排序号 - /// - public int ShowOrder { get; set; } - - /// - /// 值 - /// - public string TypeValue { get; set; } = string.Empty; - - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } - - public string Remark { get; set; } = string.Empty; - - /// - /// 显示父问题 - /// - public Guid? RelevanceId { get; set; } - - /// - /// 显示父问题的值 - /// - public string RelevanceValue { get; set; } = string.Empty; - - /// - /// 是否显示 - /// - public int ShowQuestion { get; set; } - - /// - /// 最大问题数 - /// - public int? MaxRowCount { get; set; } - - /// - /// 数据表名称 - /// - public string DataTableName { get; set; } = string.Empty; - - /// - /// 数据列 - /// - public string DataTableColumn { get; set; } = string.Empty; - - - /// - /// 关联父问题 - /// - public Guid? DependParentId { get; set; } - - /// - /// 是否关联 - /// - public IsDepend IsDepend { get; set; } - - /// - /// 表格问题类型 - /// - public TableQuestionType? TableQuestionType { get; set; } - - /// - /// 系统标准Id - /// - public Guid SystemCriterionId { get; set; } - - /// - /// 问题标识 - /// - public QuestionMark? QuestionMark { get; set; } - - /// - /// 字典code - /// - public string DictionaryCode { get; set; } = string.Empty; - - - /// - /// 数值类型 - /// - public ValueOfType? ValueType { get; set; } - - /// - /// 单位 - /// - public ValueUnit? Unit { get; set; } - - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; - - /// - /// 数据来源 - /// - public DataSources DataSource { get; set; } = DataSources.ManualEntry; - - /// - /// 限制编辑 - /// - public LimitEdit LimitEdit { get; set; } = LimitEdit.None; - - /// - /// 最大答案长度 - /// - public int? MaxAnswerLength { get; set; } - - /// - /// 文件类型 - /// - public string? FileType { get; set; } = string.Empty; - - /// - /// 问题分类 - /// - public QuestionClassify? QuestionClassify { get; set; } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs index eb1df59c7..9bbe02951 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs @@ -3,221 +3,217 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-08-17 14:36:04 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Collections.Generic; using System.Linq; -namespace IRaCIS.Core.Domain.Models; - -/// -/// 项目阅片问题 -/// -[Table("ReadingTableQuestionTrial")] -public class ReadingTableQuestionTrial : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("DependParentId")] - public ReadingTableQuestionTrial DependParentQuestion { get; set; } - - [JsonIgnore] - [ForeignKey("ReadingQuestionId")] - public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - [NotMapped] - public List ParentTriggerValueList + /// + /// 项目阅片问题 + /// + [Table("ReadingTableQuestionTrial")] + public class ReadingTableQuestionTrial : BaseAddAuditEntity { - get + #region 导航属性 + [JsonIgnore] + [ForeignKey("DependParentId")] + public ReadingTableQuestionTrial DependParentQuestion { get; set; } + + [JsonIgnore] + [ForeignKey("ReadingQuestionId")] + public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + [NotMapped] + public List ParentTriggerValueList { - try - { - return this.ParentTriggerValue.Split(',').ToList(); - } - catch (Exception) + get { + try + { + return this.ParentTriggerValue.Split(',').ToList(); + } + catch (Exception) + { - return new List(); - } - } - - } - - - [NotMapped] - public List RelevanceValueList - { - get - { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - } - - } - - - [NotMapped] - public List CalculateQuestionList - { - get - { - try - { - var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); + return new List(); + } } } + + + [NotMapped] + public List RelevanceValueList + { + get + { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + + + [NotMapped] + public List CalculateQuestionList + { + get + { + try + { + var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } + } + #endregion + + public Guid TrialId { get; set; } + + /// + /// 项目问题的Id ReadingQuestionTrial的id + /// + public Guid ReadingQuestionId { get; set; } + + + public string Type { get; set; } = string.Empty; + + + public Guid? ParentId { get; set; } + + public string ParentTriggerValue { get; set; } = string.Empty; + + + public string QuestionName { get; set; } = string.Empty; + + + public IsRequired IsRequired { get; set; } + + public int ShowOrder { get; set; } + + public string TypeValue { get; set; } = string.Empty; + + + public bool IsEnable { get; set; } + + public string Remark { get; set; } = string.Empty; + + + public Guid? RelevanceId { get; set; } + + public string RelevanceValue { get; set; } = string.Empty; + + public int ShowQuestion { get; set; } + + + public int? MaxRowCount { get; set; } + + public string DataTableName { get; set; } = string.Empty; + + public string DataTableColumn { get; set; } = string.Empty; + + public TableQuestionType? TableQuestionType { get; set; } + + public Guid? DependParentId { get; set; } + + public IsDepend IsDepend { get; set; } + + + public Guid TrialCriterionId { get; set; } + + /// + /// 问题标识 + /// + public QuestionMark? QuestionMark { get; set; } + + + /// + /// 字典code + /// + public string DictionaryCode { get; set; } = string.Empty; + + /// + /// 数值类型 + /// + public ValueOfType? ValueType { get; set; } + + /// + /// 单位 + /// + public ValueUnit? Unit { get; set; } + + /// + /// 自定义单位 + /// + public string CustomUnit { get; set; } = string.Empty; + + /// + /// 自定义计算标记 + /// + public CustomCalculateMark? CustomCalculateMark { get; set; } + + /// + /// 限制编辑 + /// + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + + /// + /// 自定义计算标记 + /// + public string CalculateQuestions { get; set; } = "[]"; + + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; + + /// + /// 数据来源 + /// + public DataSources DataSource { get; set; } = DataSources.ManualEntry; + + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } + + /// + /// 文件类型 + /// + public string FileType { get; set; } = string.Empty; + + /// + /// 问题分类 + /// + public QuestionClassify? QuestionClassify { get; set; } + + + + /// + /// 复制病灶的时候 是否复制这个问题 + /// + public bool IsCopy { get; set; } = false; + + /// + /// 系统表格问题Id + /// + public Guid? SystemTableQuestionId { get; set; } + + + } - #endregion - - public Guid TrialId { get; set; } - - /// - /// 项目问题的Id ReadingQuestionTrial的id - /// - public Guid ReadingQuestionId { get; set; } - - - public string Type { get; set; } = string.Empty; - - - public Guid? ParentId { get; set; } - - public string ParentTriggerValue { get; set; } = string.Empty; - - - public string QuestionName { get; set; } = string.Empty; - - - public IsRequired IsRequired { get; set; } - - public int ShowOrder { get; set; } - - public string TypeValue { get; set; } = string.Empty; - - - public bool IsEnable { get; set; } - - public string Remark { get; set; } = string.Empty; - - - public Guid? RelevanceId { get; set; } - - public string RelevanceValue { get; set; } = string.Empty; - - public int ShowQuestion { get; set; } - - - public int? MaxRowCount { get; set; } - - public string DataTableName { get; set; } = string.Empty; - - public string DataTableColumn { get; set; } = string.Empty; - - public TableQuestionType? TableQuestionType { get; set; } - - public Guid? DependParentId { get; set; } - - public IsDepend IsDepend { get; set; } - - - public Guid TrialCriterionId { get; set; } - - /// - /// 问题标识 - /// - public QuestionMark? QuestionMark { get; set; } - - - /// - /// 字典code - /// - public string DictionaryCode { get; set; } = string.Empty; - - /// - /// 数值类型 - /// - public ValueOfType? ValueType { get; set; } - - /// - /// 单位 - /// - public ValueUnit? Unit { get; set; } - - /// - /// 自定义单位 - /// - public string CustomUnit { get; set; } = string.Empty; - - /// - /// 自定义计算标记 - /// - public CustomCalculateMark? CustomCalculateMark { get; set; } - - /// - /// 限制编辑 - /// - public LimitEdit LimitEdit { get; set; } = LimitEdit.None; - - /// - /// 自定义计算标记 - /// - public string CalculateQuestions { get; set; } = "[]"; - - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; - - /// - /// 数据来源 - /// - public DataSources DataSource { get; set; } = DataSources.ManualEntry; - - /// - /// 最大答案长度 - /// - public int? MaxAnswerLength { get; set; } - - /// - /// 文件类型 - /// - public string FileType { get; set; } = string.Empty; - - /// - /// 问题分类 - /// - public QuestionClassify? QuestionClassify { get; set; } - - - - /// - /// 复制病灶的时候 是否复制这个问题 - /// - public bool IsCopy { get; set; } = false; - - /// - /// 系统表格问题Id - /// - public Guid? SystemTableQuestionId { get; set; } - } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs index 9a42cc0ab..2094e509e 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs @@ -3,40 +3,42 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-04-24 09:32:01 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目阅片标准 - 全局配置")] -[Table("ReadingTrialCriterionDictionary")] -public class ReadingTrialCriterionDictionary : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///ReadingTrialCriterionDictionary + /// + [Table("ReadingTrialCriterionDictionary")] + public class ReadingTrialCriterionDictionary : BaseAddAuditEntity + { - #region 导航属性 - [JsonIgnore] - [ForeignKey("DictionaryId")] - public Dictionary Dictionary { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("DictionaryId")] + public Dictionary Dictionary { get; set; } - [ForeignKey("CriterionId")] - [JsonIgnore] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - #endregion - public Guid CriterionId { get; set; } + [ForeignKey("CriterionId")] + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion + public Guid CriterionId { get; set; } - public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } + public Guid DictionaryId { get; set; } - public Guid DictionaryId { get; set; } - public bool IsBaseLineUse { get; set; } - public bool IsFollowVisitUse { get; set; } + public string ParentCode { get; set; } = string.Empty; + + public bool IsBaseLineUse { get; set; } + + public bool IsFollowVisitUse { get; set; } + + public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } + + + + } - public string ParentCode { get; set; } = null!; } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs index 045702f65..59eeb7002 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs @@ -1,39 +1,33 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-07-31 11:12:15 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目阅片 - 自定义标记")] -[Table("ReadingCustomTag")] -public class ReadingCustomTag : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///ReadingCustomTag + /// + [Table("ReadingCustomTag")] + public class ReadingCustomTag : BaseAddAuditEntity + { + #region 导航属性 - #endregion + #endregion - public Guid? InstanceId { get; set; } + public Guid VisitTaskId { get; set; } + + public Guid? StudyId { get; set; } - [MaxLength] - public string MeasureData { get; set; } = null!; + public Guid? SeriesId { get; set; } - public int? NumberOfFrames { get; set; } + public Guid? InstanceId { get; set; } - public Guid? SeriesId { get; set; } + public string MeasureData { get; set; } = string.Empty; - public Guid? StudyId { get; set; } + public int? NumberOfFrames { get; set; } + + } - [Comment(" 任务Id")] - public Guid VisitTaskId { get; set; } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs index 5b1e08687..88eda6ba9 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs @@ -1,46 +1,60 @@ - -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目阅片 - 全局阅片结果")] -[Table("ReadingGlobalTaskInfo")] -public class ReadingGlobalTaskInfo : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TaskId")] - public VisitTask VisitTask { get; set; } + /// + /// 阅片全局任务信息 + /// + [Table("ReadingGlobalTaskInfo")] + public class ReadingGlobalTaskInfo : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("TaskId")] + public VisitTask VisitTask { get; set; } - [JsonIgnore] - [ForeignKey("GlobalTaskId")] - public VisitTask GlobalVisitTask { get; set; } + [JsonIgnore] + [ForeignKey("GlobalTaskId")] + public VisitTask GlobalVisitTask { get; set; } - [JsonIgnore] - [ForeignKey("QuestionId")] - public ReadingQuestionTrial TrialReadingQuestion { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("QuestionId")] + public ReadingQuestionTrial TrialReadingQuestion { get; set; } + #endregion - [StringLength(4000)] - public string Answer { get; set; } = null!; - [Comment("全局答案类型")] - public GlobalAnswerType GlobalAnswerType { get; set; } - [Comment("全局任务Id")] - public Guid GlobalTaskId { get; set; } + /// + /// 全局任务Id + /// + public Guid GlobalTaskId { get; set; } - public Guid? QuestionId { get; set; } + /// + /// 原任务ID + /// - public Guid SubjectId { get; set; } - [Comment("原任务ID")] - public Guid TaskId { get; set; } + public Guid TaskId { get; set; } + + /// + /// 问题ID + /// + public Guid? QuestionId { get; set; } + + /// + /// 问题答案 + /// + + public string Answer { get; set; } = string.Empty; + + + public Guid TrialId { get; set; } + + /// + /// 全局答案类型 + /// + public GlobalAnswerType GlobalAnswerType { get; set; } + + public Guid SubjectId { get; set; } + + } - public Guid TrialId { get; set; } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs index 0d80dc8af..f5aaf93a1 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs @@ -1,30 +1,40 @@ - - -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目阅片 - 产生裁判信息记录")] -[Table("ReadingJudgeInfo")] -public class ReadingJudgeInfo : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///阅片裁判信息 + /// + [Table("ReadingJudgeInfo")] + public class ReadingJudgeInfo : BaseAddAuditEntity + { + #region 导航属性 - #endregion - public Guid JudgeTaskId { get; set; } + #endregion + /// + /// 第一个任务ID + /// + [Required] + public Guid TaskIdOne { get; set; } - public Guid SubjectId { get; set; } + /// + /// 第二个任务ID + /// + [Required] + public Guid TaskIdTwo { get; set; } - public Guid TaskIdOne { get; set; } + /// + /// 裁判任务ID + /// + [Required] + public Guid JudgeTaskId { get; set; } - public Guid TaskIdTwo { get; set; } - public Guid TrialId { get; set; } + + public Guid TrialId { get; set; } + + + public Guid SubjectId { get; set; } + + } + } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs index cdacc09a0..e5bd2edbc 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs @@ -1,45 +1,58 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-08-01 14:50:23 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目阅片 - 肿瘤学结果")] -[Table("ReadingOncologyTaskInfo")] -public class ReadingOncologyTaskInfo : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + /// 阅片肿瘤学 针对访视任务 添加了一个结果 + /// + [Table("ReadingOncologyTaskInfo")] + public class ReadingOncologyTaskInfo : BaseAddAuditEntity + { + #region 导航属性 - [JsonIgnore] - [ForeignKey("OncologyTaskId")] - public VisitTask OncologyVisitTask { get; set; } + [JsonIgnore] + [ForeignKey("OncologyTaskId")] + public VisitTask OncologyVisitTask { get; set; } - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } + #endregion + /// + /// 肿瘤学 阅片任务ID + /// + public Guid OncologyTaskId { get; set; } - [StringLength(1000)] - public string EvaluationReason { get; set; } = null!; + /// + /// 产生肿瘤学阅片任务的 访视类型的阅片任务Id + /// + public Guid VisitTaskId { get; set; } - public string EvaluationResult { get; set; } = null!; + /// + /// 结果 + /// + public string EvaluationResult { get; set; } = string.Empty; - public Guid OncologyTaskId { get; set; } + /// + /// 原因 + /// + public string EvaluationReason { get; set; } = string.Empty; - public Guid SubjectId { get; set; } - public Guid TrialId { get; set; } + /// + /// 项目Id + /// + public Guid TrialId { get; set; } - public Guid VisitTaskId { get; set; } + /// + /// 受试者Id + /// + public Guid SubjectId { get; set; } + + + } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs index 17f08ad09..8907c5255 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs @@ -3,172 +3,171 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-08-26 10:38:09 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目阅片 - 表格问题行记录")] -[Table("ReadingTableAnswerRowInfo")] -public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("InstanceId")] - public DicomInstance Instance { get; set; } - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } - [JsonIgnore] - [ForeignKey("OrganInfoId")] - public OrganInfo OrganInfo { get; set; } - [JsonIgnore] - [ForeignKey("SplitRowId")] - public ReadingTableAnswerRowInfo SplitRow { get; set; } - [JsonIgnore] - [ForeignKey("MergeRowId")] - public ReadingTableAnswerRowInfo MergeRow { get; set; } - [JsonIgnore] - [ForeignKey("QuestionId")] - public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + /// + /// 表格问题答案行数据 + /// + [Table("ReadingTableAnswerRowInfo")] + public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("InstanceId")] + public DicomInstance Instance { get; set; } + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } + [JsonIgnore] + [ForeignKey("OrganInfoId")] + public OrganInfo OrganInfo { get; set; } + [JsonIgnore] + [ForeignKey("SplitRowId")] + public ReadingTableAnswerRowInfo SplitRow { get; set; } + [JsonIgnore] + [ForeignKey("MergeRowId")] + public ReadingTableAnswerRowInfo MergeRow { get; set; } + [JsonIgnore] + [ForeignKey("QuestionId")] + public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - //病灶答案表 - [JsonIgnore] - public List LesionAnswerList { get; set; } = new List(); - #endregion + //病灶答案表 + [JsonIgnore] + public List LesionAnswerList { get; set; } = new List(); + #endregion - public Guid QuestionId { get; set; } + public Guid QuestionId { get; set; } - public Guid VisitTaskId { get; set; } + public Guid VisitTaskId { get; set; } - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public Guid? InstanceId { get; set; } + public Guid? InstanceId { get; set; } - public Guid? SeriesId { get; set; } + public Guid? SeriesId { get; set; } - public Guid? StudyId { get; set; } + public Guid? StudyId { get; set; } - public Guid? OtherInstanceId { get; set; } + public Guid? OtherInstanceId { get; set; } - public Guid? OtherSeriesId { get; set; } + public Guid? OtherSeriesId { get; set; } - public Guid? OtherStudyId { get; set; } + public Guid? OtherStudyId { get; set; } - public string OtherMarkTool { get; set; } = string.Empty; + public string OtherMarkTool { get; set; } = string.Empty; - public string OtherPicturePath { get; set; } = string.Empty; + public string OtherPicturePath { get; set; } = string.Empty; - public int? OtherNumberOfFrames { get; set; } + public int? OtherNumberOfFrames { get; set; } - public bool IsCanEditPosition { get; set; } = false; + public bool IsCanEditPosition { get; set; } = false; - /// - /// 是Dicom阅片 - /// - public bool IsDicomReading { get; set; } = true; + /// + /// 是Dicom阅片 + /// + public bool IsDicomReading { get; set; } = true; - public decimal RowIndex { get; set; } + public decimal RowIndex { get; set; } - public string MeasureData { get; set; } = string.Empty; + public string MeasureData { get; set; } = string.Empty; - /// - /// 是否是当前任务添加 - /// - public bool IsCurrentTaskAdd { get; set; } = false; + /// + /// 是否是当前任务添加 + /// + public bool IsCurrentTaskAdd { get; set; } = false; - public Guid? SplitRowId { get; set; } + public Guid? SplitRowId { get; set; } - public Guid? MergeRowId { get; set; } + public Guid? MergeRowId { get; set; } - public string BlindName { get; set; } = string.Empty; + public string BlindName { get; set; } = string.Empty; - public string OrderMark { get; set; } = string.Empty; + public string OrderMark { get; set; } = string.Empty; - /// - /// 截图地址 - /// - public string PicturePath { get; set; } = string.Empty; + /// + /// 截图地址 + /// + public string PicturePath { get; set; } = string.Empty; - /// - /// 第一次添加的任务ID - /// - public decimal FristAddTaskNum { get; set; } = 0; + /// + /// 第一次添加的任务ID + /// + public decimal FristAddTaskNum { get; set; } = 0; - /// - /// 首次添加任务ID - /// - public Guid FristAddTaskId { get; set; } + /// + /// 首次添加任务ID + /// + public Guid FristAddTaskId { get; set; } - /// - /// 融合的PTSeriesId - /// - public Guid? PTSeriesId { get; set; } + /// + /// 融合的PTSeriesId + /// + public Guid? PTSeriesId { get; set; } - /// - /// 融合的CTSeriesId - /// - public Guid? CTSeriesId { get; set; } + /// + /// 融合的CTSeriesId + /// + public Guid? CTSeriesId { get; set; } - public SplitOrMergeType? SplitOrMergeType { get; set; } + public SplitOrMergeType? SplitOrMergeType { get; set; } - public int? NumberOfFrames { get; set; } + public int? NumberOfFrames { get; set; } - /// - /// 器官Id - /// - public Guid? OrganInfoId { get; set; } + /// + /// 器官Id + /// + public Guid? OrganInfoId { get; set; } - /// - /// 窗宽WW - /// - public decimal? WW { get; set; } + /// + /// 窗宽WW + /// + public decimal? WW { get; set; } - /// - /// 窗位WL - /// - public decimal? WL { get; set; } + /// + /// 窗位WL + /// + public decimal? WL { get; set; } - /// - /// 来自于哪个标记 - /// - public string FromMark { get; set; } = string.Empty; + /// + /// 来自于哪个标记 + /// + public string FromMark { get; set; } = string.Empty; - /// - /// 报告页面显示来自于哪个标记 - /// - public string ReportMark { get; set; } = string.Empty; + /// + /// 报告页面显示来自于哪个标记 + /// + public string ReportMark { get; set; } = string.Empty; - public string OtherMeasureData { get; set; } = string.Empty; + public string OtherMeasureData { get; set; } = string.Empty; - //病灶编号 - public string RowMark { get; set; } = string.Empty; + //病灶编号 + public string RowMark { get; set; } = string.Empty; - /// - /// 标记工具 - /// - public string MarkTool { get; set; } = string.Empty; + /// + /// 标记工具 + /// + public string MarkTool { get; set; } = string.Empty; + } + + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs index c50a9d6df..6ed2506ef 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs @@ -1,68 +1,63 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-08-22 09:26:04 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目阅片 - 表格问题行记录子项答案")] -[Table("ReadingTableQuestionAnswer")] -public class ReadingTableQuestionAnswer : BaseFullDeleteAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("RowId")] + /// + ///ReadingTableQuestionAnswer + /// + [Table("ReadingTableQuestionAnswer")] + public class ReadingTableQuestionAnswer : BaseFullDeleteAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("RowId")] - public ReadingTableAnswerRowInfo Lesion { get; set; } + public ReadingTableAnswerRowInfo Lesion { get; set; } - [JsonIgnore] - [ForeignKey("QuestionId")] + [JsonIgnore] + [ForeignKey("QuestionId")] - public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - [JsonIgnore] - [ForeignKey("TableQuestionId")] + [JsonIgnore] + [ForeignKey("TableQuestionId")] - public ReadingTableQuestionTrial ReadingTableQuestionTrial { get; set; } + public ReadingTableQuestionTrial ReadingTableQuestionTrial { get; set; } - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } + #endregion - [Comment(" 答案")] - [MaxLength] - public string Answer { get; set; } = null!; + public Guid QuestionId { get; set; } - [Comment(" 问题Id")] - public Guid QuestionId { get; set; } + /// + /// 表格问题Id + /// + public Guid TableQuestionId { get; set; } - public Guid RowId { get; set; } + public Guid VisitTaskId { get; set; } - [Comment(" 行号")] - [DecimalPrecision(18, 2)] - public decimal RowIndex { get; set; } + public Guid TrialId { get; set; } - public Guid TableQuestionId { get; set; } - [Comment(" 项目Id")] - public Guid TrialId { get; set; } + public decimal RowIndex { get; set; } - [Comment(" 任务Id")] - public Guid VisitTaskId { get; set; } + public string Answer { get; set; } = string.Empty; + + + public Guid RowId { get; set; } + + + + } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs index a8a934546..b932c5905 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs @@ -1,49 +1,64 @@ - - -using System; -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; - -[Comment("项目阅片 - 问题答案")] -[Table("ReadingTaskQuestionAnswer")] -public class ReadingTaskQuestionAnswer : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + /// 阅片任务答案 + /// + [Table("ReadingTaskQuestionAnswer")] + public class ReadingTaskQuestionAnswer : BaseAddAuditEntity + { + #region 导航属性 - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } - [JsonIgnore] - [ForeignKey("ReadingQuestionTrialId")] - public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - #endregion - [MaxLength] - public string Answer { get; set; } = null!; + [JsonIgnore] + [ForeignKey("ReadingQuestionTrialId")] + public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + #endregion + /// + /// 项目问题Id + /// + public Guid ReadingQuestionTrialId { get; set; } - [Comment("全局阅片修改的答案")] - [StringLength(400)] - public string GlobalChangeAnswer { get; set; } = null!; + /// + /// 项目问题标准Id + /// + public Guid ReadingQuestionCriterionTrialId { get; set; } - [Comment("全局阅片是否修改")] - public bool IsGlobalChange { get; set; } + public Guid TrialId { get; set; } + + public Guid SubjectId { get; set; } + + public Guid VisitTaskId { get; set; } + + /// + /// 答案 + /// + public string Answer { get; set; } = string.Empty; + + /// + /// 全局阅片修改的答案 + /// + public string GlobalChangeAnswer { get; set; } = string.Empty; + + + /// + /// 全局阅片是否修改 + /// + public bool IsGlobalChange { get; set; } = false; + + + + + + + + } - public Guid ReadingQuestionCriterionTrialId { get; set; } - public Guid ReadingQuestionTrialId { get; set; } - public Guid SubjectId { get; set; } - public Guid TrialId { get; set; } - public Guid VisitTaskId { get; set; } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs index c6650c24a..7b3021cbd 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs @@ -3,83 +3,69 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-09-21 16:08:07 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -/// -/// -/// -[Table("ReadingTaskQuestionMark")] -public class ReadingTaskQuestionMark : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("QuestionId")] - public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + /// + /// + /// + [Table("ReadingTaskQuestionMark")] + public class ReadingTaskQuestionMark : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("QuestionId")] + public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } + #endregion - public Guid? FirstAddTaskId { get; set; } + public Guid VisitTaskId { get; set; } - public Guid? InstanceId { get; set; } + public Guid QuestionId { get; set; } - [StringLength(1000)] - public string MarkTool { get; set; } = null!; + public Guid? InstanceId { get; set; } + + public Guid? SeriesId { get; set; } - [MaxLength] - public string MeasureData { get; set; } = null!; - - public int? NumberOfFrames { get; set; } - - public string OrderMarkName { get; set; } = null!; - - public Guid? OtherInstanceId { get; set; } + public Guid? StudyId { get; set; } - [MaxLength] - public string OtherMarkTool { get; set; } = null!; + public string MarkTool { get; set; } = string.Empty; + + public string PicturePath { get; set; } = string.Empty; + + public int? NumberOfFrames { get; set; } + + public string MeasureData { get; set; } = string.Empty; - [MaxLength] - public string OtherMeasureData { get; set; } = null!; + public Guid? FirstAddTaskId { get; set; } - public int? OtherNumberOfFrames { get; set; } + public QuestionType? QuestionType { get; set; } - [MaxLength] - public string OtherPicturePath { get; set; } = null!; + public string OrderMarkName { get; set; } = string.Empty; - public Guid? OtherSeriesId { get; set; } + public Guid? OtherInstanceId { get; set; } - public Guid? OtherStudyId { get; set; } + public Guid? OtherSeriesId { get; set; } + + public Guid? OtherStudyId { get; set; } + + public string OtherMarkTool { get; set; } = string.Empty; + + public string OtherPicturePath { get; set; } = string.Empty; + + public int? OtherNumberOfFrames { get; set; } + public string OtherMeasureData { get; set; } = string.Empty; - [MaxLength] - public string PicturePath { get; set; } = null!; - - [Comment(" 问题Id")] - public Guid QuestionId { get; set; } - - public QuestionType? QuestionType { get; set; } - - public Guid? SeriesId { get; set; } - - public Guid? StudyId { get; set; } - - [Comment(" 任务Id")] - public Guid VisitTaskId { get; set; } + } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs index 5242c86d1..1e2d07b30 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs @@ -3,33 +3,41 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-02-03 09:43:09 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目阅片 - 任务关联")] -[Table("ReadingTaskRelation")] -public class ReadingTaskRelation : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///任务关系表 + /// + [Table("ReadingTaskRelation")] + public class ReadingTaskRelation : BaseAddAuditEntity + { + #region 导航属性 - [ForeignKey("TaskId")] - [JsonIgnore] - public VisitTask VisitTask { get; set; } - #endregion + [ForeignKey("TaskId")] + [JsonIgnore] + public VisitTask VisitTask { get; set; } + #endregion - public Guid RelevanceTaskId { get; set; } + /// + /// 任务ID + /// + public Guid TaskId { get; set; } - public RelevanceType RelevanceType { get; set; } + /// + /// 关联的任务ID + /// + public Guid RelevanceTaskId { get; set; } - public Guid TaskId { get; set; } + /// + /// 类型具体解释 看枚举 + /// + public RelevanceType RelevanceType { get; set; } + + } + + } - - - diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs index 25f34931a..a5a448eda 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs @@ -1,104 +1,117 @@ - - -using System; 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; - -[Comment("受试者 - 阅片模块")] -[Table("ReadModule")] -public class ReadModule : BaseFullDeleteAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///读片模块 + /// + [Table("ReadModule")] + public class ReadModule : BaseFullDeleteAuditEntity + { + #region 导航属性 - [JsonIgnore] - /// - /// 受试者 - /// - [ForeignKey("SubjectId")] + [JsonIgnore] + /// + /// 受试者 + /// + [ForeignKey("SubjectId")] - public Subject Subject { get; set; } + public Subject Subject { get; set; } - [JsonIgnore] - /// - /// 阅片期配置 - /// - [ForeignKey("ReadingPeriodSetId")] - public ReadingPeriodSet ReadingPeriodSet { get; set; } + [JsonIgnore] + /// + /// 阅片期配置 + /// + [ForeignKey("ReadingPeriodSetId")] + public ReadingPeriodSet ReadingPeriodSet { get; set; } - [JsonIgnore] - /// - /// 访视 - /// - [ForeignKey("SubjectVisitId")] - public SubjectVisit SubjectVisit { get; set; } + [JsonIgnore] + /// + /// 访视 + /// + [ForeignKey("SubjectVisitId")] + public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } - [JsonIgnore] - public List ReadModuleCriterionFromList { get; set; } = new List(); + [JsonIgnore] + public List ReadModuleCriterionFromList { get; set; } = new List(); - [JsonIgnore] - public List ModuleTaskList { get; set; } - [JsonIgnore] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + [JsonIgnore] + public List ModuleTaskList { get; set; } + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - [JsonIgnore] - public List ReadingClinicalDataList { get; set; } - #endregion + [JsonIgnore] + public List ReadingClinicalDataList { get; set; } + #endregion - public bool? IsClinicalDataBlind { get; set; } - [Comment("临床数据是否完整")] - public bool? IsClinicalDataComplete { get; set; } + public Guid SubjectId { get; set; } - [Comment("CRC是否正在申请撤回")] - public bool IsCRCApplicationRevoke { get; set; } + public Guid TrialReadingCriterionId { get; set; } - public bool IsCRCConfirm { get; set; } + /// + /// 模块类型 + /// + public ModuleTypeEnum ModuleType { get; set; } - public bool IsNotNeedPMConfirm { get; set; } + /// + /// 模块名称 + /// + public string ModuleName { get; set; } = string.Empty; - public bool IsPMConfirm { get; set; } + /// + /// 是否加急 + /// + public bool? IsUrgent { get; set; } - [Comment(" 是否加急")] - public bool? IsUrgent { get; set; } + public Guid SubjectVisitId { get; set; } - public Guid? LastVisitIdSetId { get; set; } - [Comment(" 模块名称")] - public string ModuleName { get; set; } = null!; + /// + /// 阅片计划ID + /// + public Guid? ReadingPeriodSetId { get; set; } - [Comment(" 模块类型")] - public ModuleTypeEnum ModuleType { get; set; } + public Guid TrialId { get; set; } - public Guid? ReadingPeriodSetId { get; set; } - public ReadingSetType ReadingSetType { get; set; } + public bool IsCRCConfirm { get; set; } = false; - public ReadingStatusEnum ReadingStatus { get; set; } = ReadingStatusEnum.TaskAllocate; + public bool IsPMConfirm { get; set; } = false; - public Guid? ReadModuleId { get; set; } + public bool IsNotNeedPMConfirm { get; set; } = false; - [Comment(" 状态")] - public int Status { get; set; } + /// + /// CRC是否正在申请撤回 + /// + public bool IsCRCApplicationRevoke { get; set; } = false; - [Comment(" 受试者ID")] - public Guid SubjectId { get; set; } - [Comment(" 访视ID")] - public Guid SubjectVisitId { get; set; } + /// + /// 临床数据是否完整 + /// + public bool? IsClinicalDataComplete { get; set; } + + /// + /// 临床数据是否盲化 + /// + public bool? IsClinicalDataBlind { get; set; } + + /// + /// 阅片配置的类型 + /// + public ReadingSetType ReadingSetType { get; set; } + + public ReadingStatusEnum ReadingStatus { get; set; } = ReadingStatusEnum.TaskAllocate; + } + - public Guid TrialId { get; set; } - public Guid TrialReadingCriterionId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs index 08d105128..6a4443cca 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs @@ -1,41 +1,42 @@ - - -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目 - 阅片期计划")] -[Table("ReadingPeriodPlan")] -public class ReadingPeriodPlan : BaseFullDeleteAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - // - /// 访视 - /// - [ForeignKey("SubjectVisitId")] - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } + /// + /// 阅片计划 + /// + [Table("ReadingPeriodPlan")] + public class ReadingPeriodPlan : BaseFullDeleteAuditEntity + { + #region 导航属性 + // + /// 访视 + /// + [ForeignKey("SubjectVisitId")] + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } - /// - /// 阅片期配置 - /// - [ForeignKey("ReadingPeriodSetId")] - [JsonIgnore] - public ReadingPeriodSet ReadingPeriodSet { get; set; } - #endregion + /// + /// 阅片期配置 + /// + [ForeignKey("ReadingPeriodSetId")] + [JsonIgnore] + public ReadingPeriodSet ReadingPeriodSet { get; set; } + #endregion + /// + /// 阅片期配置ID + /// + public Guid ReadingPeriodSetId { get; set; } - [Comment(" 阅片期配置ID")] - public Guid ReadingPeriodSetId { get; set; } - - [Comment(" 访视Id")] - public Guid SubjectVisitId { get; set; } + /// + /// 访视 + /// + public Guid SubjectVisitId { get; set; } + } + + + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs index 62f0b11af..c00c50e7e 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs @@ -1,61 +1,85 @@ - - -using System; 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; - -[Comment("项目 - 阅片期配置")] -[Table("ReadingPeriodSet")] -public class ReadingPeriodSet : BaseFullDeleteAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public List ReadingPeriodSites { get; set; } = new List(); - [JsonIgnore] - /// - /// 访视模板 - /// - [ForeignKey("VisitStageId")] - public VisitStage VisitStage { get; set; } + /// + ///阅片期设置 只会设计到所有人 或者某个Site 针对全局 + /// + [Table("ReadingPeriodSet")] + public class ReadingPeriodSet : BaseFullDeleteAuditEntity + { + #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; } - public DateTime? ExpirationDate { get; set; } - [Comment("截止访视")] - [DecimalPrecision(18, 0)] - public decimal? ExpirationVisitNum { get; set; } + public Guid TrialId { get; set; } - public bool IsGlobal { get; set; } + public Guid TrialReadingCriterionId { get; set; } - public ReadingPeriodStatus IsTakeEffect { get; set; } + /// + /// 阅片期名称 + /// + public string ReadingPeriodName { get; set; } = string.Empty; - [StringLength(400)] - public string ReadingPeriodName { get; set; } = null!; - [Comment("阅片范围")] - public ReadingScopeEnum ReadingScope { get; set; } - [Comment("阅片配置的类型")] - public ReadingSetType ReadingSetType { get; set; } + /// + /// 阅片范围 + /// + public ReadingScopeEnum ReadingScope { get; set; } - public Guid? SiteId { get; set; } + /// + /// 截止日期 + /// + public DateTime? ExpirationDate { get; set; } - public Guid TrialId { get; set; } + /// + /// 截止访视 + /// + public decimal? ExpirationVisitNum { get; set; } - public Guid TrialReadingCriterionId { get; set; } - - public Guid? VisitStageId { get; set; } + /// + /// 访视计划ID + /// + public Guid? VisitStageId { get; set; } + /// + /// 是否生效 + /// + public ReadingPeriodStatus IsTakeEffect { get; set; } + + /// + /// 生效时间 + /// + public DateTime? EffectOfTime { get; set; } + + + /// + /// 是否为全局阅片 + /// + public bool IsGlobal { get; set; } + + /// + /// 阅片配置的类型 + /// + public ReadingSetType ReadingSetType { get; set; } + + + + + } + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs index 5437836df..9a42ce613 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs @@ -1,31 +1,34 @@ - - -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("阅片期和中心关联")] -[Table("ReadingPeriodSite")] -public class ReadingPeriodSite : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public TrialSite TrialSite { get; set; } + /// + /// 阅片期和中心关联 + /// + [Table("ReadingPeriodSite")] + public class ReadingPeriodSite : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + public TrialSite TrialSite { get; set; } - [JsonIgnore] - public ReadingPeriodSet ReadingPeriodSet { get; set; } - #endregion + [JsonIgnore] + public ReadingPeriodSet ReadingPeriodSet { get; set; } + #endregion + /// + ///阅片期配置ID + /// + + public Guid ReadingPeriodSetId { get; set; } + + public Guid TrialId { get; set; } + + public Guid TrialSiteId { get; set; } + + + + } - [Comment(" 阅片期配置ID")] - public Guid ReadingPeriodSetId { get; set; } - public Guid TrialId { get; set; } - public Guid TrialSiteId { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs b/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs index efd69ed36..792222286 100644 --- a/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs +++ b/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs @@ -1,44 +1,49 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-02-13 10:33:05 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("用户配置 - 快捷键")] -[Table("ShortcutKey")] -public class ShortcutKey : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///ShortcutKey + /// + [Table("ShortcutKey")] + public class ShortcutKey : BaseAddAuditEntity + { + #region 导航属性 - #endregion - public bool AltKey { get; set; } + #endregion + /// + /// 对应的键盘按键 + /// + public string Keyboardkey { get; set; } = string.Empty; - public string Code { get; set; } = null!; + /// + /// 按键枚举 + /// + public int ShortcutKeyEnum { get; set; } - public bool CtrlKey { get; set; } + /// + /// 影像工具类型 + /// + public int ImageToolType { get; set; } - [Comment("影像工具类型")] - public int ImageToolType { get; set; } - public string Keyboardkey { get; set; } = null!; + public Guid UserId { get; set; } - public bool MetaKey { get; set; } + public bool AltKey { get; set; } = false; - public bool ShiftKey { get; set; } - [Comment("按键枚举")] - public int ShortcutKeyEnum { get; set; } + public bool CtrlKey { get; set; } = false; - public string Text { get; set; } = null!; + public bool ShiftKey { get; set; } = false; + + public bool MetaKey { get; set; } = false; + + public string Text { get; set; } = string.Empty; + + public string Code { get; set; } = string.Empty; + + } - public Guid UserId { get; set; } } - - - diff --git a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs index ec8b61d5d..bf4974000 100644 --- a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs +++ b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs @@ -1,34 +1,41 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2023-05-08 15:14:38 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("用户配置 - WL模板")] -[Table("UserWLTemplate")] -public class UserWLTemplate : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///UserWLTemplate + /// + [Table("UserWLTemplate")] + public class UserWLTemplate : BaseAddAuditEntity + { + #region 导航属性 - #endregion + #endregion - public string TemplateName { get; set; } = string.Empty; - - public Guid UserId { get; set; } - - public int WW { get; set; } - - public int WL { get; set; } - - public int ShowOrder { get; set; } = 0; + public string TemplateName { get; set; } = string.Empty; - public bool IsPitchOn { get; set; } = true; + public Guid UserId { get; set; } + + + + + public int WW { get; set; } + + + public int WL { get; set; } + + + public int ShowOrder { get; set; } = 0; + + /// + /// 是否为默认 + /// + 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 d4b08018e..09b0cd1d1 100644 --- a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs +++ b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs @@ -3,30 +3,35 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-08-22 10:06: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; - -[Comment("系统标准 - 疗效评估对照表 (需要同步)")] -[Table("TumorAssessment_IRECIST1Point1")] -public class TumorAssessment_IRECIST1Point1 : Entity +namespace IRaCIS.Core.Domain.Models { + /// + ///IRECIST1Point1肿瘤评估(系统标准) + /// + [Table("TumorAssessment_IRECIST1Point1")] + public class TumorAssessment_IRECIST1Point1 : Entity + { - [Comment("靶病灶")] - public TargetAssessment TargetLesion { get; set; } + /// + /// 靶病灶 + /// + public TargetAssessment TargetLesion { get; set; } - [Comment("非靶病灶")] - public NoTargetAssessment NonTargetLesions { get; set; } + /// + /// 非靶病灶 + /// + public NoTargetAssessment NonTargetLesions { get; set; } - [Comment("新病灶")] - public NewLesionAssessment NewLesion { get; set; } + /// + /// 新病灶 + /// + public NewLesionAssessment NewLesion { get; set; } + /// + /// 整体疗效 + /// + public OverallAssessment OverallEfficacy { 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 4c17227e4..ba555509a 100644 --- a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs +++ b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs @@ -3,29 +3,35 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-08-22 10:06: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; - -/// -///RECIST1Point1肿瘤评估(系统标准) -/// -[Table("TumorAssessment_RECIST1Point1")] -public class TumorAssessment_RECIST1Point1 : Entity +namespace IRaCIS.Core.Domain.Models { + /// + ///RECIST1Point1肿瘤评估(系统标准) + /// + [Table("TumorAssessment_RECIST1Point1")] + public class TumorAssessment_RECIST1Point1 : Entity + { - [Comment("靶病灶")] - public TargetAssessment TargetLesion { get; set; } + /// + /// 靶病灶 + /// + public TargetAssessment TargetLesion { get; set; } - [Comment("非靶病灶")] - public NoTargetAssessment NonTargetLesions { get; set; } + /// + /// 非靶病灶 + /// + public NoTargetAssessment NonTargetLesions { get; set; } - [Comment("新病灶")] - public NewLesionAssessment NewLesion { get; set; } + /// + /// 新病灶 + /// + public NewLesionAssessment NewLesion { get; set; } + + /// + /// 整体疗效 + /// + public OverallAssessment OverallEfficacy { 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 6dd6b6557..22e2609ed 100644 --- a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs +++ b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs @@ -3,31 +3,35 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-08-22 10:06: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; - -/// -///RECIST1Point1BM肿瘤评估(系统标准) -/// -[Table("TumorAssessment_RECIST1Point1BM")] -public class TumorAssessment_RECIST1Point1BM : Entity +namespace IRaCIS.Core.Domain.Models { + /// + ///RECIST1Point1BM肿瘤评估(系统标准) + /// + [Table("TumorAssessment_RECIST1Point1BM")] + public class TumorAssessment_RECIST1Point1BM : Entity + { - [Comment("靶病灶")] - public TargetAssessment TargetLesion { get; set; } + /// + /// 靶病灶 + /// + public TargetAssessment TargetLesion { get; set; } - [Comment("非靶病灶")] - public NoTargetAssessment NonTargetLesions { get; set; } + /// + /// 非靶病灶 + /// + public NoTargetAssessment NonTargetLesions { get; set; } - [Comment("新病灶")] - public NewLesionAssessment NewLesion { get; set; } + /// + /// 新病灶 + /// + public NewLesionAssessment NewLesion { get; set; } + + /// + /// 整体疗效 + /// + public OverallAssessment OverallEfficacy { get; set; } + } - [Comment("整体疗效")] - public OverallAssessment OverallEfficacy { get; set; } } - - diff --git a/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs b/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs index 6d2bfad29..811a55a45 100644 --- a/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs +++ b/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs @@ -1,13 +1,8 @@ using IRaCIS.Core.Domain.Share; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace IRaCIS.Core.Domain.Models { - public class ReadModuleView: Entity + public class ReadModuleView : Entity { /// /// Id(阅片期Id 或者 访视ID) @@ -78,7 +73,7 @@ namespace IRaCIS.Core.Domain.Models /// public string? ReadModuleName { get; set; } - + /// /// 创建时间 @@ -168,16 +163,17 @@ namespace IRaCIS.Core.Domain.Models /// public int NeedSignClinicalDataCount { get; set; } - /// - /// 已经签名的临床数据数量 - /// - public int SignClinicalDataCount { get; set; } + /// + /// 已经签名的临床数据数量 + /// + public int SignClinicalDataCount { get; set; } public CompleteClinicalDataEnum CompleteClinicalData { - get { + get + { if (NeedSignClinicalDataCount == 0) { @@ -195,5 +191,5 @@ namespace IRaCIS.Core.Domain.Models } } - } + } } diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs index 5a0b1ff35..a996e86cb 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs @@ -1,43 +1,41 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 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; - -[Comment("项目 - 项目中心调研设备表")] -[Table("TrialSiteEquipmentSurvey")] -public class TrialSiteEquipmentSurvey : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialSiteSurveyId")] - public TrialSiteSurvey TrialSiteSurvey { get; set; } + /// + ///TrialSiteEquipmentSurvey + /// + [Table("TrialSiteEquipmentSurvey")] + public class TrialSiteEquipmentSurvey : BaseFullAuditEntity + { + #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 c5ccb5ab8..4d4393ee5 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs @@ -4,77 +4,73 @@ // 生成时间 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; - - -[Comment("项目 - 项目中心调研表")] -[Table("TrialSiteSurvey")] -public class TrialSiteSurvey : BaseFullDeleteAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///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 359a79e54..29a15eeef 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs @@ -4,61 +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; - -[Comment("项目 - 项目中心调研用户表")] -[Table("TrialSiteUserSurvey")] -public class TrialSiteUserSurvey : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialSiteSurveyId")] - public TrialSiteSurvey TrialSiteSurvey { get; set; } - [JsonIgnore] - [ForeignKey("UserTypeId")] - public UserType UserTypeRole { get; set; } - #endregion + /// + ///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 - 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/DataInspection.cs b/IRaCIS.Core.Domain/Trial/DataInspection.cs index d0422ccb9..b34fdf3b1 100644 --- a/IRaCIS.Core.Domain/Trial/DataInspection.cs +++ b/IRaCIS.Core.Domain/Trial/DataInspection.cs @@ -1,12 +1,6 @@ - //-------------------------------------------------------------------- // 生成时间 2022-03-21 17:13:43 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; namespace IRaCIS.Core.Domain.Models; [Comment("稽查 - 记录表")] diff --git a/IRaCIS.Core.Domain/Trial/Enroll.cs b/IRaCIS.Core.Domain/Trial/Enroll.cs index a7ccc86e1..c56428a2d 100644 --- a/IRaCIS.Core.Domain/Trial/Enroll.cs +++ b/IRaCIS.Core.Domain/Trial/Enroll.cs @@ -1,93 +1,67 @@ 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; - -[Comment("医生 - 入组项目中间记录表")] -[Table("Enroll")] -public partial class Enroll : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialId")] - public virtual Trial Trial { get; set; } - [JsonIgnore] - public virtual Doctor Doctor { get; set; } - [JsonIgnore] - public User DoctorUser { get; set; } + [Table("Enroll")] + public partial class Enroll : BaseFullAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialId")] + public virtual Trial Trial { get; set; } + [JsonIgnore] + public virtual Doctor Doctor { get; set; } + [JsonIgnore] + public User DoctorUser { get; set; } - [JsonIgnore] - public List EnrollReadingCategoryList { get; set; } + [JsonIgnore] + public List EnrollReadingCategoryList { get; set; } - [JsonIgnore] - public List EnrollReadingCriteriaList { get; set; } - #endregion + [JsonIgnore] + public List EnrollReadingCriteriaList { get; set; } + #endregion - [Comment(" 裁定")] - public int? Adjudication { get; set; } + public Guid DoctorId { get; set; } + public Guid TrialId { get; set; } + public Guid AttachmentId { get; set; } = Guid.Empty; + public EnrollStatus EnrollStatus { get; set; } - [Comment(" 裁定24小时")] - public int? Adjudication24H { get; set; } + public decimal? AdjustmentMultiple { get; set; } + public DateTime? EnrollTime { get; set; } + public DateTime? OutEnrollTime { get; set; } - [Comment(" 裁定48小时")] - public int? Adjudication48H { get; set; } + public string Memo { get; set; } = string.Empty; - [Comment(" 价格")] - [DecimalPrecision(18, 2)] - public decimal? AdjustmentMultiple { get; set; } + public int ReviewerReadingType { get; set; } = 0; - public Guid? AttachmentId { get; set; } + public int? Training { get; set; } - public Guid DoctorId { get; set; } + public int? RefresherTraining { get; set; } - public int DoctorTrialState { get; set; } + public int? Timepoint { get; set; } - [Comment(" 生成账号 加入到项目中后 赋值")] - public Guid? DoctorUserId { get; set; } + public int? Timepoint48H { get; set; } - [Comment(" 空跑")] - public int? Downtime { get; set; } + public int? Timepoint24H { get; set; } - [Comment(" 入组状态")] - public EnrollStatus EnrollStatus { get; set; } + public int? Adjudication { get; set; } - [Comment(" 入组时间")] - public DateTime? EnrollTime { get; set; } + public int? Adjudication48H { get; set; } - [Comment(" 总体")] - public int? Global { get; set; } + public int? Adjudication24H { get; set; } - [StringLength(500)] - public string Memo { get; set; } = null!; + public int? Global { get; set; } - [Comment(" 出组时间")] - public DateTime? OutEnrollTime { get; set; } - - [Comment(" 重新培训")] - public int? RefresherTraining { get; set; } - - [Comment(" 0代表裁判和TP都可以 1代表Tp 2 代表裁判")] - public int ReviewerReadingType { get; set; } - - [Comment(" 时间点")] - public int? Timepoint { get; set; } - - [Comment(" 时间点24小时")] - public int? Timepoint24H { get; set; } - - [Comment(" 时间点48小时")] - public int? Timepoint48H { get; set; } - - [Comment(" 培训")] - public int? Training { get; set; } - - public Guid TrialId { get; set; } + public int? Downtime { get; set; } + /// + /// 生成账号 加入到项目中后 赋值 + /// + public Guid? DoctorUserId { get; set; } + + + } } diff --git a/IRaCIS.Core.Domain/Trial/EnrollDetail.cs b/IRaCIS.Core.Domain/Trial/EnrollDetail.cs index 4880edb8d..7f1d29126 100644 --- a/IRaCIS.Core.Domain/Trial/EnrollDetail.cs +++ b/IRaCIS.Core.Domain/Trial/EnrollDetail.cs @@ -1,37 +1,28 @@ using IRaCIS.Core.Domain.Share; -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models; - -[Comment("ҽ - Ŀ̼¼")] -[Table("EnrollDetail")] -public partial class EnrollDetail : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region - [JsonIgnore] - public virtual TrialStatusDetail TrialDetail { get; set; } - [JsonIgnore] - public Doctor Doctor { get; set; } - #endregion + [Table("EnrollDetail")] + public partial class EnrollDetail : BaseAddAuditEntity + { + #region + [JsonIgnore] + public virtual TrialStatusDetail TrialDetail { get; set; } + [JsonIgnore] + public Doctor Doctor { get; set; } + #endregion - public Guid DoctorId { get; set; } - - public Guid? EnrollId { get; set; } - - public EnrollStatus EnrollStatus { get; set; } - - [StringLength(1024)] - public string Memo { get; set; } = null!; - - public int OptUserType { get; set; } - - public Guid TrialDetailId { get; set; } - - public Guid TrialId { get; set; } + public Guid DoctorId { get; set; } + public Guid TrialId { get; set; } + public EnrollStatus EnrollStatus { get; set; } + public Guid? EnrollId { get; set; } + public string Memo { get; set; } = string.Empty; + public int OptUserType { get; set; } + public Guid TrialDetailId { get; set; } + + + } } diff --git a/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs b/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs index c95124b32..ea26664cf 100644 --- a/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs +++ b/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs @@ -3,31 +3,31 @@ // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-07-08 10:43:53 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("医生 - 项目阅片标准阅片类型配置表")] -[Table("EnrollReadingCategory")] -public class EnrollReadingCategory : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///EnrollReadingCategory + /// + [Table("EnrollReadingCategory")] + public class EnrollReadingCategory : BaseAddAuditEntity + { + #region 导航属性 - [JsonIgnore] - [ForeignKey("EnrollId")] - public Enroll Enroll { get; set; } - #endregion - public Guid EnrollId { get; set; } + [JsonIgnore] + [ForeignKey("EnrollId")] + public Enroll Enroll { get; set; } + #endregion + public Guid EnrollId { get; set; } - public ReadingCategory ReadingCategory { get; set; } + public ReadingCategory ReadingCategory { get; set; } - public Guid TrialReadingCriterionId { get; set; } + public Guid TrialReadingCriterionId { get; set; } + } + } diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 184c754a0..dd94cda71 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +using IRaCIS.Core.Domain.Share; using System.Linq; -using IRaCIS.Core.Domain.Share; -using Newtonsoft.Json; namespace IRaCIS.Core.Domain.Models { @@ -357,6 +352,6 @@ namespace IRaCIS.Core.Domain.Models public bool IsTrialPACSConfirmed { get; set; } - + } } diff --git a/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs b/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs index df435c8ae..00fbe6338 100644 --- a/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs +++ b/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs @@ -1,38 +1,36 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2024-06-04 10:38:19 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -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; - -[Comment("项目 - 项目部位配置")] -[Table("TrialBodyPart")] -public class TrialBodyPart : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///TrialBodyPart + /// + [Table("TrialBodyPart")] + public class TrialBodyPart : BaseAddAuditEntity + { + #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } - #endregion + #endregion - public string Code { get; set; } = null!; + public string Code { get; set; } = string.Empty; - public bool IsHandAdd { get; set; } - [StringLength(500)] - public string Name { get; set; } = null!; + public string Name { get; set; } = string.Empty; - [StringLength(500)] - public string NameCN { get; set; } = null!; - public Guid TrialId { get; set; } + public string NameCN { get; set; } = string.Empty; + + + 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 1eb052961..edd37e647 100644 --- a/IRaCIS.Core.Domain/Trial/TrialDictionary.cs +++ b/IRaCIS.Core.Domain/Trial/TrialDictionary.cs @@ -1,25 +1,20 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("Ŀ - Ŀֵϵ")] -[Table("TrialDictionary")] -public partial class TrialDictionary : Entity +namespace IRaCIS.Core.Domain.Models { - #region - [JsonIgnore] - public virtual Trial Trial { get; set; } - [JsonIgnore] - public virtual Dictionary Dictionary { get; set; } - #endregion + [Table("TrialDictionary")] + public partial class TrialDictionary : Entity + { + #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 Guid TrialId { get; set; } + public string KeyName { get; set; } = string.Empty; - public Guid DictionaryId { get; set; } + public Guid TrialId { get; set; } + + public Guid DictionaryId { get; set; } + } } diff --git a/IRaCIS.Core.Domain/Trial/TrialSign.cs b/IRaCIS.Core.Domain/Trial/TrialSign.cs index deab61307..bdd312e73 100644 --- a/IRaCIS.Core.Domain/Trial/TrialSign.cs +++ b/IRaCIS.Core.Domain/Trial/TrialSign.cs @@ -1,36 +1,34 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 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; - -[Comment("项目 - 项目操作签名表")] -[Table("TrialSign")] -public class TrialSign : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///TrialSign + /// + [Table("TrialSign")] + public class TrialSign : BaseAddAuditEntity + { + #region 导航属性 - #endregion - public Guid? TrialId { get; set; } + #endregion + public Guid? TrialId { get; set; } - public Guid? SubjectVisitId { get; set; } - public Guid? SignCodeId { get; set; } + public Guid? SubjectVisitId { get; set; } - public string SignCode { get; set; } = string.Empty; - [StringLength(1024)] - public string SignText { get; set; } = string.Empty; + //关联基础数据 + public Guid? SignCodeId { get; set; } + + public string SignCode { get; set; } = string.Empty; + + public string SignText { get; set; } = string.Empty; + + public bool IsCompleted { get; set; } + + } - public bool IsCompleted { get; set; } } - - - diff --git a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs index 15f28a1c8..0ef33d71e 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs @@ -1,35 +1,35 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-02-25 14:21:48 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目 - 项目状态变更记录表")] -[Table("TrialStateChange")] -public class TrialStateChange : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } + /// + ///TrialStateChange + /// + [Table("TrialStateChange")] + public class TrialStateChange : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } - #endregion + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public string OriginState { get; set; } = String.Empty; + public string OriginState { get; set; } = String.Empty; - public string NowState { get; set; } = String.Empty; + public string NowState { get; set; } = String.Empty; - public string Reason { 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 0b3b1d565..306e6b7c3 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs @@ -1,31 +1,25 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("Ŀ - ̼¼")] -[Table("TrialStatus")] -public partial class TrialStatusDetail : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region - [JsonIgnore] - public List IntoGroupDetails { get; set; } + [Table("TrialStatus")] + public partial class TrialStatusDetail : BaseAddAuditEntity + { + #region + [JsonIgnore] + public List IntoGroupDetails { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - #endregion + [JsonIgnore] + public Trial Trial { get; set; } + #endregion - public Guid TrialId { get; set; } - public int TrialStatus { get; set; } - [StringLength(400)] - public string Memo { get; set; } = string.Empty; + public Guid TrialId { get; set; } + public int TrialStatus { get; set; } - public int OptUserType { get; set; } + public string Memo { get; set; } = string.Empty; + + public int OptUserType { get; set; } + } } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs index 919550e9f..60aa6ffcc 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs @@ -1,33 +1,31 @@ -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -public class TrialAudit : Entity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("SubjectId")] - public Subject Subject { get; set; } - #endregion - public int AuditType { get; set; } + public class TrialAudit : Entity + { + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } + #endregion + public int AuditType { get; set; } - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public Guid StudyId { get; set; } = Guid.Empty; + public Guid StudyId { get; set; } = Guid.Empty; - public Guid? SubjectId { get; set; } + public Guid? SubjectId { get; set; } - public Guid OptUserId { get; set; } + public Guid OptUserId { get; set; } - public string OptUser { get; set; } = string.Empty; + public string OptUser { get; set; } = string.Empty; - public DateTime OptTime { get; set; } = DateTime.Now; - public string Note { get; set; } = string.Empty; + public DateTime OptTime { get; set; } = DateTime.Now; + public string Note { get; set; } = string.Empty; - public string Detail { get; set; } = string.Empty; + public string Detail { get; set; } = string.Empty; + } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs index 1e1a59106..b8f595171 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs @@ -4,56 +4,64 @@ // 生成时间 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; - -[Comment("项目 - 项目外部人员")] -[Table("TrialExternalUser")] -public class TrialExternalUser : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } - #endregion + /// + ///TrialExternalUser + /// + [Table("TrialExternalUser")] + public class TrialExternalUser : BaseFullAuditEntity + { + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } + #endregion - public Guid TrialId { get; set; } - public Guid UserTypeId { get; set; } + public Guid TrialId { get; set; } - public string Phone { get; set; } = String.Empty; + public Guid UserTypeId { get; set; } - public string Email { get; set; } = String.Empty; + public string Phone { 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 bool IsSystemUser { get; set; } + public string OrganizationName { get; set; } = String.Empty; - 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 bool IsSystemUser { get; set; } - [Comment(" 邀请状态")] - public TrialExternalUserStateEnum InviteState { get; set; } = TrialExternalUserStateEnum.WaitSent; + public Guid SystemUserId { get; set; } + + + + 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 a797294ba..099d858f5 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs @@ -1,55 +1,49 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目 - 项目中心表")] -[Table("TrialSite")] -public class TrialSite : BaseFullDeleteAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] + public class TrialSite : BaseFullDeleteAuditEntity + { + #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 bc1d28312..c36cd0bf8 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs @@ -1,45 +1,41 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2024-07-02 16:53:49 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目 - 项目中心DicomAE表")] -[Table("TrialSiteDicomAE")] -public class TrialSiteDicomAE : BaseFullDeleteAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///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 TrialId { get; set; } - public Guid TrialSiteId { get; set; } + public Guid TrialSiteId { get; set; } - public string CallingAE { get; set; } = string.Empty; + public string CallingAE { get; set; } = string.Empty; - [StringLength(500)] - public string Description { get; set; } = null!; - - public string IP { get; set; } = null!; - - [StringLength(500)] - public string Port { get; set; } = null!; + public string IP { get; set; } = string.Empty; + public string Port { get; set; } = string.Empty; + + + public string Description { get; set; } = string.Empty; + + + + } } - - diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs index 9bd6587bc..6888708ef 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs @@ -1,44 +1,39 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 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; - -[Comment("项目 - 项目中心用户关系表")] -[Table("TrialSiteUser")] -public class TrialSiteUser : BaseFullDeleteAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///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 6e34ea8e3..7363d1d7f 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs @@ -1,31 +1,28 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using IRaCIS.Core.Domain.Share; -using Microsoft.EntityFrameworkCore; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目 - 项目参与人员中间表")] -[Table("TrialUser")] -public partial class TrialUser : BaseFullDeleteAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } + /// + /// 运维人员与项目关联关系表 - 实体 + /// + [Table("TrialUser")] + public partial class TrialUser : BaseFullDeleteAuditEntity + { + #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 Guid UserId { get; set; } + public Guid TrialId { get; set; } - public DateTime? RemoveTime { get; set; } + public DateTime? RemoveTime { get; set; } - public DateTime? JoinTime { get; set; } + public DateTime? JoinTime { get; set; } + } } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs index c8e000e87..d8d51cc9c 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs @@ -1,42 +1,37 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-03-24 13:22:08 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models; - -/// -///TrialUserPreparation -/// -[Table("TrialUserPreparation ")] -public class TrialUserPreparation : BaseFullAuditEntity +namespace IRaCIS.Core.Domain.Models { + /// + ///TrialUserPreparation + /// + [Table("TrialUserPreparation ")] + public class TrialUserPreparation : BaseFullAuditEntity + { - #region 导航属性 - [JsonIgnore] - public User User { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + public User User { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } + #endregion - public Guid UserId { get; set; } + public Guid UserId { get; set; } - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public DateTime? ExpireTime { get; set; } + public DateTime? ExpireTime { get; set; } - public bool? IsJoin { get; set; } + public bool? IsJoin { get; set; } - public DateTime? JoinTime { get; set; } + public DateTime? JoinTime { get; set; } - public string RejectReason { get; set; } = string.Empty; + public string RejectReason { get; set; } = string.Empty; + } + } - - diff --git a/IRaCIS.Core.Domain/Visit/Subject.cs b/IRaCIS.Core.Domain/Visit/Subject.cs index f5a1ca040..38379ceeb 100644 --- a/IRaCIS.Core.Domain/Visit/Subject.cs +++ b/IRaCIS.Core.Domain/Visit/Subject.cs @@ -1,14 +1,10 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using IRaCIS.Core.Domain.Share; -using Microsoft.EntityFrameworkCore; -using Newtonsoft.Json; +using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models; -[Comment("项目 - 受试者")] +/// +/// 受试者 +/// [Table("Subject")] public class Subject : BaseFullDeleteAuditEntity { @@ -64,69 +60,56 @@ public class Subject : BaseFullDeleteAuditEntity public List ClinicalFormList { get; set; } #endregion - public int? Age { get; set; } - - public DateTime? BirthDate { get; set; } - - [StringLength(400)] - public string Code { get; set; } = null!; - public Guid? FinalSubjectVisitId { get; set; } - public DateTime? FirstGiveMedicineTime { get; set; } - [StringLength(400)] - public string FirstName { get; set; } = null!; + public Guid TrialSiteId { get; set; } - public string Height { get; set; } = null!; + public string Code { get; set; } = string.Empty; + public string FirstName { get; set; } = string.Empty; + public string LastName { get; set; } = string.Empty; + public int? Age { get; set; } + public string Sex { get; set; } = string.Empty; - public bool IsEnrollment { get; set; } - public bool IsEnrollmentConfirm { get; set; } - public bool IsMissingImages { get; set; } - - public bool IsReReadingOrBackInfluenceAnalysis { get; set; } - - public bool IsUrgent { get; set; } - - [StringLength(400)] - public string LastName { get; set; } = null!; - - [Comment(" 最新受试者访视")] public Guid? LatestSubjectVisitId { get; set; } - [StringLength(400)] - public string MedicalNo { get; set; } = null!; + + + public Guid TrialId { get; set; } = Guid.Empty; + public string MedicalNo { get; set; } = string.Empty; + + public SubjectStatus Status { get; set; } = SubjectStatus.OnVisit;//1 访视中，2 出组 3 访视结束 + public string Reason { get; set; } = string.Empty; + public bool IsEnrollment { get; set; } public DateTime? OutEnrollmentTime { get; set; } - [Comment(" 出组原因")] - - [MaxLength] - public string? Reason { get; set; } - - [StringLength(400)] - public string Sex { get; set; } = null!; - - [Comment(" 受试者名称缩写")] - public string ShortName { get; set; } = null!; - - [Comment(" 知情同意书签署日期")] - public DateTime? SignDate { get; set; } - - public SubjectStatus Status { get; set; } = SubjectStatus.OnVisit; - - - public Guid TrialId { get; set; } - - public Guid TrialSiteId { get; set; } - public DateTime? VisitOverTime { get; set; } - [StringLength(400)] - public string Weight { get; set; } = null!; + + public string ShortName { get; set; } = String.Empty; + + public string Height { get; set; } = String.Empty; + + public string Weight { get; set; } = String.Empty; + + public DateTime? BirthDate { get; set; } + public DateTime? SignDate { get; set; } + + public int StudyCount { get; set; } = 0; + public string Modalities { get; set; } = string.Empty; + + public DateTime? FirstGiveMedicineTime { get; set; } + + public bool IsUrgent { get; set; } + + + + + public bool IsReReadingOrBackInfluenceAnalysis { get; set; } diff --git a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs index 4b4a3de1b..cc7d52372 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs @@ -1,31 +1,29 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2022-07-29 10:43:49 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using System; -using IRaCIS.Core.Domain.Share; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models; - -[Comment("受试者 - 阅片标准取消分配医生记录")] -[Table("SubjectCanceDoctor")] -public class SubjectCanceDoctor : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public Subject Subject { get; set; } - #endregion + /// + ///SubjectCanceDoctor + /// + [Table("SubjectCanceDoctor")] + public class SubjectCanceDoctor : BaseAddAuditEntity + { + #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/SubjectVisit.cs b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs index 5fcb3021f..7e7480505 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs @@ -1,252 +1,250 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using IRaCIS.Core.Domain.Share; +using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models; - -[Table("SubjectVisit")] -public class SubjectVisit : BaseFullDeleteAuditEntity +namespace IRaCIS.Core.Domain.Models { + [Table("SubjectVisit")] + public class SubjectVisit : BaseFullDeleteAuditEntity + { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - public TrialSite TrialSite { get; set; } + [JsonIgnore] + public TrialSite TrialSite { get; set; } - [JsonIgnore] - [ForeignKey("OutPlanPreviousVisitId")] - public SubjectVisit OutPlanPreviousVisit { get; set; } + [JsonIgnore] + [ForeignKey("OutPlanPreviousVisitId")] + public SubjectVisit OutPlanPreviousVisit { get; set; } - [ForeignKey("ForwardUserId")] - public User ForwardUser { get; set; } + [ForeignKey("ForwardUserId")] + public User ForwardUser { get; set; } - [JsonIgnore] - [ForeignKey("PreliminaryAuditUserId")] - public User PreliminaryAuditUser { get; set; } + [JsonIgnore] + [ForeignKey("PreliminaryAuditUserId")] + public User PreliminaryAuditUser { get; set; } - [JsonIgnore] - [ForeignKey("ReviewAuditUserId")] - public User ReviewAuditUser { get; set; } + [JsonIgnore] + [ForeignKey("ReviewAuditUserId")] + public User ReviewAuditUser { get; set; } - [JsonIgnore] - [ForeignKey("CurrentActionUserId")] - public User CurrentActionUser { get; set; } - [JsonIgnore] - [ForeignKey("SubmitUserId")] - public User SubmitUser { get; set; } + [JsonIgnore] + [ForeignKey("CurrentActionUserId")] + public User CurrentActionUser { get; set; } + [JsonIgnore] + [ForeignKey("SubmitUserId")] + public User SubmitUser { get; set; } - //导航属性 - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } + //导航属性 + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } - [JsonIgnore] - public List ReadModuleList { get; set; } + [JsonIgnore] + public List ReadModuleList { get; set; } - [JsonIgnore] - [ForeignKey("SubjectId")] - public Subject Subject { get; set; } + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } - [JsonIgnore] - public List PreviousHistoryList { get; set; } - [JsonIgnore] - public List PreviousOtherList { get; set; } - [JsonIgnore] - public List PreviousSurgeryList { get; set; } - [JsonIgnore] - public List PreviousPDFList { get; set; } - [JsonIgnore] - public List ReadingClinicalDataList { get; set; } - [JsonIgnore] - public List CheckChallengeDialogList { get; set; } = new List(); - [JsonIgnore] - public List StudyList { get; set; } = new List(); - [JsonIgnore] - public List NoneDicomStudyList { get; set; } = new List(); + [JsonIgnore] + public List PreviousHistoryList { get; set; } + [JsonIgnore] + public List PreviousOtherList { get; set; } + [JsonIgnore] + public List PreviousSurgeryList { get; set; } + [JsonIgnore] + public List PreviousPDFList { get; set; } + [JsonIgnore] + public List ReadingClinicalDataList { get; set; } + [JsonIgnore] + public List CheckChallengeDialogList { get; set; } = new List(); + [JsonIgnore] + public List StudyList { get; set; } = new List(); + [JsonIgnore] + public List NoneDicomStudyList { get; set; } = new List(); - [JsonIgnore] - public List QCChallengeList { get; set; } = new List(); - [JsonIgnore] - public List QCChallengeDialogList { get; set; } = new List(); - [JsonIgnore] - public List VisitTaskList { get; set; } = new List(); + [JsonIgnore] + public List QCChallengeList { get; set; } = new List(); + [JsonIgnore] + public List QCChallengeDialogList { get; set; } = new List(); + [JsonIgnore] + public List VisitTaskList { get; set; } = new List(); - [JsonIgnore] - public List SubjectCriteriaEvaluationVisitFilterList { get; set; } - #endregion + [JsonIgnore] + public List SubjectCriteriaEvaluationVisitFilterList { get; set; } + #endregion - public Guid TrialSiteId { get; set; } + public Guid TrialSiteId { get; set; } - //一个访视 对应有对应Site的 TrialSiteCode + //一个访视 对应有对应Site的 TrialSiteCode - public Guid TrialId { get; set; } - public Guid SubjectId { get; set; } + public Guid TrialId { get; set; } + public Guid SubjectId { get; set; } - public Guid? VisitStageId { get; set; } - public int VisitDay { get; set; } - public string VisitName { get; set; } = string.Empty; - public int VisitWindowLeft { get; set; } - public int VisitWindowRight { get; set; } + public Guid? VisitStageId { get; set; } + public int VisitDay { get; set; } + public string VisitName { get; set; } = string.Empty; + public int VisitWindowLeft { get; set; } + public int VisitWindowRight { get; set; } - [Column(TypeName = "decimal(18,1)")] - public decimal VisitNum { get; set; } - public string BlindName { get; set; } = string.Empty; + [Column(TypeName = "decimal(18,1)")] + public decimal VisitNum { get; set; } + public string BlindName { get; set; } = string.Empty; - public string SVUPDES { get; set; } = string.Empty; - public DateTime? SVSTDTC { get; set; } - public DateTime? SVENDTC { get; set; } - public bool InPlan { get; set; } = true; - public bool IsBaseLine { get; set; } = false; + public string SVUPDES { get; set; } = string.Empty; + public DateTime? SVSTDTC { get; set; } + public DateTime? SVENDTC { get; set; } + public bool InPlan { get; set; } = true; + public bool IsBaseLine { get; set; } = false; - //0 未执行 1 执行了 2 不可用 - public VisitExecutedEnum VisitExecuted { get; set; } = VisitExecutedEnum.UnExecuted; + //0 未执行 1 执行了 2 不可用 + public VisitExecutedEnum VisitExecuted { get; set; } = VisitExecutedEnum.UnExecuted; - public DateTime? EarliestScanDate { get; set; } + public DateTime? EarliestScanDate { get; set; } + /// + /// 最晚拍片日期 + /// + public DateTime? LatestScanDate { get; set; } + + public Guid? Auditor { get; set; } + + + //核查状态 + public CheckStateEnum CheckState { get; set; } + + //提交状态 + public SubmitStateEnum SubmitState { get; set; } + //审核状态 + public AuditStateEnum AuditState { get; set; } + public ForwardStateEnum ForwardState { get; set; } + + /// + /// 单审通过人 + /// + public Guid? PreliminaryAuditUserId { get; set; } + + /// + /// 双审通过人 + /// + public Guid? ReviewAuditUserId { get; set; } + + /// + /// 一致性核查人Id + /// + public Guid? CheckUserId { get; set; } + + public DateTime? ReviewAuditTime { get; set; } + public DateTime? PreliminaryAuditTime { get; set; } + public Guid? ForwardUserId { get; set; } + public DateTime? ForwardTime { get; set; } + + /// + /// 当前质控领取人 + /// + public Guid? CurrentActionUserId { get; set; } + public DateTime? CurrentActionUserExpireTime { get; set; } + + public DateTime? SubmitTime { get; set; } + public DateTime? CheckTime { get; set; } + + /// + /// 通过原因 + /// + public string ManualPassReason { get; set; } = string.Empty; + + public bool IsUrgent { get; set; } + + public bool IsTake { get; set; } + + public bool IsFinalVisit { get; set; } + + public ChallengeStateEnum ChallengeState { get; set; } + + public string CheckResult { get; set; } = String.Empty; + + //是否一致性核查回退 + public bool? IsCheckBack { get; set; } + + public DateTime? CheckBackTime { get; set; } + + public CheckChanllengeTypeEnum CheckChallengeState { get; set; } + public PDStateEnum PDState { get; set; } = PDStateEnum.None; + + + public DateTime? CheckPassedTime { get; set; } + + /// + /// 上一访视 + /// + public Guid? OutPlanPreviousVisitId { get; set; } + + + public RequestBackStateEnum RequestBackState { get; set; } + + + public bool IsQCConfirmedReupload { get; set; } + + public bool IsLostVisit { get; set; } + + + //是否确认了、签名了 临床数据完整性 + public bool? IsConfirmedClinicalData { get; set; } + + + public bool IsEnrollmentConfirm { get; set; } + + public bool IsVisitTaskGenerated { get; set; } + + public bool IsPMBackOrReReading { get; set; } + + /// + /// 关闭一致性质疑原因 + /// + public string CloseTheReason { get; set; } = string.Empty; + + public Guid? SubmitUserId { get; set; } + + + public ReadingStatusEnum ReadingStatus { get; set; } + + public string VisitImageZipPath { get; set; } = string.Empty; + + public PackState PackState { get; set; } + + public PackState NoDicomPackState { get; set; } + + public string VisitNoDicomImageZipPath { get; set; } = string.Empty; + } /// - /// 最晚拍片日期 + /// 影像下载打包状态 /// - public DateTime? LatestScanDate { get; set; } + public enum PackState + { - public Guid? Auditor { get; set; } + /// + /// 待打包 + /// + WaitPack = 0, + /// + /// 打包中 + /// + Packing = 1, - //核查状态 - public CheckStateEnum CheckState { get; set; } - - //提交状态 - public SubmitStateEnum SubmitState { get; set; } - //审核状态 - public AuditStateEnum AuditState { get; set; } - public ForwardStateEnum ForwardState { get; set; } - - /// - /// 单审通过人 - /// - public Guid? PreliminaryAuditUserId { get; set; } - - /// - /// 双审通过人 - /// - public Guid? ReviewAuditUserId { get; set; } - - /// - /// 一致性核查人Id - /// - public Guid? CheckUserId { get; set; } - - public DateTime? ReviewAuditTime { get; set; } - public DateTime? PreliminaryAuditTime { get; set; } - public Guid? ForwardUserId { get; set; } - public DateTime? ForwardTime { get; set; } - - /// - /// 当前质控领取人 - /// - public Guid? CurrentActionUserId { get; set; } - public DateTime? CurrentActionUserExpireTime { get; set; } - - public DateTime? SubmitTime { get; set; } - public DateTime? CheckTime { get; set; } - - /// - /// 通过原因 - /// - public string ManualPassReason { get; set; } = string.Empty; - - public bool IsUrgent { get; set; } - - public bool IsTake { get; set; } - - public bool IsFinalVisit { get; set; } - - public ChallengeStateEnum ChallengeState { get; set; } - - public string CheckResult { get; set; } = String.Empty; - - //是否一致性核查回退 - public bool? IsCheckBack { get; set; } - - public DateTime? CheckBackTime { get; set; } - - public CheckChanllengeTypeEnum CheckChallengeState { get; set; } - public PDStateEnum PDState { get; set; } = PDStateEnum.None; - - - public DateTime? CheckPassedTime { get; set; } - - /// - /// 上一访视 - /// - public Guid? OutPlanPreviousVisitId { get; set; } - - - public RequestBackStateEnum RequestBackState { get; set; } - - - public bool IsQCConfirmedReupload { get; set; } - - public bool IsLostVisit { get; set; } - - - //是否确认了、签名了 临床数据完整性 - public bool? IsConfirmedClinicalData { get; set; } - - - public bool IsEnrollmentConfirm { get; set; } - - public bool IsVisitTaskGenerated { get; set; } - - public bool IsPMBackOrReReading { get; set; } - - /// - /// 关闭一致性质疑原因 - /// - public string CloseTheReason { get; set; } = string.Empty; - - public Guid? SubmitUserId { get; set; } - - - public ReadingStatusEnum ReadingStatus { get; set; } - - public string VisitImageZipPath { get; set; } = string.Empty; - - public PackState PackState { get; set; } - - public PackState NoDicomPackState { get; set; } - - public string VisitNoDicomImageZipPath { get; set; } = string.Empty; -} -/// -/// 影像下载打包状态 -/// -public enum PackState -{ - - /// - /// 待打包 - /// - WaitPack = 0, - - /// - /// 打包中 - /// - Packing = 1, - - /// - /// 打包完成 - /// - Packed = 2 + /// + /// 打包完成 + /// + Packed = 2 + } } diff --git a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs index 9bd5ad6ee..997bda5a9 100644 --- a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs +++ b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs @@ -1,31 +1,27 @@ - //-------------------------------------------------------------------- // 此代码由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; - -[Comment("项目配置 - 访视计划调整不一致数量记录表")] -[Table("VisitPlanInfluenceStat")] -public class VisitPlanInfluenceStat : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 + /// + ///VisitPlanInfluenceStudystat + /// + [Table("VisitPlanInfluenceStat")] + public class VisitPlanInfluenceStat : BaseAddAuditEntity + { + #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 c5db2db0b..b565f0251 100644 --- a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs +++ b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs @@ -1,44 +1,44 @@ - //-------------------------------------------------------------------- // 此代码由T4模板自动生成 byzhouhang 20210918 // 生成时间 2021-12-20 16:42:26 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目配置 - 访视计划调整影像检查")] -[Table("VisitPlanInfluenceStudy")] -public class VisitPlanInfluenceStudy : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - [ForeignKey("VisitPlanInfluenceStatId")] - public VisitPlanInfluenceStat VisitPlanInfluenceStat { get; set; } - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - #endregion + /// + ///VisitPlanInfluenceSubjectVisit + /// + [Table("VisitPlanInfluenceStudy")] + public class VisitPlanInfluenceStudy : BaseAddAuditEntity + { + #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 6d8f31486..9cc0b18c0 100644 --- a/IRaCIS.Core.Domain/Visit/VisitStage.cs +++ b/IRaCIS.Core.Domain/Visit/VisitStage.cs @@ -1,40 +1,35 @@ -using Microsoft.EntityFrameworkCore; -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models; - -[Comment("项目配置 - 访视记录")] -[Table("VisitStage")] -public class VisitStage : BaseFullDeleteAuditEntity +namespace IRaCIS.Core.Domain.Models { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } - #endregion + [Table("VisitStage")] + public class VisitStage : BaseFullDeleteAuditEntity + { + #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; - [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; + [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; - 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; } + } } diff --git a/IRaCIS.Core.Domain/_Config/_AppSettings.cs b/IRaCIS.Core.Domain/_Config/_AppSettings.cs index be182ee8c..28b1f939f 100644 --- a/IRaCIS.Core.Domain/_Config/_AppSettings.cs +++ b/IRaCIS.Core.Domain/_Config/_AppSettings.cs @@ -1,7 +1,6 @@ using IRaCIS.Core.Domain.Models; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration.Json; -using System.Collections.Generic; namespace IRaCIS.Core.Domain.Share { @@ -93,14 +92,14 @@ namespace IRaCIS.Core.Domain.Share { public int Port { get; set; } - public string IP { get; set; }=string.Empty; + public string IP { get; set; } = string.Empty; } public class IRCEncreptOption { - public string Base64RSAPublicKey { get; set;} + public string Base64RSAPublicKey { get; set; } public string Base64RSAPrivateKey { get; set; } @@ -111,7 +110,7 @@ namespace IRaCIS.Core.Domain.Share public List ApiPathList { get; set; } } - public class IRaCISBasicConfigOption + public class IRaCISBasicConfigOption { public string DoctorCodePrefix { get; set; } public string UserCodePrefix { get; set; } @@ -130,7 +129,7 @@ namespace IRaCIS.Core.Domain.Share /// public static class AppSettings { - + public static IRaCISBasicConfigOption IRaCISBasicConfig { get; set; } static AppSettings() @@ -183,7 +182,7 @@ namespace IRaCIS.Core.Domain.Share default: return string.Empty; } - + } }