From ad78362f93d0a1a15ae097e87f1f7e98cf71e08e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 20 Sep 2022 15:08:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/Dto/ReadingQuestionViewModel.cs   |   8 +-
 IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs  | 165 ++++++++++++++++++
 IRaCIS.Core.Domain/Reading/CriterionNidus.cs  |  11 +-
 IRaCIS.Core.Domain/Reading/TumorAssessment.cs |   8 +-
 4 files changed, 180 insertions(+), 12 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index e7f648916..746c650d1 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -46,22 +46,22 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// <summary>
 		/// 靶病灶
 		/// </summary>
-		public string TargetLesion { get; set; }
+		public TargetAssessment TargetLesion { get; set; }
 
 		/// <summary>
 		/// 非靶病灶
 		/// </summary>
-		public string NonTargetLesions { get; set; }
+		public NoTargetAssessment NonTargetLesions { get; set; }
 
 		/// <summary>
 		/// 新病灶
 		/// </summary>
-		public string NewLesion { get; set; }
+		public NewLesionAssessment NewLesion { get; set; }
 
 		/// <summary>
 		/// 整体疗效
 		/// </summary>
-		public string OverallEfficacy { get; set; }
+		public OverallAssessment OverallEfficacy { get; set; }
 	}
 	public class CopySystemCriterionDataInDto
 	{
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index a7394d4d1..45f5b6717 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -767,4 +767,169 @@ namespace IRaCIS.Core.Domain.Share
         PreviousOther=3
 
     }
+
+
+    #region 疗效评估
+
+    /// <summary>
+    /// 非靶病灶评估
+    /// </summary>
+    public enum NoTargetAssessment
+    {
+
+        /// <summary>
+        /// PD
+        /// </summary>
+        PD = 0,
+
+        /// <summary>
+        /// CR
+        /// </summary>
+        CR = 1,
+
+        /// <summary>
+        /// NE
+        /// </summary>
+        NE = 2,
+
+        /// <summary>
+        /// ND
+        /// </summary>
+        ND = 3,
+
+        /// <summary>
+        /// NN
+        /// </summary>
+        NN = 4,
+
+        /// <summary>
+        /// NA
+        /// </summary>
+        NA = 5
+    }
+
+    /// <summary>
+    /// 靶病灶评估
+    /// </summary>
+    public enum TargetAssessment
+    {
+
+        /// <summary>
+        /// CR
+        /// </summary>
+        CR = 0,
+
+        /// <summary>
+        /// PR
+        /// </summary>
+        PR = 1,
+
+        /// <summary>
+        /// SD
+        /// </summary>
+        SD = 2,
+
+        /// <summary>
+        /// PD
+        /// </summary>
+        PD = 3,
+
+        /// <summary>
+        /// NE
+        /// </summary>
+        NE = 4,
+
+        /// <summary>
+        /// ND
+        /// </summary>
+        ND = 5,
+
+        /// <summary>
+        /// NA
+        /// </summary>
+        NA = 6
+    }
+
+    /// <summary>
+    /// 新病灶评估
+    /// </summary>
+    public enum NewLesionAssessment
+    {
+
+        /// <summary>
+        /// 是
+        /// </summary>
+        Yes = 0,
+
+        /// <summary>
+        /// 疑似
+        /// </summary>
+        Suspected = 1,
+
+        /// <summary>
+        /// NE
+        /// </summary>
+        NE = 2,
+
+        /// <summary>
+        /// 否
+        /// </summary>
+        No = 3,
+
+        /// <summary>
+        /// NA
+        /// </summary>
+        NA = 4
+    }
+
+    /// <summary>
+    /// 整体肿瘤评估
+    /// </summary>
+    public enum OverallAssessment
+    {
+
+        /// <summary>
+        /// CR
+        /// </summary>
+        CR = 0,
+
+        /// <summary>
+        /// ND
+        /// </summary>
+        ND = 1,
+
+        /// <summary>
+        /// NE
+        /// </summary>
+        NE = 2,
+
+        /// <summary>
+        /// NN
+        /// </summary>
+        NN = 3,
+
+        /// <summary>
+        /// PD
+        /// </summary>
+        PD = 4,
+
+        /// <summary>
+        /// PR
+        /// </summary>
+        PR = 5,
+
+        /// <summary>
+        /// SD
+        /// </summary>
+        SD = 6,
+
+        /// <summary>
+        /// NA
+        /// </summary>
+        NA = 7
+    }
+
+
+    #endregion
+
 }
diff --git a/IRaCIS.Core.Domain/Reading/CriterionNidus.cs b/IRaCIS.Core.Domain/Reading/CriterionNidus.cs
index 0b5219725..7d87156e3 100644
--- a/IRaCIS.Core.Domain/Reading/CriterionNidus.cs
+++ b/IRaCIS.Core.Domain/Reading/CriterionNidus.cs
@@ -21,6 +21,13 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
 		public Guid CriterionId { get; set; }
 
+
+		/// <summary>
+		/// 器官类型
+		/// </summary>
+		public OrganType OrganType { get; set; }
+
+
 		/// <summary>
 		/// 病灶类型
 		/// </summary>
@@ -36,10 +43,6 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
 		public Guid CreateUserId { get; set; }
 
-		/// <summary>
-		/// 器官类型
-		/// </summary>
-		public OrganType OrganType { get; set; }
 
 	}
 
diff --git a/IRaCIS.Core.Domain/Reading/TumorAssessment.cs b/IRaCIS.Core.Domain/Reading/TumorAssessment.cs
index 67e85dc0f..fb5e1b2e6 100644
--- a/IRaCIS.Core.Domain/Reading/TumorAssessment.cs
+++ b/IRaCIS.Core.Domain/Reading/TumorAssessment.cs
@@ -19,22 +19,22 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
         /// 靶病灶
         /// </summary>
-		public string TargetLesion { get; set; }
+		public TargetAssessment TargetLesion { get; set; }
 	
 		/// <summary>
         /// 非靶病灶
         /// </summary>
-		public string NonTargetLesions { get; set; }
+		public NoTargetAssessment NonTargetLesions { get; set; }
 	
 		/// <summary>
         /// 新病灶
         /// </summary>
-		public string NewLesion { get; set; }
+		public NewLesionAssessment NewLesion { get; set; }
 	
 		/// <summary>
         /// 整体疗效
         /// </summary>
-		public string OverallEfficacy { get; set; }
+		public OverallAssessment OverallEfficacy { get; set; }
 
 		/// <summary>
 		/// 标准ID