fix report
This commit is contained in:
parent
78b0ad7d1d
commit
9b81e22599
4 changed files with 12 additions and 6 deletions
|
|
@ -894,7 +894,7 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
LeaveLastEnd = lastLeaveRequest == null ? null : lastLeaveRequest.LeaveEndDate,
|
||||
|
||||
//LeaveTotal = rawData.LeaveStartDate.DiffDay(rawData.LeaveEndDate),
|
||||
LeaveTotal = sumLeave - (sumWeekend + sumHoliday),
|
||||
LeaveTotal = rawData.LeaveTotal,
|
||||
|
||||
|
||||
LeaveBirthDate = profile.BirthDate,
|
||||
|
|
@ -1401,7 +1401,7 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
|
||||
|
||||
//LeaveTotal = rawData.LeaveStartDate.DiffDay(rawData.LeaveEndDate),
|
||||
LeaveTotal = sumLeave - (sumHoliday + sumWeekend),
|
||||
LeaveTotal = rawData.LeaveTotal,
|
||||
|
||||
LeaveBirthDate = profile.BirthDate,
|
||||
LeaveGovernmentDate = profile.DateAppoint == null ? null : profile.DateAppoint.Value,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue