From 7ca524c3d36a459b310e0a92029313e0eba6ba7e Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 2 Feb 2023 14:40:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E9=98=85=E7=89=87=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E7=AD=BE=E5=90=8D=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/ReadingCriterion/ReadingCriterionService.cs    | 1 +
 .../Service/TrialSiteUser/TrialConfigService.cs            | 7 ++++---
 .../ReadingCriterion/ReadingQuestionCriterionTrial.cs      | 5 +++++
 IRaCIS.Core.Domain/SQLFile/Test.sql                        | 6 +++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
index ee35ab942..0bb5a3a24 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
@@ -62,6 +62,7 @@ namespace IRaCIS.Core.Application.Service.RC
             {
                 SynchronizeOriginalTime = null,
                 SynchronizeTime = DateTime.Now.AddYears(-20),
+                IsSigned=false,
                 ReadingInfoSignTime=null,
 
             });
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index a0b0bd872..4b5b4c763 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -148,6 +148,7 @@ namespace IRaCIS.Core.Application
 
             await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
             {
+                IsSigned=true,
                 ReadingInfoSignTime = DateTime.Now
             });
 
@@ -298,7 +299,7 @@ namespace IRaCIS.Core.Application
             {
                 IsGlobalReading = trialCriterion.IsGlobalReading,
                 IsSystemCriterion = trialCriterion.ReadingQuestionCriterionSystemId != null,
-                IsSign = trialCriterion.ReadingInfoSignTime != null,
+                IsSign = trialCriterion.IsSigned,
                 GlobalAssessTypes = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.TrialReadingCriterionId
             && x.ParentCode == ReadingCommon.CriterionDictionary.GlobalAssess
             )
@@ -335,7 +336,7 @@ namespace IRaCIS.Core.Application
                 EvaluationReason = trialCriterion.EvaluationReason.IsNullOrEmpty() ? ReadingCommon.EvaluationReason : trialCriterion.EvaluationReason,
                 OncologyAssessIds = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.TrialReadingCriterionId && x.ParentCode == ReadingCommon.CriterionDictionary.OncologyAssess).Select(x => x.DictionaryId).ToListAsync(),
                 IsSystemCriterion = trialCriterion.ReadingQuestionCriterionSystemId != null,
-                IsSign = trialCriterion.ReadingInfoSignTime != null,
+                IsSign = trialCriterion.IsSigned,
             };
         }
 
@@ -402,7 +403,7 @@ namespace IRaCIS.Core.Application
             return (judgeQuestionList, new
             {
 
-                IsSign = trialCriterion.ReadingInfoSignTime != null,
+                IsSign = trialCriterion.IsSigned,
 
             });
         }
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
index 98b3346c4..26d51d54a 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
@@ -179,6 +179,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public bool IsGlobalReading { get; set; } = true;
 
+		/// <summary>
+		/// 是否签名
+		/// </summary>
+		public bool IsSigned { get; set; } = false;
+
 
 		/// <summary>
 		/// 仲裁阅片
diff --git a/IRaCIS.Core.Domain/SQLFile/Test.sql b/IRaCIS.Core.Domain/SQLFile/Test.sql
index 8e9a3cddc..cb7e04589 100644
--- a/IRaCIS.Core.Domain/SQLFile/Test.sql
+++ b/IRaCIS.Core.Domain/SQLFile/Test.sql
@@ -934,4 +934,8 @@ where ReadingQuestionTrial.ReadingQuestionSystemId is not null and ReadingTableQ
  from   VisitTask
 
   where  RelatedVisitTaskIds='[]' and  PastResultTaskIds='[]'
- and TaskState=0 and ( ReadingCategory=2 or ReadingCategory=5)  and  ReadingTaskState =2 and IsSelfAnalysis is not null
\ No newline at end of file
+ and TaskState=0 and ( ReadingCategory=2 or ReadingCategory=5)  and  ReadingTaskState =2 and IsSelfAnalysis is not null
+
+
+ --------------------------------------维护阅片标准签名状态----------------
+ update ReadingQuestionCriterionTrial set IsSigned=1 where ReadingInfoSignTime is not null
\ No newline at end of file