Commit c8afc4b1 by wyc

Merge branch 'feature/考核' into develop

parents a7bd8716 7af194db
......@@ -1836,7 +1836,7 @@ public DeptDataDetails GetDoctorDetail(int computeId)
var data = _perforImDataRepository.GetEntities(t => t.AllotID == resCompute.AllotID && sheets.Select(s => s.ID).Contains(t.SheetID.Value)
&& t.JobNumber == resCompute.JobNumber) ?? new List<im_data>();
data = data.Where(t => ((UnitType)t.UnitType).ToString() == resCompute.UnitType && t.AccountingUnit == resCompute.AccountingUnit).ToList();
data = data.Where(t => t.UnitType != null && Enum.IsDefined(typeof(UnitType), t.UnitType ) == true && ((UnitType)t.UnitType).ToString() == resCompute.UnitType && t.AccountingUnit == resCompute.AccountingUnit).ToList();
foreach (var sheet in sheets)
{
......
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