hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

แก้รายงานคำสั่ง

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-09-25 17:06:20 +07:00
parent 1f5edf20ed
commit 652a9f2b16
11 changed files with 130 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

21
BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
View file

@ -620,7 +620,7 @@ namespace BMA.EHR.Application.Repositories.Commands
PositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name.ToThaiNumber(),
Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
//Salary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
ActiveDate = "",
ActiveDate = p.Date == null ? "" : p.Date.Value.ToThaiShortDate2().ToThaiNumber(),
ReceiveOrganizationName = r.Command!.ReceiveOrganizationName
})
.ToList();
@ -706,6 +706,7 @@ namespace BMA.EHR.Application.Repositories.Commands
Organization = p.Organization,
StartDate = p.DateStart == null ? "" : p.DateStart.Value.ToThaiShortDate2().ToThaiNumber(),
EndDate = p.DateEnd == null ? "" : p.DateEnd.Value.ToThaiShortDate2().ToThaiNumber(),
Reason = p.Reason == null ? "" : p.Reason.ToThaiNumber()
})
.ToList();
@ -801,11 +802,11 @@ namespace BMA.EHR.Application.Repositories.Commands
PositionNumber = p.PositionNumberOld.ToThaiNumber(),
Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
//Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
Fault = r.Command.Fault,
GuiltyBasis = r.Command.GuiltyBasis,
Fault = r.Command.Fault.ToThaiNumber(),
GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(),
ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(),
ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(),
ConclusionFireResolution = r.Command.ConclusionFireResolution
ConclusionFireResolution = r.Command.ConclusionFireResolution.ToThaiNumber()
})
.ToList();
@ -855,11 +856,11 @@ namespace BMA.EHR.Application.Repositories.Commands
PositionNumber = p.PositionNumberOld.ToThaiNumber(),
Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
//Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
Fault = r.Command.Fault,
GuiltyBasis = r.Command.GuiltyBasis,
Fault = r.Command.Fault.ToThaiNumber(),
GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(),
ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(),
ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(),
ConclusionFireResolution = r.Command.ConclusionFireResolution
ConclusionFireResolution = r.Command.ConclusionFireResolution.ToThaiNumber()
})
.ToList();
@ -908,11 +909,11 @@ namespace BMA.EHR.Application.Repositories.Commands
PositionNumber = p.PositionNumberOld.ToThaiNumber(),
Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
//Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
Fault = r.Command.Fault,
GuiltyBasis = r.Command.GuiltyBasis,
Fault = r.Command.Fault.ToThaiNumber(),
GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(),
ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(),
ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(),
ConclusionFireResolution = r.Command.ConclusionFireResolution
ConclusionFireResolution = r.Command.ConclusionFireResolution.ToThaiNumber()
})
.ToList();