From 4a1a935112bc3e252bd2bc5f8fa6b9a0fe1e5b59 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Mon, 8 Jul 2024 12:48:21 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=8A?= =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=9F=E0=B8=B4=E0=B8=A7=20?= =?UTF-8?q?=E0=B8=9E=E0=B9=89=E0=B8=99=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3?= 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 8ebbe4f9..1f46a81e 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs @@ -778,9 +778,9 @@ namespace BMA.EHR.Retirement.Service.Controllers child4 = x.child4, child4Id = x.child4Id, position = x.position, - positionType = x.posTypeName, - positionLevel = x.posLevelName, - positionExecutive = x.posExecutiveName, + posTypeName = x.posTypeName, + posLevelName = x.posLevelName, + posExecutiveName = x.posExecutiveName, posNo = x.posNo, // positionEmployeePosition = x.Profile.PositionEmployeePosition == null ? null : x.Profile.PositionEmployeePosition.Name, // positionEmployeeLevel = x.Profile.PositionEmployeeLevel == null ? null : x.Profile.PositionEmployeeLevel.Name, From a393be5c64a748d224eff3f5afff09c902047ab9 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Mon, 8 Jul 2024 14:58:52 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD?= =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B9=81?= =?UTF-8?q?=E0=B8=95=E0=B9=88=E0=B8=87=E0=B8=95=E0=B8=B1=E0=B9=89=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Application/Repositories/Commands/CommandRepository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs index 9d5888a0..619df85c 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs @@ -2935,7 +2935,7 @@ namespace BMA.EHR.Application.Repositories.Commands positionType = placementProfile.posTypeName == null ? string.Empty : placementProfile.posTypeName, positionLevel = placementProfile.posLevelName == null ? string.Empty : placementProfile.posLevelName, refCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", - templateDoc = string.Empty, + templateDoc = "คำสั่งแต่งตั้ง คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", }); var _result = await _res.Content.ReadAsStringAsync(); }