space posno

.github/workflows/release_Retirement.yaml

@@ -68,40 +68,40 @@ jobs:
             docker compose pull
             docker compose up -d
             echo "${{ steps.gen_ver.outputs.image_ver }}"> success
-      - name: Notify Discord Success
+      # - name: Notify Discord Success
-        if: success()
+      #   if: success()
-        run: |
+      #   run: |
-          curl -H "Content-Type: application/json" \
+      #     curl -H "Content-Type: application/json" \
-          -X POST \
+      #     -X POST \
-          -d '{
+      #     -d '{
-            "embeds": [{
+      #       "embeds": [{
-              "title": "✅ Deployment Success!",
+      #         "title": "✅ Deployment Success!",
-              "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`",
+      #         "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`",
-              "color": 3066993,
+      #         "color": 3066993,
-              "footer": {
+      #         "footer": {
-                "text": "Release Notification",
+      #           "text": "Release Notification",
-                "icon_url": "https://example.com/success-icon.png"
+      #           "icon_url": "https://example.com/success-icon.png"
-              },
+      #         },
-              "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
+      #         "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
-            }]
+      #       }]
-          }' \
+      #     }' \
-          ${{ secrets.DISCORD_WEBHOOK }}
+      #     ${{ secrets.DISCORD_WEBHOOK }}
 
-      - name: Notify Discord Failure
+      # - name: Notify Discord Failure
-        if: failure()
+      #   if: failure()
-        run: |
+      #   run: |
-          curl -H "Content-Type: application/json" \
+      #     curl -H "Content-Type: application/json" \
-          -X POST \
+      #     -X POST \
-          -d '{
+      #     -d '{
-            "embeds": [{
+      #       "embeds": [{
-              "title": "❌ Deployment Failed!",
+      #         "title": "❌ Deployment Failed!",
-              "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`",
+      #         "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`",
-              "color": 15158332,
+      #         "color": 15158332,
-              "footer": {
+      #         "footer": {
-                "text": "Release Notification",
+      #           "text": "Release Notification",
-                "icon_url": "https://example.com/failure-icon.png"
+      #           "icon_url": "https://example.com/failure-icon.png"
-              },
+      #         },
-              "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
+      #         "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
-            }]
+      #       }]
-          }' \
+      #     }' \
-          ${{ secrets.DISCORD_WEBHOOK }}
+      #     ${{ secrets.DISCORD_WEBHOOK }}

.github/workflows/release_discipline.yaml

@@ -68,40 +68,40 @@ jobs:
             docker compose pull
             docker compose up -d
             echo "${{ steps.gen_ver.outputs.image_ver }}"> success
-            - name: Notify Discord Success
+      # - name: Notify Discord Success
-              if: success()
+      #   if: success()
-              run: |
+      #   run: |
-                curl -H "Content-Type: application/json" \
+      #     curl -H "Content-Type: application/json" \
-                -X POST \
+      #     -X POST \
-                -d '{
+      #     -d '{
-                  "embeds": [{
+      #       "embeds": [{
-                    "title": "✅ Deployment Success!",
+      #         "title": "✅ Deployment Success!",
-                    "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`",
+      #         "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`",
-                    "color": 3066993,
+      #         "color": 3066993,
-                    "footer": {
+      #         "footer": {
-                      "text": "Release Notification",
+      #           "text": "Release Notification",
-                      "icon_url": "https://example.com/success-icon.png"
+      #           "icon_url": "https://example.com/success-icon.png"
-                    },
+      #         },
-                    "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
+      #         "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
-                  }]
+      #       }]
-                }' \
+      #     }' \
-                ${{ secrets.DISCORD_WEBHOOK }}
+      #     ${{ secrets.DISCORD_WEBHOOK }}
 
-            - name: Notify Discord Failure
+      # - name: Notify Discord Failure
-              if: failure()
+      #   if: failure()
-              run: |
+      #   run: |
-                curl -H "Content-Type: application/json" \
+      #     curl -H "Content-Type: application/json" \
-                -X POST \
+      #     -X POST \
-                -d '{
+      #     -d '{
-                  "embeds": [{
+      #       "embeds": [{
-                    "title": "❌ Deployment Failed!",
+      #         "title": "❌ Deployment Failed!",
-                    "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`",
+      #         "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`",
-                    "color": 15158332,
+      #         "color": 15158332,
-                    "footer": {
+      #         "footer": {
-                      "text": "Release Notification",
+      #           "text": "Release Notification",
-                      "icon_url": "https://example.com/failure-icon.png"
+      #           "icon_url": "https://example.com/failure-icon.png"
-                    },
+      #         },
-                    "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
+      #         "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
-                  }]
+      #       }]
-                }' \
+      #     }' \
-                ${{ secrets.DISCORD_WEBHOOK }}
+      #     ${{ secrets.DISCORD_WEBHOOK }}

.github/workflows/release_placement.yaml

@@ -68,40 +68,40 @@ jobs:
             docker compose pull
             docker compose up -d
             echo "${{ steps.gen_ver.outputs.image_ver }}"> success
-      - name: Notify Discord Success
+      # - name: Notify Discord Success
-        if: success()
+      #   if: success()
-        run: |
+      #   run: |
-          curl -H "Content-Type: application/json" \
+      #     curl -H "Content-Type: application/json" \
-          -X POST \
+      #     -X POST \
-          -d '{
+      #     -d '{
-            "embeds": [{
+      #       "embeds": [{
-              "title": "✅ Deployment Success!",
+      #         "title": "✅ Deployment Success!",
-              "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`",
+      #         "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`",
-              "color": 3066993,
+      #         "color": 3066993,
-              "footer": {
+      #         "footer": {
-                "text": "Release Notification",
+      #           "text": "Release Notification",
-                "icon_url": "https://example.com/success-icon.png"
+      #           "icon_url": "https://example.com/success-icon.png"
-              },
+      #         },
-              "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
+      #         "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
-            }]
+      #       }]
-          }' \
+      #     }' \
-          ${{ secrets.DISCORD_WEBHOOK }}
+      #     ${{ secrets.DISCORD_WEBHOOK }}
 
-      - name: Notify Discord Failure
+      # - name: Notify Discord Failure
-        if: failure()
+      #   if: failure()
-        run: |
+      #   run: |
-          curl -H "Content-Type: application/json" \
+      #     curl -H "Content-Type: application/json" \
-          -X POST \
+      #     -X POST \
-          -d '{
+      #     -d '{
-            "embeds": [{
+      #       "embeds": [{
-              "title": "❌ Deployment Failed!",
+      #         "title": "❌ Deployment Failed!",
-              "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`",
+      #         "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`",
-              "color": 15158332,
+      #         "color": 15158332,
-              "footer": {
+      #         "footer": {
-                "text": "Release Notification",
+      #           "text": "Release Notification",
-                "icon_url": "https://example.com/failure-icon.png"
+      #           "icon_url": "https://example.com/failure-icon.png"
-              },
+      #         },
-              "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
+      #         "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
-            }]
+      #       }]
-          }' \
+      #     }' \
-          ${{ secrets.DISCORD_WEBHOOK }}
+      #     ${{ secrets.DISCORD_WEBHOOK }}

BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs

