财务全院绩效发放表增加人员类别以及花名册中的人员科室

performance/Performance.Api/Controllers/ComputeController.cs

@@ -294,10 +294,12 @@ public ApiResponse AllComputeByPM([FromBody] ComputerRequest request)
             if (list == null || !list.Any())
                 return new ApiResponse(ResponseType.OK, "ok", list);
 
-            var result = list.GroupBy(t => new { t.EmployeeName, t.JobNumber }).Select(t => new ComputeResponse
+            var result = list.GroupBy(t => new { t.AccountingUnit, t.UnitType, t.EmployeeName, t.JobNumber }).Select(t => new ComputeResponse
             {
-                EmployeeName = t.Key.EmployeeName,
                 JobNumber = t.Key.JobNumber,
+                EmployeeName = t.Key.EmployeeName,
+                AccountingUnit = t.Key.AccountingUnit,
+                UnitType = t.Key.UnitType,
                 PerforSumFee = t.Sum(s => s.PerforSumFee),
                 PerforManagementFee = t.Sum(s => s.PerforManagementFee),
                 AdjustLaterOtherFee = t.Sum(s => s.AdjustLaterOtherFee),

performance/Performance.Services/ComputeService.cs

@@ -749,6 +749,10 @@ public List<ComputeResponse> AllCompute(int allotId, int hospitalId, int isShowM
                     item.ReservedRatio = empDic?.FirstOrDefault(w => w.PersonnelNumber == item.JobNumber)?.ReservedRatio ?? 0;
                     item.ReservedRatioFee = Math.Round(real * (item.ReservedRatio ?? 0), 2, MidpointRounding.AwayFromZero);
                     item.RealGiveFee = Math.Round(item.ShouldGiveFee - (item.ReservedRatioFee ?? 0) ?? 0, 2, MidpointRounding.AwayFromZero);
+                    // 人员信息使用人员字典中数据
+                    item.AccountingUnit = empDic?.FirstOrDefault(w => w.PersonnelNumber == item.JobNumber)?.AccountingUnit ?? "";
+                    item.UnitType = empDic?.FirstOrDefault(w => w.PersonnelNumber == item.JobNumber)?.UnitType ?? "";
+                    item.EmployeeName = empDic?.FirstOrDefault(w => w.PersonnelNumber == item.JobNumber)?.DoctorName ?? "";
                 }
             }