From 8ce368e16d47c2d6bc45f801679654816bf4daaa Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 16 May 2022 17:32:59 +0800 Subject: [PATCH] =?UTF-8?q?QC=E9=97=AE=E9=A2=98=E7=A1=AE=E8=AE=A4=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/QC/QCOperationService.cs | 2 +- .../Service/TrialSiteUser/TrialConfigService.cs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 8ec87a3e4..6ead940a5 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -949,7 +949,7 @@ namespace IRaCIS.Core.Application.Image.QA #endregion [HttpGet] - public async Task IsQCCanOpt([FromQuery,NotDefault]Guid sujectVisitId) + public async Task IsQCCanOpt([FromQuery,Required]Guid sujectVisitId) { await VerifyIsCanQCAsync(null,sujectVisitId); } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index a346833a0..efbcc9eb9 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -139,8 +139,6 @@ namespace IRaCIS.Core.Application .IfNullThrowException(); - - var showOrderList = await _repository.Where(t => t.TrialId == signConfirmDTO.TrialId).Select(t => new { t.ShowOrder , ParentShowOrder=(int?) t.ParentQCQuestion.ShowOrder} ).ToListAsync(); @@ -163,6 +161,11 @@ namespace IRaCIS.Core.Application throw new BusinessValidationFailedException("父问题的序号要比子问题序号小,请确认"); } + if( await _trialRepository.AnyAsync(t =>t.Id== signConfirmDTO.TrialId && t.QCQuestionConfirmedUserId != null && t.QCQuestionConfirmedUserId!= _userInfo.Id)) + { + throw new BusinessValidationFailedException("QC审核问题已被其他QC确认,不允许再次确认"); + } + await _trialRepository.UpdatePartialFromQueryAsync(t => t.Id == signConfirmDTO.TrialId, u => new Trial() { QCQuestionConfirmedTime = DateTime.Now, QCQuestionConfirmedUserId = _userInfo.Id, IsQCQuestionConfirmed = true }); }