复核稽查修改011

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

@@ -1369,6 +1369,12 @@ namespace IRaCIS.Core.Application.Image.QA
 
             if (obtaionOrCancel)
             {
+                //复核的时候，指派后，另外一个人进来的时候如果是自己，那么不进行后续流程
+                if (dbSubjectVisit.CurrentActionUserId == _userInfo.UserRoleId)
+                {
+                    return ResponseOutput.Ok();
+                }
+
                 if (dbSubjectVisit.CurrentActionUserId != null && dbSubjectVisit.IsTake)
                 {
                     //throw new BusinessValidationFailedException("当前访视已被领取，不允许领取");
@@ -1400,6 +1406,8 @@ namespace IRaCIS.Core.Application.Image.QA
                 //    return ResponseOutput.NotOk("您已经领取了其他受试者，完成后才允许领取新的受试者");
                 //}
 
+                if (dbSubjectVisit.SecondReviewState == SecondReviewState.None)
+                {
                     #region 处理验证
 
                     if (trialConfig.QCProcessEnum == TrialQCProcess.NotAudit)
@@ -1459,6 +1467,8 @@ namespace IRaCIS.Core.Application.Image.QA
                     }
 
                     #endregion
+                }
+
 
                 dbSubjectVisit.IsTake = true;
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs

@@ -6,9 +6,11 @@ using IRaCIS.Core.Application.Contracts.DTO;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infrastructure.Extention;
 using MassTransit.Serialization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore.Storage.Json;
+using NPOI.SS.Formula.Functions;
 using System;
 
 namespace IRaCIS.Core.Application.Service
@@ -315,12 +317,16 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
-        public async Task<List<TrialSelectUserBasicInfo>> GetTrialUserRoleList(Guid trialId, UserTypeEnum? userTypeEnum)
+        public async Task<List<TrialSelectUserBasicInfo>> GetTrialUserRoleList(Guid trialId, Guid? subjectVisitId, UserTypeEnum? userTypeEnum)
         {
+            //复审指派需要过滤初审的人
+            var firstUserId = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => t.PreliminaryAuditUserId).FirstOrDefaultAsync();
+
             var list = await _trialIdentityUserRepository.Where(t => t.TrialId == trialId)
                     .SelectMany(t => t.TrialUserRoleList)
                    .WhereIf(userTypeEnum != null, t => t.UserRole.UserTypeEnum == userTypeEnum)
                    .Where(t => t.UserRole.Id != _userInfo.UserRoleId)//iQC 指派过滤自己
+                   .WhereIf(firstUserId != null, t => t.UserRole.Id != firstUserId)//iQC 指派过滤自己
                    .Select(t => new TrialSelectUserBasicInfo()
                    {
                        FullName = t.TrialUser.IdentityUser.FullName,