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

Merge branch 'develop' into working

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-08-11 13:54:51 +07:00
commit e5699ea046
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -233,6 +233,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.Id, p.Id,
PrefixId = p.Profile.Prefix == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Prefix.Id, PrefixId = p.Profile.Prefix == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Prefix.Id,
Prefix = p.Profile.Prefix == null ? null : p.Profile.Prefix.Name, Prefix = p.Profile.Prefix == null ? null : p.Profile.Prefix.Name,
AvatarId = p.Profile.Avatar == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.Profile.Avatar.Id,
p.Profile.FirstName, p.Profile.FirstName,
p.Profile.LastName, p.Profile.LastName,
ProfileId = p.Profile.Id, ProfileId = p.Profile.Id,
@ -270,6 +271,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
data.Id, data.Id,
data.ProfileId, data.ProfileId,
AvataPath = data.AvatarId == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(data.AvatarId),
data.PrefixId, data.PrefixId,
data.Prefix, data.Prefix,
data.FirstName, data.FirstName,

3
BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
View file

@ -215,6 +215,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
.FirstOrDefaultAsync(x => x.Id == req.ProfileId); .FirstOrDefaultAsync(x => x.Id == req.ProfileId);
if (profile == null) if (profile == null)
return Error(GlobalMessages.DataNotFound, 404); return Error(GlobalMessages.DataNotFound, 404);
profile.LeaveDate = DateTime.Now;
profile.IsLeave = true;
profile.LeaveReason = "DEATH";
var retirementDeceased = new RetirementDeceased var retirementDeceased = new RetirementDeceased
{ {