科主任显示问题修复

performance/Performance.Services/ComputeService.cs

@@ -174,13 +174,13 @@ public List<ResComputeResponse> GetCompute(int allotId, int type)
                     //t.WorkTime = string.IsNullOrEmpty(t.WorkTime) ? null : Convert.ToDateTime(t.WorkTime).ToString("yyyy-MM-dd");
                     if (isShowManage == 2)
                     {
-                        t.PerforSumFee = t.ShouldGiveFee + t.AssessBeforeOtherFee;
+                        t.PerforSumFee = (t.ShouldGiveFee ?? 0) + (t.AssessBeforeOtherFee ?? 0);
                         var employee = employees.FirstOrDefault(e => e.DoctorName == t.EmployeeName && e.AccountingUnit == t.AccountingUnit && pairs[type].Contains(e.UnitType));
                         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;
-                        t.BaiscNormValue = t.RealGiveFee;
+                        t.GiveFee = (t.ShouldGiveFee ?? 0) * scoreAverageRate * attendance + (t.OtherPerfor ?? 0) + (t.Punishment ?? 0) + (t.AssessLaterOtherFee ?? 0);
+                        t.RealGiveFee = t.GiveFee * (t.Adjust ?? 1m) + (t.AdjustLaterOtherFee ?? 0);
+                        t.BaiscNormValue = (t.RealGiveFee ?? 0);
                     }
 
                     var aprAmount = apramounts?.Where(w => !(string.IsNullOrEmpty(w.DoctorName) && string.IsNullOrEmpty(w.PersonnelNumber)) && w.DoctorName?.Trim() == t.EmployeeName?.Trim() && w.PersonnelNumber?.Trim() == t.JobNumber?.Trim());

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

@@ -413,11 +413,11 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
                     // 考核前绩效
                     compute.PerforSumFee = compute.Attendance == 0 ? Math.Round(compute.ShouldGiveFee ?? 0) : Math.Round(compute.Avg / compute.Attendance + compute.ShouldGiveFee ?? 0);
                     // 考核后绩效
-                    compute.GiveFee = Math.Round(compute.Avg + compute.AssessLaterManagementFee ?? 0);
+                    compute.GiveFee = Math.Round((compute.Avg ?? 0) + (compute.AssessLaterManagementFee ?? 0));
                     // 参考基数专用绩效合计
                     compute.BaiscNormPerforTotal = compute.PerforSumFee;
                     // 实发绩效
-                    compute.RealGiveFee = Math.Round((compute.Avg + compute.AssessLaterManagementFee) * compute.Adjust + compute.AdjustLaterOtherFee ?? 0);
+                    compute.RealGiveFee = Math.Round(((compute.Avg ?? 0) + (compute.AssessLaterManagementFee ?? 0)) * compute.Adjust + (compute.AdjustLaterOtherFee??0) ?? 0);
 
                     ////绩效合计
                     //compute.PerforSumFee = Math.Round((compute.Avg * (empolyee.Basics ?? 0)) + compute.ShouldGiveFee + compute.AssessBeforeOtherFee ?? 0);