BUG修复

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -56,7 +56,7 @@ public List<res_baiscnorm> Compute(per_allot allot, PerExcel excel, List<PerShee
             List<ComputeEmployee> computeEmployees = Mapper.Map<List<ComputeEmployee>>(empolyeeList);
 
             logManageService.WriteMsg("正在生成绩效", "临床科室主任、临床科室副主任、临床科室护士长 最终绩效数据计算", 1, allot.ID, "ReceiveMessage");
-            var computResult = computeDirector.Compute(computeEmployees, accountbasicList, accountSheet, allot, isMinimum);
+            var computResult = computeDirector.Compute(computeEmployees, accountbasicList, accountSheet, allot);
             //计算 绩效标准 基数（科主任、副主任、护士长 =>> 平均值）
             List<res_baiscnorm> baiscnormList = new List<res_baiscnorm>();
             baiscNormService.ComputeAvg(baiscnormList, accountbasicList, computResult);

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

@@ -137,7 +137,7 @@ public class ComputeDirector : IAutoInjection
         /// <param name="nurseList"></param>
         /// <param name="directorList"></param>
         /// <returns></returns>
-        public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_accountbasic> accountbasicList, List<PerSheet> accountSheet, per_allot allot, bool isMinimum = false)
+        public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_accountbasic> accountbasicList, List<PerSheet> accountSheet, per_allot allot)
         {
             var basicRuleList = new[]
             {
@@ -174,8 +174,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_a
                 var perforTotal = resAccount.Sum(t => t.PerforTotal);
                 var realGiveFee = resAccount.Sum(t => t.RealGiveFee);
                 var avg = resAccount.Average(t => t.Avg);
-                if (!isMinimum && resAccount.Any(t => t.ManagerNumber > 0 || t.Number > 0))
-                    avg = resAccount.Sum(t => t.RealGiveFee / (t.ManagerNumber + t.Number)) / resAccount.Count();
+                var realAvg = resAccount.Sum(t => (t.ManagerNumber + t.Number) == 0 ? 0 : t.RealGiveFee / (t.ManagerNumber + t.Number)) / resAccount.Count();
 
                 var basicRule = basicRuleList.FirstOrDefault(t => t.UnitType == (UnitType)accountbasic.UnitType);
                 if (basicRule == null) continue;
@@ -210,7 +209,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_a
 
                     Number = number,
                     PerforTotal = realGiveFee,
-                    Avg = avg,
+                    Avg = realAvg,
                     Efficiency = avg * (accountbasic.DoctorEffic ?? 1),
                     Scale = perforTotal * (accountbasic.DoctorScale ?? 1),
                     Adjust = empolyee.Adjust,