This commit is contained in:
parent
0065468568
commit
7ee1477ee2
1 changed files with 5 additions and 13 deletions
|
|
@ -113,21 +113,13 @@ namespace BMA.EHR.Application.Repositories.Reports
|
||||||
|
|
||||||
OccupationPositionType = p.OccupationPositionType == "other" ? "ผู้ปฏิบัติงานอื่นในกรุงเทพมหานคร" : (p.OccupationPositionType == "temp" ? "ลูกจ้างชั่วคราว" : (p.OccupationPositionType == "prem" ? "ลูกจ้างประจำ" : "-")),
|
OccupationPositionType = p.OccupationPositionType == "other" ? "ผู้ปฏิบัติงานอื่นในกรุงเทพมหานคร" : (p.OccupationPositionType == "temp" ? "ลูกจ้างชั่วคราว" : (p.OccupationPositionType == "prem" ? "ลูกจ้างประจำ" : "-")),
|
||||||
OccupationPosition = p.OccupationPosition == null ? "-" : p.OccupationPosition,
|
OccupationPosition = p.OccupationPosition == null ? "-" : p.OccupationPosition,
|
||||||
OccupationSalary = p.OccupationSalary == null ? "-" : p.OccupationSalary.Value.ToString("N0"),
|
OccupationSalary = p.OccupationSalary == null ? "-" : (p.OccupationSalary.Value % 1 == 0 ? p.OccupationSalary.Value.ToString("N0") : p.OccupationSalary.Value.ToString("N2")),
|
||||||
OccupationGroup = p.OccupationGroup == null ? "-" : p.OccupationGroup,
|
OccupationGroup = p.OccupationGroup == null ? "-" : p.OccupationGroup,
|
||||||
OccupationPile = p.OccupationPile == null ? "-" : p.OccupationPile,
|
OccupationPile = p.OccupationPile == null ? "-" : p.OccupationPile,
|
||||||
OccupationOrg = p.OccupationOrg == null ? "-" : p.OccupationOrg,
|
OccupationOrg = p.OccupationOrg == null ? "-" : p.OccupationOrg,
|
||||||
OccupationTelephone = p.OccupationTelephone == null ? "-" : p.OccupationTelephone,
|
OccupationTelephone = p.OccupationTelephone == null ? "-" : p.OccupationTelephone,
|
||||||
|
|
||||||
CareersTotal = sb.ToString(),
|
CareersTotal = sb.ToString(),
|
||||||
// Careers = p.Careers.Select(y => new
|
|
||||||
// {
|
|
||||||
// Position = y.Position,
|
|
||||||
// Type = y.Type,
|
|
||||||
// DurationStart = y.DurationStart.ToThaiShortDate2(),
|
|
||||||
// DurationEnd = y.DurationEnd.ToThaiShortDate2(),
|
|
||||||
// RangeDate = y.RangeDate,
|
|
||||||
// }).ToList(),
|
|
||||||
|
|
||||||
RegistAddress = p.RegistAddress == null ? "-" : p.RegistAddress,
|
RegistAddress = p.RegistAddress == null ? "-" : p.RegistAddress,
|
||||||
RegistProvinceName = p.RegistProvinceName == null ? "-" : p.RegistProvinceName,
|
RegistProvinceName = p.RegistProvinceName == null ? "-" : p.RegistProvinceName,
|
||||||
|
|
@ -176,10 +168,10 @@ namespace BMA.EHR.Application.Repositories.Reports
|
||||||
{
|
{
|
||||||
Position = item.Position,
|
Position = item.Position,
|
||||||
Type = item.Type,
|
Type = item.Type,
|
||||||
DurationStart = item.DurationStart.ToThaiNumber(),
|
DurationStart = item.DurationStart,
|
||||||
DurationEnd = item.DurationEnd.ToThaiNumber(),
|
DurationEnd = item.DurationEnd,
|
||||||
RangeDate = item.RangeDate.ToThaiNumber(),
|
RangeDate = item.RangeDate,
|
||||||
Index = retVal.ToString().ToThaiNumber(),
|
Index = retVal.ToString(),
|
||||||
};
|
};
|
||||||
data.Add(_data);
|
data.Add(_data);
|
||||||
retVal++;
|
retVal++;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue