Skip to content

P
performance
Commit ae2c21eb by ruyun.zhang
Options

科室详情BUG修复

parent 91f49dee
Showing with 21 additions and 18 deletions
performance/Performance.DtoModels/Response/UniteDeptDetailResponse.cs
......@@ -19,6 +19,7 @@ public class DeptDetailItem
public string Remark { get; set; }
public int Sort { get; set; }
public bool Display { get; set; } = true;
public SheetType SheetType { get; set; }
public List<Dictionary<string, object>> Items { get; set; }
}
}
performance/Performance.Services/ComputeService.UniteDeptDetail.cs
......@@ -71,7 +71,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
});
}
var detail = new DeptDetailItem { Title = "业绩绩效", Type = (int)UniteDept.Type.左侧下拉, Total = account.PerforTotal ?? 0, Items = items };
var detail = new DeptDetailItem { Title = "行政工勤", Type = (int)UniteDept.Type.左侧下拉, Total = account.PerforTotal ?? 0, Items = items };
response.DetailItems.Add(detail);
}
#endregion
......@@ -106,7 +106,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
#endregion
#region 特殊处理
var total = response.DetailItems.FirstOrDefault(w => w.Title == UniteDept.Title.业绩绩效.ToString() && w.Type == (int)UniteDept.Type.左侧下拉)?.Total ?? 0;
var total = response.DetailItems.FirstOrDefault(w => w.Title == "行政工勤" && w.Type == (int)UniteDept.Type.左侧下拉)?.Total ?? 0;
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩分值.ToString(), Type = (int)UniteDept.Type.右侧收缩, Total = 0 });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩绩效.ToString(), Type = (int)UniteDept.Type.右侧收缩, Total = total });
......@@ -132,17 +132,17 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
});
}
var detail = new DeptDetailItem { Title = "工作量绩效", Type = (int)UniteDept.Type.左侧下拉, Total = special.First().ResultsTotalFee ?? 0, Items = items };
var detail = new DeptDetailItem { Title = "量化考核", Type = (int)UniteDept.Type.左侧下拉, Total = special.First().ResultsTotalFee ?? 0, Items = items };
response.DetailItems.Add(detail);
}
#endregion
#region 特殊处理
var total = response.DetailItems.FirstOrDefault(w => w.Title == UniteDept.Title.工作量绩效.ToString() && w.Type == (int)UniteDept.Type.左侧下拉)?.Total ?? 0;
var total = response.DetailItems.FirstOrDefault(w => w.Title == "量化考核" && w.Type == (int)UniteDept.Type.左侧下拉)?.Total ?? 0;
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩分值.ToString(), Type = (int)UniteDept.Type.右侧收缩, Total = 0 });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩绩效.ToString(), Type = (int)UniteDept.Type.右侧收缩, Total = 0 });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.工作量绩效.ToString(), Type = (int)UniteDept.Type.右侧收缩, Total = account.WorkloadFee ?? 0 });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.工作量绩效.ToString(), Type = (int)UniteDept.Type.右侧收缩, Total = total });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.考核前绩效.ToString(), Type = (int)UniteDept.Type.右侧收缩, Total = special.First().PerforTotal ?? 0 });
#endregion
}
......@@ -275,19 +275,21 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
// 显示详情
#region 补全公共附属表明细
{
var rightSheetTypeMaps = new[]
var rightSheetTypeMaps = new DeptDetailItem[]
{
new { Name = nameof(PerDataAccountBaisc.BasicFactor) , Title = UniteDept.Title.预算比例.ToString(), SheetType = SheetType.BudgetRatio},
new { Name = nameof(PerDataAccountBaisc.Extra), Title = UniteDept.Title.医院奖罚.ToString(), SheetType = SheetType.AccountExtra },
new { Name = nameof(PerDataAccountBaisc.AssessBeforeOtherFee), Title = UniteDept.Title.考核前其他绩效.ToString(), SheetType = SheetType.AssessBeforeOtherFee },
new { Name = nameof(PerDataAccountBaisc.MedicineExtra), Title = UniteDept.Title.药占比奖罚.ToString(), SheetType = SheetType.AccountDrugAssess },
new { Name = nameof(PerDataAccountBaisc.MaterialsExtra), Title = UniteDept.Title.材料占比奖罚.ToString(), SheetType = SheetType.AccountMaterialsAssess },
new { Name = nameof(PerDataAccountBaisc.ScoringAverage), Title = UniteDept.Title.考核得分率.ToString(), SheetType = SheetType.AccountScoreAverage },
new { Name = nameof(PerDataAccountBaisc.AdjustLaterOtherFee), Title = UniteDept.Title.调节后其他绩效.ToString(), SheetType = SheetType.AccountAdjustLaterOtherFee },
new DeptDetailItem { Title = UniteDept.Title.预算比例.ToString(), Type = (int)UniteDept.Type.右侧收缩, SheetType = SheetType.BudgetRatio },
new DeptDetailItem { Title = UniteDept.Title.医院奖罚.ToString(), Type = (int)UniteDept.Type.右侧收缩, SheetType = SheetType.AccountExtra },
new DeptDetailItem { Title = UniteDept.Title.考核前其他绩效.ToString(), Type = (int)UniteDept.Type.右侧收缩, SheetType = SheetType.AssessBeforeOtherFee },
new DeptDetailItem { Title = UniteDept.Title.药占比奖罚.ToString(), Type = (int)UniteDept.Type.右侧收缩, SheetType = SheetType.AccountDrugAssess },
new DeptDetailItem { Title = UniteDept.Title.材料占比奖罚.ToString(), Type = (int)UniteDept.Type.右侧收缩, SheetType = SheetType.AccountMaterialsAssess },
new DeptDetailItem { Title = UniteDept.Title.考核得分率.ToString(), Type = (int)UniteDept.Type.右侧收缩, SheetType = SheetType.AccountScoreAverage },
new DeptDetailItem { Title = UniteDept.Title.调节后其他绩效.ToString(), Type = (int)UniteDept.Type.右侧收缩, SheetType = SheetType.AccountAdjustLaterOtherFee },
};
foreach (var map in rightSheetTypeMaps)
foreach (var detail in rightSheetTypeMaps)
{
foreach (var sheet in persheet.Where(t => t.SheetType == (int)map.SheetType))
response.DetailItems.Add(detail);
foreach (var sheet in persheet.Where(t => t.SheetType == (int)detail.SheetType))
{
var type = TypeConversion(account.UnitType);
var sheetName = BeautifulName(sheet.SheetName);
......@@ -307,8 +309,8 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
items.Add(row);
}
var amount = basicData?.Where(t => t.SheetID == sheet.ID && t.UnitType == (int)type && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0;
var detail = new DeptDetailItem { Title = map.Title, Type = (int)UniteDept.Type.右侧收缩, Total = amount, Items = items };
response.DetailItems.Add(detail);
detail.Total = amount;
detail.Items = items;
}
}
}
......@@ -464,6 +466,7 @@ public UniteDeptSetting GetUniteDeptDetailSetting(int allotId)
};
foreach (var detail in rightSheetTypeMaps)
{
response.DetailItems.Add(detail);
foreach (var sheet in persheet.Where(t => t.SheetType == detail.SheetType))
{
var sheetName = BeautifulName(sheet.SheetName);
......@@ -476,7 +479,6 @@ public UniteDeptSetting GetUniteDeptDetailSetting(int allotId)
items.Add(new UniteDeptDetailItem { Title = post.Key.TypeName, Type = (int)UniteDept.Type.右侧收缩 });
}
detail.Items = items;
response.DetailItems.Add(detail);
}
}
}
......
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