附加评估

IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationViewModel.cs

@@ -11,8 +11,11 @@ using System.ComponentModel.DataAnnotations;
 namespace IRaCIS.Core.Application.ViewModel
 {
     /// <summary> SubjectCriteriaEvaluationView  列表视图模型 </summary>
-    public class SubjectCriteriaEvaluationView : SubjectCriteriaEvaluationAddOrEdit
+    public class SubjectCriteriaEvaluationView 
     {
+        public Guid? Id { get; set; }
+        public Guid SubjectId { get; set; }
+        public Guid TrialReadingCriterionId { get; set; }
 
         public DateTime? CreateTime { get; set; }
         public Guid? CreateUserId { get; set; }
@@ -22,12 +25,26 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public bool? IsImageFiltering { get; set; }
 
-        public new bool? IsJoinEvaluation { get; set; }
+        public  bool? IsJoinEvaluation { get; set; }
 
         public string SubjectCode { get; set; }
 
         public string TrialSiteCode { get; set; }
         public SubjectStatus SubjectStatus { get; set; }
+
+        public List<EvaluationInfo> EvaluationList { get; set; }
+    }
+
+
+    public class EvaluationInfo
+    {
+        public string QuestioName { get; set; }
+
+        public string QuestioNameEn { get; set; }
+
+        public string Answer { get; set; }
+
+        public string FinalTranslateDictionaryCode { get; set; } = string.Empty;
     }
 
 
@@ -35,6 +52,9 @@ namespace IRaCIS.Core.Application.ViewModel
     ///<summary>SubjectCriteriaEvaluationQuery  列表查询参数模型</summary>
     public class SubjectCriteriaEvaluationQuery : PageInput
     {
+        [NotDefault]
+        public Guid TrialId { get; set; }
+
         [NotDefault]
         public Guid TrialReadingCriterionId { get; set; }
         public string SubjectCode { get; set; } = string.Empty;

IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs

@@ -18,8 +18,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid? UpdateUserId { get; set; }
         public DateTime? UpdateTime { get; set; }
 
-        public new int? ImageFilterState { get; set; }
-        public new int? ImageDeterminationResultState { get; set; }
+        public new ImageFilterState? ImageFilterState { get; set; }
+        public new ImageDeterminationResultState? ImageDeterminationResultState { get; set; }
         public bool? IsGeneratedTask { get; set; }
 
 
@@ -39,9 +39,9 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid SubjectId { get; set; }
 
 
-        public int? ImageFilterState { get; set; }
+        public ImageFilterState? ImageFilterState { get; set; }
 
-        public int? ImageDeterminationResultState { get; set; }
+        public ImageDeterminationResultState? ImageDeterminationResultState { get; set; }
 
         public bool? IsGeneratedTask { get; set; }
     }
@@ -56,6 +56,21 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid SubjectId { get; set; }
     }
 
+    public class BatchGenerateTaskCommand
+    {
+        [NotDefault]
+        public Guid TrialReadingCriterionId { get; set; }
+
+        [NotDefault]
+        public Guid TrialId { get; set; }
+
+        [NotDefault]
+        public Guid SubjectId { get; set; }
+
+
+        public List<Guid> SubjectVisitIdList { get; set; }
+    }
+
     public class VisitStudyAndSeriesQuery
     {
         [NotDefault]

IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitStudyFilterViewModel.cs

@@ -34,6 +34,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid SubjectVisitId { get; set; }
         public Guid StudyId { get; set; }
         public Guid SeriesId { get; set; }
+
+        public bool IsConfirmed { get; set; }
     }