Skip to content

P
performance
Commit a77bf37f by wyc
Options

科室详情 添加（DGR绩效）的显示

parent 202c9746
Showing with 51 additions and 4 deletions
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
......@@ -1096,7 +1096,12 @@
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.PermanentStaff">
<summary>
效率绩效人数
效率绩效人数(在册人数)
</summary>
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.Dgr">
<summary>
DGR绩效
</summary>
</member>
<member name="P:Performance.DtoModels.PerDataAccountBaisc.Number">
......
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
......@@ -4951,6 +4951,11 @@
调节后其他绩效
</summary>
</member>
<member name="P:Performance.EntityModels.im_accountbasic.Dgr">
<summary>
DGR绩效
</summary>
</member>
<member name="T:Performance.EntityModels.im_data">
<summary>
......@@ -9121,6 +9126,11 @@
夜班绩效
</summary>
</member>
<member name="P:Performance.EntityModels.res_account.Dgr">
<summary>
DGR绩效
</summary>
</member>
<member name="T:Performance.EntityModels.res_baiscnorm">
<summary>
核算基础标准
......@@ -9541,6 +9551,11 @@
定科人数(在册人数)
</summary>
</member>
<member name="P:Performance.EntityModels.res_specialunit.Dgr">
<summary>
DGR绩效
</summary>
</member>
<member name="T:Performance.EntityModels.sys_extract">
<summary>
医院数据提取脚本
......
performance/Performance.DtoModels/Enum.cs
......@@ -203,6 +203,7 @@ public enum Title
{
业绩分值 = 2100,
在册人数 = 2101,
DGR绩效 = 2102,
预算比例 = 2110,
业绩绩效 = 2120,
工作量绩效 = 2130,
......
performance/Performance.DtoModels/PerExcel/PerDataAccountBaisc.cs
......@@ -37,9 +37,13 @@ public class PerDataAccountBaisc : IPerData
//public string Department { get; set; }
/// <summary>
/// 效率绩效人数
/// 效率绩效人数(在册人数)
/// </summary>
public Nullable<decimal> PermanentStaff { get; set; }
/// <summary>
/// DGR绩效
/// </summary>
public Nullable<decimal> Dgr { get; set; }
///// <summary>
///// 科主任/护士长数量
......
performance/Performance.EntityModels/Entity/im_accountbasic.cs
......@@ -231,5 +231,9 @@ public class im_accountbasic
/// </summary>
public Nullable<decimal> AdjustLaterOtherFee { get; set; }
public Nullable<decimal> RealGiveFee { get; set; }
/// <summary>
/// DGR绩效
/// </summary>
public Nullable<decimal> Dgr { get; set; }
}
}
performance/Performance.EntityModels/Entity/res_account.cs
......@@ -200,5 +200,9 @@ public class res_account
/// 夜班绩效
/// </summary>
public Nullable<decimal> NightShiftWorkPerforFee { get; set; }
/// <summary>
/// DGR绩效
/// </summary>
public Nullable<decimal> Dgr { get; set; }
}
}
performance/Performance.EntityModels/Entity/res_specialunit.cs
......@@ -145,5 +145,10 @@ public class res_specialunit
/// 定科人数(在册人数)
/// </summary>
public Nullable<decimal> PermanentStaff { get; set; }
/// <summary>
/// DGR绩效
/// </summary>
public Nullable<decimal> Dgr { get; set; }
}
}
performance/Performance.Services/AllotCompute/ProcessComputService.cs
......@@ -392,6 +392,7 @@ public void ComputeOffice(per_allot allot, PerExcel excel)
dept.Income = empolyees.Sum(w => w.PerforTotal ?? 0);
dept.NeedSecondAllot = empolyees.Any(w => w.NeedSecondAllot == "是") ? "是" : "否";
dept.PermanentStaff = resAccount?.PermanentStaff ?? 0;
dept.Dgr=resAccount?.Dgr ?? 0;
if (UnitTypeUtil.IsOffice(resAccount?.UnitType) && dept.NeedSecondAllot == "是")
{
// 夜班绩效 从医院奖罚的明细项中获取
......
performance/Performance.Services/AllotCompute/ResultComputeService.cs
......@@ -205,6 +205,7 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
QuantitativeIndicatorsValue = item.QuantitativeIndicatorsValue,
QuantitativeFee = item.Quantity * item.QuantitativeIndicatorsValue * headcount,
PermanentStaff = dept?.PermanentStaff ?? 0,//定科人数(在册人数)
Dgr= dept?.Dgr ?? 0,//DGR绩效
//ScoringAverage = scoreAverage.HasValue ? scoreAverage : dept?.ScoringAverage,
ScoringAverage = dept?.ScoringAverage ?? 1,
//OtherPerfor = dept?.OtherPerfor1,
......
performance/Performance.Services/ComputeService.UniteDeptDetail.cs
......@@ -11,6 +11,7 @@
using Performance.DtoModels;
using Performance.EntityModels;
using Performance.Infrastructure;
using Performance.Services.ExtractExcelService.SheetDataWrite;
namespace Performance.Services
{
......@@ -120,6 +121,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩分值.ToString(), Total = 0 });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.在册人数.ToString(), Total = account.PermanentStaff ?? 0 });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.DGR绩效.ToString(), Total = account.Dgr ?? 0 });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩绩效.ToString(), Total = total, Children = detailItems });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.工作量绩效.ToString(), Total = 0 });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.考核前绩效.ToString(), Total = total, StandOut = true });
......@@ -166,6 +168,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
#region 特殊处理
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩分值.ToString(), Total = 0 });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.在册人数.ToString(), Total = special.First().PermanentStaff ?? 0 });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.DGR绩效.ToString(), Total = special.First().Dgr ?? 0 });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩绩效.ToString(), Total = 0 });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.工作量绩效.ToString(), Total = detailItems.Total, TotalFormat = detailItems.TotalFormat, Items = detailItems.Items });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.考核前绩效.ToString(), Total = special.First().PerforTotal ?? 0, StandOut = true });
......@@ -215,7 +218,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
if (post.FirstOrDefault().FactorValue != null)
{
items.Add(row);
}
}
}
#region 添加合计
{
......@@ -333,6 +336,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
}
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩分值.ToString(), Total = account.Income ?? 0, Children = detailItems });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.在册人数.ToString(), Total = account.PermanentStaff ?? 0 });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.DGR绩效.ToString(), Total = account.Dgr ?? 0 });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩绩效.ToString(), Total = account.PerforFee ?? 0 });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.工作量绩效.ToString(), Total = detailItemWorkloads.Total, TotalFormat = detailItemWorkloads.TotalFormat, Items = detailItemWorkloads.Items });
response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.考核前绩效.ToString(), Total = account.PerforTotal ?? 0, StandOut = true });
......@@ -660,6 +664,7 @@ public List<UniteDeptDetailItem> GetUniteDeptDetailSetting(int allotId)
#endregion
response.Add(new UniteDeptDetailItem { Title = UniteDept.Title.业绩分值.ToString(), Children = lcUniteDepts });
response.Add(new UniteDeptDetailItem { Title = UniteDept.Title.在册人数.ToString() });
response.Add(new UniteDeptDetailItem { Title = UniteDept.Title.DGR绩效.ToString() });
#region 行政工勤
List<UniteDeptDetailItem> gqUniteDepts = new List<UniteDeptDetailItem>();
{
......
performance/Performance.Services/OriginalService.cs
......@@ -173,6 +173,7 @@ private bool EditAccountBasic(int userId, OriginalRequest request)
{ "核算单元", nameof(im_accountbasic.DoctorAccountingUnit) },
//{ "科室名称", nameof(im_accountbasic.Department) },
{ "效率绩效人数", nameof(im_accountbasic.PermanentStaff) },
{ "DGR绩效", nameof(im_accountbasic.Dgr) },
//{ "科主任/护士长人数", nameof(im_accountbasic.DoctorDirectorNumber) },
{ "核算单元人员数量", nameof(im_accountbasic.DoctorNumber) },
{ "预算比例", nameof(im_accountbasic.DoctorBasicFactor) },
......
performance/Performance.Services/PerExcelService/ExcelReadConfig.cs
......@@ -79,7 +79,8 @@ public class ExcelReadConfig
new ColumnInfo(nameof(PerDataAccountBaisc.UnitType), "核算单元类型"),
new ColumnInfo(nameof(PerDataAccountBaisc.AccountingUnit), "核算单元"),
//new ColumnInfo(nameof(PerDataAccountBaisc.ManagerNumber), "科主任/护士长人数", true),
new ColumnInfo(nameof(PerDataAccountBaisc.PermanentStaff), "在册人数", true),
new ColumnInfo(nameof(PerDataAccountBaisc.Dgr), "DGR绩效", true),
new ColumnInfo(nameof(PerDataAccountBaisc.PermanentStaff), "在册人数", true),
new ColumnInfo(nameof(PerDataAccountBaisc.Number), "核算单元人员数量", true),
new ColumnInfo(nameof(PerDataAccountBaisc.BasicFactor), "预算比例", true),
//new ColumnInfo(nameof(PerDataAccountBaisc.OtherPerfor1), "其他绩效1", true),
......
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