Merge branch 'hotfix/行政中层二次分配显示错误' into develop

performance/Performance.DtoModels/PerExcel/PerDataAccountBaisc.cs

@@ -284,5 +284,9 @@ public class PerDataAccountBaisc : IPerData
         /// </summary>
         public Nullable<decimal> PostCoefficient { get; set; }
 
+        /// <summary>
+        /// 考核后绩效
+        /// </summary>
+        public Nullable<decimal> GiveFee { get; set; }
     }
 }

performance/Performance.Services/ComputeService.cs

@@ -1646,7 +1646,7 @@ public DeptDataDetails GetDoctorDetail(int computeId)
                 var itemName = Regex.Replace(sheet.SheetName, @"\d", "");
                 var detail = new DetailDtos
                 {
-                    
+
                     ItemName = itemName.Replace(".", "").Replace(" ", ""),
                     IncomeType = sheet.SheetType == (int)SheetType.PersonExtra ? 5 : 8,
                     OriginalType = sheet.SheetType ?? 0,
@@ -1667,40 +1667,37 @@ public DeptDataDetails GetAdministration(int computeId)
             var resCompute = _perforRescomputeRepository.GetEntity(t => t.ID == computeId);
             if (resCompute == null) return new DeptDataDetails();
 
-            var employee = _perforImemployeeRepository.GetEntity(t => t.AllotID == resCompute.AllotID && t.AccountingUnit == resCompute.AccountingUnit && t.PersonnelNumber == resCompute.JobNumber);
+            //var employee = _perforImemployeeRepository.GetEntity(t => t.AllotID == resCompute.AllotID && t.AccountingUnit == resCompute.AccountingUnit && t.PersonnelNumber == resCompute.JobNumber);
 
             DeptDataDetails doctorDetails = new DeptDataDetails
             {
                 ShowFormula = 0,
                 Pandect = new PerDataAccountBaisc
                 {
-                    EmployeeName = employee.DoctorName,//医生姓名
-                    JobNumber = employee.PersonnelNumber,//工号
-                    AccountingUnit = employee.AccountingUnit,//核算单元
-                    AccountType = employee.AccountType,//核算单元类型
-                    JobTitle = employee.JobTitle,//职称
-                    FitPeople = employee.FitPeople,//绩效基数核算参考对象
-                    FitPeopleValue = employee.FitPeopleValue ?? 0,//绩效基础核算参考值
-                    FitPeopleRatio = employee.FitPeopleRatio,//绩效基础核算系数
-                    PostCoefficient = employee.PostCoefficient,//岗位系数
-                    Attendance = employee.Attendance,//出勤率
-                    ScoringAverage = employee?.ScoreAverageRate,//考核得分率
-                    AssessBeforeOtherFee = employee.AssessBeforeOtherFee ?? 0,
-                    Extra = employee.Punishment,//医院奖罚
-                    NightShiftWorkPerforFee = employee.NightWorkPerfor,//夜班费
-                    AdjustFactor = employee.Adjust,//调节系数
-                    AdjustLaterOtherFee = employee?.AdjustLaterOtherFee ?? 0,//调解后其他绩效
-                    PerforTotal = Math.Round(employee.FitPeopleValue ?? 0 * employee.PostCoefficient ?? 0 * employee.Attendance + employee.AssessBeforeOtherFee ?? 0),
-                    //考核前绩效
+                    EmployeeName = resCompute.EmployeeName,//医生姓名
+                    JobNumber = resCompute.JobNumber,//工号
+                    AccountingUnit = resCompute.AccountingUnit,//核算单元
+                    AccountType = resCompute.AccountType,//核算单元类型
+                    JobTitle = resCompute.JobTitle,//职称
+                    FitPeople = resCompute.FitPeople,//绩效基数核算参考对象
+                    FitPeopleValue = resCompute.FitPeopleValue ?? 0,//绩效基础核算参考值
+                    FitPeopleRatio = resCompute.FitPeopleRatio,//绩效基础核算系数
+                    PostCoefficient = resCompute.PostCoefficient,//岗位系数
+                    Attendance = resCompute.Attendance,//出勤率
+                    ScoringAverage = resCompute?.ScoreAverageRate,//考核得分率
+                    AssessBeforeOtherFee = resCompute.AssessBeforeOtherFee ?? 0,
+                    Extra = resCompute.Punishment,//医院奖罚
+                    NightShiftWorkPerforFee = resCompute.NightWorkPerfor,//夜班费
+                    AdjustFactor = resCompute.Adjust,//调节系数
+                    AdjustLaterOtherFee = resCompute?.AdjustLaterOtherFee ?? 0,//调解后其他绩效
+                    PerforTotal = resCompute.PerforTotal,//考核前绩效
+                    GiveFee = resCompute.GiveFee,//考核后绩效
+                    RealGiveFee = resCompute.RealGiveFee //实发绩效
+
                 },
 
                 Detail = new List<DetailDtos>()
             };
-            var pandect = doctorDetails.Pandect;
-            //考核后绩效
-            doctorDetails.Pandect.AssessLaterPerforTotal = Math.Round(pandect.PerforTotal * pandect.ScoringAverage + pandect.Extra ?? 0);
-            //实发绩效
-            doctorDetails.Pandect.RealGiveFee = Math.Round((pandect.AssessLaterPerforTotal * pandect.AdjustFactor + pandect.AdjustLaterOtherFee) ?? 0);
 
             var isShowManage = IsShowManage(resCompute.AllotID.Value);
             // 开启 显示管理绩效