附加评估

2023-03-20 17:18:03 +08:00
parent 107c95aa9f
commit 7d17d993af
16 changed files with 445 additions and 171 deletions
@@ -15,60 +15,46 @@ namespace IRaCIS.Core.Domain.Models
 	 [Table("SubjectAdditionalEvaluationResult")]	
 	 public class SubjectAdditionalEvaluationResult : Entity, IAuditUpdate, IAuditAdd
 	 {
-	 

-		/// <summary>
-        /// SubjectId
-        /// </summary>
-		[Required]
-		public Guid SubjectId { get; set; }
+
+        [JsonIgnore]
+        [ForeignKey("TrialReadingQuestionId")]
+        public ReadingQuestionTrial TrialReadingQuestion { get; set; }
+
+
+        public Guid TrialReadingQuestionId { get; set; }
+
+
+
+
+        public Guid SubjectId { get; set; }
 	
-		/// <summary>
-        /// TrialReadingCriterionId
-        /// </summary>
-		[Required]
+
 		public Guid TrialReadingCriterionId { get; set; }
 	
-		/// <summary>
-        /// CreateTime
-        /// </summary>
-		[Required]
+
 		public DateTime CreateTime { get; set; }
 	
-		/// <summary>
-        /// CreateUserId
-        /// </summary>
-		[Required]
+
 		public Guid CreateUserId { get; set; }
 	
-		/// <summary>
-        /// UpdateUserId
-        /// </summary>
-		[Required]
+
 		public Guid UpdateUserId { get; set; }
 	
-		/// <summary>
-        /// UpdateTime
-        /// </summary>
-		[Required]
+
 		public DateTime UpdateTime { get; set; }
 	
-		/// <summary>
-        /// VisitTaskId
-        /// </summary>
+
 		public Guid? VisitTaskId { get; set; }
 	
-		/// <summary>
-        /// 附加评估答案
-        /// </summary>
-		[Required]
+
 		public string Answer { get; set; }
 	
 		/// <summary>
        /// 附加评估答案翻译字典
        /// </summary>
 		[Required]
-		public string TranslateDictionaryCode { get; set; }
+		public string TranslateDictionaryCode { get; set; }=string.Empty;
 	
 		/// <summary>
        /// 是否是最终结果
@@ -7,6 +7,8 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Collections.Generic;
+
 namespace IRaCIS.Core.Domain.Models
 {
 	 ///<summary>
@@ -59,12 +61,16 @@ namespace IRaCIS.Core.Domain.Models
        /// </summary>
 		[Required]
 		public DateTime UpdateTime { get; set; }
+
+
+
+		public List<SubjectCriteriaEvaluationVisitFilter> SubjectCriteriaEvaluationVisitFilterList { get; set; }
 	
-		/// <summary>
-        /// 是否影像筛选
-        /// </summary>
-		[Required]
-		public bool IsImageFiltering { get; set; }
+		///// <summary>
+  //      /// 是否影像筛选
+  //      /// </summary>
+		//[Required]
+		//public bool IsImageFiltering { get; set; }
 	 
 	 }

@@ -9,75 +9,72 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
-	 ///<summary>
-	 ///SubjectCriteriaEvaluationVisitFilter
-	 ///</summary>
-	 [Table("SubjectCriteriaEvaluationVisitFilter")]	
-	 public class SubjectCriteriaEvaluationVisitFilter : Entity, IAuditUpdate, IAuditAdd
-	 {
-	 
+    ///<summary>
+    ///SubjectCriteriaEvaluationVisitFilter
+    ///</summary>
+    [Table("SubjectCriteriaEvaluationVisitFilter")]
+    public class SubjectCriteriaEvaluationVisitFilter : Entity, IAuditUpdate, IAuditAdd
+    {

-	
-		/// <summary>
-        /// SubjectId
-        /// </summary>
-		[Required]
-		public Guid SubjectId { get; set; }
-	
-		/// <summary>
-        /// TrialReadingCriterionId
-        /// </summary>
-		[Required]
-		public Guid TrialReadingCriterionId { get; set; }
-	
-		/// <summary>
-        /// CreateTime
-        /// </summary>
-		[Required]
-		public DateTime CreateTime { get; set; }
-	
-		/// <summary>
-        /// CreateUserId
-        /// </summary>
-		[Required]
-		public Guid CreateUserId { get; set; }
-	
-		/// <summary>
-        /// UpdateUserId
-        /// </summary>
-		[Required]
-		public Guid UpdateUserId { get; set; }
-	
-		/// <summary>
-        /// UpdateTime
-        /// </summary>
-		[Required]
-		public DateTime UpdateTime { get; set; }
-	
-		/// <summary>
-        /// SubjectVisitId
-        /// </summary>
-		[Required]
-		public Guid SubjectVisitId { get; set; }
-	
-		/// <summary>
+        public SubjectCriteriaEvaluation SubjectCriteriaEvaluation { 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 SubjectVisitId { get; set; }
+
+        /// <summary>
        /// 影像筛选状态
        /// </summary>
-		[Required]
-		public int ImageFilterState { get; set; }
-	
-		/// <summary>
+        [Required]
+        public ImageFilterState ImageFilterState { get; set; }
+
+        /// <summary>
        /// 影像判断结果
        /// </summary>
-		[Required]
-		public int ImageDeterminationResultState { get; set; }
-	
-		/// <summary>
+        [Required]
+        public ImageDeterminationResultState ImageDeterminationResultState { get; set; }
+
+        /// <summary>
        /// 是否已生成任务
        /// </summary>
-		[Required]
-		public bool IsGeneratedTask { get; set; }
-	 
-	 }
+        [Required]
+        public bool IsGeneratedTask { get; set; }

-}	 
+    }
+
+
+    public enum ImageDeterminationResultState
+    {
+        //待定
+        None = 0,
+
+        //通过
+        Passed = 1,
+    }
+
+    public enum ImageFilterState
+    {
+        //默认值 待筛选
+        None = 0,
+
+        //已完成
+        Finished = 1
+    }
+
+}
@@ -9,18 +9,18 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
-	 ///<summary>
-	 ///SubjectCriteriaEvaluationVisitStudyFilter
-	 ///</summary>
-	 [Table("SubjectCriteriaEvaluationVisitStudyFilter")]	
-	 public class SubjectCriteriaEvaluationVisitStudyFilter : Entity, IAuditUpdate, IAuditAdd
-	 {
-	 
+    ///<summary>
+    ///SubjectCriteriaEvaluationVisitStudyFilter
+    ///</summary>
+    [Table("SubjectCriteriaEvaluationVisitStudyFilter")]
+    public class SubjectCriteriaEvaluationVisitStudyFilter : Entity, IAuditUpdate, IAuditAdd
+    {


-	
+        [JsonIgnore]
+        public SubjectVisit SubjectVisit { get; set; }

-		public Guid TrialReadingCriterionId { get; set; }
+        public Guid TrialReadingCriterionId { get; set; }

        public Guid SubjectVisitId { get; set; }

@@ -34,18 +34,18 @@ namespace IRaCIS.Core.Domain.Models


        public DateTime CreateTime { get; set; }
-	
-
-		public Guid CreateUserId { get; set; }
-	
-
-		public Guid UpdateUserId { get; set; }
-	
-
-		public DateTime UpdateTime { get; set; }
-	


-	 }
+        public Guid CreateUserId { get; set; }

-}	 
+
+        public Guid UpdateUserId { get; set; }
+
+
+        public DateTime UpdateTime { get; set; }
+
+
+
+    }
+
+}