แนบท้าย
This commit is contained in:
parent
fb6a82be14
commit
9eae970ff3
1 changed files with 11 additions and 5 deletions
|
|
@ -2344,8 +2344,10 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
{
|
{
|
||||||
No = r.Sequence.ToString().ToThaiNumber(),
|
No = r.Sequence.ToString().ToThaiNumber(),
|
||||||
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
||||||
|
// Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
|
||||||
|
// p.PlacementEducations.FirstOrDefault().Degree,
|
||||||
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
|
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
|
||||||
p.PlacementEducations.FirstOrDefault().Degree,
|
$"{p.PlacementEducations.FirstOrDefault().Degree} {p.PlacementEducations.FirstOrDefault().Field}",
|
||||||
OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
|
OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
|
||||||
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
|
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
|
||||||
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
|
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
|
||||||
|
|
@ -2578,8 +2580,10 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
{
|
{
|
||||||
No = r.Sequence.ToString().ToThaiNumber(),
|
No = r.Sequence.ToString().ToThaiNumber(),
|
||||||
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
||||||
|
// Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
|
||||||
|
// p.PlacementEducations.FirstOrDefault().Degree,
|
||||||
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
|
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
|
||||||
p.PlacementEducations.FirstOrDefault().Degree,
|
$"{p.PlacementEducations.FirstOrDefault().Degree} {p.PlacementEducations.FirstOrDefault().Field}",
|
||||||
OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
|
OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
|
||||||
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
|
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
|
||||||
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
|
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
|
||||||
|
|
@ -2801,8 +2805,10 @@ namespace BMA.EHR.Placement.Service.Controllers
|
||||||
{
|
{
|
||||||
No = r.Sequence.ToString().ToThaiNumber(),
|
No = r.Sequence.ToString().ToThaiNumber(),
|
||||||
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
||||||
|
// Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
|
||||||
|
// p.PlacementEducations.FirstOrDefault().Degree,
|
||||||
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
|
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
|
||||||
p.PlacementEducations.FirstOrDefault().Degree,
|
$"{p.PlacementEducations.FirstOrDefault().Degree} {p.PlacementEducations.FirstOrDefault().Field}",
|
||||||
OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
|
OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
|
||||||
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
|
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
|
||||||
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
|
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue