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

no message

Browse source
This commit is contained in:
Kittapath 2024-04-26 18:03:45 +07:00
parent 66c97a162b
commit 0afe06fac0
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
View file

@ -2322,7 +2322,7 @@ namespace BMA.EHR.Application.Repositories.Commands
Prefix = d.prefix, Prefix = d.prefix,
FirstName = d.firstName, FirstName = d.firstName,
LastName = d.lastName, LastName = d.lastName,
RefPlacementProfileId = d.profileId, RefPlacementProfileId = d.profileId == null ? null: Guid.Parse(d.profileId),
RefDisciplineId = d.id, RefDisciplineId = d.id,
}; };
seq++; seq++;
@ -2374,7 +2374,7 @@ namespace BMA.EHR.Application.Repositories.Commands
Prefix = d.prefix, Prefix = d.prefix,
FirstName = d.firstName, FirstName = d.firstName,
LastName = d.lastName, LastName = d.lastName,
RefPlacementProfileId = d.profileId, RefPlacementProfileId = d.profileId == null ? null : Guid.Parse(d.profileId),
RefDisciplineId = d.id, RefDisciplineId = d.id,
}; };
seq++; seq++;
@ -2426,7 +2426,7 @@ namespace BMA.EHR.Application.Repositories.Commands
Prefix = d.prefix, Prefix = d.prefix,
FirstName = d.firstName, FirstName = d.firstName,
LastName = d.lastName, LastName = d.lastName,
RefPlacementProfileId = d.profileId, RefPlacementProfileId = d.profileId == null ? null : Guid.Parse(d.profileId),
RefDisciplineId = d.id, RefDisciplineId = d.id,
}; };
seq++; seq++;
@ -2478,7 +2478,7 @@ namespace BMA.EHR.Application.Repositories.Commands
Prefix = d.prefix, Prefix = d.prefix,
FirstName = d.firstName, FirstName = d.firstName,
LastName = d.lastName, LastName = d.lastName,
RefPlacementProfileId = d.profileId, RefPlacementProfileId = d.profileId == null ? null : Guid.Parse(d.profileId),
RefDisciplineId = d.id, RefDisciplineId = d.id,
}; };
seq++; seq++;
@ -2530,7 +2530,7 @@ namespace BMA.EHR.Application.Repositories.Commands
Prefix = d.prefix, Prefix = d.prefix,
FirstName = d.firstName, FirstName = d.firstName,
LastName = d.lastName, LastName = d.lastName,
RefPlacementProfileId = d.profileId, RefPlacementProfileId = d.profileId == null ? null : Guid.Parse(d.profileId),
RefDisciplineId = d.id, RefDisciplineId = d.id,
}; };
seq++; seq++;

2
BMA.EHR.Application/Responses/PassSalaryResponse.cs
View file

@ -14,7 +14,7 @@
public string prefix { get; set; } = string.Empty; public string prefix { get; set; } = string.Empty;
public string firstName { get; set; } = string.Empty; public string firstName { get; set; } = string.Empty;
public string lastName { get; set; } = string.Empty; public string lastName { get; set; } = string.Empty;
public Guid? profileId { get; set; } = Guid.Empty; public string? profileId { get; set; } = string.Empty;
// public Guid? commandId { get; set; } = Guid.Empty; // public Guid? commandId { get; set; } = Guid.Empty;
} }
} }

4
BMA.EHR.Command.Service/Controllers/OrderController.cs
View file

@ -4565,12 +4565,12 @@ namespace BMA.EHR.Command.Service.Controllers
.OrderBy(x => x.Sequence) .OrderBy(x => x.Sequence)
.Select(r => new CommandReceiverResponse .Select(r => new CommandReceiverResponse
{ {
RefRecordId = r.RefPlacementProfileId!.Value, RefRecordId = r.RefPlacementProfileId == null? Guid.Parse("00000000-0000-0000-0000-000000000000") : r.RefPlacementProfileId.Value,
PersonalId = r.Id, PersonalId = r.Id,
Sequence = r.Sequence, Sequence = r.Sequence,
IdCard = r.CitizenId, IdCard = r.CitizenId,
Name = $"{r.Prefix!}{r.FirstName!} {r.LastName!}", Name = $"{r.Prefix!}{r.FirstName!} {r.LastName!}",
SelectStatus = existed.FirstOrDefault(x => x.RefPlacementProfileId!.Value == r.RefPlacementProfileId!.Value) != null, SelectStatus = r.RefPlacementProfileId == null ? false : (existed.FirstOrDefault(x => x.RefPlacementProfileId!.Value == r.RefPlacementProfileId!.Value) != null),
Education = "" // ยังหาไม่เจอว่าอยุ่ field ไหน Education = "" // ยังหาไม่เจอว่าอยุ่ field ไหน
}).ToList(); }).ToList();