修改导表

IRaCIS.Core.Application/Helper/ExcelExportHelper.cs

@@ -1,4 +1,5 @@
-using IRaCIS.Application.Interfaces;
+using DocumentFormat.OpenXml.Drawing.Diagrams;
+using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Hosting;
@@ -83,10 +84,12 @@ public static class ExcelExportHelper
                         }
 
                         itemDic.Add("No", no++);
+
+
                         newObjList.Add(itemDic);
                     }
 
-                    dic[key] = newObjList;
+                    dic[key] =  newObjList ;
 
                 }
             }

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -75,7 +75,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
 
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialCRCUploadImageList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(CRCVisitExportDTO));
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialCRCUploadImageList_Export, exportInfo, $"{exportInfo.TrialCode}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(CRCVisitExportDTO));
 
         }
 
@@ -120,7 +120,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             exportInfo.List = list;
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialQCImageChanllengeList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(QCChanllengeExportDto));
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialQCImageChanllengeList_Export, exportInfo, $"{exportInfo.TrialCode}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(QCChanllengeExportDto));
         }
 
 
@@ -153,7 +153,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             exportInfo.List = list;
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SubjectExportDTO));
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectList_Export, exportInfo, $"{exportInfo.TrialCode}", _commonDocumentRepository , _hostEnvironment, _dictionaryService, typeof(SubjectExportDTO));
 
         }
 
@@ -189,7 +189,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             exportInfo.List = list;
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SubjectExportDTO));
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectList_Export, exportInfo, $"{exportInfo.TrialCode}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SubjectExportDTO));
         }
 
 
@@ -328,7 +328,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             return new FileStreamResult(memoryStream2, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
             {
-                FileDownloadName = $"{fileName.Substring(startIndex: 0, fileName.LastIndexOf('.'))}_{DateTime.Now.ToString("yyyyMMddHHmmss")}.xlsx"
+                FileDownloadName = $"{exportInfo.TrialCode}_{exportInfo.CriterionName}_{fileName.Substring(startIndex: 0, fileName.LastIndexOf('.'))}_{DateTime.Now.ToString("yyyyMMddHHmmss")}.xlsx"
             };
 
         }
@@ -358,7 +358,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             exportInfo.List = list;
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectReadingPeriodList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReadPeriodExportDto));
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectReadingPeriodList_Export, exportInfo, $"{exportInfo.TrialCode}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReadPeriodExportDto));
 
         }
 
@@ -442,7 +442,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             exportInfo.List = list;
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialStudyList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(UnionStudyExportDTO));
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialStudyList_Export, exportInfo, $"{exportInfo.TrialCode}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(UnionStudyExportDTO));
         }
 
 
@@ -476,7 +476,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             exportInfo.List = list;
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectVisitCheckList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(PMKCheckEXportDTO));
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectVisitCheckList_Export, exportInfo, $"{exportInfo.TrialCode}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(PMKCheckEXportDTO));
         }
 
 
@@ -523,7 +523,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             exportInfo.List = list;
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialReadingTaskList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReadingTaskExportDto));
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialReadingTaskList_Export, exportInfo, $"{exportInfo.TrialCode}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReadingTaskExportDto));
         }
 
 
@@ -570,7 +570,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             exportInfo.List = list;
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialReReadingTaskList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReReadingTaskExportDto));
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialReReadingTaskList_Export, exportInfo, $"{exportInfo.TrialCode}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReReadingTaskExportDto));
         }
 
 
@@ -608,7 +608,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             exportInfo.List = list;
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialMedicalReviewList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(TaskMedicalReviewExportDto));
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialMedicalReviewList_Export, exportInfo, $"{exportInfo.TrialCode}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(TaskMedicalReviewExportDto));
         }
 
 
