From 75f4d5696ac540ec39d4d807db1f0c0485ea1282 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 21 Aug 2024 17:30:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/TaskConsistentRuleService.cs      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
index 77e0a2737..c18405e5c 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
@@ -34,6 +34,7 @@ namespace IRaCIS.Core.Application.Service
         private readonly IRepository<TaskConsistentRule> _taskConsistentRuleRepository;
         private readonly IRepository<VisitTask> _visitTaskRepository;
         private readonly IRepository<ReadingConsistentClinicalData> _readingConsistentClinicalDataRepository;
+        private readonly IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository;
         private readonly IReadingClinicalDataService _readingClinicalDataService;
         private readonly IRepository<SubjectUser> _subjectUserRepository;
         private readonly IRepository<Subject> _subjectRepository;
@@ -49,6 +50,7 @@ namespace IRaCIS.Core.Application.Service
 
         public TaskConsistentRuleService(IRepository<VisitTask> visitTaskRepository,
                 IRepository<ReadingConsistentClinicalData> readingConsistentClinicalDataRepository,
+                  IRepository<ReadingQuestionCriterionTrial> trialReadingCriterionRepository,
                 IReadingClinicalDataService readingClinicalDataService,
             IRepository<Enroll> enrollRepository, IRepository<TaskConsistentRule> taskConsistentRuleRepository, IRepository<SubjectUser> subjectUserRepository, IRepository<Subject> subjectRepository, IDistributedLockProvider distributedLockProvider,
             IRepository<Trial> trialRepository, IRepository<TrialSite> trialSiteRepository, IRepository<TrialVirtualSiteCodeUpdate> trialVirtualSiteCodeUpdateRepository, IVisitTaskHelpeService visitTaskCommonService)
@@ -56,6 +58,7 @@ namespace IRaCIS.Core.Application.Service
             _taskConsistentRuleRepository = taskConsistentRuleRepository;
             _visitTaskRepository = visitTaskRepository;
             this._readingConsistentClinicalDataRepository = readingConsistentClinicalDataRepository;
+            this._trialReadingCriterionRepository = trialReadingCriterionRepository;
             this._readingClinicalDataService = readingClinicalDataService;
             _subjectUserRepository = subjectUserRepository;
             _subjectRepository = subjectRepository;
@@ -782,9 +785,11 @@ namespace IRaCIS.Core.Application.Service
 
 
         [HttpPost]
-        public async Task<TaskConsistentRuleBasic?> GetConsistentRule(TaskConsistentRuleQuery inQuery)
+        public async Task<(TaskConsistentRuleBasic?,object)> GetConsistentRule(TaskConsistentRuleQuery inQuery)
         {
-            return await _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId && t.IsSelfAnalysis == inQuery.IsSelfAnalysis && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId).ProjectTo<TaskConsistentRuleBasic>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
+            return (await _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId && t.IsSelfAnalysis == inQuery.IsSelfAnalysis && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId).ProjectTo<TaskConsistentRuleBasic>(_mapper.ConfigurationProvider).FirstOrDefaultAsync(),
+                await _trialReadingCriterionRepository.Where(x=>x.Id==inQuery.TrialReadingCriterionId).Select(x=>x.IsReadingTaskViewInOrder).FirstNotNullAsync()
+                );
         }
 
         /// <summary>