From 35a9fe287857bd4a4524468eb2ac12255f0d5b09 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 27 Apr 2022 16:48:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BF=E8=A7=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 8 ++++- .../Service/QC/DTO/QCListViewModel.cs | 2 -- .../Service/QC/QCListService.cs | 31 ++++++++++++------- .../Service/TrialSiteUser/TrialService.cs | 5 ++- 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 7c17f99d6..7bd4e7dc1 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -44,7 +44,7 @@ FrontAuditConfigService - + 翻译稽查数据 @@ -205,6 +205,12 @@ 配置加急信息 + + + 稽查泛型Dto + + 泛型 + 用户 签名某个文档 Dto diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index afa2115ed..b98d477ea 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -1,5 +1,4 @@ using IRaCIS.Core.Domain.Share; -using IRaCIS.Core.Infrastructure.Extention; using System.ComponentModel.DataAnnotations; namespace IRaCIS.Core.Application.Contracts @@ -136,7 +135,6 @@ namespace IRaCIS.Core.Application.Contracts public DateTime? SubmitTime { get; set; } public AuditStateEnum AuditState { get; set; } - public ChallengeStateEnum ChallengeState { get; set; } public int? DicomStudyCount { get; set; } public int? NoneDicomStudyCount { get; set; } diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs index 350ff00e7..17e11c897 100644 --- a/IRaCIS.Core.Application/Service/QC/QCListService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs @@ -31,16 +31,20 @@ namespace IRaCIS.Core.Application.Image.QA var inPlanArray = VisitPlanArray.Where(t => !t.Contains('.')).Select(t => decimal.Parse(t)).ToArray(); var isSelectOutPlan = VisitPlanArray.Any(t => t.Contains('.')); - if (isSelectOutPlan) - { - svExpression = svExpression.And(t => t.InPlan == false); - - } if (inPlanArray.Length > 0) { - svExpression.Or(t => inPlanArray.Contains(t.VisitNum)); + svExpression = svExpression.And(t => inPlanArray.Contains(t.VisitNum)); } + + + if (isSelectOutPlan) + { + svExpression = svExpression.Or(t => t.InPlan == false); + + } + + } return svExpression; @@ -58,16 +62,19 @@ namespace IRaCIS.Core.Application.Image.QA var inPlanArray = VisitPlanArray.Where(t => !t.Contains('.')).Select(t => decimal.Parse(t)).ToArray(); var isSelectOutPlan = VisitPlanArray.Any(t => t.Contains('.')); - if (isSelectOutPlan) - { - svExpression = svExpression.And(t => t.SubjectVisit.InPlan == false); - - } if (inPlanArray.Length > 0) { - svExpression.Or(t => inPlanArray.Contains(t.SubjectVisit.VisitNum)); + svExpression = svExpression.And(t => inPlanArray.Contains(t.SubjectVisit.VisitNum)); } + + if (isSelectOutPlan) + { + svExpression = svExpression.Or(t => t.SubjectVisit.InPlan == false); + + } + + } return svExpression; diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs index 039c6ebf6..1bc5a6f89 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs @@ -63,8 +63,7 @@ namespace IRaCIS.Application.Services .WhereIf(multiModalityIdSelectCount > 0, t => t.TrialDicList.Count(t => t.KeyName == StaticData.Modality) == multiModalityIdSelectCount) .WhereIf(multiCriteriaSelectCount > 0, t => t.TrialDicList.Count(t => t.KeyName == StaticData.Criterion) == multiCriteriaSelectCount) .WhereIf(multiReviewTypeSelectCount > 0, t => t.TrialDicList.Count(t => t.KeyName == StaticData.ReviewType) == multiReviewTypeSelectCount) - .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id)) - .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.ProjectManager && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.APM, t => t.IsDeleted == false) + .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.IsDeleted == false) .ProjectTo(_mapper.ConfigurationProvider, new { userTypeEnumInt = _userInfo.UserTypeEnumInt, userId = _userInfo.Id }); return await query.ToPagedListAsync(searchParam.PageIndex, searchParam.PageSize, string.IsNullOrWhiteSpace(searchParam.SortField) ? "CreateTime" : searchParam.SortField, searchParam.Asc); @@ -75,7 +74,7 @@ namespace IRaCIS.Application.Services //过滤废除的项目 public async Task> GetTrialSelect() { - return await _trialRepository.AsQueryable() + return await _trialRepository.AsQueryable().IgnoreQueryFilters() .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin, t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.IsDeleted == false) .ProjectTo(_mapper.ConfigurationProvider).ToListAsync();