แก้บรรจุ

This commit is contained in:
Kittapath 2024-05-16 17:00:47 +07:00
parent 7876063288
commit 94c43e5479
11 changed files with 18442 additions and 428 deletions

View file

@ -252,7 +252,7 @@ namespace BMA.EHR.Application.Repositories.Commands
{
Sequence = seq,
CitizenId = item.CitizenId!,
Prefix = item.Prefix!.Name,
Prefix = item.Prefix,
FirstName = item.Firstname!,
LastName = item.Lastname!,
RefPlacementProfileId = item.Id,
@ -317,7 +317,7 @@ namespace BMA.EHR.Application.Repositories.Commands
{
Sequence = seq,
CitizenId = item.CitizenId!,
Prefix = item.Prefix!.Name,
Prefix = item.Prefix,
FirstName = item.Firstname!,
LastName = item.Lastname!,
RefPlacementProfileId = item.Id,
@ -383,7 +383,7 @@ namespace BMA.EHR.Application.Repositories.Commands
{
Sequence = seq,
CitizenId = item.CitizenId!,
Prefix = item.Prefix!.Name,
Prefix = item.Prefix,
FirstName = item.Firstname!,
LastName = item.Lastname!,
RefPlacementProfileId = item.Id,
@ -448,7 +448,7 @@ namespace BMA.EHR.Application.Repositories.Commands
{
Sequence = seq,
CitizenId = item.CitizenId!,
Prefix = item.Prefix!.Name,
Prefix = item.Prefix,
FirstName = item.Firstname!,
LastName = item.Lastname!,
RefPlacementProfileId = item.Id,
@ -2675,7 +2675,7 @@ namespace BMA.EHR.Application.Repositories.Commands
/// </summary>
/// <param name="command">object ของรายการคำสั่ง</param>
/// <returns></returns>
private async Task ExecuteCommand01_02Async(Command command, string token="")
private async Task ExecuteCommand01_02Async(Command command, string token = "")
{
try
{
@ -2703,21 +2703,21 @@ namespace BMA.EHR.Application.Repositories.Commands
.Include(x => x.PlacementProfileDocs)
.ThenInclude(x => x.Document)
.Include(x => x.Prefix)
.Include(x => x.FatherPrefix)
.Include(x => x.MotherPrefix)
.Include(x => x.MarryPrefix)
.Include(x => x.Gender)
.Include(x => x.Relationship)
.Include(x => x.BloodGroup)
.Include(x => x.Religion)
// .Include(x => x.Prefix)
// .Include(x => x.FatherPrefix)
// .Include(x => x.MotherPrefix)
// .Include(x => x.MarryPrefix)
// .Include(x => x.Gender)
// .Include(x => x.Relationship)
// .Include(x => x.BloodGroup)
// .Include(x => x.Religion)
.Include(x => x.RegistSubDistrict)
.Include(x => x.RegistDistrict)
.Include(x => x.RegistProvince)
.Include(x => x.CurrentSubDistrict)
.Include(x => x.CurrentDistrict)
.Include(x => x.CurrentProvince)
// .Include(x => x.RegistSubDistrict)
// .Include(x => x.RegistDistrict)
// .Include(x => x.RegistProvince)
// .Include(x => x.CurrentSubDistrict)
// .Include(x => x.CurrentDistrict)
// .Include(x => x.CurrentProvince)
.Include(x => x.PositionPath)
.Include(x => x.PositionPathSide)
@ -2864,7 +2864,7 @@ namespace BMA.EHR.Application.Repositories.Commands
var _res = await client.PostAsJsonAsync(apiUrl, new
{
rank = string.Empty,
prefix = placementProfile.Prefix.Name == null ? string.Empty : placementProfile.Prefix.Name,
prefix = placementProfile.Prefix == null ? string.Empty : placementProfile.Prefix,
firstName = placementProfile.Firstname == null ? string.Empty : placementProfile.Firstname,
lastName = placementProfile.Lastname == null ? string.Empty : placementProfile.Lastname,
citizenId = placementProfile.CitizenId == null ? string.Empty : placementProfile.CitizenId,
@ -2886,9 +2886,9 @@ namespace BMA.EHR.Application.Repositories.Commands
ethnicity = placementProfile.Race == null ? string.Empty : placementProfile.Race,
telephoneNumber = placementProfile.Telephone == null ? string.Empty : placementProfile.Telephone,
nationality = placementProfile.Nationality == null ? string.Empty : placementProfile.Nationality,
gender = placementProfile.Gender == null ? string.Empty : placementProfile.Gender.Name,
relationship = placementProfile.Relationship == null ? string.Empty : placementProfile.Relationship.Name,
religion = placementProfile.Religion == null ? string.Empty : placementProfile.Religion.Name,
gender = placementProfile.Gender == null ? string.Empty : placementProfile.Gender,
relationship = placementProfile.Relationship == null ? string.Empty : placementProfile.Relationship,
religion = placementProfile.Religion == null ? string.Empty : placementProfile.Religion,
bloodGroup = string.Empty,
registrationAddress = placementProfile.RegistAddress == null ? string.Empty : placementProfile.RegistAddress,
registrationProvinceId = (String?)null,
@ -3260,21 +3260,21 @@ namespace BMA.EHR.Application.Repositories.Commands
.Include(x => x.PlacementProfileDocs)
.ThenInclude(x => x.Document)
.Include(x => x.Prefix)
.Include(x => x.FatherPrefix)
.Include(x => x.MotherPrefix)
.Include(x => x.MarryPrefix)
.Include(x => x.Gender)
.Include(x => x.Relationship)
.Include(x => x.BloodGroup)
.Include(x => x.Religion)
// .Include(x => x.Prefix)
// .Include(x => x.FatherPrefix)
// .Include(x => x.MotherPrefix)
// .Include(x => x.MarryPrefix)
// .Include(x => x.Gender)
// .Include(x => x.Relationship)
// .Include(x => x.BloodGroup)
// .Include(x => x.Religion)
.Include(x => x.RegistSubDistrict)
.Include(x => x.RegistDistrict)
.Include(x => x.RegistProvince)
.Include(x => x.CurrentSubDistrict)
.Include(x => x.CurrentDistrict)
.Include(x => x.CurrentProvince)
// .Include(x => x.RegistSubDistrict)
// .Include(x => x.RegistDistrict)
// .Include(x => x.RegistProvince)
// .Include(x => x.CurrentSubDistrict)
// .Include(x => x.CurrentDistrict)
// .Include(x => x.CurrentProvince)
.Include(x => x.PositionPath)
.Include(x => x.PositionPathSide)
@ -3537,21 +3537,21 @@ namespace BMA.EHR.Application.Repositories.Commands
.ThenInclude(x => x.Document)
.Include(x => x.Prefix)
.Include(x => x.FatherPrefix)
.Include(x => x.MotherPrefix)
.Include(x => x.MarryPrefix)
.Include(x => x.Gender)
.Include(x => x.Relationship)
.Include(x => x.BloodGroup)
.Include(x => x.Religion)
// .Include(x => x.Prefix)
// .Include(x => x.FatherPrefix)
// .Include(x => x.MotherPrefix)
// .Include(x => x.MarryPrefix)
// .Include(x => x.Gender)
// .Include(x => x.Relationship)
// .Include(x => x.BloodGroup)
// .Include(x => x.Religion)
.Include(x => x.RegistSubDistrict)
.Include(x => x.RegistDistrict)
.Include(x => x.RegistProvince)
.Include(x => x.CurrentSubDistrict)
.Include(x => x.CurrentDistrict)
.Include(x => x.CurrentProvince)
// .Include(x => x.RegistSubDistrict)
// .Include(x => x.RegistDistrict)
// .Include(x => x.RegistProvince)
// .Include(x => x.CurrentSubDistrict)
// .Include(x => x.CurrentDistrict)
// .Include(x => x.CurrentProvince)
.Include(x => x.PositionPath)
.Include(x => x.PositionPathSide)