@@ -625,9 +625,9 @@ namespace IRaCIS.Core.Application.Service.Common
                 [FromServices] IRepository<Trial> _trialRepository)
         {
 
-            var criterionType = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => t.CriterionType).FirstOrDefaultAsync();
+            var criterion = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName }).FirstOrDefaultAsync();
 
-            if (criterionType != CriterionType.RECIST1Pointt1)
+            if (criterion.CriterionType != CriterionType.RECIST1Pointt1)
             {
                 throw new Exception("当前标准导出还未支持");
             }
@@ -684,9 +684,10 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
+            exportInfo.CriterionName = await _repository.Where<ReadingQuestionCriterionTrial>(u => u.TrialId == queryVisitTask.TrialId && u.IsConfirm && u.Id == queryVisitTask.TrialReadingCriterionId).Select(t => t.CriterionName).FirstOrDefaultAsync();
             exportInfo.List = list;
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSelfAnalysisList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SelftAnalysisExport));
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSelfAnalysisList_Export, exportInfo, $"{exportInfo.TrialCode}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SelftAnalysisExport));
         }
 
 
@@ -701,9 +702,9 @@ namespace IRaCIS.Core.Application.Service.Common
                 [FromServices] IDictionaryService _dictionaryService,
                 [FromServices] IRepository<Trial> _trialRepository)
         {
-            var criterionType = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => t.CriterionType).FirstOrDefaultAsync();
+            var criterion = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName }).FirstOrDefaultAsync();
 
-            if (criterionType != CriterionType.RECIST1Pointt1)
+            if (criterion.CriterionType != CriterionType.RECIST1Pointt1)
             {
                 throw new Exception("当前标准导出还未支持");
             }
@@ -781,10 +782,10 @@ namespace IRaCIS.Core.Application.Service.Common
 
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
-
+            exportInfo.CriterionName = await _repository.Where<ReadingQuestionCriterionTrial>(u => u.TrialId == queryVisitTask.TrialId && u.IsConfirm && u.Id == queryVisitTask.TrialReadingCriterionId).Select(t => t.CriterionName).FirstOrDefaultAsync();
             exportInfo.List = newList;
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialGroupAnalysisList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(GroupAnalysisExport));
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialGroupAnalysisList_Export, exportInfo, $"{exportInfo.TrialCode}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(GroupAnalysisExport));
         }
 
 
@@ -821,9 +822,9 @@ namespace IRaCIS.Core.Application.Service.Common
         {
 
             var list = new List<ExportDocumentDes>();
-            var criterionType = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == trialReadingCriterionId).Select(t => t.CriterionType).FirstOrDefaultAsync();
+            var criterion = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == trialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName }).FirstOrDefaultAsync();
 
-            if (criterionType == CriterionType.RECIST1Pointt1)
+            if (criterion.CriterionType == CriterionType.RECIST1Pointt1)
             {
                 list.Add(new ExportDocumentDes() { Code = StaticData.Export.OverallTumorEvaluation_Export, ExportCatogory = ExportCatogory.OverallTumorEvaluation });
                 list.Add(new ExportDocumentDes() { Code = StaticData.Export.RECIST1Point1EvaluationOfTumorEfficacy_Export, ExportCatogory = ExportCatogory.EvaluationOfTumorEfficacy });
@@ -859,9 +860,9 @@ namespace IRaCIS.Core.Application.Service.Common
 
 
             //每次查询必须是单标准的
-            var criterionType = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => t.CriterionType).FirstOrDefaultAsync();
+            var criterion = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName }).FirstOrDefaultAsync();
 
-            if (criterionType != CriterionType.RECIST1Pointt1)
+            if (criterion.CriterionType != CriterionType.RECIST1Pointt1)
             {
                 throw new Exception("当前标准导出还未支持");
             }
