#1271 (1) placement and retirement
This commit is contained in:
parent
c1a20aca35
commit
6cb0ddff6b
11 changed files with 203 additions and 339 deletions
|
|
@ -805,17 +805,12 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
{
|
||||
No = r.Sequence.ToString().ToThaiNumber(),
|
||||
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
||||
OldOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" :
|
||||
p.child4Old != null
|
||||
? p.PositionOld == null ? $"{p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child4Old} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child3Old != null
|
||||
? p.PositionOld == null ? $"{p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child3Old} {p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child2Old != null
|
||||
? p.PositionOld == null ? $"{p.child2Old} {p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child2Old} {p.child1Old} {p.rootOld}" :
|
||||
p.child1Old != null
|
||||
? p.PositionOld == null ? $"{p.child1Old} {p.rootOld}" : $"{p.PositionOld} {p.child1Old} {p.rootOld}" :
|
||||
p.rootOld != null
|
||||
? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld} {p.rootOld}" : "-",
|
||||
OldOc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
|
||||
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
|
||||
(p.child3Old == null ? "" : $"{p.child3Old}\n") +
|
||||
(p.child2Old == null ? "" : $"{p.child2Old}\n") +
|
||||
(p.child1Old == null ? "" : $"{p.child1Old}\n") +
|
||||
(p.rootOld == null ? "" : $"{p.rootOld}"),
|
||||
PositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
|
||||
PositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld,
|
||||
PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue