调研表更新

IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs

@@ -22,7 +22,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string TrialCode { get; set; } = string.Empty;
 
-        public Guid IndicationTypeId { get; set; } 
+        public Guid IndicationTypeId { get; set; }
 
         public string IndicationType { get; set; } = string.Empty;
 
@@ -30,13 +30,13 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string TrialSiteSurveyEquipmentType { get; set; } = string.Empty;
 
-        public List<TrialSiteForSelect> TrialSiteSelectList { get; set; }=new List<TrialSiteForSelect>();
+        public List<TrialSiteForSelect> TrialSiteSelectList { get; set; } = new List<TrialSiteForSelect>();
 
     }
 
     public class TrialSiteForSelect
     {
-        public Guid Id { get; set; }    
+        public Guid Id { get; set; }
         public Guid TrialId { get; set; }
 
         public Guid SiteId { get; set; }
@@ -57,6 +57,26 @@ namespace IRaCIS.Core.Application.Contracts
         public List<TrialSiteUserSurveyView> TrialSiteUserSurveyList { get; set; } = new List<TrialSiteUserSurveyView>();
     }
 
+    public class TrialSiteUserSurveyAllDTO : TrialSiteUserSurveyView
+    {
+        public TrialSiteSurveyView TrialSiteSurvey { get; set; }
+    }
+
+    public class TrialSiteUserSurveyAllQuery : PageInput
+    {
+        [NotDefault]
+        public Guid TrialId { get; set; }
+        public Guid? SiteId { get; set; }
+
+
+
+        public string FormWriterKeyInfo { get; set; } = string.Empty;
+
+        public string UserKeyInfo { get; set; } = string.Empty;
+
+
+    }
+
 
     /// <summary> TrialSiteSurveyView  列表视图模型 </summary>
     public class TrialSiteSurveyView
@@ -86,7 +106,20 @@ namespace IRaCIS.Core.Application.Contracts
 
         public TrialSiteSurveyEnum State { get; set; }
 
-        public string LatestBackReason { get; set; } = string.Empty; 
+        public string LatestBackReason { get; set; } = string.Empty;
+
+        public UserInfoBasic ReviewerUser { get; set; }
+        public UserInfoBasic PreliminaryUser { get; set; }
+
+        public Guid? PreliminaryUserId { get; set; }
+
+        public Guid? ReviewerUserId { get; set; }
+
+
+        public DateTime? PreliminaryTime { get; set; }
+
+        public DateTime? ReviewerTime { get; set; }
+
 
 
 
@@ -121,7 +154,7 @@ namespace IRaCIS.Core.Application.Contracts
     public class SiteSurveySendVerifyCode
     {
         public VerifyType verificationType { get; set; }
-       public string EmailOrPhone { get; set; } = string.Empty;
+        public string EmailOrPhone { get; set; } = string.Empty;
 
     }
 
@@ -163,12 +196,25 @@ namespace IRaCIS.Core.Application.Contracts
 
     }
 
-    public  class TrialSiteSurvyeSubmitDTO
+
+    public class TrialSiteSubmitBackCommand
     {
         [NotDefault]
-        public  Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
         [NotDefault]
-        public Guid     TrialSiteSurveyId { get; set; }
+        public Guid TrialSiteSurveyId { get; set; }
+
+        public string LatestBackReason { get; set; }
+
+        public string RouteUrl { get; set; }
+    }
+
+    public class TrialSiteSurvyeSubmitDTO
+    {
+        [NotDefault]
+        public Guid TrialId { get; set; }
+        [NotDefault]
+        public Guid TrialSiteSurveyId { get; set; }
 
         public string? LoginUrl { get; set; }
 
@@ -186,7 +232,7 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class CopyTrialSiteSurveyDTO
     {
-       public Guid TrialSiteSurveyId { get; set; }
+        public Guid TrialSiteSurveyId { get; set; }
         public string UserName { get; set; } = string.Empty;
         public string Phone { get; set; } = string.Empty;
         public string Email { get; set; } = string.Empty;

IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteUserSurveyViewModel.cs

@@ -50,8 +50,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public Guid? SystemUserId { get; set; }
 
-        public UserInfoBasic ReviewerUser { get; set; }
-        public UserInfoBasic PreliminaryUser { get; set; }
+
 
     }
 
@@ -92,7 +91,6 @@ namespace IRaCIS.Core.Application.Contracts
         public string LastName { get; set; } = string.Empty;
         public string Phone { get; set; } = string.Empty;
         public string Email { get; set; } = string.Empty;
-        public bool IsCorrect { get; set; }
         public bool IsGenerateAccount { get; set; }
 
         public string OrganizationName { get; set; } = string.Empty;