XCKJ/irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改影响上传 切换磁盘预提交

Browse Source
This commit is contained in:
hang
2023-04-26 18:27:00 +08:00
parent 6a7971f314
commit 8c43bcf030
14 changed files with 455 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomInstanceModel.cs
+8 -5
View File
@@ -45,11 +45,9 @@ namespace IRaCIS.Core.Application.Contracts
public string ResearchProgramNo { get; set; } = string.Empty;
public string TrialIndication { get; set; } = string.Empty;
public CheckStateEnum CheckState { get; set; }
public decimal VisitNum { get; set; }
public string SVUPDES { get; set; } = string.Empty;
public string VisitName { get; set; } = string.Empty;
public string Sponsor { get; set; } = string.Empty;
public Guid TrialId { get; set; }
@@ -57,10 +55,15 @@ namespace IRaCIS.Core.Application.Contracts
public Guid SubjectId { get; set; }
public Guid SubjectVisitId { get; set; }
public SubmitStateEnum SubmitState { get; set; }
public AuditStateEnum AuditState { get; set; }
public ForwardStateEnum ForwardState { get; set; }
//public string SVUPDES { get; set; } = string.Empty;
//public CheckStateEnum CheckState { get; set; }
//public SubmitStateEnum SubmitState { get; set; }
//public AuditStateEnum AuditState { get; set; }
//public ForwardStateEnum ForwardState { get; set; }
//public string SubjectName => LastName + " / " + FirstName;
//public string FirstName { get; set; } = string.Empty;
IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
+119 -7
View File
@@ -34,7 +34,7 @@ namespace IRaCIS.Core.Application.Contracts
public DateTime UploadTime { get; set; }
public string StudyCode { get; set; }
public string StudyCode { get; set; }
//[JsonIgnore]
@@ -69,7 +69,7 @@ namespace IRaCIS.Core.Application.Contracts
}
}
public string ArchiveIntervalStr
public string ArchiveIntervalStr
{
get
{
@@ -137,12 +137,12 @@ namespace IRaCIS.Core.Application.Contracts
}
public class UnionStudyViewModel:UnionStudyBaseModel
public class UnionStudyViewModel : UnionStudyBaseModel
{
public Guid Id { get; set; }
public int? Count { get; set; }
@@ -153,12 +153,12 @@ namespace IRaCIS.Core.Application.Contracts
public DateTime? StudyTime { get; set; }
}
public class StudyQuery:PageInput
public class StudyQuery : PageInput
{
[NotDefault]
public Guid TrialId { get; set; }
@@ -174,4 +174,116 @@ namespace IRaCIS.Core.Application.Contracts
public string[]? VisitPlanArray { get; set; }
}
public class NewArchiveStudyCommand
{
[NotDefault]
public Guid TrialId { get; set; }
[NotDefault]
public Guid SiteId { get; set; }
[NotDefault]
public Guid SubjectId { get; set; }
[NotDefault]
public Guid SubjectVisitId { get; set; }
public bool IsAdd { get; set; }
public AddOrUpdateStudyDto Study { get; set; }
public List<AddOrUpdateSeriesDto> SeriesList { get; set; }
public List<AddInstanceDto> InstanceList { get; set; }
}
public class AddOrUpdateStudyDto
{
public Guid? Id { get; set; }
public string StudyId { get; set; } = string.Empty;
//public int Code { get; set; } = 0;
//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 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 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 class AddOrUpdateSeriesDto
{
public Guid? Id { get; set; }
public string StudyInstanceUid { get; set; }
public string SeriesInstanceUid { get; set; }
public int SeriesNumber { get; set; }
public DateTime? SeriesTime { get; set; }
public string Modality { get; set; }
public string Description { get; set; }
public int InstanceCount { get; set; }
public string SliceThickness { get; set; }
public string ImagePositionPatient { get; set; }
public string ImageOrientationPatient { get; set; }
public string BodyPartExamined { get; set; }
public string SequenceName { get; set; }
public string ProtocolName { get; set; }
public string ImagerPixelSpacing { get; set; }
public string AcquisitionTime { get; set; } = string.Empty;
public string AcquisitionNumber { get; set; } = string.Empty;
public string TriggerTime { get; set; } = string.Empty;
}
public class AddInstanceDto
{
public string StudyInstanceUid { get; set; }
public string SeriesInstanceUid { get; set; }
public string SopInstanceUid { get; set; }
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; }
public int NumberOfFrames { get; set; }
public string PixelSpacing { get; set; }
public string ImagerPixelSpacing { get; set; }
public string FrameOfReferenceUID { get; set; }
public string WindowCenter { get; set; }
public string WindowWidth { get; set; }
public bool Anonymize { get; set; }
public string Path { get; set; }
}
}