Skip to content

P
performance
Commit f08504de by ruyun.zhang@suvalue.com
Options

科室详情

parent 201a7605
Showing with 31 additions and 26 deletions
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
...@@ -570,7 +570,12 @@ ...@@ -570,7 +570,12 @@
</member> </member>
<member name="P:Performance.DtoModels.ComputeResult.ShouldGiveFee"> <member name="P:Performance.DtoModels.ComputeResult.ShouldGiveFee">
<summary> <summary>
应发管理绩效(需计算) 考核前管理绩效
</summary>
</member>
<member name="P:Performance.DtoModels.ComputeResult.AssessLaterManagementFee">
<summary>
考核后管理绩效
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.ComputeResult.PerforSumFee"> <member name="P:Performance.DtoModels.ComputeResult.PerforSumFee">
...@@ -620,7 +625,7 @@ ...@@ -620,7 +625,7 @@
</member> </member>
<member name="P:Performance.DtoModels.ComputeResult.GiveFee"> <member name="P:Performance.DtoModels.ComputeResult.GiveFee">
<summary> <summary>
应发绩效 考核前(需计算) 应发绩效 考核后(需计算)
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.ComputeResult.BaiscNormPerforTotal"> <member name="P:Performance.DtoModels.ComputeResult.BaiscNormPerforTotal">
......
performance/Performance.Services/ComputeService.cs
...@@ -710,7 +710,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId) ...@@ -710,7 +710,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
var sheetType = new List<int> { var sheetType = new List<int> {
(int)SheetType.Income, (int)SheetType.OtherIncome, (int)SheetType.Expend, (int)SheetType.Workload, (int)SheetType.AccountExtra, (int)SheetType.Income, (int)SheetType.OtherIncome, (int)SheetType.Expend, (int)SheetType.Workload, (int)SheetType.AccountExtra,
(int)SheetType.AccountDrugAssess, (int)SheetType.AccountMaterialsAssess, (int)SheetType.AccountScoreAverage, (int)SheetType.AccountDrugAssess, (int)SheetType.AccountMaterialsAssess, (int)SheetType.AccountScoreAverage,
(int)SheetType.AccountAdjustLaterOtherFee (int)SheetType.AccountAdjustLaterOtherFee,(int)SheetType.AccountScoreAverage, (int)SheetType.BudgetRatio, (int)SheetType.AssessBeforeOtherFee
}; };
foreach (var stype in sheetType) foreach (var stype in sheetType)
{ {
...@@ -751,26 +751,25 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId) ...@@ -751,26 +751,25 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
} }
else if (sheet.SheetType == (int)SheetType.AccountDrugAssess) else if (sheet.SheetType == (int)SheetType.AccountDrugAssess)
{ {
sheettype = 6; sheettype = 5;
amount = doctor?.MedicineExtra ?? 0; amount = doctor?.MedicineExtra ?? 0;
} }
else if (sheet.SheetType == (int)SheetType.AccountMaterialsAssess) else if (sheet.SheetType == (int)SheetType.AccountMaterialsAssess)
{ {
sheettype = 7; sheettype = 5;
amount = doctor?.MaterialsExtra ?? 0; amount = doctor?.MaterialsExtra ?? 0;
} }
else if (sheet.SheetType == (int)SheetType.AccountScoreAverage) else
{
int[] types = new int[] { (int)SheetType.AccountScoreAverage, (int)SheetType.BudgetRatio, (int)SheetType.AssessBeforeOtherFee, (int)SheetType.AccountAdjustLaterOtherFee };
if (types.Contains(sheet.SheetType ?? 0))
{ {
sheettype = 8; sheettype = 5;
//amount = Math.Round(doctor?.ScoringAverage ?? 0, 4);
amount = Math.Round(basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == type && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0, 4); amount = Math.Round(basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == type && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0, 4);
} }
else if (sheet.SheetType == (int)SheetType.AccountAdjustLaterOtherFee)
{
sheettype = 9;
amount = Math.Round(basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == type && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0, 0);
} }
var item = new DetailDtos var item = new DetailDtos
{ {
ItemName = sheetName, ItemName = sheetName,
...@@ -972,7 +971,8 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second) ...@@ -972,7 +971,8 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second)
var sheetType = new List<int> var sheetType = new List<int>
{ {
(int)SheetType.AccountExtra, (int)SheetType.AccountDrugAssess, (int)SheetType.AccountMaterialsAssess, (int)SheetType.AccountExtra, (int)SheetType.AccountDrugAssess, (int)SheetType.AccountMaterialsAssess,
(int)SheetType.AccountScoreAverage, (int)SheetType.AccountAdjustLaterOtherFee (int)SheetType.AccountScoreAverage, (int)SheetType.AccountAdjustLaterOtherFee,(int)SheetType.AccountScoreAverage,
(int)SheetType.BudgetRatio, (int)SheetType.AssessBeforeOtherFee,
}; };
Regex reg = new Regex("[0-9]*"); Regex reg = new Regex("[0-9]*");
int groupBasis = 0; int groupBasis = 0;
...@@ -996,24 +996,22 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second) ...@@ -996,24 +996,22 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second)
} }
else if (sheet.SheetType == (int)SheetType.AccountDrugAssess) else if (sheet.SheetType == (int)SheetType.AccountDrugAssess)
{ {
sheettype = 6; sheettype = 5;
amount = special.FirstOrDefault()?.MedicineExtra ?? 0; amount = special.FirstOrDefault()?.MedicineExtra ?? 0;
} }
else if (sheet.SheetType == (int)SheetType.AccountMaterialsAssess) else if (sheet.SheetType == (int)SheetType.AccountMaterialsAssess)
{ {
sheettype = 7; sheettype = 5;
amount = special.FirstOrDefault()?.MaterialsExtra ?? 0; amount = special.FirstOrDefault()?.MaterialsExtra ?? 0;
} }
else if (sheet.SheetType == (int)SheetType.AccountScoreAverage) else
{ {
sheettype = 8; int[] types = new int[] { (int)SheetType.AccountScoreAverage, (int)SheetType.BudgetRatio, (int)SheetType.AssessBeforeOtherFee, (int)SheetType.AccountAdjustLaterOtherFee };
//amount = Math.Round(special.FirstOrDefault()?.ScoringAverage ?? 0, 4); if (types.Contains(sheet.SheetType ?? 0))
{
sheettype = 5;
amount = Math.Round(basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == (int)UnitType.特殊核算组 && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0, 4); amount = Math.Round(basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == (int)UnitType.特殊核算组 && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0, 4);
} }
else if (sheet.SheetType == (int)SheetType.AccountAdjustLaterOtherFee)
{
sheettype = 9;
amount = Math.Round(basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == (int)UnitType.特殊核算组 && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0, 0);
} }
var item = new DetailDtos var item = new DetailDtos
......
performance/Performance.Services/PerExcelService/PerSheetService.cs
...@@ -104,6 +104,12 @@ public SheetType GetSheetType(string sheetName) ...@@ -104,6 +104,12 @@ public SheetType GetSheetType(string sheetName)
return SheetType.AccountDrugAssess; return SheetType.AccountDrugAssess;
else if (sheetName.StartsWith("5.4")) else if (sheetName.StartsWith("5.4"))
return SheetType.AccountMaterialsAssess; return SheetType.AccountMaterialsAssess;
else if (sheetName.StartsWith("6.10")) // 调节后其他管理绩效
return SheetType.PersonAdjustLaterOtherManagePerforFee;
else if (sheetName.StartsWith("6.11")) // 个人岗位系数
return SheetType.PersonPostCoefficient;
else if (sheetName.StartsWith("6.1")) else if (sheetName.StartsWith("6.1"))
return SheetType.AccountScoreAverage; return SheetType.AccountScoreAverage;
else if (sheetName.StartsWith("6.2")) else if (sheetName.StartsWith("6.2"))
...@@ -119,10 +125,6 @@ public SheetType GetSheetType(string sheetName) ...@@ -119,10 +125,6 @@ public SheetType GetSheetType(string sheetName)
return SheetType.AccountAdjustLaterOtherFee; return SheetType.AccountAdjustLaterOtherFee;
else if (sheetName.StartsWith("6.9")) // 其他管理绩效 else if (sheetName.StartsWith("6.9")) // 其他管理绩效
return SheetType.PersonOtherManagePerforFee; return SheetType.PersonOtherManagePerforFee;
else if (sheetName.StartsWith("6.10")) // 调节后其他管理绩效
return SheetType.PersonAdjustLaterOtherManagePerforFee;
else if (sheetName.StartsWith("6.11")) // 个人岗位系数
return SheetType.PersonPostCoefficient;
return SheetType.Unidentifiable; return SheetType.Unidentifiable;
} }
......
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