diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index 1532ee143..8dd91ca1c 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -216,6 +216,7 @@ namespace IRaCIS.Core.API.Controllers + /// diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs index f9271e34d..1ae66077d 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs @@ -89,7 +89,7 @@ namespace IRaCIS.Application.Services public async Task> GetTrialClinicalDataTrialSetList(GetTrialClinicalDataTrialIndto inDto) { await this.AddTrialClinicalDataTrialSet(inDto.TrialId); - return await _clinicalDataTrialSetRepository.AsQueryable() + var trialClinicalDataList= await _clinicalDataTrialSetRepository.AsQueryable() .Where(x => x.TrialId == inDto.TrialId) .WhereIf(inDto.ClinicalDataLevel!=null,x=>x.ClinicalDataLevel== inDto.ClinicalDataLevel) @@ -97,6 +97,17 @@ namespace IRaCIS.Application.Services .WhereIf(inDto.ClinicalDataSetName != String.Empty, x => x.ClinicalDataSetName.Contains(inDto.ClinicalDataSetName)) .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); + var crcClinicalData = await _previousPDFRepository.AnyAsync(x => x.TrialId == inDto.TrialId); + + trialClinicalDataList.ForEach(x => + { + if (x.ClinicalDataSetName == "既往局部治疗史") + { + x.IsUsed = crcClinicalData; + } + }); + return trialClinicalDataList; + } diff --git a/IRaCIS.Core.Domain/Reading/View/ReadingClinicalDataView.cs b/IRaCIS.Core.Domain/Reading/View/ReadingClinicalDataView.cs index 67f40bdf6..a3bdb5c1f 100644 --- a/IRaCIS.Core.Domain/Reading/View/ReadingClinicalDataView.cs +++ b/IRaCIS.Core.Domain/Reading/View/ReadingClinicalDataView.cs @@ -57,8 +57,5 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsSign { get; set; } - - - } }