@@ -317,11 +317,13 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
         [HttpPost()]
         public async Task<ActionResult<ResponseObject>> CreateDiscipline([FromForm] DisciplineComplaint_AppealRequest req)
         {
-
             var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+            var id = "";
+            var type = "";
             using (var client = new HttpClient())
             {
-                client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
+                client.DefaultRequestHeaders.Authorization =
+                    new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
                 client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
                 var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
                 var _res = await client.SendAsync(_req);
@@ -331,9 +333,12 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
 
                 if (org == null || org.result == null)
                     return Success(new { data = new List<dynamic>(), total = 0 });
-                var id = org.result.profileId;
+                id = org.result.profileId;
                 if (id == "")
                     return Success(new { data = new List<dynamic>(), total = 0 });
+                type = org.result.profileType;
+            }
+
             var disciplineComplaint_Appeal = new Domain.Models.Discipline.DisciplineComplaint_Appeal
             {
                 Title = req.Title,
@@ -348,7 +353,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
                 ProfileId = id,
                 Position = req.Position,
                 Oc = req.Oc,
-                    profileType = org.result.profileType,
+                profileType = type,
                 CreatedFullName = FullName ?? "System Administrator",
                 CreatedUserId = UserId ?? "",
                 CreatedAt = DateTime.Now,
@@ -398,11 +403,15 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
             var baseAPIOrg = _configuration["API"];
             var apiUrlOrg = $"{baseAPIOrg}/org/workflow/find/director";
             var refId = new List<Guid>();
-                client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
+
+            using (var client = new HttpClient())
+            {
+                client.DefaultRequestHeaders.Authorization =
+                    new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
                 client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
                 var __res = await client.PostAsJsonAsync(apiUrlOrg, new
                 {
-                    refId = new List<Guid> { id },
+                    refId = new List<Guid> { Guid.Parse(id) },
                 });
                 var __result = await __res.Content.ReadAsStringAsync();
                 var __org = JsonConvert.DeserializeObject<DirectorRequest>(__result);
@@ -410,6 +419,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
                 {
                     refId = __org.result.Select(x => Guid.Parse(x.id)).ToList();
                 }
+
                 await _repositoryNoti.PushNotificationsAsync(
                     refId.ToArray(),
                     $"มีคำขอยื่นอุทธรณ์/ร้องทุกข์จาก {req.Fullname}",
@@ -419,10 +429,10 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
                     true,
                     true
                 );
-                await _context.SaveChangesAsync();
-                return Success(disciplineComplaint_Appeal.Id);
             }
 
+            await _context.SaveChangesAsync();
+            return Success(disciplineComplaint_Appeal.Id);
         }
 
         /// <summary>

BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs

@@ -58,7 +58,7 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpGet()]
-        public async Task<ActionResult<ResponseObject>> GetDisciplineSuspend(int page = 1, int pageSize = 25, string keyword = "", string profileType = "")
+        public async Task<ActionResult<ResponseObject>> GetDisciplineSuspend(DateTime? startDate, DateTime? endDate, int page = 1, int pageSize = 25, string keyword = "", string profileType = "")
         {
             var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_DISCIPLINE_SUSPENDED");
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
@@ -68,6 +68,16 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
             }
             var data_search = (from x in _context.DisciplineReport_Profiles.Include(x => x.DisciplineDisciplinary)
                                where
+                               (
+                                endDate != null &&  startDate != null?
+                                    (
+                                        (x.StartDateSuspend.Value.Date >= startDate.Value.Date && x.StartDateSuspend.Value.Date <= endDate.Value.Date) ||
+                                        (x.EndDateSuspend.Value.Date >= startDate.Value.Date && x.EndDateSuspend.Value.Date <= endDate.Value.Date) ||
+                                        (x.StartDateSuspend.Value.Date <= startDate.Value.Date && x.EndDateSuspend.Value.Date >= endDate.Value.Date)
+                                    ) :
+                                true
+                               )
+                                &&
                                (
                                    (x.CitizenId != null && x.CitizenId.Contains(keyword)) ||
                                    ((x.Prefix ?? "") + (x.FirstName ?? "") + " " + (x.LastName ?? "")).Contains(keyword) ||

BMA.EHR.Domain/Models/Retirement/RetirementDeceasedNoti.cs

@@ -37,10 +37,10 @@ namespace BMA.EHR.Domain.Models.Retirement
         public bool IsSendNotification { get; set; } = true;
 
         [Comment("ชื่อหน่วยงานของผู้รับสำเนาคำสั่ง")]
-        public string OrganizationName { get; set; } = string.Empty;
+        public string? OrganizationName { get; set; } = string.Empty;
 
         [Comment("ชื่อตำแหน่งของผู้รับสำเนาคำสั่ง")]
-        public string PositionName { get; set; } = string.Empty;
+        public string? PositionName { get; set; } = string.Empty;
 
         [Comment("Fk Table Document")]
         public Document? Document { get; set; }

BMA.EHR.Infrastructure/Migrations/20250405091100_update_table_placementRepatriation_add_refId1.cs

@@ -0,0 +1,82 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class update_table_placementRepatriation_add_refId1 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "PositionName",
+                table: "RetirementDeceasedNotis",
+                type: "longtext",
+                nullable: true,
+                comment: "ชื่อตำแหน่งของผู้รับสำเนาคำสั่ง",
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldComment: "ชื่อตำแหน่งของผู้รับสำเนาคำสั่ง")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "OrganizationName",
+                table: "RetirementDeceasedNotis",
+                type: "longtext",
+                nullable: true,
+                comment: "ชื่อหน่วยงานของผู้รับสำเนาคำสั่ง",
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldComment: "ชื่อหน่วยงานของผู้รับสำเนาคำสั่ง")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.UpdateData(
+                table: "RetirementDeceasedNotis",
+                keyColumn: "PositionName",
+                keyValue: null,
+                column: "PositionName",
+                value: "");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PositionName",
+                table: "RetirementDeceasedNotis",
+                type: "longtext",
+                nullable: false,
+                comment: "ชื่อตำแหน่งของผู้รับสำเนาคำสั่ง",
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true,
+                oldComment: "ชื่อตำแหน่งของผู้รับสำเนาคำสั่ง")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.UpdateData(
+                table: "RetirementDeceasedNotis",
+                keyColumn: "OrganizationName",
+                keyValue: null,
+                column: "OrganizationName",
+                value: "");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "OrganizationName",
+                table: "RetirementDeceasedNotis",
+                type: "longtext",
+                nullable: false,
+                comment: "ชื่อหน่วยงานของผู้รับสำเนาคำสั่ง",
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true,
+                oldComment: "ชื่อหน่วยงานของผู้รับสำเนาคำสั่ง")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/ApplicationDBContextModelSnapshot.cs

