Commit c6da600d by 李承祥

部分实发绩效数据为0修改

parent 03a803ff
......@@ -231,10 +231,17 @@ private List<PerSheet> MergeCompute(PerExcel excel)
doctorSheet.PerData.Add(doctor);
var nurse = Mapper.Map<PerDataAccountNurse>(dept);
if (nurse.AdjustFactor == 0m) nurse.AdjustFactor = 1;
if (nurse.ScoringAverage == 0m) nurse.ScoringAverage = 1;
var econNurse = twiceEconomicResult.PerData.FirstOrDefault(t => t.UnitType == "护理组" && t.AccountingUnit == dept.AccountingUnit);
nurse.Income = econNurse?.CellValue ?? 0;
var workNurse = twiceWorkloadResult2.PerData.FirstOrDefault(t => t.UnitType == "护理组" && t.AccountingUnit == dept.AccountingUnit);
nurse.WorkloadFee = workNurse?.CellValue ?? 0;
if (nurse.PerforTotal == 0m && nurse.Extra == 0m && nurse.OtherPerfor2 == 0m && nurse.ScoringAverage == 1m && nurse.AdjustFactor == 1m)
{
nurse.AdjustFactor = 0;
nurse.ScoringAverage = 0;
}
nurseSheet.PerData.Add(nurse);
}
perSheet.Add(doctorSheet);
......
......@@ -221,7 +221,7 @@ public void Generate(per_allot allot, UserIdentity user)
_allotRepository.UpdateAllotStates(allot.ID, (int)AllotStates.GenerateFail, EnumHelper.GetDescription(AllotStates.GenerateFail));
SendEmail(allot, user.Mail, "绩效生成失败", ex.ToString());
logdbug.Add(allot.ID, "绩效开始执行", ex.ToString());
throw ex;
//throw ex;
}
}
......
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