diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index b2b6cb602..744bf86e9 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -460,15 +460,6 @@
-
-
- 受试者 阅片期 进度表 导出
-
-
-
-
-
-
Subject 进展表 --new
diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
index cb47c580d..1749c0356 100644
--- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
@@ -159,38 +159,38 @@ namespace IRaCIS.Core.Application.Service.Common
- ///
- /// 受试者 阅片期 进度表 导出
- ///
- ///
- ///
- ///
- ///
- [HttpPost]
- public async Task GetSubjectReadingPeriod_Export(GetReadModuleDto dto,
- [FromServices] IRepository _commonDocumentRepository,
- [FromServices] IDictionaryService _dictionaryService,
- [FromServices] IRepository _trialRepository)
- {
+ /////
+ ///// 受试者 阅片期 进度表 导出
+ /////
+ /////
+ /////
+ /////
+ /////
+ //[HttpPost]
+ //public async Task GetSubjectReadingPeriod_Export(GetReadModuleDto dto,
+ // [FromServices] IRepository _commonDocumentRepository,
+ // [FromServices] IDictionaryService _dictionaryService,
+ // [FromServices] IRepository _trialRepository)
+ //{
- var list = await _repository.Where(u => u.TrialId == dto.TrialId)
- .WhereIf(dto.SubjectId != null, x => x.Id == dto.SubjectId)
- .WhereIf(dto.TrialSiteCode != null && dto.TrialSiteCode != string.Empty, x => x.TrialSite.TrialSiteCode == dto.TrialSiteCode)
- .WhereIf(dto.SubjectCode != null && dto.SubjectCode != string.Empty, x => x.Code == dto.SubjectCode)
- //.WhereIf(dto.ReadingStatus != null, x => x.ReadingStatus == dto.ReadingStatus)
+ // var list = await _repository.Where(u => u.TrialId == dto.TrialId)
+ // .WhereIf(dto.SubjectId != null, x => x.Id == dto.SubjectId)
+ // .WhereIf(dto.TrialSiteCode != null && dto.TrialSiteCode != string.Empty, x => x.TrialSite.TrialSiteCode == dto.TrialSiteCode)
+ // .WhereIf(dto.SubjectCode != null && dto.SubjectCode != string.Empty, x => x.Code == dto.SubjectCode)
+ // //.WhereIf(dto.ReadingStatus != null, x => x.ReadingStatus == dto.ReadingStatus)
- .ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
+ // .ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
- list = list.OrderBy(t => t.TrialSiteCode).ThenBy(t => t.Code).ToList();
+ // list = list.OrderBy(t => t.TrialSiteCode).ThenBy(t => t.Code).ToList();
- var exportInfo = (await _trialRepository.Where(t => t.Id == dto.TrialId).IgnoreQueryFilters().ProjectTo(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
+ // var exportInfo = (await _trialRepository.Where(t => t.Id == dto.TrialId).IgnoreQueryFilters().ProjectTo(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
- exportInfo.List = list;
+ // exportInfo.List = list;
- return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SubjectExportDTO));
- }
+ // return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SubjectExportDTO));
+ //}
@@ -964,7 +964,7 @@ namespace IRaCIS.Core.Application.Service.Common
.WhereIf(queryVisitTask.EndAllocateDate != null, t => t.AllocateTime < queryVisitTask.EndAllocateDate!.Value.AddDays(1))
.ProjectTo(_mapper.ConfigurationProvider, new { criterionType = criterion.CriterionType }).ToListAsync();
-
+ list= list.OrderBy(t=>t.SubjectCode).ThenBy(t=>t.VisitTaskNum).ToList();
var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
exportInfo.CriterionName = criterion.CriterionName;