Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -8000,6 +8000,13 @@
             <param name="challengeQuery"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Image.QA.QCListService.GetNextQCInfo(IRaCIS.Core.Application.Contracts.GetNextQCInfoInDto)">
+            <summary>
+            获取下一个Qc信息
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Image.QA.QCListService.GetQCVisitList(IRaCIS.Core.Application.Contracts.QCVisitSearchDTO)">
             <summary>
             QC 访视列表

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; }

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[0] : 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)

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs

@@ -335,7 +335,7 @@ namespace IRaCIS.Application.Services
                 {
                     var agreeOrNotAnswer = globalReadingQuestion.Where(y => y.TaskId == x.VisitTaskId && y.GlobalAnswerType == GlobalAnswerType.AgreeOrNot).Select(x => x.Answer).FirstOrDefault() ?? string.Empty;
 
-                    if (agreeOrNotAnswer.IsNullOrEmpty()&& lastGlobalTask.RelatedVisitTaskIdList.Contains(x.VisitTaskId))
+                    if (agreeOrNotAnswer.IsNullOrEmpty()&& lastGlobalTask!=null&& lastGlobalTask.RelatedVisitTaskIdList.Contains(x.VisitTaskId))
                     {
                         agreeOrNotAnswer = "1";
                     }