复核稽查修改008
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
08ff24b14a
commit
1aad2c6a3f
|
@ -732,7 +732,7 @@ namespace IRaCIS.Core.Application.Image.QA
|
||||||
if (currentQCType == CurrentQC.SecondReview)
|
if (currentQCType == CurrentQC.SecondReview)
|
||||||
{
|
{
|
||||||
//二次复核自动领取,如果有人先领取了,那么后续不能操作
|
//二次复核自动领取,如果有人先领取了,那么后续不能操作
|
||||||
await _subjectVisitRepository.UpdatePartialFromQueryAsync(t => t.Id == subjectVisitId && t.CurrentActionUserId == null, u => new SubjectVisit() { CurrentActionUserId = _userInfo.UserRoleId }, true);
|
await _subjectVisitRepository.UpdatePartialFromQueryAsync(t => t.Id == subjectVisitId && t.CurrentActionUserId == null, u => new SubjectVisit() { CurrentActionUserId = _userInfo.UserRoleId, IsTake = true }, true);
|
||||||
}
|
}
|
||||||
//验证是否能操作
|
//验证是否能操作
|
||||||
await VerifyIsCanQCAsync(null, subjectVisitId);
|
await VerifyIsCanQCAsync(null, subjectVisitId);
|
||||||
|
@ -1189,13 +1189,15 @@ namespace IRaCIS.Core.Application.Image.QA
|
||||||
{
|
{
|
||||||
var dbSubjectVisit = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId)).IfNullThrowException();
|
var dbSubjectVisit = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId)).IfNullThrowException();
|
||||||
|
|
||||||
|
//await VerifyIsCanQCAsync(dbSubjectVisit);
|
||||||
|
|
||||||
if (dbSubjectVisit.CurrentActionUserId == null && dbSubjectVisit.IsTake == false)
|
if (dbSubjectVisit.CurrentActionUserId == null && dbSubjectVisit.IsTake == false)
|
||||||
{
|
{
|
||||||
|
|
||||||
//---当前访视的影像质控任务已被原领取人释放。您可以通过“领取”获得
|
//---当前访视的影像质控任务已被原领取人释放。您可以通过“领取”获得
|
||||||
return ResponseOutput.NotOk(_localizer["QCOperation_QCImageTaskAlreadyReleased"], ApiResponseCodeEnum.NeedTips);
|
return ResponseOutput.NotOk(_localizer["QCOperation_QCImageTaskAlreadyReleased"], ApiResponseCodeEnum.NeedTips);
|
||||||
}
|
}
|
||||||
await VerifyIsCanQCAsync(dbSubjectVisit);
|
|
||||||
|
|
||||||
dbSubjectVisit.IsTake = true;
|
dbSubjectVisit.IsTake = true;
|
||||||
|
|
||||||
|
@ -2109,6 +2111,9 @@ namespace IRaCIS.Core.Application.Image.QA
|
||||||
if (isSecondPass)
|
if (isSecondPass)
|
||||||
{
|
{
|
||||||
sv.SecondReviewState = SecondReviewState.AuditPassed;
|
sv.SecondReviewState = SecondReviewState.AuditPassed;
|
||||||
|
sv.IsTake = false;
|
||||||
|
sv.CurrentActionUserId = null;
|
||||||
|
sv.CurrentActionUserExpireTime = null;
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue