diff --git a/IRaCIS.Core.Domain/Image/DicomStudy.cs b/IRaCIS.Core.Domain/Image/DicomStudy.cs index e82cc8a0a..19035e818 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudy.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudy.cs @@ -37,7 +37,7 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId public string AcquisitionTime { get; set; } = null!; - [StringLength(512)] + [StringLength(500)] public string BodyPartExamined { get; set; } = null!; public string BodyPartForEdit { get; set; } = null!; diff --git a/IRaCIS.Core.Domain/Image/SCPSeries.cs b/IRaCIS.Core.Domain/Image/SCPSeries.cs index f7ceddf24..ddd463ede 100644 --- a/IRaCIS.Core.Domain/Image/SCPSeries.cs +++ b/IRaCIS.Core.Domain/Image/SCPSeries.cs @@ -37,8 +37,6 @@ public string BodyPartForEdit { get; set; } = string.Empty; - public bool IsReading { get; set; } = true; - public string ImageResizePath { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Image/SCPStudy.cs b/IRaCIS.Core.Domain/Image/SCPStudy.cs index 07992eabd..bb695ffcd 100644 --- a/IRaCIS.Core.Domain/Image/SCPStudy.cs +++ b/IRaCIS.Core.Domain/Image/SCPStudy.cs @@ -19,29 +19,24 @@ [JsonIgnore] public TrialSite TrialSite { get; set; } - #endregion - - - - //0 未知 1 单重 2 双重 - public bool IsDoubleReview { get; set; } - - public Guid SeqId { get; set; } - [ForeignKey("PatientId")] [JsonIgnore] public SCPPatient Patient { get; set; } + + #endregion + + + public Guid SeqId { get; set; } + public Guid PatientId { get; set; } 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 InstitutionName { get; set; } = string.Empty; public string PatientIdStr { get; set; } = string.Empty; public string PatientName { get; set; } = string.Empty; @@ -61,8 +56,6 @@ public string ModalityForEdit { get; set; } = string.Empty; - - public string CallingAE { get; set; } = string.Empty; public string CalledAE { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Image/TaskInstance.cs b/IRaCIS.Core.Domain/Image/TaskInstance.cs index 3f493ebcb..20e6a4bed 100644 --- a/IRaCIS.Core.Domain/Image/TaskInstance.cs +++ b/IRaCIS.Core.Domain/Image/TaskInstance.cs @@ -12,8 +12,6 @@ public TaskStudy TaskStudy { get; set; } #endregion - - public Guid SeqId { get; set; } public Guid StudyId { get; set; } public Guid SeriesId { get; set; } @@ -26,8 +24,6 @@ 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; @@ -37,14 +33,12 @@ 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 string HtmlPath { get; set; } = string.Empty; public long? FileSize { get; set; } diff --git a/IRaCIS.Core.Domain/Image/TaskSeries.cs b/IRaCIS.Core.Domain/Image/TaskSeries.cs index db3376ae0..08bd6bc70 100644 --- a/IRaCIS.Core.Domain/Image/TaskSeries.cs +++ b/IRaCIS.Core.Domain/Image/TaskSeries.cs @@ -10,9 +10,9 @@ [JsonIgnore] public List InstanceList { get; set; } #endregion - - - + public Guid TrialId { get; set; } + public Guid SubjectId { get; set; } + public Guid VisitTaskId { get; set; } public Guid SeqId { get; set; } public Guid StudyId { get; set; } public string StudyInstanceUid { get; set; } = String.Empty; @@ -35,15 +35,9 @@ 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 string BodyPartForEdit { get; set; } = string.Empty; - public bool IsReading { get; set; } = true; - public string ImageResizePath { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Image/TaskStudy.cs b/IRaCIS.Core.Domain/Image/TaskStudy.cs index 196591630..a4659534f 100644 --- a/IRaCIS.Core.Domain/Image/TaskStudy.cs +++ b/IRaCIS.Core.Domain/Image/TaskStudy.cs @@ -24,15 +24,9 @@ #endregion public Guid SeqId { get; set; } - public Guid TrialId { get; set; } - - public Guid SubjectId { get; set; } - - public Guid VisitTaskId { get; set; } - public int Code { get; set; } = 0; public string StudyCode { get; set; } = string.Empty; @@ -45,7 +39,7 @@ 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; @@ -64,16 +58,5 @@ public string BodyPartForEdit { get; set; } = string.Empty; public string ModalityForEdit { get; set; } = string.Empty; - - - - //0 未知 1 单重 2 双重 - public bool IsDoubleReview { get; set; } - - - - - - } }