特殊科室取值修改

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

@@ -53,8 +53,8 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
                     //AccountingUnit = accountingUnit,
                     //Department = accountingUnit,
                     QuantitativeIndicators = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "量化指标").PointCell)?.StringCellValue,
-                    Quantity = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "数量").PointCell)?.NumericCellValue),
-                    QuantitativeIndicatorsValue = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "量化指标绩效分值").PointCell)?.NumericCellValue),
+                    Quantity = NopiSevice.GetCellValue(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "数量").PointCell)),
+                    QuantitativeIndicatorsValue = NopiSevice.GetCellValue(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "量化指标绩效分值").PointCell)),
                 };
                 var cell = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "科室").PointCell);//?.ToString();
                 var accountingUnit = NopiSevice.GetCellStringValue(cell);
@@ -72,11 +72,11 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
 
                 specialUnit.AccountingUnit = accountingUnit;
                 specialUnit.Department = accountingUnit;
-                specialUnit.Number = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "人数").PointCell)?.NumericCellValue);
-                specialUnit.ScoringAverage = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "考核得分率").PointCell)?.NumericCellValue);
-                specialUnit.OtherPerfor = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "其他绩效").PointCell)?.NumericCellValue);
-                specialUnit.Punishment = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "医院奖罚").PointCell)?.NumericCellValue);
-                specialUnit.Adjust = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "调节系数").PointCell)?.NumericCellValue);
+                specialUnit.Number = NopiSevice.GetCellValue(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "人数").PointCell));
+                specialUnit.ScoringAverage = NopiSevice.GetCellValue(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "考核得分率").PointCell));
+                specialUnit.OtherPerfor = NopiSevice.GetCellValue(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "其他绩效").PointCell));
+                specialUnit.Punishment = NopiSevice.GetCellValue(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "医院奖罚").PointCell));
+                specialUnit.Adjust = NopiSevice.GetCellValue(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "调节系数").PointCell));
                 //}
                 if (!string.IsNullOrEmpty(specialUnit.QuantitativeIndicators) && specialUnit.QuantitativeIndicatorsValue != null)
                     dataList.Add(specialUnit);