修改附加评估预提交

2023-03-17 15:57:04 +08:00
parent 51aebaab21
commit 5b87b9719d
12 changed files with 229 additions and 268 deletions
@@ -18,10 +18,11 @@ namespace IRaCIS.Core.Application.ViewModel
        public Guid? CreateUserId { get; set; }
        public Guid? UpdateUserId { get; set; }
        public DateTime? UpdateTime { get; set; }
-        public bool IsImageFiltering { get; set; }


-        //public string AdditionalResult { get; set; }
+        public bool? IsImageFiltering { get; set; }
+
+        public new bool? IsJoinEvaluation { get; set; }

        public string SubjectCode { get; set; }

@@ -17,7 +17,10 @@ namespace IRaCIS.Core.Application.ViewModel
        public Guid? CreateUserId { get; set; }
        public Guid? UpdateUserId { get; set; }
        public DateTime? UpdateTime { get; set; }
-        public bool IsGeneratedTask { get; set; }
+
+        public new int? ImageFilterState { get; set; }
+        public new int? ImageDeterminationResultState { get; set; }
+        public bool? IsGeneratedTask { get; set; }


        public string VisitName { get; set; }
@@ -36,6 +39,20 @@ namespace IRaCIS.Core.Application.ViewModel
        public Guid SubjectId { get; set; }
    }

+    public class VisitStudyAndSeriesQuery
+    {
+        [NotDefault]
+        public Guid TrialReadingCriterionId { get; set; }
+
+
+        [NotDefault]
+        public Guid SubjectId { get; set; }
+
+
+        [NotDefault]
+        public Guid SubjectVisitId { get; set; }
+    }
+
    ///<summary> SubjectCriteriaEvaluationVisitFilterAddOrEdit  列表查询参数模型</summary>
    public class SubjectCriteriaEvaluationVisitFilterAddOrEdit
    {
@@ -49,6 +66,86 @@ namespace IRaCIS.Core.Application.ViewModel
    }


+
+    public class SelctStudySeriesView
+    {
+       public List<SelectStudyView> StudyList { get; set; }=new List<SelectStudyView>();
+
+        public List<SelectSeriesView> SeriesList { get; set; }=new List<SelectSeriesView>();
+    }
+
+    public class SelectStudyView
+    {
+        public string StudyInstanceUid { get; set; } = string.Empty;
+
+        public Guid TrialId { get; set; }
+
+        public Guid StudyId { get; set; }
+
+        public int StudyStatus { get; set; }
+
+        public string StudyCode { get; set; } = string.Empty;
+
+        public string Modalities { get; set; } = String.Empty;
+
+        public int SeriesCount { get; set; }
+
+        public int InstanceCount { get; set; }
+
+        public string Uploader { get; set; } = string.Empty;
+        public DateTime? StudyTime { get; set; }
+
+        public DateTime? UploadedTime { get; set; }
+        public string BodyPartExamined { get; set; } = String.Empty;
+
+        public string BodyPartForEdit { get; set; } = String.Empty;
+
+        public string ModalityForEdit { get; set; } = string.Empty;
+
+
+    }
+
+    public class SelectSeriesView
+    {
+        public DateTime? StudyTime { get; set; }
+
+        public string StudyCode { get; set; } = string.Empty;
+
+
+        public Guid SeriesId { get; set; }
+
+        public Guid StudyId { get; set; }
+
+        public string BodyPartForEdit { get; set; } = String.Empty;
+
+        public string SeriesInstanceUid { get; set; } = String.Empty;
+        public int SeriesNumber { get; set; }
+        public DateTime? SeriesTime { get; set; }
+        public string Modality { get; set; } = String.Empty;
+        public string Description { get; set; } = String.Empty;
+        public int InstanceCount { get; set; }
+
+
+        public string BodyPartExamined { get; set; } = String.Empty;
+
+
+        public Guid[] InstanceList = new Guid[0];
+
+        public List<string> InstancePathList = new List<string>();
+
+
+
+
+
+        public DateTime? CreateTime { get; set; }
+
+        public Guid? TrialReadingCriterionId { get; set; }
+
+        public Guid? SubjectVisitId { get; set; }
+
+        public bool? IsConfirmed { get; set; }
+    }
+
 }


@@ -24,25 +24,15 @@ namespace IRaCIS.Core.Application.ViewModel
 	 		public bool IsConfirmed { get; set; }
 	      } 

-	 ///<summary>SubjectCriteriaEvaluationVisitStudyFilterQuery  列表查询参数模型</summary>
-	 public class SubjectCriteriaEvaluationVisitStudyFilterQuery
-	 { 
-	 	 	 	 	 	 	 	 	 	 	 	 	 } 
+

 	 ///<summary> SubjectCriteriaEvaluationVisitStudyFilterAddOrEdit  列表查询参数模型</summary>
 	 public class  SubjectCriteriaEvaluationVisitStudyFilterAddOrEdit
 	 {
-	 		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; }
-	 		public Guid UpdateUserId { get; set; }
-	 		public DateTime UpdateTime { get; set; }
+	 		public Guid TrialReadingCriterionId { get; set; }	
 	 		public Guid SubjectVisitId { get; set; }
 	 		public Guid StudyId { get; set; }
 	 		public Guid SeriesId { get; set; }
-	 		public bool IsConfirmed { get; set; }
 	      }