系统签名文档废除

IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs

@@ -658,7 +658,7 @@ namespace IRaCIS.Core.Application.Services
         /// <param name="isSystemDoc"></param>
         /// <returns></returns>
         [HttpPut("{documentId:guid}/{isSystemDoc:bool}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt", "SignSystemDocNoTrialId" })]
         public async Task<IResponseOutput> UserAbandonDoc(Guid documentId, bool isSystemDoc)
         {
             if (isSystemDoc)

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

@@ -694,7 +694,8 @@ namespace IRaCIS.Core.Application
 
 
                     //待领取量
-                    ToBeClaimedCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted).Where(u => u.CurrentActionUserId == null && (u.PreliminaryAuditUserId == null || (u.PreliminaryAuditUserId != _userInfo.Id && u.ReviewAuditUserId == null))).Count(),
+                    ToBeClaimedCount = t.SubjectVisitList.Where(t => t.SubmitState == SubmitStateEnum.Submitted && t.AuditState!=AuditStateEnum.QCPassed)
+                    .Where(u => u.CurrentActionUserId == null && (u.PreliminaryAuditUserId == null || (u.PreliminaryAuditUserId != _userInfo.Id && u.ReviewAuditUserId == null))).Count(),
 
                     //待审核通过，统计从已领取到QC提交之间的      已领取 待审核 审核中   (审核完成  领取人就会清理 所以只用查询当前领取人是自己的就好了)
                     ToBeReviewedCount = t.SubjectVisitList.Where(u => u.CurrentActionUserId == _userInfo.Id).Count()
@@ -709,7 +710,7 @@ namespace IRaCIS.Core.Application
 
 
             var toBeClaimedCount = _subjectVisitRepository
-                .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
+                .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id)&& t.SubmitState == SubmitStateEnum.Submitted  && t.AuditState != AuditStateEnum.QCPassed)
                 .Where(u => u.CurrentActionUserId == null && (u.PreliminaryAuditUserId == null || (u.PreliminaryAuditUserId != _userInfo.Id && u.ReviewAuditUserId == null))).Count();
 
 

IRaCIS.Core.Domain/Visit/SubjectVisit.cs

@@ -82,6 +82,8 @@ namespace IRaCIS.Core.Domain.Models
         public DateTime? PreliminaryAuditTime { get; set; }
         public Guid? ForwardUserId { get; set; }
         public DateTime? ForwardTime { get; set; }
+
+        // 质控领取人
         public Guid? CurrentActionUserId { get; set; }
         public DateTime? CurrentActionUserExpireTime { get; set; }