Merge branch 'v2020morge' into custom_script

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -236,6 +236,7 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
                     var avg = (empolyee.FitPeopleValue.HasValue)
                         ? empolyee.FitPeopleValue
                         : group.Number == 0 ? 0 : sumValue / group.Number;
+                    var effAvg = empolyee.PermanentStaff == 0 ? 0 : sumValue / empolyee.PermanentStaff;
 
                     var empolyeeAdjust = isBudget ? adjust : empolyee.Adjust;
                     var compute = new ComputeResult
@@ -261,7 +262,7 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
                         AssessBeforeOtherFee = empolyee?.AssessBeforeOtherFee ?? 0,
                         AssessLaterOtherFee = empolyee?.AssessLaterOtherFee ?? 0,
                         AdjustLaterOtherFee = empolyee?.AdjustLaterOtherFee ?? 0,
-                        Efficiency = avg * (empolyee.Efficiency ?? 0),
+                        Efficiency = effAvg * (empolyee.Efficiency ?? 0),
                         Scale = sumValue * (empolyee.Scale ?? 0),
                     };
 
@@ -581,7 +582,7 @@ public void GenerateSecondAllot(per_allot allot)
                 }
                 else
                 {
-                    if (Math.Round((second.RealGiveFee ?? 0) - (item.RealGiveFee ?? 0)) >= 0.5m && second.Status > 1)
+                    if (Math.Abs((second.RealGiveFee ?? 0) - (item.RealGiveFee ?? 0)) >= 0.5m && second.Status > 1)
                     {
                         second.Status = 4;
                         second.Remark = "科室绩效结果发生变更，需要重新提交";