Merge branch 'release/v22.1.24' into release/v22.2.10-Beta-ninghai

performance/Performance.Services/EmployeeService.cs

@@ -1502,7 +1502,7 @@ public void CheckGatherData(int allotId, SaveGatherData saveGather)
             var departments = perdeptdicRepository.GetEntities(w => w.HospitalId == allot.HospitalId);
             if (departments == null || !departments.Any()) throw new PerformanceException("未配置科室字典");
 
-            var notExistsDeptData = data.Where(w => !departments.Select(t => t.Department).Contains(w[0]));
+            var notExistsDeptData = data.Where(w => !departments.Select(t => t.HISDeptName).Contains(w[0]));
             if (notExistsDeptData != null && notExistsDeptData.Any())
                 throw new PerformanceException($"科室字典中不存在科室[{string.Join(",", notExistsDeptData.Select(t => t[0]).Distinct())}]");
 

performance/Performance.Services/RedistributionService.cs

@@ -39,6 +39,7 @@ public class RedistributionService : IAutoInjection
         private readonly PerforAgworkloadRepository _agworkloadRepository;
         private readonly PerforAgworkloadsourceRepository _agworkloadsourceRepository;
         private readonly PerforAgworkloadtypeRepository _agworkloadtypeRepository;
+        private readonly PerforImemployeeclinicRepository _imemployeeclinicRepository;
         private readonly PerforImemployeelogisticsRepository _imemployeelogisticsRepository;
 
         public RedistributionService(
@@ -59,6 +60,7 @@ public class RedistributionService : IAutoInjection
             PerforAgworkloadRepository agworkloadRepository,
             PerforAgworkloadsourceRepository agworkloadsourceRepository,
             PerforAgworkloadtypeRepository agworkloadtypeRepository,
+            PerforImemployeeclinicRepository imemployeeclinicRepository,
             PerforImemployeelogisticsRepository imemployeelogisticsRepository)
         {
             _logger = logger;
@@ -78,6 +80,7 @@ public class RedistributionService : IAutoInjection
             _agworkloadRepository = agworkloadRepository;
             _agworkloadsourceRepository = agworkloadsourceRepository;
             _agworkloadtypeRepository = agworkloadtypeRepository;
+            _imemployeeclinicRepository = imemployeeclinicRepository;
             _imemployeelogisticsRepository = imemployeelogisticsRepository;
         }
         #endregion
@@ -393,7 +396,10 @@ public List<SecondColumnDictionary> GetTableHeaderDictionary(ComputeMode compute
             var refAvg = 0m;
             if (Enum.TryParse(typeof(UnitType), second.UnitType, true, out object unittype))
             {
-                var rescompute = _resaccountRepository.GetEntity(w => w.AccountingUnit == second.Department && w.UnitType == (int)((UnitType)unittype));
+                // 优先取 业务中层实际人均绩效 否则 取 科室人均
+                var empolyee = _imemployeeclinicRepository.GetEntity(w => w.AllotID == allot.ID && w.AccountingUnit == second.Department && w.UnitType == second.UnitType);
+                var rescompute = _resaccountRepository.GetEntity(w => w.AllotID == allot.ID && w.AccountingUnit == second.Department && w.UnitType == (int)((UnitType)unittype));
+                var avg = (empolyee != null && empolyee.FitPeopleValue.HasValue) ? empolyee.FitPeopleValue : rescompute?.Avg ?? 0;
                 refAvg = rescompute?.Avg ?? 0;
             }
             head.AddOrUpdate("RefAvg", Math.Round(refAvg, 0, MidpointRounding.AwayFromZero));