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

.github/workflows/release_discipline.yaml

@@ -6,102 +6,102 @@ on:
       - "discipline-[0-9]+.[0-9]+.[0-9]+"
   workflow_dispatch:
 env:
-    REGISTRY: docker.frappet.com
-    IMAGE_NAME: ehr/bma-ehr-discipline-service
-    DEPLOY_HOST: frappet.com
-    DEPLOY_PORT: 10102
-    # COMPOSE_PATH: /home/frappet/docker/bma-ehr
-    COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-discipline
-    TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0
+  REGISTRY: docker.frappet.com
+  IMAGE_NAME: ehr/bma-ehr-discipline-service
+  DEPLOY_HOST: frappet.com
+  DEPLOY_PORT: 10102
+  # COMPOSE_PATH: /home/frappet/docker/bma-ehr
+  COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-discipline
+  TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0
 
 jobs:
-    # act workflow_dispatch -W .github/workflows/release_discipline.yaml --input IMAGE_VER=latest -s DOCKER_USER=admin -s DOCKER_PASS=FPTadmin2357 -s SSH_PASSWORD=FPTadmin2357
-    release-dev:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-            - name: Set output tags
-              id: vars
-              run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
-            - name: Gen Version
-              id: gen_ver
-              run: |
-                if [[ $GITHUB_REF == 'refs/tags/'* ]]; then
-                  IMAGE_VER=${{ steps.vars.outputs.tag }}
-                else
-                  IMAGE_VER=${{ github.event.inputs.IMAGE_VER }}
-                fi
-                if [[ $IMAGE_VER == '' ]]; then
-                  IMAGE_VER='test-vBeta'
-                fi
-                echo '::set-output name=image_ver::'$IMAGE_VER
-            - name: Check Version
-              run: |
-                  echo $GITHUB_REF
-                  echo ${{ steps.gen_ver.outputs.image_ver }}
-            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v2
-            - name: Login in to registry
-              uses: docker/login-action@v2
-              with:
-                  registry: ${{env.REGISTRY}}
-                  username: ${{secrets.DOCKER_USER}}
-                  password: ${{secrets.DOCKER_PASS}}
-            - name: Build and load local docker image
-              uses: docker/build-push-action@v3
-              with:
-                  context: .
-                  platforms: linux/amd64
-                  file: BMA.EHR.Discipline.Service/Dockerfile
-                  push: true
-                  tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest
+  # act workflow_dispatch -W .github/workflows/release_discipline.yaml --input IMAGE_VER=latest -s DOCKER_USER=admin -s DOCKER_PASS=FPTadmin2357 -s SSH_PASSWORD=FPTadmin2357
+  release-dev:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set output tags
+        id: vars
+        run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+      - name: Gen Version
+        id: gen_ver
+        run: |
+          if [[ $GITHUB_REF == 'refs/tags/'* ]]; then
+            IMAGE_VER=${{ steps.vars.outputs.tag }}
+          else
+            IMAGE_VER=${{ github.event.inputs.IMAGE_VER }}
+          fi
+          if [[ $IMAGE_VER == '' ]]; then
+            IMAGE_VER='test-vBeta'
+          fi
+          echo '::set-output name=image_ver::'$IMAGE_VER
+      - name: Check Version
+        run: |
+          echo $GITHUB_REF
+          echo ${{ steps.gen_ver.outputs.image_ver }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login in to registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{env.REGISTRY}}
+          username: ${{secrets.DOCKER_USER}}
+          password: ${{secrets.DOCKER_PASS}}
+      - name: Build and load local docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64
+          file: BMA.EHR.Discipline.Service/Dockerfile
+          push: true
+          tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest
 
