From 6107e391bf33a38094ef8d655598d220c6a23bad Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 24 Jun 2022 15:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/Reading/Dto/ReadingClinicalDataDto.cs | 10 ++++++++++
.../Service/Reading/ReadingClinicalDataService.cs | 4 +++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
index d5b51bdce..2d7bc4930 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
@@ -72,6 +72,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public string ClinicalDataSetName { get; set; }
+ ///
+ /// 模板文件名称
+ ///
+ public string FileName { get; set; }
+
+ ///
+ /// 文件路径
+ ///
+ public string Path { get; set; }
+
public List ReadingClinicalDataList { get; set; }
}
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
index dafa0e639..919b1a680 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
@@ -120,11 +120,13 @@ namespace IRaCIS.Application.Services
public async Task> GetCRCClinicalData(GetCRCClinicalDataInDto inDto)
{
- List cRCClinicalDataList = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == inDto.TrialId && x.UploadRole == UploadRole.CRC)
+ List cRCClinicalDataList = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == inDto.TrialId && x.UploadRole == UploadRole.CRC&&x.ClinicalDataLevel != ClinicalLevel.Read)
.Select(x => new GetCRCClinicalDataOutDto()
{
ClinicalDataSetName = x.ClinicalDataSetName,
ClinicalDataTrialSetId = x.Id,
+ FileName=x.FileName,
+ Path=x.Path,
}).ToListAsync() ;
PageOutput clinicalData = await this.GetReadingClinicalDataList(new GetReadingClinicalDataListIndto()