From eac351f0033d61f99b41db3337cda79a5789522e Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 30 Sep 2022 10:04:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/Dto/ReadingQuestionViewModel.cs   | 11 +++
 .../Service/Reading/ReadingQuestionService.cs |  3 +-
 IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs  | 88 +++++++++++++++++++
 .../Reading/ReadingQuestionCriterionSystem.cs |  9 +-
 .../Reading/ReadingQuestionCriterionTrial.cs  |  5 +-
 5 files changed, 113 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index b6e0cf8d1..d48f80e33 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -398,6 +398,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public int ShowOrder { get; set; }
 
+		/// <summary>
+		/// 标准类型
+		/// </summary>
+		public CriterionType CriterionType { get; set; }
+
 		/// <summary>
 		/// 是否完成配置
 		/// </summary>
@@ -1217,6 +1222,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public bool IsEnable { get; set; }
 
+
+		/// <summary>
+		/// 标准类型
+		/// </summary>
+		public CriterionType CriterionType { get; set; }
+
 		/// <summary>
 		/// 是否完成配置
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
index 9698ec640..6f5b7d4e4 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
@@ -951,7 +951,8 @@ namespace IRaCIS.Application.Services
             {
                 await _readingQuestionCriterionTrialRepository.BatchUpdateNoTrackingAsync(x => x.ReadingQuestionCriterionSystemId == indto.Id, x => new ReadingQuestionCriterionTrial()
                 {
-                    CriterionName = indto.CriterionName
+                    CriterionName = indto.CriterionName,
+                    CriterionType=indto.CriterionType,
 
                 });
             }
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 6a1903b79..d6304496e 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -17,6 +17,94 @@ namespace IRaCIS.Core.Domain.Share
     }
 
 
+    /// <summary>
+    /// 标准类型
+    /// </summary>
+    public enum CriterionType
+    {
+        None=0,
+
+        /// <summary>
+        /// RECIST 1.1
+        /// </summary>
+        RECIST1Pointt1 = 1,
+
+        /// <summary>
+        /// PCWG3
+        /// </summary>
+        PCWG3 = 10,
+
+        /// <summary>
+        /// mRECIST Mesothelioma
+        /// </summary>
+        mRECISTMesothelioma = 11,
+
+        /// <summary>
+        /// RECIL
+        /// </summary>
+        RECIL = 12,
+
+        /// <summary>
+        /// RECIST 1.0
+        /// </summary>
+        RECIST1Point0 = 13,
+
+        /// <summary>
+        /// WHO
+        /// </summary>
+        WHO = 14,
+
+        /// <summary>
+        /// PERCIST
+        /// </summary>
+        PERCIST = 15,
+
+        /// <summary>
+        /// Forrest
+        /// </summary>
+        Forrest = 16,
+
+        /// <summary>
+        /// Lugano 2014
+        /// </summary>
+        Lugano2014 = 2,
+
+        /// <summary>
+        /// iRECIST
+        /// </summary>
+        iRECIST = 3,
+
+        /// <summary>
+        /// RANO-BM
+        /// </summary>
+        RANO_BM = 4,
+
+        /// <summary>
+        /// RANO
+        /// </summary>
+        RANO = 5,
+
+        /// <summary>
+        /// IWCLL 2018
+        /// </summary>
+        IWCLL2018 = 6,
+
+        /// <summary>
+        /// mRECIST HCC
+        /// </summary>
+        mRECISTHCC = 7,
+
+        /// <summary>
+        /// Cheson 2007
+        /// </summary>
+        Cheson2007 = 8,
+
+        /// <summary>
+        /// IMWG 2016
+        /// </summary>
+        IMWG2016 = 9
+		 }
+
 
     /// <summary>
     /// 是否存在疾病
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs
index 1882e622e..111a7a953 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs
@@ -54,13 +54,20 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid CreateUserId { get; set; }
 
-        [JsonIgnore]
+		/// <summary>
+		/// 标准类型
+		/// </summary>
+		public CriterionType CriterionType { get; set; }
+
+		[JsonIgnore]
 		public List<ReadingQuestionSystem> ReadingQuestionSystemList { get; set; } = new List<ReadingQuestionSystem>();
 
 		//[JsonIgnore]
 		//[ForeignKey("CriterionId")]
 		//public Dictionary Dictionary { get; set; }
 
+	
+
 	}
 
 
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
index 97bfa3c90..45718d768 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
@@ -109,7 +109,10 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public DateTime? SynchronizeOriginalTime { get; set; }
 
-
+		/// <summary>
+		/// 标准类型
+		/// </summary>
+		public CriterionType? CriterionType { get; set; }
 
 		/// <summary>
 		/// 项目