diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 1f002c5b8..a2d2cf745 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -2134,7 +2134,8 @@ namespace IRaCIS.Application.Services
.Select(x => new
{
QuestionMark = x.ReadingTableQuestionTrial.QuestionMark,
- Answer = x.Answer
+ Answer = x.Answer,
+
}).ToListAsync();
if (tableAnswerList.Any(x => x.QuestionMark == QuestionMark.State && x.Answer.IsNullOrEmpty()))
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 373b4f570..1ad86e78b 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -17,6 +17,21 @@ namespace IRaCIS.Core.Domain.Share
}
+ public enum ImagePlatform
+ {
+ None=0,
+
+
+ MINT=1,
+
+ Ambra=2,
+
+ ///
+ /// 展影
+ ///
+ PACS=3,
+ }
+
///
/// 标准类型
///
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
index 45718d768..b7e40fab1 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
@@ -114,6 +114,69 @@ namespace IRaCIS.Core.Domain.Models
///
public CriterionType? CriterionType { get; set; }
+ #region 阅片单元配置 新加
+
+ ///
+ /// 阅片平台
+ ///
+ public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.MINT;
+
+ ///
+ /// 阅片工具
+ ///
+ public ReadingTool? ReadingTool { get; set; }
+
+ ///
+ /// 任务组织级别
+ ///
+ public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; }
+
+
+ ///
+ /// 阅片是否显示受试者信息
+ ///
+ public bool IsReadingShowSubjectInfo { get; set; } = false;
+
+ ///
+ /// IR阅片页面是否可以查看既往任务结果
+ ///
+ public bool IsReadingShowPreviousResults { get; set; } = false;
+
+
+ ///
+ /// 仲裁对象
+ ///
+ public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.None;
+
+
+ ///
+ /// 阅片模式
+ ///
+ public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double;
+
+ ///
+ /// 全局阅片
+ ///
+ public bool IsGlobalReading { get; set; } = true;
+
+ ///
+ /// 仲裁阅片
+ ///
+ public bool IsArbitrationReading { get; set; } = true;
+
+
+ ///
+ /// 肿瘤学阅片 原字段 IsClinicalReading
+ ///
+ public bool IsOncologyReading { get; set; }
+
+ ///
+ /// 任务展示访视
+ ///
+ public bool IsReadingTaskViewInOrder { get; set; } = true;
+
+ #endregion
+
///
/// 项目
///
diff --git a/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs b/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs
index 23c3c1545..5c9687998 100644
--- a/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs
+++ b/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs
@@ -147,8 +147,15 @@ namespace IRaCIS.Core.Domain.Models
public bool IsBaseLine { get; set; } = false;
+ ///
+ /// 标准Id
+ ///
+ public Guid? TrialReadingCriterionId { get; set; }
- //public Guid? TrialReadingCriterionId { get; set; }
+ ///
+ /// 标准名称
+ ///
+ public string CriterionName { get; set; }
}
}