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
///
///
[HttpPost]
- public async Task GetNextQCInfo(GetNextQCInfoInDto inDto)
- {
- var result= await GetQCVisitList(new QCVisitSearchDTO()
- {
+ public async Task 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;
- }
-
- ///
- /// QC 访视列表
- ///
- ///
- ///
- [HttpPost]
+ ///
+ /// QC 访视列表
+ ///
+ ///
+ ///
+ [HttpPost]
public async Task<(PageOutput, 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)