实发绩效计算

performance/Performance.DtoModels/PerExcel/PerDataAccountDoctor.cs

@@ -86,7 +86,7 @@ public class PerDataAccountDoctor : IPerData
         /// <summary>
         /// 实发绩效
         /// </summary>
-        public decimal RealGiveFee { get => (PerforTotal * ScoringAverage + Extra + OtherPerfor2) * AdjustFactor; set => giveFee = value; }
+        public decimal RealGiveFee { get => (PerforTotal * ScoringAverage + Extra + OtherPerfor2) * (AdjustFactor == 0 ? 1 : AdjustFactor); set => giveFee = value; }
         /// <summary>
         /// 人均绩效
         /// </summary>

performance/Performance.DtoModels/PerExcel/PerDataAccountNurse.cs

@@ -85,7 +85,7 @@ public class PerDataAccountNurse : IPerData
         /// <summary>
         /// 实发绩效
         /// </summary>
-        public decimal RealGiveFee { get => (PerforTotal * ScoringAverage + Extra + OtherPerfor2) * AdjustFactor; set => giveFee = value; }
+        public decimal RealGiveFee { get => (PerforTotal * ScoringAverage + Extra + OtherPerfor2) * (AdjustFactor == 0 ? 1 : AdjustFactor); set => giveFee = value; }
         /// <summary>
         /// 人均绩效
         /// </summary>

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -114,7 +114,7 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
                     var radio = perforImEmployeeRepository.GetEntities(p => p.FitPeople == EnumHelper.GetDescription((PerformanceType)type.Value) && p.AllotID == allot.ID)
                         ?.FirstOrDefault().FitPeopleRatio ?? 1;
                     var basic = baiscNormService.GetBaiscNorm(baiscnormList, (PerformanceType)type.Value);
-                    t.Quantity = basic != null ? basic * radio : null;    //添加参数计算
+                    t.Quantity = basic != null ? basic * radio : 0;    //添加参数计算
                 }
 
                 var res = new res_specialunit
@@ -132,7 +132,7 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
                     Adjust = t.Adjust ?? 1,
                     Avg = t.Number != 0 ? t.Quantity * t.QuantitativeIndicatorsValue / t.Number : null,
                     GiveFee = t.Quantity * t.QuantitativeIndicatorsValue,
-                    RealGiveFee = (t.Quantity * t.QuantitativeIndicatorsValue + t.OtherPerfor + t.Punishment) * (t.Adjust ?? 1),
+                    RealGiveFee = (t.Quantity * t.QuantitativeIndicatorsValue + (t.OtherPerfor ?? 0) + (t.Punishment ?? 0)) * (t.Adjust ?? 1),
                 };
                 resDataList.Add(res);
             }