考核等分率、调节系数默认100%

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -195,12 +195,12 @@ public class ResultComputeService : IAutoInjection
                         QuantitativeIndicatorsValue = item.QuantitativeIndicatorsValue,
                         QuantitativeFee = item.Quantity * item.QuantitativeIndicatorsValue * headcount,
                         //ScoringAverage = scoreAverage.HasValue ? scoreAverage : dept?.ScoringAverage, 
-                        ScoringAverage = dept?.ScoringAverage ?? 0,
+                        ScoringAverage = dept?.ScoringAverage ?? 1,
                         //OtherPerfor = dept?.OtherPerfor1,
                         Punishment = (extra ?? 0),
                         MedicineExtra = (drugExtra ?? 0),
                         MaterialsExtra = (materialsExtra ?? 0),
-                        Adjust = isBudget ? adjust : (dept?.AdjustFactor ?? 0),
+                        Adjust = isBudget ? adjust : (dept?.AdjustFactor ?? 1),
 
                         AssessBeforeOtherFee = dept?.AssessBeforeOtherFee ?? 0,
                         AssessLaterOtherFee = dept?.AssessLaterOtherFee ?? 0,

performance/Performance.Services/ComputeService.cs

@@ -178,7 +178,7 @@ public List<ResComputeResponse> GetCompute(int allotId, int type)
                     {
                         t.PerforSumFee = t.ShouldGiveFee + t.AssessBeforeOtherFee;
                         var employee = employees.FirstOrDefault(e => e.DoctorName == t.EmployeeName && e.AccountingUnit == t.AccountingUnit && pairs[type].Contains(e.UnitType));
-                        var scoreAverageRate = t.ScoreAverageRate ?? employee.ScoreAverageRate ?? 0;
+                        var scoreAverageRate = t.ScoreAverageRate ?? employee.ScoreAverageRate ?? 1;
                         var attendance = t.Attendance ?? employee.Attendance ?? 0;
                         t.GiveFee = t.ShouldGiveFee * scoreAverageRate * attendance + (t.OtherPerfor ?? 0) + t.Punishment + t.OtherPerfor + t.AssessLaterOtherFee;
                         t.RealGiveFee = t.GiveFee * (t.Adjust ?? 1m) + t.AdjustLaterOtherFee;
@@ -1057,9 +1057,9 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second)
                     UnitType = second.UnitType,
                     AccountingUnit = second.Department,
                     //Department = second.Department,
-                    ScoringAverage = special.FirstOrDefault()?.ScoringAverage ?? 0,
+                    ScoringAverage = special.FirstOrDefault()?.ScoringAverage ?? 1,
                     //OtherPerfor1 = special.FirstOrDefault()?.OtherPerfor ?? 0,
-                    AdjustFactor = special.FirstOrDefault()?.Adjust ?? 0,
+                    AdjustFactor = special.FirstOrDefault()?.Adjust ?? 1,
                     Avg = special.FirstOrDefault()?.Avg,
                     RealGiveFee = special.FirstOrDefault()?.RealGiveFee,
                     Number = special.FirstOrDefault()?.Number ?? 0,
@@ -1207,9 +1207,9 @@ public DeptDataDetails GetDoctorDetail(int computeId)
                     ScalePerfor = resCompute.Scale ?? 0,    //规模绩效
                     Management = employee.Management,//管理绩效发放系数
                     ShouldGiveFee = resCompute.ShouldGiveFee ?? 0,  //考核前管理绩效                   
-                    ScoringAverage = resCompute.ScoreAverageRate ?? 0,  //考核得分率
+                    ScoringAverage = resCompute.ScoreAverageRate ?? 1,  //考核得分率
                     AssessLaterManagementFee = Math.Round(resCompute.ShouldGiveFee * resCompute.ScoreAverageRate * resCompute.Attendance + resCompute.Punishment ?? 0), //考核后管理绩效
-                    AdjustFactor = employee?.Adjust ?? 0,   //调节系数
+                    AdjustFactor = employee?.Adjust ?? 1,   //调节系数
                     AdjustLaterOtherFee = employee.AdjustLaterOtherFee, //调节后其他绩效
                     RealGiveFee = resCompute.RealGiveFee    //绩效合计
                 },

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

@@ -380,7 +380,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
                         JobNumber = empolyee.JobNumber,
 
                         AssessBeforeOtherFee = empolyee.AssessBeforeOtherFee ?? 0,
-                        ScoreAverageRate = empolyee.ScoreAverageRate ?? 0,
+                        ScoreAverageRate = empolyee.ScoreAverageRate ?? 1,
                         AssessLaterOtherFee = empolyee.AssessLaterOtherFee ?? 0,
                         AdjustLaterOtherFee = empolyee.AdjustLaterOtherFee ?? 0,
                         //OtherPerfor = empolyee.OtherPerfor ?? 0,
@@ -481,7 +481,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, per_allot
                         //WorkTime = item.WorkTime,
                         PostCoefficient = item.PostCoefficient ?? 0,
                         Attendance = item.Attendance ?? 0,
-                        ScoreAverageRate = item.ScoreAverageRate ?? 0,
+                        ScoreAverageRate = item.ScoreAverageRate ?? 1,
                         Punishment = extra ?? 0,
                         OtherPerfor = item.OtherPerfor ?? 0,
                         JobTitle = item.JobTitle,