From cfe076f6c56ef1ce8808378b26d2f0a86757c0e8 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 27 Feb 2023 17:23:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=E4=B8=8B?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AAqc=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/QC/DTO/QCListViewModel.cs         |  7 ++++++
 .../Service/QC/QCListService.cs               | 22 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
index ad813749c..6a914a8f0 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
@@ -31,11 +31,18 @@ namespace IRaCIS.Core.Application.Contracts
 
     }
 
+    public class GetNextQCInfoInDto
+    {
+        public Guid TrialId { get; set; }
+    }
+
     public class QCVisitSearchDTO : PageInput
     {
 
         //public AuditStateEnum? AuditState { get; set; }
 
+        public Guid? CurrentActionUserId { get; set; }
+
         public AuditStateEnum[]? AuditStateArray { get; set; }
 
         public ChallengeStateEnum? ChallengeState { get; set; }
diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs
index 430b5120d..bb6b585f0 100644
--- a/IRaCIS.Core.Application/Service/QC/QCListService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs
@@ -237,6 +237,27 @@ namespace IRaCIS.Core.Application.Image.QA
             return (pageList, config);
         }
 
+
+        /// <summary>
+        /// 获取下一个Qc信息
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<QCVisitViewModel?> GetNextQCInfo(GetNextQCInfoInDto inDto)
+        {
+         var result=   await GetQCVisitList(new QCVisitSearchDTO()
+            {
+
+                TrialId = inDto.TrialId,
+                CurrentActionUserId=_userInfo.Id,
+                PageIndex=1,
+                PageSize=1,
+            });
+
+           return result.Item1.CurrentPageData.Count > 0 ? result.Item1.CurrentPageData[1] : null;
+        }
+
         /// <summary>
         /// QC 访视列表
         /// </summary>
@@ -406,6 +427,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
             var svExpression = QCCommon.GetSubjectVisitFilter(visitSearchDTO.VisitPlanArray);
             var query = _subjectVisitRepository.Where(x => x.TrialId == visitSearchDTO.TrialId)
+                           .WhereIf(visitSearchDTO.CurrentActionUserId != null, t => t.CurrentActionUserId == visitSearchDTO.CurrentActionUserId)
                          .WhereIf(visitSearchDTO.ChallengeState != null, t => t.ChallengeState == visitSearchDTO.ChallengeState)
                         .WhereIf(visitSearchDTO.SiteId != null, t => t.SiteId == visitSearchDTO.SiteId)
                         .WhereIf(visitSearchDTO.SubjectId != null, t => t.Subject.Id == visitSearchDTO.SubjectId)