Merge branch 'fixed/bug' into v2020calculate

performance/Performance.Services/SecondAllotService.cs

@@ -441,6 +441,7 @@ private void SupplementOtherPerfor(SecondResponse result, int allotId)
         {
             if (result?.BodyItems != null && result.BodyItems.Any())
             {
+                var second = perforAgsecondallotRepository.GetEntity(t => t.AllotId == allotId);
                 var perapramounts = perapramountRepository.GetEntities(t => t.AllotId == allotId);
 
                 foreach (var rownum in result.BodyItems.Where(w => w.RowNumber > -1).Select(w => w.RowNumber).Distinct())
@@ -450,7 +451,7 @@ private void SupplementOtherPerfor(SecondResponse result, int allotId)
                     var fullName = rowData.FirstOrDefault(w => w.FiledId == "FullName")?.Value;
 
                     var amount = perapramounts
-                       ?.Where(w => w.DoctorName?.Trim() == fullName?.Trim() && w.PersonnelNumber?.Trim() == personnelNumber?.Trim())
+                       ?.Where(w => w.AccountingUnit?.Trim() == second.Department?.Trim() && w.DoctorName?.Trim() == fullName?.Trim() && w.PersonnelNumber?.Trim() == personnelNumber?.Trim())
                        ?.Sum(w => w.Amount);
                     var otherPerfor = rowData.FirstOrDefault(w => w.FiledId == "OtherPerformance");
                     if (otherPerfor != null)
@@ -474,9 +475,10 @@ private List<BodyItem> GetEmployees(List<per_employee> employees, int allotId, i
             if (!string.IsNullOrEmpty(jobNumber))
                 employees = employees?.Where(w => !string.IsNullOrEmpty(w.PersonnelNumber) && w.PersonnelNumber.Contains(jobNumber.Trim())).ToList();
 
+            var second = perforAgsecondallotRepository.GetEntity(t => t.AllotId == allotId);
             var perapramounts = perapramountRepository.GetEntities(t => t.AllotId == allotId);
             Func<per_employee, decimal?> getAprAmount = (t) => perapramounts
-                ?.Where(w => w.DoctorName?.Trim() == t.DoctorName?.Trim() && w.PersonnelNumber?.Trim() == t.PersonnelNumber?.Trim())
+                ?.Where(w => w.AccountingUnit?.Trim() == second.Department?.Trim() && w.DoctorName?.Trim() == t.DoctorName?.Trim() && w.PersonnelNumber?.Trim() == t.PersonnelNumber?.Trim())
                 ?.Sum(w => w.Amount);
 
             Dictionary<(string, string), Func<per_employee, object>> dict = new Dictionary<(string, string), Func<per_employee, object>>
@@ -1630,14 +1632,14 @@ private void SupplementSecondDetail(ag_secondallot second, List<per_employee> em
             // 补充医院其他绩效  及  预留比例
             var perapramounts = perapramountRepository.GetEntities(t => t.AllotId == second.AllotId);
             Func<per_employee, decimal?> getAprAmount = (t) => perapramounts
-                ?.Where(w => w.DoctorName?.Trim() == t.DoctorName?.Trim() && w.PersonnelNumber?.Trim() == t.PersonnelNumber?.Trim())
+                ?.Where(w => w.AccountingUnit?.Trim() == second.Department?.Trim() && w.DoctorName?.Trim() == t.DoctorName?.Trim() && w.PersonnelNumber?.Trim() == t.PersonnelNumber?.Trim())
                 ?.Sum(w => w.Amount);
 
             var distPerformance = rescomputeRepository.GetEntities(t => t.AllotID == second.AllotId && employees.Select(s => s.DoctorName).Contains(t.EmployeeName));
             Func<per_employee, decimal?> getDistPerformance = (t) => 0;
             if (second.UnitType == UnitType.行政后勤.ToString())
                 getDistPerformance = (t) => distPerformance
-                ?.Where(w => w.EmployeeName?.Trim() == t.DoctorName?.Trim() && w.JobNumber?.Trim() == t.PersonnelNumber?.Trim())
+                ?.Where(w => w.AccountingUnit?.Trim() == second.Department?.Trim() && w.EmployeeName?.Trim() == t.DoctorName?.Trim() && w.JobNumber?.Trim() == t.PersonnelNumber?.Trim())
                 ?.Sum(w => w.GiveFee);
 
             foreach (var item in result)