hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop

Browse source
This commit is contained in:
kittapath 2025-02-07 16:53:12 +07:00
commit fec4095617
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -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,21 +1756,21 @@ 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,
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,