From f878ef239eff0e6d0d53d99e0ce03b217bd0b204 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 4 Aug 2023 11:45:13 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9E=E0=B9=89=E0=B8=99=E0=B8=A3=E0=B8=B2?= =?UTF-8?q?=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B8=9E=E0=B8=B4?= =?UTF-8?q?=E0=B9=88=E0=B8=A1=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0?= =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94=E0=B8=A3=E0=B8=AD?= =?UTF-8?q?=E0=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/RetirementController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs index 70837e2b..75558e09 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs @@ -416,7 +416,7 @@ namespace BMA.EHR.Retirement.Service.Controllers posNoEmployee = x.Profile.PosNoEmployee, }) .ToListAsync(); - return Success(new { retire.Id, retire.CreatedAt, retire.Year, retire.Round, retire.Type, profile = profile_new }); + return Success(new { retire.Id, retire.CreatedAt, retire.Year, retire.Round, retire.Type, retire.TypeReport, profile = profile_new }); } /// @@ -446,7 +446,7 @@ namespace BMA.EHR.Retirement.Service.Controllers var responseTask = client.GetAsync(url); var results = responseTask.Result; // Console.WriteLine(results.Content.ReadAsStringAsync().Result); - return Success(new { Json = true, profile = Newtonsoft.Json.JsonConvert.DeserializeObject>(results.Content.ReadAsStringAsync().Result) }); + return Success(new { Json = true, profileHistorys.Id, profileHistorys.CreatedAt, profileHistorys.Year, profileHistorys.Round, profileHistorys.Type, profileHistorys.TypeReport, profile = Newtonsoft.Json.JsonConvert.DeserializeObject>(results.Content.ReadAsStringAsync().Result) }); } } var profile_new = await _context.RetirementProfiles @@ -474,7 +474,7 @@ namespace BMA.EHR.Retirement.Service.Controllers }) .ToListAsync(); - return Success(new { Json = false, profile = profile_new }); + return Success(new { Json = false, retire.Id, retire.CreatedAt, retire.Year, retire.Round, retire.Type, retire.TypeReport, profile = profile_new }); } ///