From a521eb345d23bd660326625fe708cc753cc726b4 Mon Sep 17 00:00:00 2001 From: Bright Date: Wed, 25 Dec 2024 18:15:38 +0700 Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=AB=E0=B8=A1=E0=B8=B2=E0=B8=A2?= =?UTF-8?q?=E0=B9=80=E0=B8=AB=E0=B8=95=E0=B8=B8=E0=B9=81=E0=B8=99=E0=B8=A7?= =?UTF-8?q?=E0=B8=99=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/DisciplineResultController.cs | 16 +- .../PlacementAppointmentController.cs | 194 ++++++++-------- .../Controllers/PlacementController.cs | 219 +++++++++--------- .../Controllers/PlacementOfficerController.cs | 26 ++- .../Controllers/PlacementReceiveController.cs | 42 ++-- .../PlacementTransferController.cs | 34 +-- .../Controllers/RetirementOtherController.cs | 90 +++---- .../Controllers/RetirementResignController.cs | 68 +++--- .../RetirementResignEmployeeController.cs | 68 +++--- 9 files changed, 399 insertions(+), 358 deletions(-) diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs index 36028d83..9662aa45 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs @@ -1039,13 +1039,15 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new { - fullName = _null, - positionname = r.RemarkHorizontal, - positionno = _null, - organizationname = _null, - salary = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new { + fullName = _null, + positionname = r.RemarkHorizontal, + positionno = _null, + organizationname = _null, + salary = _null, + }); + } } return Success(result); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index fa8e7b28..fc25fa13 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -844,27 +844,29 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - Education = _null, - OldOc = _null, - OldPositionType = _null, - OldPositionLevel = _null, - OldPositionNumber = _null, - OldSalary = _null, - LeaveDate = _null, - NewOc = _null, - NewPositionType = _null, - NewPositionLevel = _null, - NewPositionNumber = _null, - NewSalary = _null, - AppointDate = _null, - CommandExcecuteDate = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + Education = _null, + OldOc = _null, + OldPositionType = _null, + OldPositionLevel = _null, + OldPositionNumber = _null, + OldSalary = _null, + LeaveDate = _null, + NewOc = _null, + NewPositionType = _null, + NewPositionLevel = _null, + NewPositionNumber = _null, + NewSalary = _null, + AppointDate = _null, + CommandExcecuteDate = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } @@ -1054,27 +1056,29 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - Education = _null, - OldOc = _null, - OldPositionType = _null, - OldPositionLevel = _null, - OldPositionNumber = _null, - OldSalary = _null, - LeaveDate = _null, - NewOc = _null, - NewPositionType = _null, - NewPositionLevel = _null, - NewPositionNumber = _null, - NewSalary = _null, - AppointDate = _null, - CommandExcecuteDate = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + Education = _null, + OldOc = _null, + OldPositionType = _null, + OldPositionLevel = _null, + OldPositionNumber = _null, + OldSalary = _null, + LeaveDate = _null, + NewOc = _null, + NewPositionType = _null, + NewPositionLevel = _null, + NewPositionNumber = _null, + NewSalary = _null, + AppointDate = _null, + CommandExcecuteDate = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } @@ -1261,21 +1265,23 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - OldOrganization = _null, - OldPositionLevel = _null, - OldPositionNumber = _null, - OldSalary = _null, - NewOc = _null, - NewPositionLevel = _null, - NewPositionNumber = _null, - NewSalary = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + OldOrganization = _null, + OldPositionLevel = _null, + OldPositionNumber = _null, + OldSalary = _null, + NewOc = _null, + NewPositionLevel = _null, + NewPositionNumber = _null, + NewSalary = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } @@ -1464,21 +1470,23 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - OldOc = _null, - OldPositionNumber = _null, - OldSalary = _null, - NewOc = _null, - NewPositionNumber = _null, - NewSalary = _null, - ReportingDate = _null, - CommandExcecuteDate = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + OldOc = _null, + OldPositionNumber = _null, + OldSalary = _null, + NewOc = _null, + NewPositionNumber = _null, + NewSalary = _null, + ReportingDate = _null, + CommandExcecuteDate = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } @@ -1678,26 +1686,28 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - Education = _null, - OldOc = _null, - OldPositionType = _null, - OldPositionLevel = _null, - OldPositionNumber = _null, - OldSalary = _null, - NewOc = _null, - NewPositionType = _null, - NewPositionLevel = _null, - NewPositionNumber = _null, - NewSalary = _null, - AppointDate = _null, - CommandExcecuteDate = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + Education = _null, + OldOc = _null, + OldPositionType = _null, + OldPositionLevel = _null, + OldPositionNumber = _null, + OldSalary = _null, + NewOc = _null, + NewPositionType = _null, + NewPositionLevel = _null, + NewPositionNumber = _null, + NewSalary = _null, + AppointDate = _null, + CommandExcecuteDate = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 0736477f..a93d007f 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1623,27 +1623,30 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { - No = _null, - FullName = r.RemarkHorizontal, - Education = _null, - PositionName = _null, - ExamNumber = _null, - PlacementName = _null, - Oc = _null, - PositionType = _null, - PositionLevel = _null, - PositionNumber = _null, - Salary = _null, - AppointDate = _null, - CommandExcecuteDate = _null, - OccupationPosition = _null, - PositionCandidate = _null, - OcCandidate = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + Education = _null, + PositionName = _null, + ExamNumber = _null, + PlacementName = _null, + Oc = _null, + PositionType = _null, + PositionLevel = _null, + PositionNumber = _null, + Salary = _null, + AppointDate = _null, + CommandExcecuteDate = _null, + OccupationPosition = _null, + PositionCandidate = _null, + OcCandidate = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } @@ -1927,26 +1930,28 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - Education = _null, - PositionName = _null, - ExamNumber = _null, - PlacementName = _null, - Oc = _null, - PositionType = _null, - PositionLevel = _null, - PositionNumber = _null, - Salary = _null, - AppointDate = _null, - CommandExcecuteDate = _null, - OccupationPosition = _null, - PositionCandidate = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + Education = _null, + PositionName = _null, + ExamNumber = _null, + PlacementName = _null, + Oc = _null, + PositionType = _null, + PositionLevel = _null, + PositionNumber = _null, + Salary = _null, + AppointDate = _null, + CommandExcecuteDate = _null, + OccupationPosition = _null, + PositionCandidate = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } @@ -2250,28 +2255,30 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - Education = _null, - OldOc = _null, - OldPositionType = _null, - OldPositionLevel = _null, - OldPositionNumber = _null, - OldSalary = _null, - OldPosition = _null, - NewOc = _null, - NewPosition = _null, - NewPositionType = _null, - NewPositionLevel = _null, - NewPositionNumber = _null, - NewSalary = _null, - AppointDate = _null, - CommandExcecuteDate = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + Education = _null, + OldOc = _null, + OldPositionType = _null, + OldPositionLevel = _null, + OldPositionNumber = _null, + OldSalary = _null, + OldPosition = _null, + NewOc = _null, + NewPosition = _null, + NewPositionType = _null, + NewPositionLevel = _null, + NewPositionNumber = _null, + NewSalary = _null, + AppointDate = _null, + CommandExcecuteDate = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } @@ -2476,28 +2483,30 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - Education = _null, - OldOc = _null, - OldPosition = _null, - OldPositionType = _null, - OldPositionLevel = _null, - OldPositionNumber = _null, - OldSalary = _null, - NewOc = _null, - NewPosition = _null, - NewPositionType = _null, - NewPositionLevel = _null, - NewPositionNumber = _null, - NewSalary = _null, - AppointDate = _null, - CommandExcecuteDate = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + Education = _null, + OldOc = _null, + OldPosition = _null, + OldPositionType = _null, + OldPositionLevel = _null, + OldPositionNumber = _null, + OldSalary = _null, + NewOc = _null, + NewPosition = _null, + NewPositionType = _null, + NewPositionLevel = _null, + NewPositionNumber = _null, + NewSalary = _null, + AppointDate = _null, + CommandExcecuteDate = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } @@ -2693,26 +2702,28 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - Education = _null, - OldOc = _null, - OldPositionType = _null, - OldPositionLevel = _null, - OldPositionNumber = _null, - OldSalary = _null, - LeaveDate = _null, - NewOc = _null, - NewPositionType = _null, - NewPositionLevel = _null, - NewPositionNumber = _null, - NewSalary = _null, - AppointDate = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + Education = _null, + OldOc = _null, + OldPositionType = _null, + OldPositionLevel = _null, + OldPositionNumber = _null, + OldSalary = _null, + LeaveDate = _null, + NewOc = _null, + NewPositionType = _null, + NewPositionLevel = _null, + NewPositionNumber = _null, + NewSalary = _null, + AppointDate = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs index 67a4149e..217a2d06 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -628,18 +628,20 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - PositionName = _null, - Organization = _null, - StartDate = _null, - EndDate = _null, - Reason = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + PositionName = _null, + Organization = _null, + StartDate = _null, + EndDate = _null, + Reason = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index 4e581132..5eb0f505 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -974,26 +974,28 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - Education = _null, - OldOrg = _null, - OldOc = _null, - OldPositionType = _null, - OldPositionLevel = _null, - OldSalary = _null, - NewOc = _null, - NewPositionType = _null, - NewPositionLevel = _null, - NewPositionNumber = _null, - NewSalary = _null, - AppointDate = _null, - CommandExcecuteDate = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + Education = _null, + OldOrg = _null, + OldOc = _null, + OldPositionType = _null, + OldPositionLevel = _null, + OldSalary = _null, + NewOc = _null, + NewPositionType = _null, + NewPositionLevel = _null, + NewPositionNumber = _null, + NewSalary = _null, + AppointDate = _null, + CommandExcecuteDate = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index d0828a85..045be807 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -838,22 +838,24 @@ namespace BMA.EHR.Placement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - OldOc = _null, - PositionType = _null, - PositionLevel = _null, - PositionNumber = _null, - Salary = _null, - ReceiveOrganizationName = _null, - ActiveDate = _null, - CommandExcecuteDate = _null, - Reason = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + OldOc = _null, + PositionType = _null, + PositionLevel = _null, + PositionNumber = _null, + Salary = _null, + ReceiveOrganizationName = _null, + ActiveDate = _null, + CommandExcecuteDate = _null, + Reason = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index 3ee9b641..81bc5bce 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -721,27 +721,29 @@ namespace BMA.EHR.Retirement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - Education = _null, - OldOc = _null, - OldPositionType = _null, - OldPositionLevel = _null, - OldPositionNumber = _null, - OldSalary = _null, - LeaveDate = _null, - NewOc = _null, - NewPositionType = _null, - NewPositionLevel = _null, - NewPositionNumber = _null, - NewSalary = _null, - AppointDate = _null, - CommandExcecuteDate = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + Education = _null, + OldOc = _null, + OldPositionType = _null, + OldPositionLevel = _null, + OldPositionNumber = _null, + OldSalary = _null, + LeaveDate = _null, + NewOc = _null, + NewPositionType = _null, + NewPositionLevel = _null, + NewPositionNumber = _null, + NewSalary = _null, + AppointDate = _null, + CommandExcecuteDate = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } @@ -925,28 +927,30 @@ namespace BMA.EHR.Retirement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - Education = _null, - OldOc = _null, - OldPositionType = _null, - OldPositionLevel = _null, - OldPositionNumber = _null, - OldSalary = _null, - LeaveDate = _null, - MilitaryDate = _null, - NewOc = _null, - NewPositionType = _null, - NewPositionLevel = _null, - NewPositionNumber = _null, - NewSalary = _null, - AppointDate = _null, - CommandExcecuteDate = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + Education = _null, + OldOc = _null, + OldPositionType = _null, + OldPositionLevel = _null, + OldPositionNumber = _null, + OldSalary = _null, + LeaveDate = _null, + MilitaryDate = _null, + NewOc = _null, + NewPositionType = _null, + NewPositionLevel = _null, + NewPositionNumber = _null, + NewSalary = _null, + AppointDate = _null, + CommandExcecuteDate = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 31eecadd..7507add9 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -2394,22 +2394,24 @@ namespace BMA.EHR.Retirement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - CitizenId = _null, - PositionName = _null, - Organization = _null, - PositionLevel = _null, - PositionType = _null, - PositionNumber = _null, - ActiveDate = _null, - Salary = _null, - Remark = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + CitizenId = _null, + PositionName = _null, + Organization = _null, + PositionLevel = _null, + PositionType = _null, + PositionNumber = _null, + ActiveDate = _null, + Salary = _null, + Remark = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } @@ -2575,22 +2577,24 @@ namespace BMA.EHR.Retirement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - CitizenId = _null, - PositionName = _null, - Organization = _null, - PositionLevel = _null, - PositionType = _null, - PositionNumber = _null, - ActiveDate = _null, - Salary = _null, - Remark = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + CitizenId = _null, + PositionName = _null, + Organization = _null, + PositionLevel = _null, + PositionType = _null, + PositionNumber = _null, + ActiveDate = _null, + Salary = _null, + Remark = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs index 4e50079f..86a554c6 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs @@ -2337,22 +2337,24 @@ namespace BMA.EHR.Retirement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - CitizenId = _null, - PositionName = _null, - Organization = _null, - PositionLevel = _null, - PositionType = _null, - PositionNumber = _null, - ActiveDate = _null, - Salary = _null, - Remark = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + CitizenId = _null, + PositionName = _null, + Organization = _null, + PositionLevel = _null, + PositionType = _null, + PositionNumber = _null, + ActiveDate = _null, + Salary = _null, + Remark = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); } @@ -2518,22 +2520,24 @@ namespace BMA.EHR.Retirement.Service.Controllers { result.Add(r); string? _null = null; - result.Add(new - { - No = _null, - FullName = r.RemarkHorizontal, - CitizenId = _null, - PositionName = _null, - Organization = _null, - PositionLevel = _null, - PositionType = _null, - PositionNumber = _null, - ActiveDate = _null, - Salary = _null, - Remark = _null, - RemarkHorizontal = _null, - RemarkVertical = _null, - }); + if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") { + result.Add(new + { + No = _null, + FullName = r.RemarkHorizontal, + CitizenId = _null, + PositionName = _null, + Organization = _null, + PositionLevel = _null, + PositionType = _null, + PositionNumber = _null, + ActiveDate = _null, + Salary = _null, + Remark = _null, + RemarkHorizontal = _null, + RemarkVertical = _null, + }); + } } return Success(result); }