From 726a2be71e4cdeae9d469be3579a8b4abfe291d2 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 21 Mar 2024 14:07:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/QC/DTO/QCListViewModel.cs         |  8 +++-
 .../Service/QC/QCListService.cs               | 39 ++++++++++---------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
index f73cd2887..99da29c06 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
@@ -34,7 +34,9 @@ namespace IRaCIS.Core.Application.Contracts
     public class GetNextQCInfoInDto
     {
         public Guid TrialId { get; set; }
-    }
+
+		public Guid? VisitId { get; set; }
+	}
 
     public class QCVisitSearchDTO : PageInput
     {
@@ -50,7 +52,9 @@ namespace IRaCIS.Core.Application.Contracts
         public bool? IsUrgent { get; set; }
         public Guid TrialId { get; set; }
         public Guid? SiteId { get; set; }
-        public Guid? SubjectId { get; set; }
+
+		public Guid? VisitId { get; set; }
+		public Guid? SubjectId { get; set; }
 
         public string SubjectInfo { get; set; } = String.Empty;
 
diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs
index 60d2bfdc1..b85b2b380 100644
--- a/IRaCIS.Core.Application/Service/QC/QCListService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs
@@ -248,26 +248,26 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<QCVisitViewModel?> GetNextQCInfo(GetNextQCInfoInDto inDto)
-        {
-         var result=   await GetQCVisitList(new QCVisitSearchDTO()
-            {
+		public async Task<QCVisitViewModel?> GetNextQCInfo(GetNextQCInfoInDto inDto)
+		{
+			var result = await GetQCVisitList(new QCVisitSearchDTO()
+			{
+				TrialId = inDto.TrialId,
+				CurrentActionUserId = _userInfo.Id,
+				VisitId = inDto.VisitId,
+				PageIndex = 1,
+				PageSize = 1,
+			});
 
-                TrialId = inDto.TrialId,
-                CurrentActionUserId=_userInfo.Id,
-                PageIndex=1,
-                PageSize=1,
-            });
+			return result.Item1.CurrentPageData.Count > 0 ? result.Item1.CurrentPageData[0] : null;
+		}
 
-           return result.Item1.CurrentPageData.Count > 0 ? result.Item1.CurrentPageData[0] : null;
-        }
-
-        /// <summary>
-        /// QC 访视列表
-        /// </summary>
-        /// <param name="visitSearchDTO"></param>
-        /// <returns></returns>
-        [HttpPost]
+		/// <summary>
+		/// QC 访视列表
+		/// </summary>
+		/// <param name="visitSearchDTO"></param>
+		/// <returns></returns>
+		[HttpPost]
         public async Task<(PageOutput<QCVisitViewModel>, TrialSubjectAndSVConfig)> GetQCVisitList(QCVisitSearchDTO visitSearchDTO)
         {
 
@@ -431,7 +431,8 @@ 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.VisitId != null, t => t.Id == visitSearchDTO.VisitId)
+						   .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)