Merge branch 'hotfix/二次分配按科室带出医院其他绩效' into develop

performance/Performance.Services/ComputeService.cs

@@ -899,10 +899,8 @@ public List<ComputeResponse> AddAprAmount(int allotId, List<ComputeResponse> com
             foreach (var item in computes.GroupBy(w => new { w.AccountingUnit, w.JobNumber }))
             {
                 // 补充过一次就不在补充了
-                var emp = computes.Where(w => w.AccountingUnit == item.Key.AccountingUnit && w.JobNumber == item.Key.JobNumber)
-                    .OrderByDescending(w => w.Source).FirstOrDefault();
-                var apramount = list.Where(t => t.AccountingUnit == emp.AccountingUnit
-                     && !string.IsNullOrEmpty(t.PersonnelNumber) && emp.JobNumber?.Trim() == t.PersonnelNumber?.Trim());
+                var emp = computes.Where(w => w.AccountingUnit == item.Key.AccountingUnit && w.JobNumber == item.Key.JobNumber).OrderByDescending(w => w.Source).FirstOrDefault();
+                var apramount = list.Where(t => t.AccountingUnit == emp.AccountingUnit && !string.IsNullOrEmpty(t.PersonnelNumber) && emp.JobNumber?.Trim() == t.PersonnelNumber?.Trim());
                 // 如果医院其他绩效 已经被使用，则不再多次带出，防止单个人多次出现造成金额叠加
                 var tag = $"{(emp.AccountingUnit ?? "")}-{(emp.JobNumber ?? "")}";
                 if (apramount != null && !uses.Contains(tag))
@@ -1819,7 +1817,7 @@ public res_baiscnorm EditHospitalAvg(ComputerAvgRequest request)
                     if (!emp.Any())
                         dicData.Add(type, "0");
                     else
-                        dicData.Add(type, Math.Round(Convert.ToDecimal(emp?.Sum(c=>c.Amount))).ToString());
+                        dicData.Add(type, Math.Round(Convert.ToDecimal(emp?.Sum(c => c.Amount))).ToString());
                 }
 
                 var sum = employees.Where(c => c.PersonnelNumber == num)?.Sum(t => t.Amount);

performance/Performance.Services/SecondAllot/SecondAllotDetails.cs

@@ -820,18 +820,20 @@ private void SupplementSecondDetail(ag_secondallot second, List<per_employee> em
                 {
                     item.WorkPerformance = distPerformance?.Where(w => w.AccountingUnit == item.Department && w.JobNumber?.Trim() == item.WorkNumber?.Trim())?.Sum(w => w.GiveFee);
                     if (string.IsNullOrEmpty(item.WorkNumber))
-                        item.WorkPerformance = distPerformance?.Where(w => w.AccountingUnit == item.Department && w.JobNumber?.Trim() == item.WorkNumber?.Trim() && w.EmployeeName?.Trim() == item.Name?.Trim())?.Sum(w => w.GiveFee);
+                        item.WorkPerformance = distPerformance?.Where(w => w.AccountingUnit == item.Department && w.JobNumber?.Trim() == item.WorkNumber?.Trim())?.Sum(w => w.GiveFee);
                 }
-
+                // 必须是相同核算单元类型才能带出医院其他绩效
+                if (second.UnitType.Replace("其他", "").Replace("医技", "医生")
+                    == empl.UnitType.Replace("其他", "").Replace("医技", "医生"))
+                {
                     if (second.UnitType == UnitType.行政后勤.ToString())
                     {
-
                         if (string.IsNullOrEmpty(item.WorkNumber))
                         {
-                        var hasAmountData = perapramounts?.Where(w => w.AccountingUnit == second.Department && w.PersonnelNumber?.Trim() == item.WorkNumber?.Trim() && w.DoctorName?.Trim() == item.Name?.Trim());
+                            var hasAmountData = perapramounts?.Where(w => w.AccountingUnit == second.Department && w.PersonnelNumber?.Trim() == item.WorkNumber?.Trim());
                             if (hasAmountData == null || !hasAmountData.Any()) continue;
                             item.OtherPerformance = hasAmountData.Sum(w => w.Amount);
-                        perapramounts.RemoveAll(w => w.AccountingUnit == second.Department && w.PersonnelNumber?.Trim() == item.WorkNumber?.Trim() && w.DoctorName?.Trim() == item.Name?.Trim());
+                            perapramounts.RemoveAll(w => w.AccountingUnit == second.Department && w.PersonnelNumber?.Trim() == item.WorkNumber?.Trim());
                         }
                         else
                         {
@@ -845,10 +847,10 @@ private void SupplementSecondDetail(ag_secondallot second, List<per_employee> em
                     {
                         if (string.IsNullOrEmpty(item.WorkNumber))
                         {
-                        var hasAmountData = perapramounts?.Where(w => w.AccountingUnit == second.Department && w.PersonnelNumber?.Trim() == item.WorkNumber?.Trim() && w.DoctorName?.Trim() == item.Name?.Trim());
+                            var hasAmountData = perapramounts?.Where(w => w.AccountingUnit == second.Department && w.PersonnelNumber?.Trim() == item.WorkNumber?.Trim());
                             if (hasAmountData == null || !hasAmountData.Any()) continue;
                             item.OtherPerformance = hasAmountData.Sum(w => w.Amount);
-                        perapramounts.RemoveAll(w => w.AccountingUnit == second.Department && w.PersonnelNumber?.Trim() == item.WorkNumber?.Trim() && w.DoctorName?.Trim() == item.Name?.Trim());
+                            perapramounts.RemoveAll(w => w.AccountingUnit == second.Department && w.PersonnelNumber?.Trim() == item.WorkNumber?.Trim());
                         }
                         else
                         {
@@ -860,6 +862,7 @@ private void SupplementSecondDetail(ag_secondallot second, List<per_employee> em
                         }
                     }
                 }
+            }
 
 
             // 补充字典中该科室不存在，但有其它绩效的人员信息