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

修改site关联

Browse Source
This commit is contained in:
hang
2024-06-03 14:37:38 +08:00
parent 4db3860ade
commit 0e23719c7b
101 changed files with 354 additions and 3290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs
+5 -3
View File
@@ -13,7 +13,9 @@ namespace IRaCIS.Application.Contracts
public int? Age { get; set; }
public string Sex { get; set; } = string.Empty;
public Guid SiteId { get; set; }
[NotDefault]
public Guid TrialSiteId { get; set; }
public Guid TrialId { get; set; }
public string MedicalNo { get; set; } = string.Empty;
@@ -51,7 +53,7 @@ namespace IRaCIS.Application.Contracts
[NotDefault]
public Guid TrialId { get; set; }
[NotDefault]
public Guid SiteId { get; set; }
public Guid TrialSiteId { get; set; }
public SubjectStatus Status { get; set; }
public DateTime? OutEnrollmentTime { get; set; }
@@ -151,7 +153,7 @@ namespace IRaCIS.Application.Contracts
public bool? IsMissingImages { get; set; }
public Guid? SiteId { get; set; }
public Guid? TrialSiteId { get; set; }
public SubjectStatus? Status { get; set; }
}
IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs
+9 -17
View File
@@ -9,6 +9,8 @@ namespace IRaCIS.Core.Application.Contracts
{
public class SubjectVisitCommand
{
[NotDefault]
public Guid TrialSiteId { get; set; }
public bool IsFinalVisit { get; set; }
public string BlindName { get; set; } = string.Empty;
@@ -16,7 +18,7 @@ namespace IRaCIS.Core.Application.Contracts
public Guid? Id { get; set; }
public Guid TrialId { get; set; }
public Guid SubjectId { get; set; }
public Guid SiteId { get; set; }
public bool InPlan { get; set; } = true;
public VisitExecutedEnum VisitExecuted { get; set; }
public decimal VisitNum { get; set; }
@@ -128,7 +130,7 @@ namespace IRaCIS.Core.Application.Contracts
public Guid? SubjectId { get; set; }
public Guid TrialId { get; set; }
public Guid? SiteId { get; set; }
public Guid? TrialSiteId { get; set; }
}
public class SubjectVisitSelectItem
@@ -289,17 +291,7 @@ namespace IRaCIS.Core.Application.Contracts
public Guid SubjectVisitId { get; set; }
public string StudyInstanceUid { get; set; } = String.Empty;
//public Guid TrialId { get; set; }
//public Guid SiteId { get; set; }
//public Guid SubjectId { get; set; }
//public DateTime? SVSTDTC { get; set; }
//public DateTime? SVENDTC { get; set; }
//public string DTFPath { get; set; }
//public string FileRealName { get; set; }
}
@@ -307,7 +299,7 @@ namespace IRaCIS.Core.Application.Contracts
public class UploadDTFCommand
{
public Guid TrialId { get; set; }
public Guid SiteId { get; set; }
public Guid TrialSiteId { get; set; }
public Guid SubjectId { get; set; }
public Guid SubjectVisitId { get; set; }
@@ -318,7 +310,7 @@ namespace IRaCIS.Core.Application.Contracts
{
public Guid Id { get; set; } = Guid.Empty;
public Guid TrialId { get; set; }
public Guid SiteId { get; set; }
public Guid TrialSiteId { get; set; }
public Guid SubjectId { get; set; }
public Guid SubjectVisitId { get; set; }
@@ -490,7 +482,7 @@ namespace IRaCIS.Core.Application.Contracts
//public List<DistributeReviewer> DistributeReviewers { get; set; }=new List<DistributeReviewer>();
public Guid SiteId { get; set; }
public Guid TrialSiteId { get; set; }
public string SiteName { get; set; } = String.Empty;
public string InstitutionName { get; set; } = String.Empty;
public string StudyId { get; set; } = String.Empty;//这个Id是dicom文件中的Id
@@ -539,7 +531,7 @@ namespace IRaCIS.Core.Application.Contracts
{
public Guid? SubjectId { get; set; }
public Guid? SiteId { get; set; }
public Guid? TrialSiteId { get; set; }
public Guid TrialId { get; set; }
public string SubjectInfo { get; set; } = String.Empty;