暂时先去掉专家组过程表

parent 15b64912
...@@ -254,7 +254,6 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_ ...@@ -254,7 +254,6 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_
{ {
new { Name = "医生组临床科室单元核算表", Data = doctorWorkloadData, SheetType = SheetType.ComputeDoctorAccount, UnitTypes = new List<UnitType> { UnitType.医生组, UnitType.医技组, UnitType.专家组, UnitType.其他组 } }, new { Name = "医生组临床科室单元核算表", Data = doctorWorkloadData, SheetType = SheetType.ComputeDoctorAccount, UnitTypes = new List<UnitType> { UnitType.医生组, UnitType.医技组, UnitType.专家组, UnitType.其他组 } },
new { Name = "护理组临床科室单元核算表", Data = nurseWorkloadData, SheetType = SheetType.ComputeNurseAccount, UnitTypes = new List<UnitType> { UnitType.护理组 } }, new { Name = "护理组临床科室单元核算表", Data = nurseWorkloadData, SheetType = SheetType.ComputeNurseAccount, UnitTypes = new List<UnitType> { UnitType.护理组 } },
new { Name = "专家核算表", Data = doctorWorkloadData, SheetType = SheetType.ComputeDoctorAccount, UnitTypes = new List<UnitType> { UnitType.专家组 } },
}; };
List<PerSheet> result = new List<PerSheet>(); List<PerSheet> result = new List<PerSheet>();
foreach (var info in pairs) foreach (var info in pairs)
...@@ -301,6 +300,9 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_ ...@@ -301,6 +300,9 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_
dept.RealGiveFee = (dept.PerforTotal * dept.ScoringAverage + dept.Extra + dept.OtherPerfor2) * dept.AdjustFactor; dept.RealGiveFee = (dept.PerforTotal * dept.ScoringAverage + dept.Extra + dept.OtherPerfor2) * dept.AdjustFactor;
dept.Avg = dept.ManagerNumber + dept.Number == 0 ? 0 : dept.PerforTotal / (dept.ManagerNumber + dept.Number); dept.Avg = dept.ManagerNumber + dept.Number == 0 ? 0 : dept.PerforTotal / (dept.ManagerNumber + dept.Number);
} }
#region 共用核算单元算法调整20190920新都调整
var multi = atDataList.GroupBy(t => new { t.UnitType, t.AccountingUnit }) var multi = atDataList.GroupBy(t => new { t.UnitType, t.AccountingUnit })
.Select(t => new { t.Key.UnitType, t.Key.AccountingUnit, Count = t.Count(), }) .Select(t => new { t.Key.UnitType, t.Key.AccountingUnit, Count = t.Count(), })
.Where(t => t.Count > 1); .Where(t => t.Count > 1);
...@@ -314,8 +316,6 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_ ...@@ -314,8 +316,6 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_
} }
} }
//共用核算单元算法调整20190920新都调整
//var multi = atDataList.GroupBy(t => new { t.UnitType, t.AccountingUnit }) //var multi = atDataList.GroupBy(t => new { t.UnitType, t.AccountingUnit })
// .Select(t => new // .Select(t => new
// { // {
...@@ -341,11 +341,10 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_ ...@@ -341,11 +341,10 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_
// } // }
// } // }
//} //}
#endregion
sheet.PerData.AddRange(atDataList); sheet.PerData.AddRange(atDataList);
} }
if ("专家核算表" == info.Name && (sheet.PerData == null || !sheet.PerData.Any()))
continue;
result.Add(sheet); result.Add(sheet);
} }
return result; return result;
......
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