From 7efd4c87ccc0b13e7bc4444252ef27642d27973d Mon Sep 17 00:00:00 2001 From: adisak Date: Sun, 22 Dec 2024 20:36:22 +0700 Subject: [PATCH] #877 (9),(18) --- .../Controllers/PlacementAppointmentController.cs | 6 +++--- .../Controllers/PlacementReceiveController.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index 519769a3..fa8e7b28 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -341,15 +341,15 @@ namespace BMA.EHR.Placement.Service.Controllers data.CreatedAt, data.Reason, - data.EducationOld, + educationOld = data.EducationOld == "/" || data.EducationOld == null ? null : data.EducationOld, data.salary, data.PositionTypeOld, data.PositionLevelOld, data.PositionNumberOld, - data.OrganizationPositionOld, + organizationPositionOld = data.OrganizationPositionOld == "/" || data.OrganizationPositionOld == null ? null : data.OrganizationPositionOld, data.PositionDate, data.AmountOld, - data.OrganizationOld, + organizationOld = data.OrganizationOld == "/" || data.OrganizationOld == null ? null : data.OrganizationOld, data.positionOld, // Docs = placementAppointmentDocs, data.typeCommand, diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index 497803f6..4e581132 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -335,14 +335,14 @@ namespace BMA.EHR.Placement.Service.Controllers data.CreatedAt, data.Reason, - data.EducationOld, + educationOld = data.EducationOld == "/" || data.EducationOld == null ? null : data.EducationOld, data.AmountOld, data.PositionOld, - data.OrganizationOld, + organizationOld = data.OrganizationOld == "/" || data.OrganizationOld == null ? null : data.OrganizationOld, data.PositionTypeOld, data.PositionLevelOld, data.PositionNumberOld, - data.OrganizationPositionOld, + organizationPositionOld = data.OrganizationPositionOld == "/" || data.OrganizationPositionOld == null ? null: data.OrganizationPositionOld, data.IsActive, data.rootOld,