-            - name: Reload docker compose
-              uses: appleboy/ssh-action@v0.1.8
-              with:
-                  host: ${{env.DEPLOY_HOST}}
-                  username: frappet
-                  password: ${{ secrets.SSH_PASSWORD }}
-                  port: ${{env.DEPLOY_PORT}}
-                  script: |
-                      cd "${{env.COMPOSE_PATH}}"
-                      docker compose pull
-                      docker compose up -d
-                      echo "${{ steps.gen_ver.outputs.image_ver }}"> success
-            - name: Notify Discord Success
-              if: success()
-              run: |
-                curl -H "Content-Type: application/json" \
-                -X POST \
-                -d '{
-                  "embeds": [{
-                    "title": "✅ Deployment Success!",
-                    "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`",
-                    "color": 3066993,
-                    "footer": {
-                      "text": "Release Notification",
-                      "icon_url": "https://example.com/success-icon.png"
-                    },
-                    "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
-                  }]
-                }' \
-                ${{ secrets.DISCORD_WEBHOOK }}
+      - name: Reload docker compose
+        uses: appleboy/ssh-action@v0.1.8
+        with:
+          host: ${{env.DEPLOY_HOST}}
+          username: frappet
+          password: ${{ secrets.SSH_PASSWORD }}
+          port: ${{env.DEPLOY_PORT}}
+          script: |
+            cd "${{env.COMPOSE_PATH}}"
+            docker compose pull
+            docker compose up -d
+            echo "${{ steps.gen_ver.outputs.image_ver }}"> success
+      # - name: Notify Discord Success
+      #   if: success()
+      #   run: |
+      #     curl -H "Content-Type: application/json" \
+      #     -X POST \
+      #     -d '{
+      #       "embeds": [{
+      #         "title": "✅ Deployment Success!",
+      #         "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`",
+      #         "color": 3066993,
+      #         "footer": {
+      #           "text": "Release Notification",
+      #           "icon_url": "https://example.com/success-icon.png"
+      #         },
+      #         "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
+      #       }]
+      #     }' \
+      #     ${{ secrets.DISCORD_WEBHOOK }}
 
-            - name: Notify Discord Failure
-              if: failure()
-              run: |
-                curl -H "Content-Type: application/json" \
-                -X POST \
-                -d '{
-                  "embeds": [{
-                    "title": "❌ Deployment Failed!",
-                    "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`",
-                    "color": 15158332,
-                    "footer": {
-                      "text": "Release Notification",
-                      "icon_url": "https://example.com/failure-icon.png"
-                    },
-                    "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
-                  }]
-                }' \
-                ${{ secrets.DISCORD_WEBHOOK }}
+      # - name: Notify Discord Failure
+      #   if: failure()
+      #   run: |
+      #     curl -H "Content-Type: application/json" \
+      #     -X POST \
+      #     -d '{
+      #       "embeds": [{
+      #         "title": "❌ Deployment Failed!",
+      #         "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`",
+      #         "color": 15158332,
+      #         "footer": {
+      #           "text": "Release Notification",
+      #           "icon_url": "https://example.com/failure-icon.png"
+      #         },
+      #         "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
+      #       }]
+      #     }' \
+      #     ${{ 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
-        if: success()
-        run: |
-          curl -H "Content-Type: application/json" \
-          -X POST \
-          -d '{
-            "embeds": [{
-              "title": "✅ Deployment Success!",
-              "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`",
-              "color": 3066993,
-              "footer": {
-                "text": "Release Notification",
-                "icon_url": "https://example.com/success-icon.png"
-              },
-              "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
-            }]
-          }' \
-          ${{ secrets.DISCORD_WEBHOOK }}
+      # - name: Notify Discord Success
+      #   if: success()
+      #   run: |
+      #     curl -H "Content-Type: application/json" \
+      #     -X POST \
+      #     -d '{
+      #       "embeds": [{
+      #         "title": "✅ Deployment Success!",
+      #         "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`",
+      #         "color": 3066993,
+      #         "footer": {
+      #           "text": "Release Notification",
+      #           "icon_url": "https://example.com/success-icon.png"
+      #         },
+      #         "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
+      #       }]
+      #     }' \
+      #     ${{ secrets.DISCORD_WEBHOOK }}
 
-      - name: Notify Discord Failure
-        if: failure()
-        run: |
-          curl -H "Content-Type: application/json" \
-          -X POST \
-          -d '{
-            "embeds": [{
-              "title": "❌ Deployment Failed!",
-              "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`",
-              "color": 15158332,
-              "footer": {
-                "text": "Release Notification",
-                "icon_url": "https://example.com/failure-icon.png"
-              },
-              "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
-            }]
-          }' \
-          ${{ secrets.DISCORD_WEBHOOK }}
+      # - name: Notify Discord Failure
+      #   if: failure()
+      #   run: |
+      #     curl -H "Content-Type: application/json" \
+      #     -X POST \
+      #     -d '{
+      #       "embeds": [{
+      #         "title": "❌ Deployment Failed!",
+      #         "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`",
+      #         "color": 15158332,
+      #         "footer": {
+      #           "text": "Release Notification",
+      #           "icon_url": "https://example.com/failure-icon.png"
+      #         },
+      #         "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
+      #       }]
+      #     }' \
+      #     ${{ secrets.DISCORD_WEBHOOK }}

BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs

@@ -99,11 +99,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        PositionLevel = p.posLevelName == null ? "" : p.posLevelName,
                                        PositionType = p.posTypeName == null ? "" : p.posTypeName,
                                        PositionNumber = p.posMasterNo == null ? "" :
-                                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
+                                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 0 ? $"{p.rootShortName} {p.posMasterNo}".ToThaiNumber() : "",
                                        Salary = p.Amount == null ? "0" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber().ToThaiNumber(),
                                        AppointDate = p.ReportingDate == null ? "" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        ExamNumber = p.ExamNumber == null ? "0" : p.ExamNumber.Value.ToString().ToThaiNumber(),
@@ -152,11 +152,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        PositionLevel = p.posLevelName == null ? "" : p.posLevelName,
                                        PositionType = p.posTypeName == null ? "" : p.posTypeName,
                                        PositionNumber = p.posMasterNo == null ? "" :
-                                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
+                                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 0 ? $"{p.rootShortName} {p.posMasterNo}".ToThaiNumber() : "",
                                        Salary = p.Amount == null ? "" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        AppointDate = p.ReportingDate == null ? "" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        ExamNumber = p.ExamNumber == null ? "" : p.ExamNumber.Value.ToString().ToThaiNumber(),
@@ -206,11 +206,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        OldPositionLevel = p.posLevelNameOld == null ? "" : p.posLevelNameOld,
                                        OldPositionType = p.posTypeNameOld == null ? "" : p.posTypeNameOld,
                                        OldPositionNumber = p.posMasterNoOld == null ? "" :
