From c46226099098b36968b68614928c27fd6c12493e Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 30 Jun 2022 14:50:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 4 ++-- .../Reading/Dto/ReadingClinicalDataDto.cs | 2 +- .../Reading/ReadingClinicalDataService.cs | 17 +++++++---------- IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs | 14 +++++++------- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 72ae08d78..c16d5b2b3 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -2189,11 +2189,11 @@ - + 删除项目的医学审核问题 - + diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs index 86c96b488..e9e6c24ec 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs @@ -157,7 +157,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 获取访视列表 /// - public class GetReadingClinicalDataListIndto :PageInput + public class GetReadingClinicalDataListIndto { [Required(ErrorMessage = "SubjectId为null")] public Guid SubjectId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs index 8417c0770..4d44ebf99 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs @@ -138,10 +138,8 @@ namespace IRaCIS.Application.Services Path=x.ClinicalDataTrialSet.Path, }).ToListAsync() ; - PageOutput clinicalData = (await this.GetReadingClinicalDataList(new GetReadingClinicalDataListIndto() + List clinicalData = (await this.GetReadingClinicalDataList(new GetReadingClinicalDataListIndto() { - PageIndex = 1, - PageSize = 9999, SubjectId = inDto.SubjectId, ReadingId = inDto.SubjectVisitId, TrialId=inDto.TrialId, @@ -153,7 +151,7 @@ namespace IRaCIS.Application.Services foreach (var item in cRCClinicalDataList) { - item.PDFFileList = clinicalData.CurrentPageData.Where(y => y.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).SelectMany(x=>x.FileList).ToList(); + item.PDFFileList = clinicalData.Where(y => y.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).SelectMany(x=>x.FileList).ToList(); item.ClinicalTableData = new ClinicalDataTable() { PreviousHistoryList = previousHistoryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(), @@ -285,7 +283,7 @@ namespace IRaCIS.Application.Services /// /// [HttpPost] - public async Task<(PageOutput,object)> GetReadingClinicalDataList(GetReadingClinicalDataListIndto inDto) + public async Task<(List,object)> GetReadingClinicalDataList(GetReadingClinicalDataListIndto inDto) { GetTrialClinicalDataSelectIndto getTrialClinicalDataSelectIndto = new GetTrialClinicalDataSelectIndto() { @@ -306,8 +304,6 @@ namespace IRaCIS.Application.Services var resultQuery = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId) .Where(x => x.ReadingId == inDto.ReadingId) .WhereIf(inDto.UploadRole == UploadRole.CRC, x => x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC) - .Where(x => x.ClinicalDataTrialSet.UploadRole != UploadRole.CRC&&x.ClinicalDataTrialSet.ClinicalUploadType!=ClinicalUploadType.PDF&&x.ReadingClinicalDataPDFList.Count()!=0) - //.WhereIf(inDto.UploadRole == UploadRole.PM && !isBaseLine, x => x.ClinicalDataTrialSet.UploadRole == UploadRole.PM) .Select(x => new GetReadingClinicalDataListOutDto() { ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel, @@ -328,12 +324,13 @@ namespace IRaCIS.Application.Services }).ToList() }); - var result=await resultQuery.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField == null ? nameof(GetReadingClinicalDataListOutDto.ClinicalDataSetName) : inDto.SortField, - inDto.Asc); + var result = await resultQuery.ToListAsync(); + result = result.Where(x => !(x.UploadRole == UploadRole.CRC && x.ClinicalUploadType == ClinicalUploadType.PDF && x.FileList.Count() == 0)).ToList(); + var previousHistoryList = await _previousHistoryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); var previousOtherList = await _previousOtherRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); var previousSurgeryList = await _previousSurgeryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); - foreach (var item in result.CurrentPageData) + foreach (var item in result) { item.ClinicalTableData = new ClinicalDataTable() { diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 936a3aca0..b4120536a 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -120,17 +120,17 @@ namespace IRaCIS.Core.Domain.Share /// public enum ClinicalUploadType { - /// - /// PDF - /// - [Display(Name = "PDF")] - PDF = 0, - /// /// 表格 /// [Display(Name = "表格")] - Table = 1, + Table = 0, + + /// + /// PDF + /// + [Display(Name = "PDF")] + PDF = 1, }