From 4050d7e4a37c578908e8dfb93f7cd26e0d37563d Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 10 May 2024 10:26:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=82=BF=E7=98=A4=E5=AD=A6?=
 =?UTF-8?q?=E6=9C=89=E5=BA=8F=E9=98=85=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml |  5 +++++
 .../ClinicalData/ReadingClinicalDataService.cs      | 12 +++++++++++-
 ...VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs | 13 ++++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 0da7c3bf2..06db1393e 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -14527,6 +14527,11 @@
             标准类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Application.Contracts.UserBasicInfo.LastChangePassWordTime">
+            <summary>
+            上一次修改密码的时间
+            </summary>
+        </member>
         <member name="T:IRaCIS.Application.Contracts.UserAddedReturnDTO">
             <summary>
             添加用户是的返回模型
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index ac9cee361..9b81e1596 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -485,7 +485,17 @@ namespace IRaCIS.Application.Services
             {
 
 
-                Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == trialId && x.SubjectId == subjectId && x.TrialReadingCriterionId == trialReadingCritrialId && x.ArmEnum != Arm.TumorArm;
+                Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == trialId && x.SubjectId == subjectId && x.TrialReadingCriterionId == trialReadingCritrialId;
+
+                if (isVisit)
+                {
+                    //访视类型的任务 不影响肿瘤学任务的临床数据状态
+                    visitTaskLambda = visitTaskLambda.And(x => x.ArmEnum != Arm.TumorArm);
+                }
+                else
+                {
+                    visitTaskLambda = visitTaskLambda.And(x => x.ArmEnum == Arm.TumorArm);
+                }
 
 
                 //维护  IsFrontTaskNeedSignButNotSign   在添加任务哪里用触发器也维护了
diff --git a/IRaCIS.Core.Application/Triggers/VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs b/IRaCIS.Core.Application/Triggers/VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs
index 21151128b..6f4c3fa41 100644
--- a/IRaCIS.Core.Application/Triggers/VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs
+++ b/IRaCIS.Core.Application/Triggers/VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs
@@ -48,9 +48,20 @@ namespace IRaCIS.Core.Application.Triggers
             var visitTask = context.Entity;
 
 
-            Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == visitTask.TrialId && x.SubjectId == visitTask.SubjectId && x.TrialReadingCriterionId == visitTask.TrialReadingCriterionId&&x.ArmEnum!=Arm.TumorArm;
             if (context.ChangeType == ChangeType.Added)
             {
+                Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.TrialId == visitTask.TrialId && x.SubjectId == visitTask.SubjectId && x.TrialReadingCriterionId == visitTask.TrialReadingCriterionId ;
+
+                if (visitTask.ArmEnum == Arm.TumorArm)
+                {
+
+                    visitTaskLambda = visitTaskLambda.And(x => x.ArmEnum == Arm.TumorArm);
+                }
+                else
+                {
+                    //访视类型的任务 不影响肿瘤学任务的临床数据状态
+                    visitTaskLambda = visitTaskLambda.And(x => x.ArmEnum != Arm.TumorArm);
+                }
 
                 //判断是否需要临床数据签名  不需要 就不用维护
                 if (visitTask.IsNeedClinicalDataSign)