diff --git a/IRaCIS.Core.Domain/Common/Dictionary.cs b/IRaCIS.Core.Domain/Common/Dictionary.cs index 7bc89d6e9..7e9b52bd4 100644 --- a/IRaCIS.Core.Domain/Common/Dictionary.cs +++ b/IRaCIS.Core.Domain/Common/Dictionary.cs @@ -19,7 +19,7 @@ public partial class Dictionary : BaseFullAuditEntity public List ChildList { get; set; } = new List(); #endregion - [StringLength(400)] + public string ChildGroup { get; set; } = null!; public string Code { get; set; } = null!; @@ -29,7 +29,6 @@ public partial class Dictionary : BaseFullAuditEntity [Comment("字典类型- 枚举|bool|下拉框")] public DicDataTypeEnum DataTypeEnum { get; set; } - [StringLength(512)] public string Description { get; set; } = null!; [Comment("是否字典类型配置")] @@ -41,9 +40,9 @@ public partial class Dictionary : BaseFullAuditEntity public int ShowOrder { get; set; } - [StringLength(400)] + public string Value { get; set; } = null!; - [StringLength(400)] + public string ValueCN { get; set; } = null!; } diff --git a/IRaCIS.Core.Domain/Common/ExploreRecommend.cs b/IRaCIS.Core.Domain/Common/ExploreRecommend.cs index a4dc99610..3f1778df6 100644 --- a/IRaCIS.Core.Domain/Common/ExploreRecommend.cs +++ b/IRaCIS.Core.Domain/Common/ExploreRecommend.cs @@ -13,16 +13,13 @@ public class ExploreRecommend : BaseFullDeleteAuditEntity public string ExploreType { get; set; } = null!; - [StringLength(1000)] public string FileName { get; set; } = null!; [StringLength(1000)] public string Path { get; set; } = null!; - [StringLength(1000)] public string Title { get; set; } = null!; - [StringLength(2000)] public string Version { get; set; } = null!; } diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs index 540c20490..e8fdc1072 100644 --- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs +++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs @@ -11,11 +11,11 @@ public class FrontAuditConfig : BaseFullAuditEntity public string ChildDataEnLabel { get; set; } = null!; [Comment("鍓嶇娓叉煋鏁扮粍 鏁扮粍鍚 鍜屾暟缁勫")] - [StringLength(400)] + public string ChildDataLabel { get; set; } = null!; [Comment("瀛愭暟鎹甐alue")] - [StringLength(400)] + public string ChildDataValue { get; set; } = null!; public Guid? ChildrenTypeId { get; set; } @@ -67,7 +67,7 @@ public class FrontAuditConfig : BaseFullAuditEntity public string ForeignKeyValue { get; set; } = null!; [Comment("鏍囪瘑")] - [StringLength(400)] + public string Identification { get; set; } = null!; [Comment("鎺ュ彛鍚")] @@ -117,10 +117,10 @@ public class FrontAuditConfig : BaseFullAuditEntity [MaxLength] public string? UrlConfigJsonStr { get; set; } - [StringLength(400)] + public string Value { get; set; } = null!; - [StringLength(400)] + public string ValueCN { get; set; } = null!; } diff --git a/IRaCIS.Core.Domain/Dcotor/Attachment.cs b/IRaCIS.Core.Domain/Dcotor/Attachment.cs index defdd442a..eb79579a8 100644 --- a/IRaCIS.Core.Domain/Dcotor/Attachment.cs +++ b/IRaCIS.Core.Domain/Dcotor/Attachment.cs @@ -10,7 +10,6 @@ public class Attachment : BaseAddAuditEntity public Doctor Doctor { get; set; } [Comment("缂栫爜")] - [StringLength(400)] public string Code { get; set; } = null!; public Guid DoctorId { get; set; } @@ -26,10 +25,9 @@ public class Attachment : BaseAddAuditEntity [Comment("1 涓枃 2涓鸿嫳鏂")] public int Language { get; set; } - [StringLength(512)] + [StringLength(1000)] public string Path { get; set; } = null!; [Comment("鏂囦欢绫诲瀷鍚")] - [StringLength(400)] public string Type { get; set; } = null!; } diff --git a/IRaCIS.Core.Domain/Dcotor/Doctor.cs b/IRaCIS.Core.Domain/Dcotor/Doctor.cs index b676a6dc3..f535001e5 100644 --- a/IRaCIS.Core.Domain/Dcotor/Doctor.cs +++ b/IRaCIS.Core.Domain/Dcotor/Doctor.cs @@ -58,7 +58,7 @@ public class Doctor : BaseFullAuditEntity [MaxLength] public string? BlindPublications { get; set; } - [StringLength(400)] + public string ChineseName { get; set; } = null!; public int Code { get; set; } @@ -67,16 +67,16 @@ public class Doctor : BaseFullAuditEntity public Guid? DepartmentId { get; set; } - [StringLength(400)] + public string DepartmentOther { get; set; } = null!; - [StringLength(400)] + public string DepartmentOtherCN { get; set; } = null!; - [StringLength(400)] + public string EMail { get; set; } = null!; - [StringLength(400)] + public string FirstName { get; set; } = null!; public int GCP { get; set; } @@ -89,14 +89,14 @@ public class Doctor : BaseFullAuditEntity public string HospitalOtherCN { get; set; } = null!; - [StringLength(2000)] + [MaxLength] public string Introduction { get; set; } = null!; public bool IsVirtual { get; set; } public DateTime? LastLoginTime { get; set; } - [StringLength(400)] + public string LastName { get; set; } = null!; public int Nation { get; set; } @@ -107,10 +107,10 @@ public class Doctor : BaseFullAuditEntity [MaxLength] public string? OtherClinicalExperienceCN { get; set; } - [StringLength(400)] + public string Password { get; set; } = null!; - [StringLength(400)] + public string Phone { get; set; } = null!; public string PhotoPath { get; set; } = null!; @@ -123,32 +123,32 @@ public class Doctor : BaseFullAuditEntity public Guid? PositionId { get; set; } - [StringLength(400)] + public string PositionOther { get; set; } = null!; - [StringLength(400)] + public string PositionOtherCN { get; set; } = null!; public Guid? RankId { get; set; } - [StringLength(400)] + public string RankOther { get; set; } = null!; - [StringLength(400)] + public string RankOtherCN { get; set; } = null!; - [StringLength(400)] + public string ReadingTypeOther { get; set; } = null!; - [StringLength(400)] + public string ReadingTypeOtherCN { get; set; } = null!; - [StringLength(512)] + [StringLength(1000)] public string ResumePath { get; set; } = null!; public ResumeStatusEnum ResumeStatus { get; set; } = ResumeStatusEnum.Failed; - [StringLength(400)] + public string ReviewerCode { get; set; } = null!; public ReviewerInformationConfirmStatus ReviewStatus { get; set; } = ReviewerInformationConfirmStatus.ConfirmRefuse; @@ -157,19 +157,19 @@ public class Doctor : BaseFullAuditEntity public Guid? SpecialityId { get; set; } - [StringLength(400)] + public string SpecialityOther { get; set; } = null!; - [StringLength(400)] + public string SpecialityOtherCN { get; set; } = null!; - [StringLength(400)] + public string SubspecialityOther { get; set; } = null!; - [StringLength(400)] + public string SubspecialityOtherCN { get; set; } = null!; - [StringLength(400)] + public string WeChat { get; set; } = null!; [NotMapped] diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs index d38154a98..faeed942e 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs +++ b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs @@ -18,10 +18,10 @@ public class DoctorCriterionFile : BaseAddAuditEntity public Guid DoctorId { get; set; } - [StringLength(400)] + public string FileName { get; set; } = null!; - [StringLength(4000)] + [StringLength(1000)] public string FilePath { get; set; } = null!; public CriterionFileType FileType { get; set; } diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs b/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs index 5201fb367..3ee0413a6 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs +++ b/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs @@ -18,6 +18,6 @@ public class DoctorDictionary : Entity public Guid DoctorId { get; set; } - [StringLength(400)] + public string KeyName { get; set; } = null!; } diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs b/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs index 576198684..b73d08d65 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs +++ b/IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs @@ -40,6 +40,6 @@ public class Workload : BaseFullAuditEntity public DateTime WorkTime { get; set; } - [StringLength(400)] + public string YearMonth { get; set; } = null!; } diff --git a/IRaCIS.Core.Domain/Dcotor/Education.cs b/IRaCIS.Core.Domain/Dcotor/Education.cs index 588ce02a0..c0f857db9 100644 --- a/IRaCIS.Core.Domain/Dcotor/Education.cs +++ b/IRaCIS.Core.Domain/Dcotor/Education.cs @@ -9,44 +9,44 @@ public class Education : BaseFullAuditEntity #endregion public DateTime? BeginDate { get; set; } - [StringLength(400)] + public string City { get; set; } = null!; - [StringLength(400)] + public string CityCN { get; set; } = null!; - [StringLength(400)] + public string Country { get; set; } = null!; - [StringLength(400)] + public string CountryCN { get; set; } = null!; - [StringLength(400)] + public string Degree { get; set; } = null!; - [StringLength(400)] + public string DegreeCN { get; set; } = null!; public Guid DoctorId { get; set; } public DateTime? EndDate { get; set; } - [StringLength(400)] + public string Major { get; set; } = null!; - [StringLength(400)] + public string MajorCN { get; set; } = null!; - [StringLength(400)] + public string Organization { get; set; } = null!; - [StringLength(400)] + public string OrganizationCN { get; set; } = null!; - [StringLength(400)] + public string Province { get; set; } = null!; - [StringLength(400)] + public string ProvinceCN { get; set; } = null!; public int ShowOrder { get; set; } diff --git a/IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs b/IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs index b3463fc7a..55a8adad9 100644 --- a/IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs +++ b/IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs @@ -7,7 +7,7 @@ public partial class ReviewerPayInformation : BaseFullAuditEntity [DecimalPrecision(18, 2)] public decimal Additional { get; set; } - [StringLength(400)] + public string BankCardNumber { get; set; } = null!; public string BankName { get; set; } = null!; @@ -16,7 +16,7 @@ public partial class ReviewerPayInformation : BaseFullAuditEntity public string DoctorNameInBank { get; set; } = null!; - [StringLength(400)] + public string IDCard { get; set; } = null!; public Guid RankId { get; set; } diff --git a/IRaCIS.Core.Domain/Image/DicomInstance.cs b/IRaCIS.Core.Domain/Image/DicomInstance.cs index 04c153dc4..dad160200 100644 --- a/IRaCIS.Core.Domain/Image/DicomInstance.cs +++ b/IRaCIS.Core.Domain/Image/DicomInstance.cs @@ -20,17 +20,16 @@ public class DicomInstance : BaseFullAuditEntity, IEntitySeqId public long? FileSize { get; set; } - [StringLength(500)] public string FrameOfReferenceUID { get; set; } = null!; - [StringLength(512)] + [StringLength(1000)] public string HtmlPath { 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; } @@ -41,7 +40,7 @@ public class DicomInstance : BaseFullAuditEntity, IEntitySeqId [MaxLength] public string Path { get; set; } = null!; - [StringLength(400)] + public string PixelSpacing { get; set; } = null!; public Guid SeqId { get; set; } @@ -52,7 +51,7 @@ public class DicomInstance : BaseFullAuditEntity, IEntitySeqId public int SliceLocation { get; set; } - [StringLength(400)] + public string SliceThickness { get; set; } = null!; public string SopInstanceUid { get; set; } = null!; @@ -67,9 +66,9 @@ public class DicomInstance : BaseFullAuditEntity, IEntitySeqId public Guid TrialId { get; set; } - [StringLength(400)] + public string WindowCenter { get; set; } = null!; - [StringLength(400)] + public string WindowWidth { get; set; } = null!; } diff --git a/IRaCIS.Core.Domain/Image/DicomSeries.cs b/IRaCIS.Core.Domain/Image/DicomSeries.cs index ace191c63..8218ed683 100644 --- a/IRaCIS.Core.Domain/Image/DicomSeries.cs +++ b/IRaCIS.Core.Domain/Image/DicomSeries.cs @@ -24,14 +24,13 @@ public class DicomSeries : BaseFullDeleteAuditEntity, IEntitySeqId public string BodyPartForEdit { get; set; } = null!; - [StringLength(500)] public string Description { get; set; } = null!; public string ImageOrientationPatient { get; set; } = null!; public string ImagePositionPatient { get; set; } = null!; - [StringLength(1600)] + [StringLength(1000)] public string ImageResizePath { get; set; } = null!; public string ImagerPixelSpacing { get; set; } = null!; @@ -42,7 +41,6 @@ public class DicomSeries : BaseFullDeleteAuditEntity, IEntitySeqId public string Modality { get; set; } = null!; - [StringLength(500)] public string ProtocolName { get; set; } = null!; public Guid SeqId { get; set; } diff --git a/IRaCIS.Core.Domain/Image/DicomStudy.cs b/IRaCIS.Core.Domain/Image/DicomStudy.cs index b9219ee78..1ca22dc30 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudy.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudy.cs @@ -34,19 +34,17 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId public string AcquisitionTime { get; set; } = null!; - [StringLength(500)] public string BodyPartExamined { get; set; } = null!; public string BodyPartForEdit { get; set; } = null!; public int Code { get; set; } - [StringLength(1000)] public string Description { get; set; } = null!; public int InstanceCount { get; set; } - [StringLength(400)] + public string InstitutionName { get; set; } = null!; public bool IsDoubleReview { get; set; } @@ -72,13 +70,12 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId public int SeriesCount { get; set; } - [StringLength(400)] + public string StudyCode { get; set; } = null!; [Comment("DicomTag.StudyID")] public string StudyId { get; set; } = null!; - [StringLength(500)] public string StudyInstanceUid { get; set; } = null!; public DateTime? StudyTime { get; set; } diff --git a/IRaCIS.Core.Domain/Institution/CRO.cs b/IRaCIS.Core.Domain/Institution/CRO.cs index 03940aca7..725c41cc2 100644 --- a/IRaCIS.Core.Domain/Institution/CRO.cs +++ b/IRaCIS.Core.Domain/Institution/CRO.cs @@ -10,10 +10,8 @@ public class CRO : BaseFullAuditEntity public string CROCode { get; set; } = null!; - [StringLength(1000)] public string CROName { get; set; } = null!; - [StringLength(1000)] public string CRONameCN { get; set; } = null!; [Comment("是否是项目级别")] diff --git a/IRaCIS.Core.Domain/Management/User.cs b/IRaCIS.Core.Domain/Management/User.cs index 1ac7d9fc9..6f0cdd0b8 100644 --- a/IRaCIS.Core.Domain/Management/User.cs +++ b/IRaCIS.Core.Domain/Management/User.cs @@ -31,7 +31,7 @@ public class User : BaseFullAuditEntity public int Code { get; set; } - [StringLength(400)] + public string DepartmentName { get; set; } = null!; [Comment("医生生成账号后,会有值")] @@ -68,10 +68,10 @@ public class User : BaseFullAuditEntity public bool PasswordChanged { get; set; } - [StringLength(400)] + public string Phone { get; set; } = null!; - [StringLength(400)] + public string PositionName { get; set; } = null!; public int? Sex { get; set; } @@ -80,7 +80,7 @@ public class User : BaseFullAuditEntity public bool SuperAdmin { get; set; } - [StringLength(400)] + public string UserCode { get; set; } = null!; public string UserName { get; set; } = null!; diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs index c87222642..6c7453f9f 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs @@ -16,7 +16,7 @@ public class ClinicalDataSystemSet : BaseAddAuditEntity public ClinicalLevel ClinicalDataLevel { get; set; } - [StringLength(400)] + public string ClinicalDataSetEnName { get; set; } = null!; [Comment("鏋氫妇(瀛楀吀閲岄潰鍙栫殑)")] public int ClinicalDataSetEnum { get; set; } @@ -25,10 +25,10 @@ public class ClinicalDataSystemSet : BaseAddAuditEntity [Comment("涓婁紶鏂瑰紡")] public ClinicalUploadType ClinicalUploadType { get; set; } - [StringLength(512)] + [StringLength(1000)] public string CriterionEnumListStr { get; set; } = null!; - [StringLength(400)] + public string FileName { get; set; } = null!; [Comment("鏄惁搴旂敤")] @@ -36,7 +36,7 @@ public class ClinicalDataSystemSet : BaseAddAuditEntity public bool IsEnable { get; set; } - [StringLength(4000)] + [StringLength(1000)] public string Path { get; set; } = null!; public UploadRole UploadRole { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs index d989f7816..6715ebfb6 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs @@ -29,7 +29,7 @@ public class ClinicalDataTrialSet : BaseAddAuditEntity [Comment("涓村簥绾у埆")] public ClinicalLevel ClinicalDataLevel { get; set; } - [StringLength(400)] + public string ClinicalDataSetEnName { get; set; } = null!; public string ClinicalDataSetName { get; set; } = null!; @@ -37,10 +37,10 @@ public class ClinicalDataTrialSet : BaseAddAuditEntity [Comment("涓婁紶鏂瑰紡")] public ClinicalUploadType ClinicalUploadType { get; set; } - [StringLength(512)] + [StringLength(1000)] public string CriterionEnumListStr { get; set; } = null!; - [StringLength(400)] + public string FileName { get; set; } = null!; [Comment("鏄惁搴旂敤")] @@ -48,7 +48,7 @@ public class ClinicalDataTrialSet : BaseAddAuditEntity public bool IsConfirm { get; set; } - [StringLength(4000)] + [StringLength(1000)] public string Path { get; set; } = null!; public Guid? SystemClinicalDataSetId { get; set; } @@ -57,6 +57,7 @@ public class ClinicalDataTrialSet : BaseAddAuditEntity public UploadRole UploadRole { get; set; } + [NotMapped] public List CriterionEnumList => CriterionEnumListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t) && int.TryParse(t.Trim(), out var s)).Select(t => int.Parse(t.Trim())).ToList(); } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs index 9552de732..225dd172b 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs @@ -20,7 +20,7 @@ public class ClinicalForm : BaseAddAuditEntity public Guid ClinicalDataTrialSetId { get; set; } [Comment("鎴浘鍦板潃")] - [StringLength(4000)] + [StringLength(1000)] public string PicturePath { get; set; } = null!; public Guid? ReadingId { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs index 61a020d45..5a5102fa6 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs @@ -10,7 +10,7 @@ public class ClinicalQuestionAnswer : BaseAddAuditEntity public ClinicalForm ClinicalForm { get; set; } #endregion - [StringLength(4000)] + [StringLength(1000)] public string Answer { get; set; } = null!; public Guid ClinicalDataTrialSetId { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs index e7b342a4a..79fa2836f 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs @@ -11,7 +11,7 @@ public partial class ClinicalTableAnswer : BaseAddAuditEntity #endregion [Comment("绛旀")] - [StringLength(4000)] + [StringLength(1000)] public string Answer { get; set; } = null!; [Comment("琛ㄥ崟Id")] diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index 67e8ebc3c..db5972bd2 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -53,7 +53,7 @@ public class IRaCISDBContext : DbContext //decimal 涓嶉厤缃紝榛樿绮惧害鏄18,2 //configurationBuilder.Conventions.Add(_ => new DecimalPrecisionConvention(18,2)); //閽堝瀛楃涓蹭娇鐢ㄩ粯璁ょ殑闀垮害閰嶇疆涓200锛屽鏋滄爣娉ㄤ簡StringLength 鍏朵粬闀垮害锛屽氨鏄爣娉ㄧ殑闀垮害锛屽鏋滄爣娉ㄤ簡MaxLength 閭d箞灏辨槸nvarcharMax - configurationBuilder.Conventions.Add(_ => new DefaultStringLengthConvention(200)); + configurationBuilder.Conventions.Add(_ => new DefaultStringLengthConvention(400)); } protected override void OnModelCreating(ModelBuilder modelBuilder)