绩效基础参考核算值、特殊核算单元数量取值方法修改，特殊核算发放部分值取整

performance/Performance.Services/ComputeService.cs

@@ -206,7 +206,17 @@ public List<res_specialunit> GetSpecial(int allotId)
             if (list != null && list.Any())
             {
                 list = list.OrderByDescending(t => t.AccountingUnit).ThenBy(t => t.RealGiveFee).ToList();
-                return Mapper.Map<List<res_specialunit>>(list);
+                var data = Mapper.Map<List<res_specialunit>>(list);
+                if (data != null && data.Any())
+                {
+                    data.ForEach(t =>
+                    {
+                        t.GiveFee = Math.Round(t.GiveFee ?? 0);
+                        t.RealGiveFee = Math.Round(t.RealGiveFee ?? 0);
+                        t.ResultsTotalFee = Math.Round(t.ResultsTotalFee ?? 0);
+                    });
+                }
+                return data;
             }
             return new List<res_specialunit>();
         }

performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs

@@ -449,7 +449,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, per_allot
                     //Workload = item.Workload
 
                 };
-                decimal? baiscnorm = 1;
+                decimal? baiscnorm = item.FitPeopleValue;
                 var perforTypeItem = perforTypeArray.FirstOrDefault(t => t.Description == item.FitPeople);
                 if (perforTypeItem != null)
                 {
@@ -465,7 +465,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, per_allot
                     }
                 }
                 //添加参数计算
-                compute.BaiscNormValue = baiscnorm * (item.FitPeopleRatio ?? 0);
+                compute.BaiscNormValue = (baiscnorm ?? 0) * (item.FitPeopleRatio ?? 0);
                 //应发绩效
                 compute.GiveFee = Math.Round((compute.BaiscNormValue * compute.PostCoefficient * (compute.WorkYear ?? 1) * compute.Attendance * compute.ScoreAverageRate
                    + (compute.OtherPerfor ?? 0) + (compute.Punishment ?? 0)) ?? 0);

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

@@ -61,7 +61,7 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
                     DoctorName = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "医生姓名").PointCell)?.StringCellValue,
                     JobTitle = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "职务分类").PointCell)?.StringCellValue,
                     FitPeople = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "绩效基数核算参考对象").PointCell)?.StringCellValue,
-                    FitPeopleValue = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "绩效基础核算参考值").PointCell)?.ToString()),
+                    FitPeopleValue = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "绩效基础核算参考值").PointCell)?.NumericCellValue),
                     FitPeopleRatio = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "绩效基数核算系数").PointCell)?.NumericCellValue),
                     AccountType = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "人员分类").PointCell)?.StringCellValue,
                     PostCoefficient = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "岗位系数").PointCell)?.NumericCellValue),

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

@@ -53,7 +53,7 @@ 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)?.ToString()),
+                    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),
                 };
                 var cell = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "科室").PointCell);//?.ToString();