From 98f493ec9769128e4039b3600af3c97b4cea1db3 Mon Sep 17 00:00:00 2001 From: Bright Date: Thu, 6 Feb 2025 18:17:32 +0700 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84?= =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B8=9A=E0=B8=A3?= =?UTF-8?q?=E0=B8=A3=E0=B8=88=E0=B8=B8=E0=B9=80=E0=B8=AA=E0=B8=A3=E0=B9=87?= =?UTF-8?q?=E0=B8=88=E0=B8=AA=E0=B8=B4=E0=B9=89=E0=B8=99=20(=E0=B8=82?= =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=97=E0=B8=B5?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=A2=E0=B8=B9=E0=B9=88=E0=B9=84=E0=B8=A1?= =?UTF-8?q?=E0=B9=88=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81?= =?UTF-8?q?=E0=B8=A5=E0=B8=87=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B8=97?= =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4)=20UAT?= =?UTF-8?q?=20#889?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PlacementController.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 12fec625..074291af 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1762,14 +1762,14 @@ namespace BMA.EHR.Placement.Service.Controllers religion = p.Religion == null ? string.Empty : p.Religion, bloodGroup = string.Empty, registrationAddress = p.RegistAddress == null ? string.Empty : p.RegistAddress, - registrationProvinceId = (String?)null, - registrationDistrictId = (String?)null, - registrationSubDistrictId = (String?)null, + registrationProvinceId = p.RegistProvinceId ?? null, + registrationDistrictId = p.RegistDistrictId ?? null, + registrationSubDistrictId = p.RegistSubDistrictId ?? null, registrationZipCode = p.RegistZipCode == null ? string.Empty : p.RegistZipCode, currentAddress = p.CurrentAddress == null ? string.Empty : p.CurrentAddress, - currentProvinceId = (String?)null, - currentDistrictId = (String?)null, - currentSubDistrictId = (String?)null, + currentProvinceId = p.CurrentProvinceId ?? null, + currentDistrictId = p.CurrentDistrictId ?? null, + currentSubDistrictId = p.CurrentSubDistrictId ?? null, currentZipCode = p.CurrentZipCode == null ? string.Empty : p.CurrentZipCode, amount = r.amount, amountSpecial = r.amountSpecial, From 45e4402b136be9ae03df7fcf84daf0572c5de266 Mon Sep 17 00:00:00 2001 From: Bright Date: Fri, 7 Feb 2025 10:18:54 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=80=E0=B8=9A=E0=B8=AD=E0=B8=A3?= =?UTF-8?q?=E0=B9=8C=E0=B9=82=E0=B8=97=E0=B8=A3=E0=B8=9B=E0=B8=A3=E0=B8=B1?= =?UTF-8?q?=E0=B8=9A=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B9=80=E0=B8=81=E0=B9=87?= =?UTF-8?q?=E0=B8=9A=E0=B9=81=E0=B8=84=E0=B9=88=E0=B8=95=E0=B8=B1=E0=B8=A7?= =?UTF-8?q?=E0=B9=80=E0=B8=A5=E0=B8=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Placement.Service/Controllers/PlacementController.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 074291af..ac13682b 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -16,6 +16,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using static Microsoft.EntityFrameworkCore.DbLoggerCategory; using BMA.EHR.Application.Repositories.Reports; +using System.Text.RegularExpressions; namespace BMA.EHR.Placement.Service.Controllers { @@ -1743,7 +1744,7 @@ namespace BMA.EHR.Placement.Service.Controllers posLevelId = p.posLevelId == null ? string.Empty : p.posLevelId, posTypeId = p.posTypeId == null ? string.Empty : p.posTypeId, email = p.Email == null ? string.Empty : p.Email, - phone = p.MobilePhone == null ? string.Empty : p.MobilePhone, + phone = p.MobilePhone == null ? string.Empty : Regex.Replace(p.MobilePhone, @"\D", ""), keycloak = string.Empty, isProbation = true, isLeave = false, @@ -1755,7 +1756,7 @@ namespace BMA.EHR.Placement.Service.Controllers birthDate = p.DateOfBirth == null ? (DateTime?)null : p.DateOfBirth, reasonSameDate = (DateTime?)null, ethnicity = p.Race == null ? string.Empty : p.Race, - telephoneNumber = p.Telephone == null ? string.Empty : p.Telephone, + telephoneNumber = p.Telephone == null ? string.Empty : Regex.Replace(p.Telephone, @"\D", ""), nationality = p.Nationality == null ? string.Empty : p.Nationality, gender = p.Gender == null ? string.Empty : p.Gender, relationship = p.Relationship == null ? string.Empty : p.Relationship,