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

บรรจุเพิ่มฟิวl5kot

Browse source
This commit is contained in:
Kittapath 2023-07-13 16:40:34 +07:00
parent 405e282a3a
commit dcc1dd9666
1 changed files with 76 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -316,10 +316,82 @@ namespace BMA.EHR.Placement.Service.Controllers
ExamRound = x.ExamRound, ExamRound = x.ExamRound,
Pass = x.Pass, Pass = x.Pass,
IsProperty = x.IsProperty == null ? null : Newtonsoft.Json.JsonConvert.DeserializeObject<List<PersonPropertyRequest>>(x.IsProperty), IsProperty = x.IsProperty == null ? null : Newtonsoft.Json.JsonConvert.DeserializeObject<List<PersonPropertyRequest>>(x.IsProperty),
BmaOfficer = _documentService.CheckBmaOfficer(x.CitizenId), BmaOfficer = "",
}).FirstOrDefaultAsync(x => x.PersonalId == personalId); }).FirstOrDefaultAsync(x => x.PersonalId == personalId);
return Success(data); var _data = new
{
data.PersonalId,
data.IdCard,
data.Prefix,
data.PrefixId,
data.FullName,
data.Firstname,
data.Lastname,
data.Nationality,
data.Race,
data.DateOfBirth,
data.Age,
data.Telephone,
data.Gender,
data.GenderId,
data.Relationship,
data.RelationshipId,
data.BloodGroup,
data.BloodGroupId,
data.Religion,
data.ReligionId,
data.Address,
data.Education,
data.RegistAddress,
data.RegistSubDistrict,
data.RegistSubDistrictId,
data.RegistZipCode,
data.RegistDistrict,
data.RegistDistrictId,
data.RegistProvince,
data.RegistProvinceId,
data.CurrentAddress,
data.CurrentSubDistrict,
data.CurrentSubDistrictId,
data.CurrentZipCode,
data.CurrentDistrict,
data.CurrentDistrictId,
data.CurrentProvince,
data.CurrentProvinceId,
data.RegistSame,
data.MarryPrefix,
data.MarryPrefixId,
data.Couple,
data.MarryFirstName,
data.MarryLastName,
data.MarryOccupation,
data.FatherPrefix,
data.FatherPrefixId,
data.FatherFirstName,
data.FatherLastName,
data.FatherOccupation,
data.MotherPrefix,
data.MotherPrefixId,
data.MotherFirstName,
data.MotherLastName,
data.MotherOccupation,
data.Certificates,
data.PointA,
data.PointB,
data.PointC,
data.PointTotalA,
data.PointTotalB,
data.PointTotalC,
data.Point,
data.PointTotal,
data.ExamNumber,
data.ExamRound,
data.Pass,
data.IsProperty,
BmaOfficer = await _documentService.CheckBmaOfficer(data.IdCard),
};
return Success(_data);
} }
[HttpPut("property/{personalId:length(36)}")] [HttpPut("property/{personalId:length(36)}")]
@ -648,7 +720,8 @@ namespace BMA.EHR.Placement.Service.Controllers
return Error(GlobalMessages.ProvinceNotFound, 404); return Error(GlobalMessages.ProvinceNotFound, 404);
person.CurrentProvince = save; person.CurrentProvince = save;
} }
person.CurrentAddress = req.CurrentAddress;
person.RegistAddress = req.RegistrationAddress;
person.RegistSame = req.RegistrationSame; person.RegistSame = req.RegistrationSame;
person.LastUpdateFullName = FullName ?? "System Administrator"; person.LastUpdateFullName = FullName ?? "System Administrator";
person.LastUpdateUserId = UserId ?? ""; person.LastUpdateUserId = UserId ?? "";