@@ -886,16 +887,17 @@ namespace IRaCIS.Core.Application.Service.Common
                .WhereIf(!string.IsNullOrEmpty(queryVisitTask.SubjectCode), t => t.Subject.Code.Contains(queryVisitTask.SubjectCode))
                .WhereIf(queryVisitTask.BeginAllocateDate != null, t => t.AllocateTime > queryVisitTask.BeginAllocateDate)
                .WhereIf(queryVisitTask.EndAllocateDate != null, t => t.AllocateTime < queryVisitTask.EndAllocateDate!.Value.AddDays(1))
-               .ProjectTo<OverallTumorEvaluationExport>(_mapper.ConfigurationProvider, new { criterionType = criterionType }).ToListAsync();
+               .ProjectTo<OverallTumorEvaluationExport>(_mapper.ConfigurationProvider, new { criterionType = criterion.CriterionType }).ToListAsync();
 
 
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
+            exportInfo.CriterionName = await _repository.Where<ReadingQuestionCriterionTrial>(u => u.TrialId == queryVisitTask.TrialId && u.IsConfirm && u.Id == queryVisitTask.TrialReadingCriterionId).Select(t => t.CriterionName).FirstOrDefaultAsync(); 
 
             exportInfo.List = list;
 
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.OverallTumorEvaluation_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(OverallTumorEvaluationExport), criterionType);
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.OverallTumorEvaluation_Export, exportInfo, $"{exportInfo.TrialCode}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(OverallTumorEvaluationExport), criterion.CriterionType);
         }
 
         /// <summary>
@@ -915,7 +917,7 @@ namespace IRaCIS.Core.Application.Service.Common
         {
 
             //每次查询必须是单标准的
-            var criterionType = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => t.CriterionType).FirstOrDefaultAsync();
+            var criterion = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName} ).FirstOrDefaultAsync();
 
             var query = _repository.Where<VisitTask>(t => t.TrialId == queryVisitTask.TrialId && t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false && t.ReadingTaskState == ReadingTaskState.HaveSigned)
 
@@ -939,15 +941,15 @@ namespace IRaCIS.Core.Application.Service.Common
                .WhereIf(queryVisitTask.EndAllocateDate != null, t => t.AllocateTime < queryVisitTask.EndAllocateDate!.Value.AddDays(1));
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
+            exportInfo.CriterionName = criterion.CriterionName;
 
-
+            if (criterion.CriterionType == CriterionType.RECIST1Pointt1)
-            if (criterionType == CriterionType.RECIST1Pointt1)
             {
-                var list = await query.ProjectTo<RECIST1Point1EvaluationOfTumorEfficacyExport>(_mapper.ConfigurationProvider, new { criterionType = criterionType }).ToListAsync();
+                var list = await query.ProjectTo<RECIST1Point1EvaluationOfTumorEfficacyExport>(_mapper.ConfigurationProvider, new { criterionType = criterion.CriterionType }).ToListAsync();
 
                 exportInfo.List = list;
 
-                return await ExcelExportHelper.DataExportAsync(StaticData.Export.RECIST1Point1EvaluationOfTumorEfficacy_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(RECIST1Point1EvaluationOfTumorEfficacyExport), criterionType);
+                return await ExcelExportHelper.DataExportAsync(StaticData.Export.RECIST1Point1EvaluationOfTumorEfficacy_Export, exportInfo, $"{exportInfo.TrialCode}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(RECIST1Point1EvaluationOfTumorEfficacyExport), criterion.CriterionType);
             }
 
             else
@@ -972,7 +974,7 @@ namespace IRaCIS.Core.Application.Service.Common
         {
 
             //每次查询必须是单标准的
-            var criterionType = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => t.CriterionType).FirstOrDefaultAsync();
+            var criterion = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName }).FirstOrDefaultAsync();
 
             var query = _repository.Where<VisitTask>(t => t.TrialId == queryVisitTask.TrialId && t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false && t.ReadingTaskState == ReadingTaskState.HaveSigned)
 
@@ -996,11 +998,11 @@ namespace IRaCIS.Core.Application.Service.Common
                .WhereIf(queryVisitTask.EndAllocateDate != null, t => t.AllocateTime < queryVisitTask.EndAllocateDate!.Value.AddDays(1));
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
+            exportInfo.CriterionName = criterion.CriterionName;
 
-
+            if (criterion.CriterionType == CriterionType.RECIST1Pointt1)
-            if (criterionType == CriterionType.RECIST1Pointt1)
             {
-                var list = await query.ProjectTo<RECIST1Point1DetailedOfEvaluatedLesionExport>(_mapper.ConfigurationProvider, new { criterionType = criterionType, isEn_Us = _userInfo.IsEn_Us }).ToListAsync();
+                var list = await query.ProjectTo<RECIST1Point1DetailedOfEvaluatedLesionExport>(_mapper.ConfigurationProvider, new { criterionType = criterion.CriterionType, isEn_Us = _userInfo.IsEn_Us }).ToListAsync();
 
 
                 var exportList = list.SelectMany(c =>
@@ -1028,7 +1030,7 @@ namespace IRaCIS.Core.Application.Service.Common
                 }).ToList();
                 exportInfo.List = exportList;
 
-                return await ExcelExportHelper.DataExportAsync(StaticData.Export.RECIST1Point1DetailedOfEvaluatedLesion_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(RECIST1Point1DetailedOfEvaluatedLesionExport), criterionType);
+                return await ExcelExportHelper.DataExportAsync(StaticData.Export.RECIST1Point1DetailedOfEvaluatedLesion_Export, exportInfo, $"{exportInfo.TrialCode}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(RECIST1Point1DetailedOfEvaluatedLesionExport), criterion.CriterionType);
 
 
             }

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -244,10 +244,9 @@ namespace IRaCIS.Core.Application.Contracts
         //public DateTime? SignDate { get; set; }
         //public bool IsUrgent { get; set; }
 
-        [ExcelFormat("MMMM dd, yyyy")]
+        //[ExcelColumn(Name = "FirstGiveMedicineTime", Format = "yyyy-MM-dd")]
         public DateTime? FirstGiveMedicineTime { get; set; }
 
-        [ExcelColumn(Name = "FirstGiveMedicineTime", Format = "yyyy-MM-dd")]
 
         public string FirstGiveMedicineTimeStr => FirstGiveMedicineTime?.ToString("yyyy-MM-dd");
 
@@ -424,6 +423,8 @@ namespace IRaCIS.Core.Application.Contracts
         [ExcelFormat("yyyy-MM-dd")]
         public DateTime? FirstGiveMedicineTime { get; set; }
 
+        public string FirstGiveMedicineTimeStr => FirstGiveMedicineTime?.ToString("yyyy-MM-dd");
+
         public string ModuleName { get; set; }
 
 
@@ -447,6 +448,8 @@ namespace IRaCIS.Core.Application.Contracts
         [ExcelFormat("yyyy-MM-dd")]
         public DateTime? StudyTime { get; set; }
 
+        public string StudyTimeStr => StudyTime?.ToString("yyyy-MM-dd");
+
         public string SubjectCode { get; set; } = String.Empty;
 
         public string VisitName { get; set; } = string.Empty;
@@ -840,7 +843,7 @@ namespace IRaCIS.Core.Application.Contracts
         public string BodyPartDescription { get; set; }
 
         //测量值
-        public string MeasurementResult { get; set; }
+        //public string MeasurementResult { get; set; }
 
 
         //长径
@@ -1148,6 +1151,9 @@ namespace IRaCIS.Core.Application.Contracts
 
         [ExcelFormat("yyyy-MM-dd")]
         public DateTime? StudyTime { get; set; }
+
+        public string StudyTimeStr => StudyTime?.ToString("yyyy-MM-dd");
+
         public DateTime? CheckTime { get; set; }
         public CheckChanllengeTypeEnum CheckChallengeState { get; set; }