Commit f8730235 by ruyun.zhang@suvalue.com

Merge branch 'fixed/bug2' into v2020calculate

parents e2effe5c dc1d21b8
...@@ -382,8 +382,8 @@ private void AddOrUpdate(per_allot allot, List<per_employee> empDic, IEnumerable ...@@ -382,8 +382,8 @@ private void AddOrUpdate(per_allot allot, List<per_employee> empDic, IEnumerable
List<res_reserved> updates = new List<res_reserved>(), inserts = new List<res_reserved>(); List<res_reserved> updates = new List<res_reserved>(), inserts = new List<res_reserved>();
foreach (var item in group) foreach (var item in group)
{ {
var ratio = empDic?.FirstOrDefault(w => w.DoctorName == item.EmployeeName && w.PersonnelNumber == item.JobNumber)?.ReservedRatio ?? 0; var ratio = empDic?.FirstOrDefault(w => w.PersonnelNumber == item.JobNumber)?.ReservedRatio ?? 0;
var reserved = reserveds?.FirstOrDefault(w => w.AccountingUnit == item.AccountingUnit && w.JobNumber == item.JobNumber && w.EmployeeName == item.EmployeeName); var reserved = reserveds?.FirstOrDefault(w => w.AccountingUnit == item.AccountingUnit && w.JobNumber == item.JobNumber);
if (reserved == null) if (reserved == null)
{ {
reserved = new res_reserved reserved = new res_reserved
......
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