-                                                            p.nodeOld == "4" ? $"{p.child4ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                                            p.nodeOld == "3" ? $"{p.child3ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                                            p.nodeOld == "2" ? $"{p.child2ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                                            p.nodeOld == "1" ? $"{p.child1ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                                            p.nodeOld == "0" ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "",
+                                                            p.nodeOld == "4" ? $"{p.child4ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                                            p.nodeOld == "3" ? $"{p.child3ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                                            p.nodeOld == "2" ? $"{p.child2ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                                            p.nodeOld == "1" ? $"{p.child1ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                                            p.nodeOld == "0" ? $"{p.rootShortNameOld} {p.posMasterNoOld}".ToThaiNumber() : "",
                                        OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
 
                                        NewOc = p.root == null ? "" : p.root,
@@ -218,11 +218,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName,
                                        NewPositionType = p.posTypeName == null ? "" : p.posTypeName,
                                        NewPositionNumber = p.posMasterNo == null ? "" :
-                                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
+                                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 0 ? $"{p.rootShortName} {p.posMasterNo}".ToThaiNumber() : "",
                                        NewSalary = p.Amount == null ? "" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        AppointDate = p.ReportingDate == null ? "" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        RemarkHorizontal = p.RemarkHorizontal,
@@ -269,22 +269,22 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        OldPositionLevel = p.posLevelNameOld == null ? "" : p.posLevelNameOld,
                                        OldPositionType = p.posTypeNameOld == null ? "" : p.posTypeNameOld,
                                        OldPositionNumber = p.posMasterNoOld == null ? "" :
-                                                            p.nodeOld == "4" ? $"{p.child4ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                                            p.nodeOld == "3" ? $"{p.child3ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                                            p.nodeOld == "2" ? $"{p.child2ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                                            p.nodeOld == "1" ? $"{p.child1ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                                            p.nodeOld == "0" ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "",
+                                                            p.nodeOld == "4" ? $"{p.child4ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                                            p.nodeOld == "3" ? $"{p.child3ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                                            p.nodeOld == "2" ? $"{p.child2ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                                            p.nodeOld == "1" ? $"{p.child1ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                                            p.nodeOld == "0" ? $"{p.rootShortNameOld} {p.posMasterNoOld}".ToThaiNumber() : "",
                                        OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        NewOc = p.root == null ? "" : p.root,
                                        NewPositionName = p.positionName == null ? "" : p.positionName,
                                        NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName,
                                        NewPositionType = p.posTypeName == null ? "" : p.posTypeName,
                                        NewPositionNumber = p.posMasterNo == null ? "" :
-                                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
+                                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 0 ? $"{p.rootShortName} {p.posMasterNo}".ToThaiNumber() : "",
                                        NewSalary = p.Amount == null ? "" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        AppointDate = p.ReportingDate == null ? "" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber()
                                    })
@@ -329,22 +329,22 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        OldPositionLevel = p.posLevelNameOld == null ? "" : p.posLevelNameOld,
                                        OldPositionType = p.posTypeNameOld == null ? "" : p.posTypeNameOld,
                                        OldPositionNumber = p.posMasterNoOld == null ? "" :
-                                                            p.nodeOld == "4" ? $"{p.child4ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                                            p.nodeOld == "3" ? $"{p.child3ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                                            p.nodeOld == "2" ? $"{p.child2ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                                            p.nodeOld == "1" ? $"{p.child1ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                                            p.nodeOld == "0" ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "",
+                                                            p.nodeOld == "4" ? $"{p.child4ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                                            p.nodeOld == "3" ? $"{p.child3ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                                            p.nodeOld == "2" ? $"{p.child2ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                                            p.nodeOld == "1" ? $"{p.child1ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                                            p.nodeOld == "0" ? $"{p.rootShortNameOld} {p.posMasterNoOld}".ToThaiNumber() : "",
                                        OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        NewOc = p.root == null ? "" : p.root,
                                        NewPositionName = p.positionName == null ? "" : p.positionName,
                                        NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName,
                                        NewPositionType = p.posTypeName == null ? "" : p.posTypeName,
                                        NewPositionNumber = p.posMasterNo == null ? "" :
-                                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
+                                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 0 ? $"{p.rootShortName} {p.posMasterNo}".ToThaiNumber() : "",
                                        NewSalary = p.Amount == null ? "" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        AppointDate = p.ReportingDate == null ? "" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber()
                                    })
@@ -407,11 +407,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName,
                                        NewPositionType = p.posTypeName == null ? "" : p.posTypeName,
                                        NewPositionNumber = p.posMasterNo == null ? "" :
-                                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
+                                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            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(),
                                        Reason = p.Reason == null ? "-" : p.Reason,
@@ -477,11 +477,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName,
                                        NewPositionType = p.posTypeName == null ? "" : p.posTypeName,
                                        NewPositionNumber = p.posMasterNo == null ? "" :
-                                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
+                                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            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(),
                                        Reason = p.Reason == null ? "-" : p.Reason,
@@ -750,11 +750,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                                    NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName,
                                    NewPositionType = p.posTypeName == null ? "" : p.posTypeName,
                                    NewPositionNumber = p.posMasterNo == null ? "" :
-                                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
+                                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            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(),
                                    Reason = p.Reason == null ? "-" : p.Reason,
@@ -1173,11 +1173,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName.ToThaiNumber(),
                                        //    NewPositionType = p.posTypeName == null ? "" : p.posTypeName,
                                        NewPositionNumber = p.posMasterNo == null ? "" :
-                                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
+                                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 0 ? $"{p.rootShortName} {p.posMasterNo}".ToThaiNumber() : "",
                                        NewSalary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        Reason = p.Reason == null ? "-" : p.Reason,
                                    })
@@ -1307,11 +1307,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        NewPositionLevel = p.posLevelName == null ? "" : p.posLevelName,
                                        //    NewPositionType = p.posTypeName == null ? "" : p.posTypeName,
                                        NewPositionNumber = p.posMasterNo == null ? "" :
-                                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
+                                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                            p.node == 0 ? $"{p.rootShortName} {p.posMasterNo}".ToThaiNumber() : "",
                                        NewSalary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        Reason = p.Reason == null ? "-" : p.Reason,
                                    })

BMA.EHR.Application/Repositories/Commands/CommandRepository.cs

@@ -3113,11 +3113,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = placementProfile.PositionSalaryAmount,
                             mouthSalaryAmount = placementProfile.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.positionName == null ? string.Empty : placementProfile.positionName,
                             positionLine = string.Empty,
                             positionPathSide = string.Empty,
@@ -3297,11 +3297,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.positionName,
                             positionLine = "",
                             positionPathSide = "",
@@ -3478,11 +3478,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.positionName,
                             positionLine = "",
                             positionPathSide = "",
@@ -3659,11 +3659,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.positionName,
                             positionLine = "",
                             positionPathSide = "",
@@ -3842,11 +3842,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.position,
                             positionLine = "",
                             positionPathSide = "",
@@ -4027,11 +4027,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.position,
                             positionLine = "",
                             positionPathSide = "",
@@ -4209,11 +4209,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.position,
                             positionLine = "",
                             positionPathSide = "",
@@ -5450,11 +5450,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.position,
                             positionLine = "",
                             positionPathSide = "",
@@ -6887,11 +6887,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = data.posMasterNo == null ? "" :
-                                                            data.node == 4 ? $"{data.child4ShortName}{data.posMasterNo}" :
-                                                            data.node == 3 ? $"{data.child3ShortName}{data.posMasterNo}" :
-                                                            data.node == 2 ? $"{data.child2ShortName}{data.posMasterNo}" :
-                                                            data.node == 1 ? $"{data.child1ShortName}{data.posMasterNo}" :
-                                                            data.node == 0 ? $"{data.rootShortName}{data.posMasterNo}" : "",
+                                                            data.node == 4 ? $"{data.child4ShortName} {data.posMasterNo}" :
+                                                            data.node == 3 ? $"{data.child3ShortName} {data.posMasterNo}" :
+                                                            data.node == 2 ? $"{data.child2ShortName} {data.posMasterNo}" :
+                                                            data.node == 1 ? $"{data.child1ShortName} {data.posMasterNo}" :
+                                                            data.node == 0 ? $"{data.rootShortName} {data.posMasterNo}" : "",
                             position = data.position,
                             positionType = data.posTypeName,
                             positionLevel = data.posLevelName,
@@ -7225,11 +7225,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = data.posMasterNo == null ? "" :
-                                                            data.node == 4 ? $"{data.child4ShortName}{data.posMasterNo}" :
-                                                            data.node == 3 ? $"{data.child3ShortName}{data.posMasterNo}" :
-                                                            data.node == 2 ? $"{data.child2ShortName}{data.posMasterNo}" :
-                                                            data.node == 1 ? $"{data.child1ShortName}{data.posMasterNo}" :
-                                                            data.node == 0 ? $"{data.rootShortName}{data.posMasterNo}" : "",
+                                                            data.node == 4 ? $"{data.child4ShortName} {data.posMasterNo}" :
+                                                            data.node == 3 ? $"{data.child3ShortName} {data.posMasterNo}" :
+                                                            data.node == 2 ? $"{data.child2ShortName} {data.posMasterNo}" :
+                                                            data.node == 1 ? $"{data.child1ShortName} {data.posMasterNo}" :
+                                                            data.node == 0 ? $"{data.rootShortName} {data.posMasterNo}" : "",
                             position = data.position,
                             positionType = data.posTypeName,
                             positionLevel = data.posLevelName,

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,78 +333,85 @@ 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 });
-                var disciplineComplaint_Appeal = new Domain.Models.Discipline.DisciplineComplaint_Appeal
+                type = org.result.profileType;
+            }
+
+            var disciplineComplaint_Appeal = new Domain.Models.Discipline.DisciplineComplaint_Appeal
+            {
+                Title = req.Title,
+                Description = req.Description,
+                Status = "NEW",
+                Type = req.Type.Trim().ToUpper(),
+                Year = req.Year == null ? DateTime.Now.Year : req.Year,
+                CaseType = req.CaseType,
+                CaseNumber = req.CaseNumber,
+                Fullname = req.Fullname,
+                CitizenId = req.CitizenId,
+                ProfileId = id,
+                Position = req.Position,
+                Oc = req.Oc,
+                profileType = type,
+                CreatedFullName = FullName ?? "System Administrator",
+                CreatedUserId = UserId ?? "",
+                CreatedAt = DateTime.Now,
+                LastUpdateFullName = FullName ?? "System Administrator",
+                LastUpdateUserId = UserId ?? "",
+                LastUpdatedAt = DateTime.Now,
+            };
+            var disciplineComplaint_Appeal_History = new DisciplineComplaint_Appeal_History
+            {
+                DisciplineComplaint_Appeal = disciplineComplaint_Appeal,
+                Status = "NEW",
+                CreatedFullName = FullName ?? "System Administrator",
+                CreatedUserId = UserId ?? "",
+                CreatedAt = DateTime.Now,
+                LastUpdateFullName = FullName ?? "System Administrator",
+                LastUpdateUserId = UserId ?? "",
+                LastUpdatedAt = DateTime.Now,
+            };
+            // await _context.DisciplineComplaint_Appeals.AddAsync(disciplineComplaint_Appeal);
+            await _context.DisciplineComplaint_Appeal_Historys.AddAsync(disciplineComplaint_Appeal_History);
+            await _context.SaveChangesAsync();
+            if (Request.Form.Files != null && Request.Form.Files.Count != 0)
+            {
+                foreach (var file in Request.Form.Files)
                 {
-                    Title = req.Title,
-                    Description = req.Description,
-                    Status = "NEW",
-                    Type = req.Type.Trim().ToUpper(),
-                    Year = req.Year == null ? DateTime.Now.Year : req.Year,
-                    CaseType = req.CaseType,
-                    CaseNumber = req.CaseNumber,
-                    Fullname = req.Fullname,
-                    CitizenId = req.CitizenId,
-                    ProfileId = id,
-                    Position = req.Position,
-                    Oc = req.Oc,
-                    profileType = org.result.profileType,
-                    CreatedFullName = FullName ?? "System Administrator",
-                    CreatedUserId = UserId ?? "",
-                    CreatedAt = DateTime.Now,
-                    LastUpdateFullName = FullName ?? "System Administrator",
-                    LastUpdateUserId = UserId ?? "",
-                    LastUpdatedAt = DateTime.Now,
-                };
-                var disciplineComplaint_Appeal_History = new DisciplineComplaint_Appeal_History
-                {
-                    DisciplineComplaint_Appeal = disciplineComplaint_Appeal,
-                    Status = "NEW",
-                    CreatedFullName = FullName ?? "System Administrator",
-                    CreatedUserId = UserId ?? "",
-                    CreatedAt = DateTime.Now,
-                    LastUpdateFullName = FullName ?? "System Administrator",
-                    LastUpdateUserId = UserId ?? "",
-                    LastUpdatedAt = DateTime.Now,
-                };
-                // await _context.DisciplineComplaint_Appeals.AddAsync(disciplineComplaint_Appeal);
-                await _context.DisciplineComplaint_Appeal_Historys.AddAsync(disciplineComplaint_Appeal_History);
-                await _context.SaveChangesAsync();
-                if (Request.Form.Files != null && Request.Form.Files.Count != 0)
-                {
-                    foreach (var file in Request.Form.Files)
+                    var fileExtension = Path.GetExtension(file.FileName);
+                    var doc = await _documentService.UploadFileAsync(file, file.FileName);
+                    var _doc = await _context.Documents.AsQueryable()
+                                        .FirstOrDefaultAsync(x => x.Id == doc.Id);
+                    if (_doc != null)
                     {
-                        var fileExtension = Path.GetExtension(file.FileName);
-                        var doc = await _documentService.UploadFileAsync(file, file.FileName);
-                        var _doc = await _context.Documents.AsQueryable()
-                                            .FirstOrDefaultAsync(x => x.Id == doc.Id);
-                        if (_doc != null)
+                        var disciplineComplaint_Appeal_Doc = new DisciplineComplaint_Appeal_Doc
                         {
-                            var disciplineComplaint_Appeal_Doc = new DisciplineComplaint_Appeal_Doc
-                            {
-                                DisciplineComplaint_Appeal = disciplineComplaint_Appeal,
-                                Document = _doc,
-                                CreatedFullName = FullName ?? "System Administrator",
-                                CreatedUserId = UserId ?? "",
-                                CreatedAt = DateTime.Now,
-                                LastUpdateFullName = FullName ?? "System Administrator",
-                                LastUpdateUserId = UserId ?? "",
-                                LastUpdatedAt = DateTime.Now,
-                            };
-                            await _context.DisciplineComplaint_Appeal_Docs.AddAsync(disciplineComplaint_Appeal_Doc);
-                        }
+                            DisciplineComplaint_Appeal = disciplineComplaint_Appeal,
+                            Document = _doc,
+                            CreatedFullName = FullName ?? "System Administrator",
+                            CreatedUserId = UserId ?? "",
+                            CreatedAt = DateTime.Now,
+                            LastUpdateFullName = FullName ?? "System Administrator",
+                            LastUpdateUserId = UserId ?? "",
+                            LastUpdatedAt = DateTime.Now,
+                        };
+                        await _context.DisciplineComplaint_Appeal_Docs.AddAsync(disciplineComplaint_Appeal_Doc);
                     }
                 }
-                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 ", ""));
+            }
+            var baseAPIOrg = _configuration["API"];
+            var apiUrlOrg = $"{baseAPIOrg}/org/workflow/find/director";
+            var refId = new List<Guid>();
+
+            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") +
@@ -831,11 +831,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
                                        NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
                                        NewPositionNumber = p.posMasterNo == null ? "-" :
