pacs 直连 增加修改

IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs

@@ -224,31 +224,41 @@ namespace IRaCIS.Application.Contracts
     {
         public string? PatientIdStr { get; set; }
         public string? PatientName { get; set; }
-        public List<string> CalledAEList { get; set; } = new List<string>();
+        //public List<string> CalledAEList { get; set; } = new List<string>();
 
         public string? CallingAE { get; set; }
-
-        public string? ExperimentName { get; set; } = string.Empty;
+        public string? CalledAE { get; set; }
 
         public DateTime? BeginPushTime { get; set; }
         public DateTime? EndPushTime { get; set; }
 
+        public string SubejctCode { get; set; }
+
+        public string TrialSiteKeyInfo { get; set; }
+
     }
 
-    public class PatientTrialView : PatientQueryView
+    public class PatientSubjectView : PatientQueryView
     {
 
         public int? StudyCount { get; set; }
 
-        public List<PatientTrialStatInfo> TrialList { get; set; }
+
+
+        public Guid? SubejctId { get; set; }
+
+        public Guid TrialId { get; set; }
+
+        public string? SubjectCode { get; set; }
+
+        public string? TrialSiteCode { get; set; }
+
+        public string? TrialSiteName { get; set; } 
+
+        public string? TrialSiteAliasName { get; set; } 
     }
 
-    public class PatientTrialStatInfo
-    {
-        public int? VisitCount { get; set; }
 
-        public string ExperimentName { get; set; }
-    }
 
     public class PatientQuery : PageInput
     {
@@ -377,7 +387,10 @@ namespace IRaCIS.Application.Contracts
         [NotDefault]
         public Guid SubjectId { get; set; }
 
-        public List<Guid> SubjectVisitIdList { get; set; }
+        [NotDefault]
+        public Guid SubjectVisitId { get; set; }
+
+        public List<Guid> SCPStudyIdList { get; set; }
     }
 
     public class SubjectVisitSelectQuery
@@ -938,6 +951,8 @@ namespace IRaCIS.Application.Contracts
 
     public class SCPImageUploadQuery : PageInput
     {
+        public string TrialSiteKeyInfo { get; set; }
+
         public string? CallingAE { get; set; }
 
         public string? CalledAE { get; set; }
@@ -966,7 +981,18 @@ namespace IRaCIS.Application.Contracts
         public long FileSize { get; set; }
 
         public int StudyCount { get; set; }
-        
+
+
+        public Guid TrialId { get; set; }
+        public Guid TrialSiteId { get; set; }
+
+
+        public string TrialSiteCode { get; set; }
+
+        public string TrialSiteName { get; set; }
+
+        public string TrialSiteAliasName { get; set; }
+
     }
     public class VisitPatientStudyView : PatientStudySelectDto
     {
@@ -990,7 +1016,20 @@ namespace IRaCIS.Application.Contracts
 
     }
 
-    public class PatientStudySimpleView
+    public class VisitPatientStudyFilterQuery : PageInput
+    {
+        [NotDefault]
+        public Guid SubjectId { get; set; }
+
+        [NotDefault]
+        public Guid SubjectVisitId { get; set; }
+
+        public DateTime? EarliestStudyTime { get; set; }
+
+        public DateTime? LatestStudyTime { get; set; }
+        public string? Modalities { get; set; }
+    }
+    public class VisitPatientStudyFilterView
     {
         public Guid SCPStudyId { get; set; }
 
@@ -1006,9 +1045,32 @@ namespace IRaCIS.Application.Contracts
         public string CalledAE { get; set; } = string.Empty;
 
         public string CallingAE { get; set; } = string.Empty;
+    }
+
+    public class PatientStudySimpleView: VisitPatientStudyFilterView
+    {
+      
+
+
+        public Guid? SubjectVisitId { get; set; }
+        public string? VisitName { get; set; }
+
+        public string? BlindName { get; set; } = string.Empty;
+
+
+        //public SubjectVisitInfo SubejectVisit { get; set; }
 
     }
 
+    public class SubjectVisitInfo
+    {
+        public Guid Id { get; set; }
+
+        public string VisitName { get; set; }
+
+        public decimal VisitNum { get; set; }
+        public string BlindName { get; set; } = string.Empty;
+    }
 
 
     public class PatientSeriesDTO

IRaCIS.Core.Application/Service/Visit/_MapConfig.cs

@@ -112,6 +112,14 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(d => d.InstanceInfoList, u => u.MapFrom(s => s.InstanceList));
 
             CreateMap<TaskInstance, InstanceBasicInfo>();
+
+
+            CreateMap<SCPImageUpload, SCPImageUploadView>()
+                 .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode))
+                  .ForMember(d => d.TrialSiteAliasName, u => u.MapFrom(s => s.TrialSite.TrialSiteAliasName))
+                   .ForMember(d => d.TrialSiteName, u => u.MapFrom(s => s.TrialSite.TrialSiteName))
+;
+            
         }
     }