Merge branch 'Test.Study' of http://192.168.3.69:3000/XCKJ/irc-netcore-api into Test.Study

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -60,6 +60,21 @@ namespace IRaCIS.Core.Application.Contracts
         public Guid? HandleUserId { get; set; }
     }
 
+    public class GetNextIQCQualityInDto
+    {
+        [NotDefault]
+        public Guid TrialId { get; set; }
+
+        public Guid SubjectId { get; set; }
+    }
+
+    public class GetNextIQCQualityOutDto
+    {
+        public Guid? SubjectId { get; set; }
+
+        public Guid? VisitId { get; set; }
+    }
+
 
     public class CRCRequestToQCCommand
     {

IRaCIS.Core.Application/Service/QC/QCOperationService.cs

@@ -878,6 +878,109 @@ namespace IRaCIS.Core.Application.Image.QA
             return ResponseOutput.Result(success);
         }
 
+        /// <summary>
+        /// 领取下一个质控任务
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<GetNextIQCQualityOutDto> CollectNextIQCQuality(GetNextIQCQualityInDto inDto)
+        {
+            var nextIQCQuality = await this.GetNextIQCQuality(inDto);
+
+            if (nextIQCQuality.VisitId != null)
+            {
+                var visit = await _subjectVisitRepository.Where(x => x.Id == nextIQCQuality.VisitId).FirstOrDefaultAsync();
+                if (!visit.IsTake)
+                {
+                    await ObtainOrCancelQCTask(inDto.TrialId, nextIQCQuality.VisitId.Value, true);
+                }
+
+            }
+
+            return nextIQCQuality;
+
+
+        }
+
+        /// <summary>
+        /// 获取下一个质控任务
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<GetNextIQCQualityOutDto> GetNextIQCQuality(GetNextIQCQualityInDto inDto)
+        {
+            var trialConfig = await _trialRepository
+                 .Select(t => new { TrialId = t.Id, t.QCProcessEnum, t.IsImageConsistencyVerification })
+                 .FirstOrDefaultAsync(t => t.TrialId == inDto.TrialId)
+                 .IfNullThrowException();
+
+            SubjectVisit? subjectVisit = null;
+            List<SubjectVisit>? visitList = null;
+            switch (trialConfig.QCProcessEnum)
+            {
+                case TrialQCProcess.NotAudit:
+                    return new GetNextIQCQualityOutDto() { };
+                    break;
+                case TrialQCProcess.SingleAudit:
+                    visitList = await _subjectVisitRepository.Where(x => x.SubmitState != SubmitStateEnum.None && x.TrialId == inDto.TrialId && (x.CurrentActionUserId == _userInfo.Id || (x.AuditState != AuditStateEnum.PrimaryQCPassed && !x.IsTake))).Include(x => x.Subject).ToListAsync();
+
+                    subjectVisit = visitList.Where(x => x.SubjectId == inDto.SubjectId).OrderBy(x => x.VisitNum).FirstOrDefault();
+                    if (subjectVisit != null)
+                    {
+                        return new GetNextIQCQualityOutDto()
+                        {
+                            SubjectId = subjectVisit.SubjectId,
+                            VisitId = subjectVisit.Id
+                        };
+                    }
+
+                    subjectVisit = visitList.OrderBy(x => x.Subject.Code).ThenBy(x => x.VisitNum).FirstOrDefault();
+                    if (subjectVisit != null)
+                    {
+                        return new GetNextIQCQualityOutDto()
+                        {
+                            SubjectId = subjectVisit.SubjectId,
+                            VisitId = subjectVisit.Id
+                        };
+                    }
+                    else
+                    {
+                        return new GetNextIQCQualityOutDto() { };
+                    }
+                    break;
+                case TrialQCProcess.DoubleAudit:
+
+                    visitList = await _subjectVisitRepository.Where(x => x.SubmitState != SubmitStateEnum.None && x.TrialId == inDto.TrialId && x.PreliminaryAuditUserId != _userInfo.Id && (x.CurrentActionUserId == _userInfo.Id || (x.AuditState != AuditStateEnum.QCPassed))).Include(x => x.Subject).ToListAsync();
+                    if (subjectVisit != null)
+                    {
+                        return new GetNextIQCQualityOutDto()
+                        {
+                            SubjectId = subjectVisit.SubjectId,
+                            VisitId = subjectVisit.Id
+                        };
+                    }
+
+                    subjectVisit = visitList.OrderBy(x => x.Subject.Code).ThenBy(x => x.VisitNum).FirstOrDefault();
+                    if (subjectVisit != null)
+                    {
+                        return new GetNextIQCQualityOutDto()
+                        {
+                            SubjectId = subjectVisit.SubjectId,
+                            VisitId = subjectVisit.Id
+                        };
+                    }
+                    else
+                    {
+                        return new GetNextIQCQualityOutDto() { };
+                    }
+                    break;
+                default:
+                    return new GetNextIQCQualityOutDto() { };
+
+            }
+        }
 
         /// <summary>
         /// 手动领取 或者取消 QC任务