返回log信息修改

performance/Performance.Services/AllotCompute/ImportDataService.cs

@@ -104,8 +104,16 @@ private PerExcel Import(per_allot allot)
                     if (SheetType.Unidentifiable != sheetType)
                     {
                         logManageService.WriteMsg("开始读取excel文件", $"开始读取sheet -- {sheet.SheetName}", 1, allot.ID, "ReceiveMessage", true);
-                        var st = perSheetService.Sheet(sheet, isnew);
-                        excel.PerSheet.Add(st);
+                        try
+                        {
+                            var st = perSheetService.Sheet(sheet, isnew);
+                            excel.PerSheet.Add(st);
+                        }
+                        catch (Exception ex)
+                        {
+                            logManageService.WriteMsg("读取excel文件", ex.Message.ToString(), 4, allot.ID, "ReceiveMessage", true);
+                            throw ex;
+                        }
                     }
                     else
                     {

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadClinicEmployee.cs

@@ -43,7 +43,7 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
             foreach (var item in headers)
             {
                 if (!perHeader.Any(p => p.CellValue == item))
-                    throw new NullReferenceException($"{sheet.SheetName}中{item}列为空");
+                    throw new NullReferenceException($"sheet '{sheet.SheetName}'中列'{item}'为空");
             }
             for (int r = Point.DataFirstRowNum.Value; r < sheet.LastRowNum + 1; r++)
             {

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadDeptAccounting.cs

@@ -46,7 +46,7 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
             foreach (var item in headers)
             {
                 if (!perHeader.Any(p => p.CellValue == item))
-                    throw new NullReferenceException($"{sheet.SheetName}中{item}列为空");
+                    throw new NullReferenceException($"sheet '{sheet.SheetName}'中列'{item}'为空");
             }
             for (int r = Point.DataFirstRowNum.Value; r < sheet.LastRowNum + 1; r++)
             {

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadEmployee.cs

@@ -45,7 +45,7 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
             foreach (var item in headers)
             {
                 if (!perHeader.Any(p => p.CellValue == item))
-                    throw new NullReferenceException($"{sheet.SheetName}中{item}列为空");
+                    throw new NullReferenceException($"sheet '{sheet.SheetName}'中列'{item}'为空");
             }
             for (int r = Point.DataFirstRowNum.Value; r < sheet.LastRowNum + 1; r++)
             {

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadSpecialUnit.cs

@@ -38,7 +38,7 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
             foreach (var item in headers)
             {
                 if (!perHeader.Any(p => p.CellValue == item))
-                    throw new NullReferenceException($"{sheet.SheetName}中{item}列为空");
+                    throw new NullReferenceException($"sheet '{sheet.SheetName}'中列'{item}'为空");
             }
             // 特殊科室多科室聚合，合并时保留科室名称
             string lastAccount = "";