读取“5.2业务中层行政中高层医院奖罚”BUG修复

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -387,7 +387,7 @@ public void ComputeOffice(per_allot allot, PerExcel excel)
                     // 夜班绩效 从医院奖罚的明细项中获取
                     var nightShift = adjustLaterOtherFee?.FirstOrDefault(w => w.UnitType == resAccount?.UnitType && w.AccountingUnit == dept.AccountingUnit && w.TypeName?.Trim() == "夜班绩效")?.CellValue ?? 0;
 
-                    dept.NightShiftWorkPerforFee = 0;
+                    dept.NightShiftWorkPerforFee = nightShift;
                     dept.ScoringAverage = resAccount?.ScoringAverage == null ? 0 : resAccount.ScoringAverage;
                     dept.AdjustFactor = (isBudget ? adjust : resAccount?.AdjustFactor) ?? 1;
                     dept.Extra = resAccount?.Extra ?? 0;

performance/Performance.Services/PerExcelService/NopiSevice.cs

@@ -71,7 +71,7 @@ public static string GetValue(this ICell cell)
                         case CellType.Numeric:
                             return cell?.NumericCellValue.ToString();
                         case CellType.String:
-                            return cell?.StringCellValue.ToString();
+                            return cell?.StringCellValue?.ToString() ?? "";
                         case CellType.Formula:
                             cell?.SetCellType(CellType.String);
                             return cell?.StringCellValue?.ToString();

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

@@ -39,14 +39,15 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
 
             var unit = Point.AccountingUnit.First();
             //查询除了 核算单元  科室名称 有效数据列头位置
-            var vhead = perHeader.Where(t => t.PointCell != unit.UnitTypeNum && t.PointCell != unit.AccountingUnitCellNum && t.PointCell != unit.DeptCellNum).OrderBy(t => t.PointCell);
+            var vhead = perHeader.Where(t => t.PointCell != unit.UnitTypeNum && t.PointCell != unit.AccountingUnitCellNum && t.PointCell != unit.JobCellNum && t.PointCell != unit.EmpNameCellNum).OrderBy(t => t.PointCell);
+            //var vhead = perHeader.OrderBy(t => t.PointCell);
 
             for (int r = Point.DataFirstRowNum.Value; r < sheet.LastRowNum + 1; r++)
             {
                 var row = sheet.GetRow(r);
                 if (row == null) continue;
 
-                for (int c = Point.DataFirstCellNum.Value; c < vhead.Count(); c++)
+                for (int c = 0; c < vhead.Count(); c++)
                 {
                     var athead = vhead.ElementAt(c);
                     //var cellValue = NopiSevice.GetCellValue(row.GetCell(athead.PointCell));