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
///
/// 靶病灶
///
- public string TargetLesion { get; set; }
+ public TargetAssessment TargetLesion { get; set; }
///
/// 非靶病灶
///
- public string NonTargetLesions { get; set; }
+ public NoTargetAssessment NonTargetLesions { get; set; }
///
/// 新病灶
///
- public string NewLesion { get; set; }
+ public NewLesionAssessment NewLesion { get; set; }
///
/// 整体疗效
///
- 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 疗效评估
+
+ ///
+ /// 非靶病灶评估
+ ///
+ public enum NoTargetAssessment
+ {
+
+ ///
+ /// PD
+ ///
+ PD = 0,
+
+ ///
+ /// CR
+ ///
+ CR = 1,
+
+ ///
+ /// NE
+ ///
+ NE = 2,
+
+ ///
+ /// ND
+ ///
+ ND = 3,
+
+ ///
+ /// NN
+ ///
+ NN = 4,
+
+ ///
+ /// NA
+ ///
+ NA = 5
+ }
+
+ ///
+ /// 靶病灶评估
+ ///
+ public enum TargetAssessment
+ {
+
+ ///
+ /// CR
+ ///
+ CR = 0,
+
+ ///
+ /// PR
+ ///
+ PR = 1,
+
+ ///
+ /// SD
+ ///
+ SD = 2,
+
+ ///
+ /// PD
+ ///
+ PD = 3,
+
+ ///
+ /// NE
+ ///
+ NE = 4,
+
+ ///
+ /// ND
+ ///
+ ND = 5,
+
+ ///
+ /// NA
+ ///
+ NA = 6
+ }
+
+ ///
+ /// 新病灶评估
+ ///
+ public enum NewLesionAssessment
+ {
+
+ ///
+ /// 是
+ ///
+ Yes = 0,
+
+ ///
+ /// 疑似
+ ///
+ Suspected = 1,
+
+ ///
+ /// NE
+ ///
+ NE = 2,
+
+ ///
+ /// 否
+ ///
+ No = 3,
+
+ ///
+ /// NA
+ ///
+ NA = 4
+ }
+
+ ///
+ /// 整体肿瘤评估
+ ///
+ public enum OverallAssessment
+ {
+
+ ///
+ /// CR
+ ///
+ CR = 0,
+
+ ///
+ /// ND
+ ///
+ ND = 1,
+
+ ///
+ /// NE
+ ///
+ NE = 2,
+
+ ///
+ /// NN
+ ///
+ NN = 3,
+
+ ///
+ /// PD
+ ///
+ PD = 4,
+
+ ///
+ /// PR
+ ///
+ PR = 5,
+
+ ///
+ /// SD
+ ///
+ SD = 6,
+
+ ///
+ /// NA
+ ///
+ 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
///
public Guid CriterionId { get; set; }
+
+ ///
+ /// 器官类型
+ ///
+ public OrganType OrganType { get; set; }
+
+
///
/// 病灶类型
///
@@ -36,10 +43,6 @@ namespace IRaCIS.Core.Domain.Models
///
public Guid CreateUserId { get; set; }
- ///
- /// 器官类型
- ///
- 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
///
/// 靶病灶
///
- public string TargetLesion { get; set; }
+ public TargetAssessment TargetLesion { get; set; }
///
/// 非靶病灶
///
- public string NonTargetLesions { get; set; }
+ public NoTargetAssessment NonTargetLesions { get; set; }
///
/// 新病灶
///
- public string NewLesion { get; set; }
+ public NewLesionAssessment NewLesion { get; set; }
///
/// 整体疗效
///
- public string OverallEfficacy { get; set; }
+ public OverallAssessment OverallEfficacy { get; set; }
///
/// 标准ID