From e028eeea84fe281dfd7d7626575cf60953e5167c Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 22 Dec 2022 11:34:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml         | 5 +++++
 .../Service/Reading/Dto/ReadingImageTaskViewModel.cs        | 6 ++++++
 .../Service/ReadingCalculate/PCWG3CalculateService.cs       | 3 +++
 .../ReadingCalculate/RECIST1Point1CalculateService.cs       | 3 +++
 .../Service/ReadingCalculate/SelfDefineCalculateService.cs  | 3 +++
 5 files changed, 20 insertions(+)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 2c16b878b..c28bfbb09 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -2230,6 +2230,11 @@
             问题类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingReportDto.DataSource">
+            <summary>
+            数据来源
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingReportDto.LesionType">
             <summary>
             病灶类型
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 00cf33a14..06c2a61a4 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -56,6 +56,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public QuestionType? QuestionType { get; set; }
 
+        /// <summary>
+        /// 数据来源
+        /// </summary>
+        public DataSources DataSource { get; set; } = DataSources.ManualEntry;
+
+
         /// <summary>
 		/// 病灶类型
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index 1f59d6b4d..38bee6cd1 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -145,6 +145,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 QuestionType = x.QuestionType,
                 LesionType = x.LesionType,
                 QuestionGenre = x.QuestionGenre,
+                DataSource = x.DataSource,
                 DictionaryCode = x.DictionaryCode,
                 TypeValue = x.TypeValue,
                 QuestionName = x.QuestionName,
@@ -167,6 +168,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     QuestionName = x.QuestionName,
                     LesionType = x.LesionType,
                     QuestionGenre = x.QuestionGenre,
+                    DataSource = x.DataSource,
                     DictionaryCode = x.DictionaryCode,
                     Type = x.Type,
                     QuestionType = x.QuestionType,
@@ -226,6 +228,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             Type = x.Type,
                             LesionType = question.LesionType,
                             TableQuestionType = x.TableQuestionType,
+                            DataSource = x.DataSource,
                             DictionaryCode = x.DictionaryCode,
                             QuestionMark = x.QuestionMark,
                             TypeValue = x.TypeValue,
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
index e2a04a88a..93d68eaa8 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
@@ -125,6 +125,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 QuestionType = x.QuestionType,
                 LesionType = x.LesionType,
                 QuestionGenre = x.QuestionGenre,
+                DataSource = x.DataSource,
                 DictionaryCode = x.DictionaryCode,
                 TypeValue = x.TypeValue,
                 QuestionName = x.QuestionName,
@@ -146,6 +147,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     QuestionName = x.QuestionName,
                     LesionType = x.LesionType,
                     QuestionGenre = x.QuestionGenre,
+                    DataSource = x.DataSource,
                     DictionaryCode = x.DictionaryCode,
                     Type = x.Type,
                     QuestionType = x.QuestionType,
@@ -203,6 +205,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             Type = x.Type,
                             LesionType = question.LesionType,
                             TableQuestionType = x.TableQuestionType,
+                            DataSource = x.DataSource,
                             DictionaryCode = x.DictionaryCode,
                             QuestionMark = x.QuestionMark,
                             TypeValue = x.TypeValue,
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
index b226afd9e..77d9270c0 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
@@ -120,6 +120,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 IsShowInDicom = x.IsShowInDicom,
                 Type = x.Type,
                 QuestionType = x.QuestionType,
+                DataSource=   x.DataSource,
                 LesionType = x.LesionType,
                 QuestionGenre = x.QuestionGenre,
                 DictionaryCode = x.DictionaryCode,
@@ -142,6 +143,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     IsShowInDicom = x.IsShowInDicom,
                     QuestionName = x.QuestionName,
                     LesionType = x.LesionType,
+                    DataSource = x.DataSource,
                     QuestionGenre = x.QuestionGenre,
                     DictionaryCode = x.DictionaryCode,
                     Type = x.Type,
@@ -198,6 +200,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             QuestionId = x.ReadingQuestionId,
                             TableQuestionId = x.Id,
                             Type = x.Type,
+                            DataSource = x.DataSource,
                             LesionType = question.LesionType,
                             TableQuestionType = x.TableQuestionType,
                             DictionaryCode = x.DictionaryCode,