diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 27742c57f..6f9d602ad 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -1174,7 +1174,7 @@ namespace IRaCIS.Core.Application.Image.QA var dbSubjectVisitList = await _subjectVisitRepository.Where(t => cRCRequestToQCCommand.SubjectVisitIds.Contains(t.Id), true).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); //普通提交 - if (dbSubjectVisitList.Count() == 1) + if (dbSubjectVisitList.Count == 1) { var sv = dbSubjectVisitList[0]; @@ -1183,7 +1183,7 @@ namespace IRaCIS.Core.Application.Image.QA if (sv.PDState == PDStateEnum.PDProgress) { - if (nameList.Count() > 0) + if (nameList.Count > 0) { //$"当前访视要求进行疾病进展确认。请在提交当前访视前,先处理未提交的前序访视:{string.Join('、', nameList)}。" return ResponseOutput.NotOk(_localizer["QCOperation_DiseaseProgressConfirmation", string.Join('、', nameList)], 1, ApiResponseCodeEnum.NeedTips); @@ -1191,7 +1191,7 @@ namespace IRaCIS.Core.Application.Image.QA } else { - if (nameList.Count() > 0) + if (nameList.Count > 0) { //$"在提交当前访视后,请尽快处理尚未提交的前序访视:{string.Join('、', nameList)}。" return ResponseOutput.NotOk(_localizer["QCOperation_UnsubmittedVisits", string.Join('、', nameList)], 0, ApiResponseCodeEnum.NeedTips); @@ -1247,7 +1247,7 @@ namespace IRaCIS.Core.Application.Image.QA } //单个提交提示信息 - if (dbSubjectVisitList.Count() == 1 && dbSubjectVisitList.First().SubmitState == SubmitStateEnum.Submitted) + if (dbSubjectVisitList.Count == 1 && dbSubjectVisitList.First().SubmitState == SubmitStateEnum.Submitted) { //---当前访视的影像数据,已经由其他CRC提交。 return ResponseOutput.NotOk(_localizer["QCOperation_ImagesSubmitted"], 3, ApiResponseCodeEnum.NeedTips); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs index a3735827c..1ba89aa30 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs @@ -48,11 +48,11 @@ namespace IRaCIS.Core.Application //正参与的数量 TrialCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin ? await _trialRepository.CountAsync() - : await _trialUserRepository.Where(t => t.UserId == _userInfo.Id).CountAsync(), + : await _trialUserRepository.Where(t => t.UserId == _userInfo.Id && t.Trial.IsDeleted==false).CountAsync(), DeletedCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin ? await _trialRepository.AsQueryable(true).CountAsync(t => t.IsDeleted) - : await _trialUserRepository.AsQueryable(true).Where(t => t.UserId == _userInfo.Id && t.IsDeleted) + : await _trialUserRepository.AsQueryable(true).Where(t => t.UserId == _userInfo.Id && t.Trial.IsDeleted) .CountAsync(),