读取Excel改同步

performance/Performance.Services/AllotCompute/ImportDataService.cs

@@ -75,13 +75,13 @@ private PerExcel Import(per_allot allot)
                 Version = FileHelper.GetExtension(path) == ".xlsx" ? ExcelVersion.xlsx : ExcelVersion.xls,
                 PerSheet = new List<PerSheet>()
             };
+
+            _logManageService.WriteMsg("读取文件", $"文件读取中...当前操作需要一点时间，请耐心等待", 1, allot.ID, "ReceiveMessage", true);
+
             using (FileStream fs = new FileStream(path, FileMode.Open))
             {
-                IWorkbook workbook = (excel.Version == ExcelVersion.xlsx)
-                    ? (IWorkbook)(new XSSFWorkbook(fs))
-                    : (IWorkbook)(new HSSFWorkbook(fs));
+                IWorkbook workbook = (excel.Version == ExcelVersion.xlsx) ? new XSSFWorkbook(fs) : new HSSFWorkbook(fs);
                 bool isnew = false;
-                var tasks = new List<Task>();
                 for (int i = 0; i < workbook.NumberOfSheets; i++)
                 {
                     var sheet = workbook.GetSheetAt(i);
@@ -93,8 +93,6 @@ private PerExcel Import(per_allot allot)
 
                     try
                     {
-                        tasks.Add(Task.Factory.StartNew(() =>
-                        {
                         // 保留临床科室测算表全部结构，用作展示，不做其他用途
                         if (sheetType == SheetType.AccountBasic)
                         {
@@ -112,7 +110,7 @@ private PerExcel Import(per_allot allot)
                             if (sheet.SheetName.Contains("开单医院"))
                                 isnew = true;
                         }
-                        }));
+
                     }
                     catch (Exception ex)
                     {
@@ -121,9 +119,6 @@ private PerExcel Import(per_allot allot)
                     }
                 }
 
-                _logManageService.WriteMsg("读取文件", $"文件读取中...当前操作需要一点时间，请耐心等待", 1, allot.ID, "ReceiveMessage", true);
-
-                Task.WaitAll(tasks.ToArray());
 
                 _logManageService.WriteMsg("读取文件", $"EXCEL文件基础数据读取完成!", 1, allot.ID, "ReceiveMessage", true);
                 return excel;