From ad9ad4c41eac6137efb0fc8d8b72966028a6a611 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 21 Nov 2022 11:04:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=BB=E5=8A=A1=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=20=20=E8=BF=94=E5=9B=9E=E6=A0=87=E5=87=86=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 50 +++++++++++++++++++
.../Allocation/DTO/VisitTaskViewModel.cs | 2 +
.../Service/Allocation/_MapConfig.cs | 9 +++-
3 files changed, 60 insertions(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index d12a61ff4..57f451d89 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1830,6 +1830,11 @@
至少一个淋巴结靶病灶短径≥10 mm
+
+
+ 淋巴结非靶病灶状态全部为消失
+
+
该淋巴结靶病灶短径绝对增加值≥5 mm
@@ -2235,6 +2240,11 @@
数值类型
+
+
+ 自定义单位
+
+
单位
@@ -3680,6 +3690,11 @@
单位
+
+
+ 自定义单位
+
+
数据来源
@@ -4001,6 +4016,11 @@
单位
+
+
+ 自定义单位
+
+
自定义计算标记
@@ -4571,6 +4591,11 @@
单位
+
+
+ 自定义单位
+
+
自定义计算标记
@@ -6621,6 +6646,11 @@
阅片信息签名时间
+
+
+ eCRF报告是否显示在图像页面
+
+
仲裁阅片
@@ -6716,6 +6746,16 @@
类型值
+
+
+ 单位
+
+
+
+
+ 自定义单位
+
+
是否启用
@@ -6826,6 +6866,11 @@
修约小数点
+
+
+ eCRF报告是否显示在图像页面
+
+
项目标准Id
@@ -6896,6 +6941,11 @@
项目标准ID
+
+
+ eCRF报告是否显示在图像页面
+
+
修约小数点
diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index d749b56fa..bfafba782 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -81,6 +81,8 @@ namespace IRaCIS.Core.Application.ViewModel
public int? DigitPlaces { get; set; } = 2;
+ public bool IseCRFShowInDicomReading { get; set; } = false;
+
/////
///// 仲裁对象
diff --git a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
index 133fc3318..26caabe34 100644
--- a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
@@ -103,10 +103,17 @@ namespace IRaCIS.Core.Application.Service
CreateMap();
-
+
CreateMap()
.ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionName))
+ .ForMember(o => o.ReadingTool, t => t.MapFrom(u => u.TrialReadingCriterion.ReadingTool))
+ .ForMember(o => o.IsReadingTaskViewInOrder, t => t.MapFrom(u => u.TrialReadingCriterion.IsReadingTaskViewInOrder))
+ .ForMember(o => o.IsReadingShowSubjectInfo, t => t.MapFrom(u => u.TrialReadingCriterion.IsReadingShowSubjectInfo))
+ .ForMember(o => o.IsReadingShowPreviousResults, t => t.MapFrom(u => u.TrialReadingCriterion.IsReadingShowPreviousResults))
+ .ForMember(o => o.DigitPlaces, t => t.MapFrom(u => u.TrialReadingCriterion.DigitPlaces))
+ .ForMember(o => o.IseCRFShowInDicomReading, t => t.MapFrom(u => u.TrialReadingCriterion.IseCRFShowInDicomReading))
+
.ForMember(o => o.SiteId, t => t.MapFrom(u => u.Subject.SiteId))
.ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.IsSelfAnalysis == true ? u.BlindTrialSiteCode : u.Subject.TrialSite.TrialSiteCode))
.ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsSelfAnalysis == true ? u.BlindSubjectCode : u.Subject.Code))