微调绩效

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -284,7 +284,7 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_
                         {
                             string minimumReference = dept.MinimumReference;
                             if (dept.MinimumReference == EnumHelper.GetDescription(MinimumType.自定义保底))
-                                minimumReference = GetCustomMinimumName(dept.Department);
+                                minimumReference = GetCustomMinimumName(dept.Department, unitType.ToString());
 
                             var minimum = baiscnormList.FirstOrDefault(t => t.PositionName == minimumReference);
                             if (minimum != null)
@@ -468,7 +468,7 @@ public void ComputeCustomMinimum(PerExcel excel, List<PerSheet> perSheet, List<r
                 var baiscnorm = new res_baiscnorm
                 {
                     AllotID = allotId,
-                    PositionName = GetCustomMinimumName(guaranteeGroup.Target),
+                    PositionName = GetCustomMinimumName(guaranteeGroup.Target, unitType.ToString()),
                     TotelNumber = count,
                     TotelValue = totalValue,
                     AvgValue = count == 0 ? 0 : totalValue / count
@@ -482,9 +482,9 @@ public void ComputeCustomMinimum(PerExcel excel, List<PerSheet> perSheet, List<r
         /// </summary>
         /// <param name="department"></param>
         /// <returns></returns>
-        private string GetCustomMinimumName(string department)
+        private string GetCustomMinimumName(string department, string unitType)
         {
-            return $"{EnumHelper.GetDescription(MinimumType.自定义保底)}({department})";
+            return $"{EnumHelper.GetDescription(MinimumType.自定义保底)}({unitType}{department})";
         }
 
         /// <summary>

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

@@ -210,8 +210,8 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_a
                     OtherPerfor = empolyee.OtherPerfor,
 
                     Number = number,
-                    PerforTotal = realGiveFee,
-                    Avg = realAvg,
+                    PerforTotal = perforTotal,
+                    Avg = avg,
                     Efficiency = avg * (accountbasic.DoctorEffic ?? 1),
                     Scale = perforTotal * (accountbasic.DoctorScale ?? 1),
                     Adjust = empolyee.Adjust,