diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index 09e04816..4c0e2dff 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -422,8 +422,8 @@ namespace BMA.EHR.Leave.Service.Controllers leaveRequest.LeaveTypeCode = leaveType.Code; - leaveRequest.Dear = req.Commander ?? ""; - leaveRequest.CommanderPosition = req.CommanderPositionName ?? ""; + leaveRequest.Dear = req.Dear ?? ""; + leaveRequest.CommanderPosition = req.CommanderPosition ?? ""; // เพิ่มตำแหน่ง //leaveRequest.CommanderPosition = req.CommanderPosition ?? ""; diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs index 21ceea77..a79f2fc4 100644 --- a/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs +++ b/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs @@ -103,9 +103,9 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest public string? CoupleDaySumTotalHistory { get; set; } - public string? Commander { get; set; } + public string? Dear { get; set; } - public string? CommanderPositionName { get; set; } + public string? CommanderPosition { get; set; } }