医院奖罚

parent d7874bfa
...@@ -310,7 +310,7 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet) ...@@ -310,7 +310,7 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet)
//dept.Extra = (extra ?? 0); //dept.Extra = (extra ?? 0);
//dept.MedicineExtra = (drugExtra ?? 0); //dept.MedicineExtra = (drugExtra ?? 0);
//dept.MaterialsExtra = (materialsExtra ?? 0); //dept.MaterialsExtra = (materialsExtra ?? 0);
dept.Extra = 0; dept.Extra = dept?.Extra ?? 0;
dept.MedicineExtra = dept.MedicineExtra ?? 0; dept.MedicineExtra = dept.MedicineExtra ?? 0;
dept.MaterialsExtra = dept.MaterialsExtra ?? 0; dept.MaterialsExtra = dept.MaterialsExtra ?? 0;
...@@ -375,7 +375,7 @@ public void ComputeOffice(per_allot allot, PerExcel excel) ...@@ -375,7 +375,7 @@ public void ComputeOffice(per_allot allot, PerExcel excel)
//dept.Extra = (extra ?? 0); //dept.Extra = (extra ?? 0);
//dept.MedicineExtra = 0;// (drugExtra ?? 0); //dept.MedicineExtra = 0;// (drugExtra ?? 0);
//dept.MaterialsExtra = 0;//(materialsExtra ?? 0); //dept.MaterialsExtra = 0;//(materialsExtra ?? 0);
dept.Extra = 0; dept.Extra = resAccount?.Extra ?? 0;
dept.MedicineExtra = resAccount?.MedicineExtra ?? 0;// (drugExtra ?? 0); dept.MedicineExtra = resAccount?.MedicineExtra ?? 0;// (drugExtra ?? 0);
dept.MaterialsExtra = resAccount?.MaterialsExtra ?? 0;//(materialsExtra ?? 0); dept.MaterialsExtra = resAccount?.MaterialsExtra ?? 0;//(materialsExtra ?? 0);
......
...@@ -81,6 +81,7 @@ public class ExcelReadConfig ...@@ -81,6 +81,7 @@ public class ExcelReadConfig
new ColumnInfo(nameof(PerDataAccountBaisc.Number), "核算单元人员数量", true), new ColumnInfo(nameof(PerDataAccountBaisc.Number), "核算单元人员数量", true),
new ColumnInfo(nameof(PerDataAccountBaisc.BasicFactor), "预算比例", true), new ColumnInfo(nameof(PerDataAccountBaisc.BasicFactor), "预算比例", true),
//new ColumnInfo(nameof(PerDataAccountBaisc.OtherPerfor1), "其他绩效1", true), //new ColumnInfo(nameof(PerDataAccountBaisc.OtherPerfor1), "其他绩效1", true),
new ColumnInfo(nameof(PerDataAccountBaisc.Extra), "医院奖罚", true),
new ColumnInfo(nameof(PerDataAccountBaisc.AssessBeforeOtherFee), "考核前其他绩效", true), new ColumnInfo(nameof(PerDataAccountBaisc.AssessBeforeOtherFee), "考核前其他绩效", true),
new ColumnInfo(nameof(PerDataAccountBaisc.MedicineExtra), "药占比奖罚", true), new ColumnInfo(nameof(PerDataAccountBaisc.MedicineExtra), "药占比奖罚", true),
new ColumnInfo(nameof(PerDataAccountBaisc.MaterialsExtra), "材料占比奖罚", true), new ColumnInfo(nameof(PerDataAccountBaisc.MaterialsExtra), "材料占比奖罚", 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