Merge branch 'develop' into working
This commit is contained in:
commit
cc4e2fa0d6
2 changed files with 4 additions and 4 deletions
|
|
@ -5090,12 +5090,12 @@ namespace BMA.EHR.Application.Repositories
|
|||
ProfileId = p.Id,
|
||||
Prefix = p.Prefix == null ? null : p.Prefix.Name,
|
||||
FullName = $"{(p.Prefix == null ? null : p.Prefix.Name)}{p.FirstName} {p.LastName}",
|
||||
Position = p.Position.Name,
|
||||
Position = p.Position == null ? null : p.Position.Name,
|
||||
PosNo = p.PosNo == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.PosNo.Id,
|
||||
Rank = p.PositionLevel.Name,
|
||||
GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
|
||||
Rank = p.PositionLevel == null ? null : p.PositionLevel.Name,
|
||||
GovAge = p.PositionLevel == null ? null : p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
|
||||
LastInsignia = p.Insignias.Count == 0 ? "" : p.Insignias.Where(x => !x.Insignia.Name.Contains("เหรียญจักรพรรดิมาลา")).OrderByDescending(x => x.Year).FirstOrDefault().Insignia.Name,
|
||||
LastInsigniaId = p.Insignias.Where(x => !x.Insignia.Name.Contains("เหรียญจักรพรรดิมาลา")).OrderByDescending(x => x.Year).FirstOrDefault().Insignia.Id,
|
||||
LastInsigniaId = p.Insignias.Where(x => !x.Insignia.Name.Contains("เหรียญจักรพรรดิมาลา")).FirstOrDefault() == null ? null : p.Insignias.Where(x => !x.Insignia.Name.Contains("เหรียญจักรพรรดิมาลา")).OrderByDescending(x => x.Year).FirstOrDefault().Insignia.Id,
|
||||
Salary = p.Salaries.Count() == 0 ? null : p.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
|
||||
RequestInsignia = GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก"),
|
||||
Seq = 4,
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue