修改

IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs

@@ -35,12 +35,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// 从上传文件中获取Datatable
         /// </summary>
         /// <returns></returns>
-        public async Task<DataTable> GetDataTableFromUpload(IFormFile file,string pathCode,Guid trialId)
+        public async Task<FileToDataTableDto> GetDataTableFromUpload(IFormFile file,string pathCode,Guid trialId)
         {
 
-        
+            FileToDataTableDto result=new FileToDataTableDto ();
 
-            DataTable result = new DataTable();
+            result.DataTable = new DataTable();
             var fileFolder = "Upload\\";
             if (!Directory.Exists(fileFolder))
             {
@@ -59,8 +59,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     file.CopyTo(stream);
                     await stream.CopyToAsync(fileStream);
 
+                    result.SheetNames= stream.GetSheetNames();
                     stream.Position = 0;
-                    result = stream.QueryAsDataTable(useHeaderRow: false);
+                    result.DataTable = stream.QueryAsDataTable(useHeaderRow: false);
                 }
             }
             catch (Exception)
@@ -89,7 +90,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var rowsToRemove = new System.Collections.Generic.List<DataRow>();
 
             // 遍历DataTable的每一行
-            foreach (DataRow row in result.Rows)
+            foreach (DataRow row in result.DataTable.Rows)
             {
                 bool allEmpty = true;
 
@@ -113,7 +114,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             // 移除标记为待删除的行
             foreach (var row in rowsToRemove)
             {
-                result.Rows.Remove(row);
+                result.DataTable.Rows.Remove(row);
             }
             return result;
         }