去除人名匹配

parent 43994d7d
...@@ -396,14 +396,14 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D ...@@ -396,14 +396,14 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
/* 如果是已保存数据,则加载原始数据,否则加载工作量自动带出 */ /* 如果是已保存数据,则加载原始数据,否则加载工作量自动带出 */
value = isSave value = isSave
? bodyDynamic?.FirstOrDefault(w => w.BodyId == employee.Id && w.WorkloadId == workitem.Id)?.Value ? bodyDynamic?.FirstOrDefault(w => w.BodyId == employee.Id && w.WorkloadId == workitem.Id)?.Value
: secondWorkload.FirstOrDefault(w => w.PersonnelNumber == employee.WorkNumber && w.DoctorName == employee.Name && workitem.ItemId.EqualsIgnoreCase(w.ItemId))?.Value; : secondWorkload.FirstOrDefault(w => w.PersonnelNumber == employee.WorkNumber && workitem.ItemId.EqualsIgnoreCase(w.ItemId))?.Value;
} }
else else
{ {
/* 如果是已保存数据,则加载原始数据,否则加载工作量自动带出 */ /* 如果是已保存数据,则加载原始数据,否则加载工作量自动带出 */
value = isSave && overrideMode != EmployeeSource.Workload value = isSave && overrideMode != EmployeeSource.Workload
? bodyDynamic?.FirstOrDefault(w => w.BodyId == employee.Id && w.WorkloadId == workitem.Id)?.Value ? bodyDynamic?.FirstOrDefault(w => w.BodyId == employee.Id && w.WorkloadId == workitem.Id)?.Value
: secondWorkload.FirstOrDefault(w => w.PersonnelNumber == employee.WorkNumber && w.DoctorName == employee.Name && workitem.ItemId.EqualsIgnoreCase(w.ItemId))?.Value; : secondWorkload.FirstOrDefault(w => w.PersonnelNumber == employee.WorkNumber && workitem.ItemId.EqualsIgnoreCase(w.ItemId))?.Value;
} }
dict.AddOrUpdate(workitem.ItemId, value); dict.AddOrUpdate(workitem.ItemId, value);
} }
......
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