From f792fd713abf02aaab09f7f359dcf82140a88cc0 Mon Sep 17 00:00:00 2001 From: Bright Date: Fri, 8 Nov 2024 14:02:37 +0700 Subject: [PATCH] add field commandDate & education --- .../Controllers/PlacementReceiveController.cs | 2 ++ .../Controllers/PlacementTransferController.cs | 2 ++ .../Controllers/RetirementOtherController.cs | 1 + BMA.EHR.Retirement.Service/Requests/OrgRequest.cs | 1 + 4 files changed, 6 insertions(+) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index fa12576c..f41d34cf 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -950,6 +950,7 @@ namespace BMA.EHR.Placement.Service.Controllers p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "", NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(), + CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(), RemarkHorizontal = r.RemarkHorizontal, RemarkVertical = r.RemarkVertical, }).ToList(); @@ -975,6 +976,7 @@ namespace BMA.EHR.Placement.Service.Controllers NewPositionNumber = _null, NewSalary = _null, AppointDate = _null, + CommandExcecuteDate = _null, RemarkHorizontal = _null, RemarkVertical = _null, }); diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index ed2733a5..3cec5762 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -826,6 +826,7 @@ namespace BMA.EHR.Placement.Service.Controllers Salary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), ReceiveOrganizationName = p.Organization == null ? "-" : p.Organization, ActiveDate = p.Date == null ? "-" : p.Date.Value.ToThaiShortDate2().ToThaiNumber(), + CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(), Reason = p.Reason ?? "-", RemarkHorizontal = r.RemarkHorizontal, RemarkVertical = r.RemarkVertical, @@ -848,6 +849,7 @@ namespace BMA.EHR.Placement.Service.Controllers Salary = _null, ReceiveOrganizationName = _null, ActiveDate = _null, + CommandExcecuteDate = _null, Reason = _null, RemarkHorizontal = _null, RemarkVertical = _null, diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index e892e1ce..d61f45db 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -402,6 +402,7 @@ namespace BMA.EHR.Retirement.Service.Controllers (org.result.child1 == null ? "" : org.result.child1 + "/") + (org.result.root == null ? "" : org.result.root); retirementOther.OrganizationPositionOld = org.result.position + "-" + retirementOther.OrganizationOld; + retirementOther.EducationOld = org.result.education; } await _context.RetirementOthers.AddAsync(retirementOther); await _context.SaveChangesAsync(); diff --git a/BMA.EHR.Retirement.Service/Requests/OrgRequest.cs b/BMA.EHR.Retirement.Service/Requests/OrgRequest.cs index 8dcf9013..52b0c932 100644 --- a/BMA.EHR.Retirement.Service/Requests/OrgRequest.cs +++ b/BMA.EHR.Retirement.Service/Requests/OrgRequest.cs @@ -44,5 +44,6 @@ namespace BMA.EHR.Retirement.Service.Requests public string? posExecutiveName { get; set; } public string? posNo { get; set; } public DateTime? leaveDate { get; set; } + public string? education { get; set; } } } \ No newline at end of file