From d5e89169341fbb64ef8184a2ff8ef43590b521f0 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 30 Jun 2022 13:55:33 +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

---
 .../Service/Reading/ReadingClinicalDataService.cs      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
index f44cd9c28..8417c0770 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
@@ -303,11 +303,13 @@ namespace IRaCIS.Application.Services
                 inDto.UploadRole = UploadRole.CRC;
             }
             var isBaseLine = await _subjectVisitRepository.AnyAsync(x => x.Id == inDto.ReadingId && x.IsBaseLine);
-            var resultQuery =  _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId)
+            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() {
+                .Select(x => new GetReadingClinicalDataListOutDto()
+                {
                     ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
                     SubjectId = x.SubjectId,
                     ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
@@ -315,14 +317,14 @@ namespace IRaCIS.Application.Services
                     IsSign = x.IsSign,
                     ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,
                     Id = x.Id,
-                    UploadRole=x.ClinicalDataTrialSet.UploadRole,
+                    UploadRole = x.ClinicalDataTrialSet.UploadRole,
                     IsCRCUpload = x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC,
                     FileList = x.ReadingClinicalDataPDFList.Select(y => new GetFileDto()
                     {
                         Id = y.Id,
                         FileName = y.FileName,
                         Path = y.Path,
-                        CreateTime=y.CreateTime,
+                        CreateTime = y.CreateTime,
                     }).ToList()
                 });