From a8872841e130518286a06b04bac3841f264de0c5 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 28 Jul 2022 17:23:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/DTO/TaskConsistentRuleViewModel.cs | 8 ++++++++
 .../Service/Allocation/VisitTaskHelpeService.cs           | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs
index 2c53fbe47..cd47a86f2 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs
@@ -203,6 +203,14 @@ namespace IRaCIS.Core.Application.ViewModel
         public UserSimpleInfo DoctorUser { get; set; }
 
         public ReReadingOrBackOptType OptType { get; set; }
+
+        /// <summary>
+        /// 是否是一致性分析产生
+        /// </summary>
+        public bool IsAnalysisCreate { get; set; }
+
+        public bool? IsSelfAnalysis { get; set; }
+
     }
 
 
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
index d5c9de6ec..df4d34b8a 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
@@ -209,7 +209,7 @@ namespace IRaCIS.Core.Application.Service
 
                                                     //存在退回访视1  又退回基线 这种情况   生成任务  考虑基线先一致性核查通过，但是访视1还未通过时  生成任务
                                                     var followVisitTaskList = await _visitTaskRepository
-                                                         .Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.SourceSubjectVisit.CheckState == CheckStateEnum.CVPassed && t.ReadingCategory == ReadingCategory.Visit, true)
+                                                         .Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.SourceSubjectVisit.CheckState == CheckStateEnum.CVPassed && t.ReadingCategory == ReadingCategory.Visit &&t.IsAnalysisCreate==false, true)
                                                          .WhereIf(followBackVisitTask != null, t => t.VisitTaskNum < followBackVisitTask.VisitTaskNum)
                                                          .ToListAsync();
 
@@ -446,7 +446,7 @@ namespace IRaCIS.Core.Application.Service
 
                                                         //存在退回访视1  又退回基线 这种情况   生成任务  考虑基线先一致性核查通过，但是访视1还未通过时  生成任务
                                                         var followVisitTaskList = await _visitTaskRepository
-                                                             .Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.SourceSubjectVisit.CheckState == CheckStateEnum.CVPassed && t.ReadingCategory == ReadingCategory.Visit, true)
+                                                             .Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum > subjectVisit.VisitNum && t.SourceSubjectVisit.CheckState == CheckStateEnum.CVPassed && t.ReadingCategory == ReadingCategory.Visit && t.IsAnalysisCreate == false, true)
                                                              .WhereIf(followBackVisitTask != null, t => t.VisitTaskNum < followBackVisitTask.VisitTaskNum)
                                                              .ToListAsync();