Commit 101009b1 by 钟博

Merge branch 'v2020morge-graphql' of https://gitlab.suvalue.com/zry/performance…

Merge branch 'v2020morge-graphql' of https://gitlab.suvalue.com/zry/performance into v2020morge-graphql
parents e74db18b 35a68167
......@@ -875,6 +875,7 @@ public List<ComputeResponse> AddAprAmount(int allotId, List<ComputeResponse> com
if (list == null || !list.Any())
return computes;
List<string> uses = new List<string>();
foreach (var item in computes.GroupBy(w => new { w.AccountingUnit, w.JobNumber }))
{
// 补充过一次就不在补充了
......@@ -882,7 +883,13 @@ public List<ComputeResponse> AddAprAmount(int allotId, List<ComputeResponse> com
.OrderByDescending(w => w.Source).FirstOrDefault();
var apramount = list.Where(t => t.AccountingUnit == emp.AccountingUnit
&& !string.IsNullOrEmpty(t.PersonnelNumber) && emp.JobNumber?.Trim() == t.PersonnelNumber?.Trim());
emp.OthePerfor = apramount?.Sum(w => w.Amount) ?? 0;
// 如果医院其他绩效 已经被使用,则不再多次带出,防止单个人多次出现造成金额叠加
var tag = $"{(emp.AccountingUnit ?? "")}-{(emp.JobNumber ?? "")}";
if (apramount != null && !uses.Contains(tag))
{
emp.OthePerfor = apramount?.Sum(w => w.Amount) ?? 0;
uses.Add(tag);
}
//foreach (var emp in computes)
//{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment