From d3958dab42940a291c38b5d8900c5b00b24a5b95 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 11 Oct 2024 11:35:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=AF=BC=E5=87=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Common/ExcelExportService.cs | 2 +- IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index cd3c3e748..fa53af9f0 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -1367,7 +1367,7 @@ namespace IRaCIS.Core.Application.Service.Common }; - var list = await query.SortToListAsync(inQuery); + var list = await resultQuery.SortToListAsync(inQuery); var exportInfo = (await _trialRepository.Where(t => t.Id == inQuery.TrialId).IgnoreQueryFilters().ProjectTo(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException(); diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 08d2d03c7..65c118c37 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -801,6 +801,7 @@ namespace IRaCIS.Core.Application.Contracts public bool IsClinicalDataSign { get; set; } + [DictionaryTranslateAttribute("CompleteClinicalDataEnum")] public CompleteClinicalDataEnum CompleteClinicalDataEnum => (IsNeedClinicalDataSign && IsClinicalDataSign) ? CompleteClinicalDataEnum.Complete : (IsNeedClinicalDataSign && IsClinicalDataSign == false) ? CompleteClinicalDataEnum.NotComplete : CompleteClinicalDataEnum.NA;