-                                             p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "-",
+                                             p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             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(),
@@ -1041,11 +1041,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
                                        NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
                                        NewPositionNumber = p.posMasterNo == null ? "-" :
-                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "-",
+                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            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(),
@@ -1250,11 +1250,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                               (p.root == null ? "" : $"{p.root}"),
                                        NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName.ToThaiNumber(),
                                        NewPositionNumber = p.posMasterNo == null ? "-" :
-                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
+                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            p.node == 0 ? $"{p.rootShortName} {p.posMasterNo}".ToThaiNumber() : "",
                                        NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        RemarkHorizontal = r.RemarkHorizontal,
                                        RemarkVertical = r.RemarkVertical,
@@ -1439,11 +1439,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
                                        OldOc = p.OrganizationPositionOld == null ? "-" : p.OrganizationPositionOld,
                                        OldPositionNumber = p.posMasterNoOld == null ? "-" :
-                                            p.child4Old != null ? $"{p.child4ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.child3Old != null ? $"{p.child3ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.child2Old != null ? $"{p.child2ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.child1Old != null ? $"{p.child1ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.rootOld != null ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-",
+                                            p.child4Old != null ? $"{p.child4ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.child3Old != null ? $"{p.child3ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.child2Old != null ? $"{p.child2ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.child1Old != null ? $"{p.child1ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.rootOld != null ? $"{p.rootShortNameOld} {p.posMasterNoOld}".ToThaiNumber() : "-",
                                        OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        NewOc = (p.position == null ? "" : $"{p.position}\n") +
                                               (p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
@@ -1453,11 +1453,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                               (p.child1 == null ? "" : $"{p.child1}\n") +
                                               (p.root == null ? "" : $"{p.root}"),
                                        NewPositionNumber = p.posMasterNo == null ? "-" :
-                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
+                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            p.node == 0 ? $"{p.rootShortName} {p.posMasterNo}".ToThaiNumber() : "",
                                        NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        ReportingDate = p.ReportingDate == null ? "" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
@@ -1652,11 +1652,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld,
                                        OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld,
                                        OldPositionNumber = p.posMasterNoOld == null ? "-" :
-                                            p.child4Old != null ? $"{p.child4ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.child3Old != null ? $"{p.child3ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.child2Old != null ? $"{p.child2ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.child1Old != null ? $"{p.child1ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.rootOld != null ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-",
+                                            p.child4Old != null ? $"{p.child4ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.child3Old != null ? $"{p.child3ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.child2Old != null ? $"{p.child2ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.child1Old != null ? $"{p.child1ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.rootOld != null ? $"{p.rootShortNameOld} {p.posMasterNoOld}".ToThaiNumber() : "-",
                                        OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        PositionDate = p.PositionDate == null ? "-" : p.PositionDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        NewOc = (p.position == null ? "" : $"{p.position}\n") +
@@ -1669,11 +1669,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
                                        NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
                                        NewPositionNumber = p.posMasterNo == null ? "" :
-                                                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
+                                                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                                            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(),

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/PlacementController.cs

@@ -1639,11 +1639,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        PositionType = p.posTypeName == null ? "-" : p.posTypeName,
                                        PositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
                                        PositionNumber = p.posMasterNo == null ? "-" :
-                                             p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "-",
+                                             p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 0 ? $"{p.rootShortName} {p.posMasterNo}".ToThaiNumber() : "-",
                                        Salary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber().ToThaiNumber(),
                                        AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
@@ -1970,11 +1970,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        PositionType = p.posTypeName == null ? "-" : p.posTypeName,
                                        PositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
                                        PositionNumber = p.posMasterNo == null ? "-" :
-                                             p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "-",
+                                             p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 0 ? $"{p.rootShortName} {p.posMasterNo}".ToThaiNumber() : "-",
                                        Salary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber().ToThaiNumber(),
                                        AppointDate = p.ReportingDate == null ? "-" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),
@@ -2294,11 +2294,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld,
                                        OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld,
                                        OldPositionNumber = p.posMasterNoOld == null ? "-" :
-                                            p.nodeOld == "4" ? $"{p.child4ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.nodeOld == "3" ? $"{p.child3ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.nodeOld == "2" ? $"{p.child2ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.nodeOld == "1" ? $"{p.child1ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.nodeOld == "0" ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-",
+                                            p.nodeOld == "4" ? $"{p.child4ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.nodeOld == "3" ? $"{p.child3ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.nodeOld == "2" ? $"{p.child2ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.nodeOld == "1" ? $"{p.child1ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.nodeOld == "0" ? $"{p.rootShortNameOld} {p.posMasterNoOld}".ToThaiNumber() : "-",
                                        OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        OldPosition = p.positionNameOld == null ? "-" : p.positionNameOld,
                                        NewOc = (p.positionName == null ? "" : $"{p.positionName}\n") +
@@ -2312,11 +2312,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
                                        NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
                                        NewPositionNumber = p.posMasterNo == null ? "-" :
-                                             p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "-",
+                                             p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             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(),
@@ -2527,11 +2527,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld,
                                        OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld,
                                        OldPositionNumber = p.posMasterNoOld == null ? "-" :
-                                             p.nodeOld == "4" ? $"{p.child4ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                             p.nodeOld == "3" ? $"{p.child3ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                             p.nodeOld == "2" ? $"{p.child2ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                             p.nodeOld == "1" ? $"{p.child1ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                             p.nodeOld == "0" ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-",
+                                             p.nodeOld == "4" ? $"{p.child4ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                             p.nodeOld == "3" ? $"{p.child3ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                             p.nodeOld == "2" ? $"{p.child2ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                             p.nodeOld == "1" ? $"{p.child1ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                             p.nodeOld == "0" ? $"{p.rootShortNameOld} {p.posMasterNoOld}".ToThaiNumber() : "-",
                                        OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        NewOc = (p.positionName == null ? "" : $"{p.positionName}\n") +
                                               (p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
@@ -2544,11 +2544,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
                                        NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
                                        NewPositionNumber = p.posMasterNo == null ? "-" :
-                                             p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                             p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "-",
+                                             p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                             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(),
@@ -2747,11 +2747,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        OldPositionType = p.posTypeNameOld == null ? "-" : p.posTypeNameOld,
                                        OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld,
                                        OldPositionNumber = p.posMasterNoOld == null ? "-" :
-                                            p.nodeOld == "4" ? $"{p.child4ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.nodeOld == "3" ? $"{p.child3ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.nodeOld == "2" ? $"{p.child2ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.nodeOld == "1" ? $"{p.child1ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
-                                            p.nodeOld == "0" ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-",
+                                            p.nodeOld == "4" ? $"{p.child4ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.nodeOld == "3" ? $"{p.child3ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.nodeOld == "2" ? $"{p.child2ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.nodeOld == "1" ? $"{p.child1ShortNameOld} {p.posMasterNoOld}".ToThaiNumber() :
+                                            p.nodeOld == "0" ? $"{p.rootShortNameOld} {p.posMasterNoOld}".ToThaiNumber() : "-",
                                        OldSalary = p.Amount == null ? "-" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
                                        LeaveDate = "-",
                                        NewOc = (p.positionName == null ? "" : $"{p.positionName}\n") +
@@ -2764,11 +2764,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
                                        NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
                                        NewPositionNumber = p.posMasterNo == null ? "-" :
-                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "-",
+                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                            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(),
                                        RemarkHorizontal = r.RemarkHorizontal,

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") +
@@ -960,11 +960,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                        NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
                                        NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
                                        NewPositionNumber = p.posMasterNo == null ? "-" :
-                                                                            p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                                            p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                                            p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                                            p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}".ToThaiNumber() :
-                                                                            p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}".ToThaiNumber() : "",
+                                                                            p.node == 4 ? $"{p.child4ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                                            p.node == 3 ? $"{p.child3ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                                            p.node == 2 ? $"{p.child2ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                                            p.node == 1 ? $"{p.child1ShortName} {p.posMasterNo}".ToThaiNumber() :
+                                                                            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(),

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") +