二次分配管理绩效根据开关控制实发绩效

performance/Performance.Services/ComputeService.cs

@@ -1249,37 +1249,43 @@ public DeptDataDetails GetDoctorDetail(int computeId)
             //var allot = perforPerallotRepository.GetEntity(t => t.ID == resCompute.AllotID);
             //if (allot == null) return new DeptDataDetails();
 
-            var employee = _perforImemployeeclinicRepository.GetEntity(t => t.AllotID == resCompute.AllotID && t.AccountingUnit == resCompute.AccountingUnit && t.UnitType == resCompute.UnitType && t.DoctorName == resCompute.EmployeeName);
+            var employee = _perforImemployeeclinicRepository.GetEntity(t => t.AllotID == resCompute.AllotID && t.AccountingUnit == resCompute.AccountingUnit && t.UnitType == resCompute.UnitType && t.PersonnelNumber == resCompute.JobNumber);
             DeptDataDetails doctorDetails = new DeptDataDetails
             {
                 ShowFormula = 0,
                 Pandect = new PerDataAccountBaisc
                 {
+                    BasicFactor = employee?.Basics ?? 0,    //基础绩效系数
+                    Effic = employee.Efficiency ?? 0,   //效率绩效系数
+                    Scale = employee.Scale ?? 0,    //规模绩效系数
+                    Management = employee.Management,//管理绩效发放系数
+                    AdjustFactor = employee?.Adjust ?? 1,   //调节系数
+                    AdjustLaterOtherFee = employee.AdjustLaterOtherFee, //调节后其他绩效
+
                     AccountingUnit = resCompute.AccountingUnit,
                     EmployeeName = resCompute.EmployeeName,
                     PerforTotal = resCompute.PerforTotal,   //科室考核前绩效
                     Number = resCompute.Number ?? 0,    //核算人数
                     AvgPerfor = (resCompute.Number ?? 0) == 0 ? 0 : resCompute.PerforTotal / resCompute.Number, //人均绩效
-                    BasicFactor = employee?.Basics ?? 0,    //基础绩效系数
-                    Attendance = resCompute.Attendance, //出勤率
+                    Attendance = resCompute.Attendance ?? 1, //出勤率
                     Avg = resCompute.Avg,   //实际人均
                     PermanentStaff = resCompute.PermanentStaff ?? 0,    //效率绩效人数
-                    Effic = employee.Efficiency ?? 0,   //效率绩效系数
                     EfficPerfor = resCompute.Efficiency ?? 0,   //效率绩效
-                    Scale = employee.Scale ?? 0,    //规模绩效系数
                     ScalePerfor = resCompute.Scale ?? 0,    //规模绩效
                     Extra = resCompute.Punishment ?? 0,     //医院奖罚
                     OtherManagePerfor = resCompute.OtherManagePerfor ?? 0, //其他管理绩效
-                    Management = employee.Management,//管理绩效发放系数
                     ShouldGiveFee = resCompute.ShouldGiveFee ?? 0,  //考核前管理绩效
                     ScoringAverage = resCompute.ScoreAverageRate ?? 1,  //考核得分率
                     AssessLaterManagementFee = Math.Round(resCompute.ShouldGiveFee * resCompute.ScoreAverageRate * resCompute.Attendance + resCompute.Punishment ?? 0), //考核后管理绩效
-                    AdjustFactor = employee?.Adjust ?? 1,   //调节系数
-                    AdjustLaterOtherFee = employee.AdjustLaterOtherFee, //调节后其他绩效
                     RealGiveFee = resCompute.RealGiveFee    //绩效合计
                 },
                 Detail = new List<DetailDtos>()
             };
+            var isShowManage = IsShowManage(resCompute.AllotID.Value);
+
+            // 开启 显示管理绩效
+            if (isShowManage == 2)
+                doctorDetails.Pandect.RealGiveFee = doctorDetails.Pandect.AssessLaterManagementFee;
 
             var sheets = _perforPerSheetRepository.GetEntities(t => t.AllotID == resCompute.AllotID && new int[] { (int)SheetType.PersonExtra, (int)SheetType.PersonAdjustLaterOtherFee }.Contains(t.SheetType.Value));
             if (sheets == null || !sheets.Any()) return doctorDetails;