From dcc1dd9666b071b8dd4b2501013d29b6cc344a6c Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Thu, 13 Jul 2023 16:40:34 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88=E0=B8=B8?=
 =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=9F=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=A7l5kot?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PlacementController.cs        | 79 ++++++++++++++++++-
 1 file changed, 76 insertions(+), 3 deletions(-)

diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
index 2474e28f..2a116fae 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
@@ -316,10 +316,82 @@ namespace BMA.EHR.Placement.Service.Controllers
                 ExamRound = x.ExamRound,
                 Pass = x.Pass,
                 IsProperty = x.IsProperty == null ? null : Newtonsoft.Json.JsonConvert.DeserializeObject<List<PersonPropertyRequest>>(x.IsProperty),
-                BmaOfficer = _documentService.CheckBmaOfficer(x.CitizenId),
+                BmaOfficer = "",
             }).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)}")]
@@ -648,7 +720,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                     return Error(GlobalMessages.ProvinceNotFound, 404);
                 person.CurrentProvince = save;
             }
-
+            person.CurrentAddress = req.CurrentAddress;
+            person.RegistAddress = req.RegistrationAddress;
             person.RegistSame = req.RegistrationSame;
             person.LastUpdateFullName = FullName ?? "System Administrator";
             person.LastUpdateUserId = UserId ?? "";