From 9eae970ff39499cc64a28f2da5322cda0466fc63 Mon Sep 17 00:00:00 2001
From: kittapath <>
Date: Tue, 9 Sep 2025 17:54:08 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=99=E0=B8=9A=E0=B8=97=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PlacementController.cs           | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
index 337890f3..1b4ecc38 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
@@ -2118,8 +2118,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                                           currentProvinceId = p.RegistSame == true ? p.RegistProvinceId : p.CurrentProvinceId,
                                           currentDistrictId = p.RegistSame == true ? p.RegistDistrictId : p.CurrentDistrictId,
                                           currentSubDistrictId = p.RegistSame == true ? p.RegistSubDistrictId : p.CurrentSubDistrictId,
-                                          currentZipCode = p.RegistSame == true 
-                                            ? p.RegistZipCode == null ? null : p.RegistZipCode 
+                                          currentZipCode = p.RegistSame == true
+                                            ? p.RegistZipCode == null ? null : p.RegistZipCode
                                             : p.CurrentZipCode == null ? null : p.CurrentZipCode,
                                           amount = r.amount,
                                           amountSpecial = r.amountSpecial,
@@ -2344,8 +2344,10 @@ namespace BMA.EHR.Placement.Service.Controllers
                                    {
                                        No = r.Sequence.ToString().ToThaiNumber(),
                                        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 ? "-" :
-                                                                   p.PlacementEducations.FirstOrDefault().Degree,
+                                            $"{p.PlacementEducations.FirstOrDefault().Degree} {p.PlacementEducations.FirstOrDefault().Field}",
                                        OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
                                                (p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
                                                (p.child4Old == null ? "" : $"{p.child4Old}\n") +
@@ -2578,8 +2580,10 @@ namespace BMA.EHR.Placement.Service.Controllers
                                    {
                                        No = r.Sequence.ToString().ToThaiNumber(),
                                        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 ? "-" :
-                                            p.PlacementEducations.FirstOrDefault().Degree,
+                                            $"{p.PlacementEducations.FirstOrDefault().Degree} {p.PlacementEducations.FirstOrDefault().Field}",
                                        OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
                                                (p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
                                                (p.child4Old == null ? "" : $"{p.child4Old}\n") +
@@ -2801,8 +2805,10 @@ namespace BMA.EHR.Placement.Service.Controllers
                                    {
                                        No = r.Sequence.ToString().ToThaiNumber(),
                                        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 ? "-" :
-                                            p.PlacementEducations.FirstOrDefault().Degree,
+                                            $"{p.PlacementEducations.FirstOrDefault().Degree} {p.PlacementEducations.FirstOrDefault().Field}",
                                        OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
                                                (p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
                                                (p.child4Old == null ? "" : $"{p.child4Old}\n") +