@@ -14839,12 +14839,10 @@ namespace BMA.EHR.Infrastructure.Migrations
                         .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
 
                     b.Property<string>("OrganizationName")
-                        .IsRequired()
                         .HasColumnType("longtext")
                         .HasComment("ชื่อหน่วยงานของผู้รับสำเนาคำสั่ง");
 
                     b.Property<string>("PositionName")
-                        .IsRequired()
                         .HasColumnType("longtext")
                         .HasComment("ชื่อตำแหน่งของผู้รับสำเนาคำสั่ง");
 

BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs

@@ -457,7 +457,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                 placementAppointment.PositionExecutiveOld = org.result.posExecutiveName;
                 placementAppointment.PositionLevelOld = org.result.posLevelName;
                 placementAppointment.PositionTypeOld = org.result.posTypeName;
-                placementAppointment.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
+                placementAppointment.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
                 placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                         (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                         (org.result.child2 == null ? "" : org.result.child2 + "\n") +

BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs

@@ -482,7 +482,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                 placementAppointment.positionOld = org.result.position;
                 placementAppointment.PositionLevelOld = org.result.posLevelName;
                 placementAppointment.PositionTypeOld = org.result.posTypeName;
-                placementAppointment.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
+                placementAppointment.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
                 placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                         (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                         (org.result.child2 == null ? "" : org.result.child2 + "\n") +

BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs

@@ -405,7 +405,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                 placementOfficer.PositionExecutiveOld = org.result.posExecutiveName;
                 placementOfficer.PositionLevelOld = org.result.posLevelName;
                 placementOfficer.PositionTypeOld = org.result.posTypeName;
-                placementOfficer.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
+                placementOfficer.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
                 placementOfficer.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                         (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                         (org.result.child2 == null ? "" : org.result.child2 + "\n") +

BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs

@@ -500,7 +500,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                     placementReceive.PositionExecutiveOld = org.result.posExecutiveName;
                     placementReceive.PositionLevelOld = org.result.posLevelName;
                     placementReceive.PositionTypeOld = org.result.posTypeName;
-                    placementReceive.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
+                    placementReceive.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
                     placementReceive.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                             (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                             (org.result.child2 == null ? "" : org.result.child2 + "\n") +

BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs

@@ -291,7 +291,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                 placementRepatriation.PositionExecutiveOld = org.result.posExecutiveName;
                 placementRepatriation.PositionLevelOld = org.result.posLevelName;
                 placementRepatriation.PositionTypeOld = org.result.posTypeName;
-                placementRepatriation.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
+                placementRepatriation.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
                 placementRepatriation.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                         (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                         (org.result.child2 == null ? "" : org.result.child2 + "\n") +

BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs

@@ -540,7 +540,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                 placementTransfer.PositionExecutiveOld = org.result.posExecutiveName;
                 placementTransfer.PositionLevelOld = org.result.posLevelName;
                 placementTransfer.PositionTypeOld = org.result.posTypeName;
-                placementTransfer.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
+                placementTransfer.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
                 placementTransfer.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                         (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                         (org.result.child2 == null ? "" : org.result.child2 + "\n") +

BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs

@@ -398,7 +398,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 retirementOther.PositionExecutiveOld = org.result.posExecutiveName;
                 retirementOther.PositionLevelOld = org.result.posLevelName;
                 retirementOther.PositionTypeOld = org.result.posTypeName;
-                retirementOther.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
+                retirementOther.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
                 retirementOther.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                         (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                         (org.result.child2 == null ? "" : org.result.child2 + "\n") +

BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs

@@ -302,7 +302,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     retirementOut.PositionExecutiveOld = org.result.posExecutiveName;
                     retirementOut.PositionLevelOld = org.result.posLevelName;
                     retirementOut.PositionTypeOld = org.result.posTypeName;
-                    retirementOut.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
+                    retirementOut.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
                     retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                             (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                             (org.result.child2 == null ? "" : org.result.child2 + "\n") +
@@ -357,7 +357,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     retirementOut.PositionOld = org.result.position;
                     retirementOut.PositionLevelOld = org.result.posLevelName;
                     retirementOut.PositionTypeOld = org.result.posTypeName;
-                    retirementOut.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
+                    retirementOut.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
                     retirementOut.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                             (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                             (org.result.child2 == null ? "" : org.result.child2 + "\n") +

BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs

@@ -942,7 +942,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 retirementResign.PositionExecutiveOld = org.result.posExecutiveName;
                 retirementResign.PositionLevelOld = org.result.posLevelName;
                 retirementResign.PositionTypeOld = org.result.posTypeName;
-                retirementResign.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
+                retirementResign.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
                 retirementResign.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                         (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                         (org.result.child2 == null ? "" : org.result.child2 + "\n") +

BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs

@@ -877,7 +877,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 retirementResignEmployee.PositionOld = org.result.position;
                 retirementResignEmployee.PositionLevelOld = org.result.posLevelName;
                 retirementResignEmployee.PositionTypeOld = org.result.posTypeName;
-                retirementResignEmployee.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
+                retirementResignEmployee.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
                 retirementResignEmployee.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
                                                         (org.result.child3 == null ? "" : org.result.child3 + "\n") +
                                                         (org.result.child2 == null ? "" : org.result.child2 + "\n") +