From 699df338c16a4099711a40932a0a2e910fc59c68 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 4 Jan 2024 15:20:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E9=98=85=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=20=20=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE=E6=9C=AA?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D=E4=BD=86=E6=98=AF=E5=8F=AF=E4=BB=A5=E5=81=9A?=
 =?UTF-8?q?=E5=90=8E=E7=BB=AD=E8=AE=BF=E8=A7=86=EF=BC=8C=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=80=BB=E8=BE=91=E9=81=97=E6=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/VisitTaskHelpeService.cs               | 4 +++-
 .../Service/Allocation/VisitTaskService.cs                    | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
index a5b261a2b..a8a98d348 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
@@ -549,6 +549,7 @@ namespace IRaCIS.Core.Application.Service
                                     var isNeedClinicalDataSign = IsNeedClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionId, clinicalDataConfirmList);
                                     var isClinicalDataSign = IsClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionId, clinicalDataConfirmList, subjectVisit.Id, trialId);
 
+                                    var isFrontTaskNeedSignButNotSign = await _visitTaskRepository.AnyAsync(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.TaskState == TaskState.Effect && t.VisitTaskNum < subjectVisit.VisitNum && t.IsNeedClinicalDataSign == true && t.IsClinicalDataSign == false);
 
                                     if (visitNumList.IndexOf(subjectVisit.VisitNum) == 0)
                                     {
@@ -590,7 +591,8 @@ namespace IRaCIS.Core.Application.Service
 
                                             TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
                                             IsNeedClinicalDataSign = isNeedClinicalDataSign,
-                                            IsClinicalDataSign = isClinicalDataSign
+                                            IsClinicalDataSign = isClinicalDataSign,
+                                            IsFrontTaskNeedSignButNotSign= isFrontTaskNeedSignButNotSign
                                         });
 
 
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index bdc855c77..a1a708029 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -647,7 +647,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
         {
             var trialReadingCriterionId = inDto.TrialReadingCriterionId;
 
-            //Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.DoctorUserId == _userInfo.Id && x.TaskState == TaskState.Effect && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId;
 
             var critrion = await _trialReadingCriterionRepository.FindAsync(trialReadingCriterionId);