diff --git a/.forgejo/workflows/build-command_backup.yml b/.forgejo/workflows/build-command_backup.yml
deleted file mode 100644
index 0884c70b..00000000
--- a/.forgejo/workflows/build-command_backup.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-# name: Build
-
-# on:
-#   push:
-#     tags:
-#       - "command-dev[0-9]+.[0-9]+.[0-9]+"
-#       - "command-dev[0-9]+.[0-9]+.[0-9]+*"
-#   workflow_dispatch:
-
-# env:
-#   REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
-#   REGISTRY_USERNAME: ${{ vars.CONTAINER_REGISTRY_USERNAME }}
-#   REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
-#   CONTAINER_IMAGE_NAME: ${{ vars.CONTAINER_REGISTRY }}/${{ vars.CONTAINER_IMAGE_OWNER }}
-#   IMAGE_VERSION: build
-#   DISCORD_WEBHOOK: ${{ vars.DISCORD_WEBHOOK }}
-
-# jobs:
-#   build:
-#     runs-on: ubuntu-latest
-#     steps:
-#       - name: Checkout repository
-#         uses: actions/checkout@v4
-#       - name: Set up Docker Buildx
-#         uses: docker/setup-buildx-action@v2
-#         with:
-#           config-inline: |
-#             [registry."${{ env.REGISTRY }}"]
-#               ca=["/etc/ssl/certs/ca-certificates.crt"]
-#       - name: Tag Version
-#         run: |
-#           if [[ "${{ github.event_name }}" == "push" ]]; then
-#             echo "IMAGE_VERSION=${{ github.ref_name }}" | sed 's/command-dev//g' >> $GITHUB_ENV
-#           else
-#             echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV
-#           fi
-#       - name: Login in to registry
-#         uses: docker/login-action@v2
-#         with:
-#           registry: ${{ env.REGISTRY }}
-#           username: ${{ env.REGISTRY_USERNAME }}
-#           password: ${{ env.REGISTRY_PASSWORD }}
-#       - name: Build and push docker image
-#         uses: docker/build-push-action@v3
-#         with:
-#           platforms: linux/amd64
-#           context: .
-#           file: ./BMA.EHR.Command.Service/Dockerfile
-#           tags: ${{ env.CONTAINER_IMAGE_NAME }}/hrms-api-command:latest,${{ env.CONTAINER_IMAGE_NAME }}/hrms-api-command:${{ env.IMAGE_VERSION }}
-#           push: true
-#       - name: Remote Deploy
-#         uses: appleboy/ssh-action@v1.2.1
-#         with:
-#           host: ${{ vars.SSH_DEPLOY_HOST }}
-#           port: ${{ vars.SSH_DEPLOY_PORT }}
-#           username: ${{ secrets.SSH_DEPLOY_USER }}
-#           password: ${{ secrets.SSH_DEPLOY_PASSWORD }}
-#           script: |
-#             cd ~/repo
-#             ./replace-env.sh API_COMMAND "${{ env.IMAGE_VERSION }}"
-#             ./deploy.sh hrms-api-command
diff --git a/.forgejo/workflows/build-report_backup.yml b/.forgejo/workflows/build-report_backup.yml
deleted file mode 100644
index 664de47b..00000000
--- a/.forgejo/workflows/build-report_backup.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-# name: Build
-
-# on:
-#   push:
-#     tags:
-#       - "report-dev[0-9]+.[0-9]+.[0-9]+"
-#       - "report-dev[0-9]+.[0-9]+.[0-9]+*"
-#   workflow_dispatch:
-
-# env:
-#   REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
-#   REGISTRY_USERNAME: ${{ vars.CONTAINER_REGISTRY_USERNAME }}
-#   REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
-#   CONTAINER_IMAGE_NAME: ${{ vars.CONTAINER_REGISTRY }}/${{ vars.CONTAINER_IMAGE_OWNER }}
-#   SERVICE_NAME: hrms-api-report
-#   IMAGE_VERSION: build
-#   DISCORD_WEBHOOK: ${{ vars.DISCORD_WEBHOOK }}
-
-# jobs:
-#   build:
-#     runs-on: ubuntu-latest
-#     steps:
-#       - name: Checkout repository
-#         uses: actions/checkout@v4
-#       - name: Set up Docker Buildx
-#         uses: docker/setup-buildx-action@v2
-#         with:
-#           config-inline: |
-#             [registry."${{ env.REGISTRY }}"]
-#               ca=["/etc/ssl/certs/ca-certificates.crt"]
-#       - name: Tag Version
-#         run: |
-#           if [[ "${{ github.event_name }}" == "push" ]]; then
-#             echo "IMAGE_VERSION=${{ github.ref_name }}" | sed 's/report-dev//g' >> $GITHUB_ENV
-#           else
-#             echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV
-#           fi
-#       - name: Login in to registry
-#         uses: docker/login-action@v2
-#         with:
-#           registry: ${{ env.REGISTRY }}
-#           username: ${{ env.REGISTRY_USERNAME }}
-#           password: ${{ env.REGISTRY_PASSWORD }}
-#       - name: Build and push docker image
-#         uses: docker/build-push-action@v3
-#         with:
-#           platforms: linux/amd64
-#           context: .
-#           file: ./BMA.EHR.Report.Service/Dockerfile
-#           tags: ${{ env.CONTAINER_IMAGE_NAME }}/${{ env.SERVICE_NAME }}:latest,${{ env.CONTAINER_IMAGE_NAME }}/${{ env.SERVICE_NAME }}:${{ env.IMAGE_VERSION }}
-#           push: true
-#       - name: Remote Deploy
-#         uses: appleboy/ssh-action@v1.2.1
-#         with:
-#           host: ${{ vars.SSH_DEPLOY_HOST }}
-#           port: ${{ vars.SSH_DEPLOY_PORT }}
-#           username: ${{ secrets.SSH_DEPLOY_USER }}
-#           password: ${{ secrets.SSH_DEPLOY_PASSWORD }}
-#           script: |
-#             cd ~/repo
-#             ./replace-env.sh API_REPORT "${{ env.IMAGE_VERSION }}"
-#             ./deploy.sh ${{ env.SERVICE_NAME }}
-
-#       - name: Discord Notification
-#         if: always()
-#         run: |
-#           STATUS="${{ job.status == 'success' && '✅ Success' || '❌ Failed' }}"
-#           COLOR="${{ job.status == 'success' && '3066993' || '15158332' }}"
-#           TIMESTAMP=$(date -u +%Y-%m-%dT%H:%M:%SZ)
-#           curl -H "Content-Type: application/json" \
-#           -X POST \
-#           -d "{
-#             \"embeds\": [{
-#               \"title\": \"$STATUS\",
-#               \"description\": \"**Build & Deploy**\\n- Image: \`${{ env.CONTAINER_IMAGE_NAME }}/${{ env.SERVICE_NAME }}\`\\n- Version: \`${{ env.IMAGE_VERSION }}\`\\n- By: \`${{ github.actor }}\`\",
-#               \"color\": $COLOR,
-#               \"footer\": {
-#                 \"text\": \"Release Notification\",
-#                 \"icon_url\": \"https://example.com/success-icon.png\"
-#               },
-#               \"timestamp\": \"$TIMESTAMP\"
-#             }]
-#           }" \
-#           ${{ env.DISCORD_WEBHOOK }}
diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
deleted file mode 100644
index a4f2d2e5..00000000
--- a/.forgejo/workflows/build.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Build
-
-on:
-  push:
-    tags:
-      - "leave[0-9]+.[0-9]+.[0-9]+"
-      - "leave[0-9]+.[0-9]+.[0-9]+*"
-  workflow_dispatch:
-
-env:
-  REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
-  REGISTRY_USERNAME: ${{ vars.CONTAINER_REGISTRY_USERNAME }}
-  REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
-  CONTAINER_IMAGE_NAME: ${{ vars.CONTAINER_REGISTRY }}/${{ vars.CONTAINER_IMAGE_OWNER }}
-  IMAGE_VERSION: build
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          config-inline: |
-            [registry."${{ env.REGISTRY }}"]
-              ca=["/etc/ssl/certs/ca-certificates.crt"]
-      - name: Tag Version
-        run: |
-          if [[ "${{ github.event_name }}" == "push" ]]; then
-            echo "IMAGE_VERSION=${{ github.ref_name }}" | sed 's/leave//g' >> $GITHUB_ENV
-          else
-            echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV
-          fi
-      - name: Login in to registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ env.REGISTRY_USERNAME }}
-          password: ${{ env.REGISTRY_PASSWORD }}
-      - name: Build and push docker image
-        uses: docker/build-push-action@v3
-        with:
-          platforms: linux/amd64
-          context: .
-          file: ./BMA.EHR.Leave/Dockerfile
-          tags: ${{ env.CONTAINER_IMAGE_NAME }}/hrms-leave:latest,${{ env.CONTAINER_IMAGE_NAME }}/hrms-leave:${{ env.IMAGE_VERSION }}
-          push: true
diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml
deleted file mode 100644
index 7a18d4cc..00000000
--- a/.forgejo/workflows/deploy.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Build
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "Version to deploy"
-        type: string
-        required: false
-        default: "latest"
-
-env:
-  IMAGE_VERSION: build
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Remote Deploy
-        uses: appleboy/ssh-action@v1.2.1
-        with:
-          host: ${{ vars.SSH_DEPLOY_HOST }}
-          port: ${{ vars.SSH_DEPLOY_PORT }}
-          username: ${{ secrets.SSH_DEPLOY_USER }}
-          password: ${{ secrets.SSH_DEPLOY_PASSWORD }}
-          script: |
-            cd ~/repo
-            ./replace-env.sh API_LEAVE "${{ inputs.version }}"
-            ./deploy.sh hrms-api-leave
diff --git a/.github/workflows/dockerhub-release-checkin.yaml b/.github/workflows/dockerhub-release-checkin.yaml
new file mode 100644
index 00000000..b80c44f7
--- /dev/null
+++ b/.github/workflows/dockerhub-release-checkin.yaml
@@ -0,0 +1,101 @@
+name: DockerHub Release - CheckIn Consumer
+run-name: DockerHub Release - CheckIn Consumer by ${{ github.actor }}
+on:
+  push:
+    tags:
+      - "checkin-[0-9]+.[0-9]+.[0-9]+"
+  workflow_dispatch:
+    inputs:
+      IMAGE_VER:
+        description: "Image version (e.g., latest, v1.0.0)"
+        required: false
+        default: "latest"
+
+env:
+  DOCKERHUB_REGISTRY: docker.io
+  IMAGE_NAME: hrms-api-checkin
+  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+
+jobs:
+  release-to-dockerhub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set output tags
+        id: vars
+        run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+
+      - name: Generate 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 "image_ver=${IMAGE_VER}" >> $GITHUB_OUTPUT
+          echo "Generated version: ${IMAGE_VER}"
+
+      - name: Display version
+        run: |
+          echo "Git Ref: $GITHUB_REF"
+          echo "Image Version: ${{ steps.gen_ver.outputs.image_ver }}"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: ${{env.DOCKERHUB_REGISTRY}}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: BMA.EHR.CheckInConsumer/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ steps.gen_ver.outputs.image_ver }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest
+          labels: |
+            org.opencontainers.image.title=BMA EHR CheckIn Consumer
+            org.opencontainers.image.description=HRMS CheckIn Consumer Service
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Notify Discord on success
+        if: success()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="✅ DockerHub release succeeded\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
+
+      - name: Notify Discord on failure
+        if: failure()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="❌ DockerHub release failed\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
diff --git a/.github/workflows/dockerhub-release-command.yaml b/.github/workflows/dockerhub-release-command.yaml
new file mode 100644
index 00000000..571fd6c9
--- /dev/null
+++ b/.github/workflows/dockerhub-release-command.yaml
@@ -0,0 +1,101 @@
+name: DockerHub Release - Command Service
+run-name: DockerHub Release - Command Service by ${{ github.actor }}
+on:
+  push:
+    tags:
+      - "command-[0-9]+.[0-9]+.[0-9]+"
+  workflow_dispatch:
+    inputs:
+      IMAGE_VER:
+        description: "Image version (e.g., latest, v1.0.0)"
+        required: false
+        default: "latest"
+
+env:
+  DOCKERHUB_REGISTRY: docker.io
+  IMAGE_NAME: hrms-api-command
+  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+
+jobs:
+  release-to-dockerhub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set output tags
+        id: vars
+        run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+
+      - name: Generate 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 "image_ver=${IMAGE_VER}" >> $GITHUB_OUTPUT
+          echo "Generated version: ${IMAGE_VER}"
+
+      - name: Display version
+        run: |
+          echo "Git Ref: $GITHUB_REF"
+          echo "Image Version: ${{ steps.gen_ver.outputs.image_ver }}"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: ${{env.DOCKERHUB_REGISTRY}}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: BMA.EHR.Command.Service/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ steps.gen_ver.outputs.image_ver }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest
+          labels: |
+            org.opencontainers.image.title=BMA EHR Command Service
+            org.opencontainers.image.description=HRMS Command API Service
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Notify Discord on success
+        if: success()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="✅ DockerHub release succeeded\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
+
+      - name: Notify Discord on failure
+        if: failure()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="❌ DockerHub release failed\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
diff --git a/.github/workflows/dockerhub-release-discipline.yaml b/.github/workflows/dockerhub-release-discipline.yaml
new file mode 100644
index 00000000..f4642bd8
--- /dev/null
+++ b/.github/workflows/dockerhub-release-discipline.yaml
@@ -0,0 +1,101 @@
+name: DockerHub Release - Discipline Service
+run-name: DockerHub Release - Discipline Service by ${{ github.actor }}
+on:
+  push:
+    tags:
+      - "discipline-[0-9]+.[0-9]+.[0-9]+"
+  workflow_dispatch:
+    inputs:
+      IMAGE_VER:
+        description: "Image version (e.g., latest, v1.0.0)"
+        required: false
+        default: "latest"
+
+env:
+  DOCKERHUB_REGISTRY: docker.io
+  IMAGE_NAME: hrms-api-discipline
+  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+
+jobs:
+  release-to-dockerhub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set output tags
+        id: vars
+        run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+
+      - name: Generate 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 "image_ver=${IMAGE_VER}" >> $GITHUB_OUTPUT
+          echo "Generated version: ${IMAGE_VER}"
+
+      - name: Display version
+        run: |
+          echo "Git Ref: $GITHUB_REF"
+          echo "Image Version: ${{ steps.gen_ver.outputs.image_ver }}"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: ${{env.DOCKERHUB_REGISTRY}}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: BMA.EHR.Discipline.Service/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ steps.gen_ver.outputs.image_ver }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest
+          labels: |
+            org.opencontainers.image.title=BMA EHR Discipline Service
+            org.opencontainers.image.description=HRMS Discipline API Service
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Notify Discord on success
+        if: success()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="✅ DockerHub release succeeded\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
+
+      - name: Notify Discord on failure
+        if: failure()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="❌ DockerHub release failed\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
diff --git a/.github/workflows/dockerhub-release-insignia.yaml b/.github/workflows/dockerhub-release-insignia.yaml
new file mode 100644
index 00000000..79d89963
--- /dev/null
+++ b/.github/workflows/dockerhub-release-insignia.yaml
@@ -0,0 +1,101 @@
+name: DockerHub Release - Insignia Service
+run-name: DockerHub Release - Insignia Service by ${{ github.actor }}
+on:
+  push:
+    tags:
+      - "insignia-[0-9]+.[0-9]+.[0-9]+"
+  workflow_dispatch:
+    inputs:
+      IMAGE_VER:
+        description: "Image version (e.g., latest, v1.0.0)"
+        required: false
+        default: "latest"
+
+env:
+  DOCKERHUB_REGISTRY: docker.io
+  IMAGE_NAME: hrms-api-insignia
+  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+
+jobs:
+  release-to-dockerhub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set output tags
+        id: vars
+        run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+
+      - name: Generate 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 "image_ver=${IMAGE_VER}" >> $GITHUB_OUTPUT
+          echo "Generated version: ${IMAGE_VER}"
+
+      - name: Display version
+        run: |
+          echo "Git Ref: $GITHUB_REF"
+          echo "Image Version: ${{ steps.gen_ver.outputs.image_ver }}"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: ${{env.DOCKERHUB_REGISTRY}}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: BMA.EHR.Insignia/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ steps.gen_ver.outputs.image_ver }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest
+          labels: |
+            org.opencontainers.image.title=BMA EHR Insignia Service
+            org.opencontainers.image.description=HRMS Insignia API Service
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Notify Discord on success
+        if: success()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="✅ DockerHub release succeeded\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
+
+      - name: Notify Discord on failure
+        if: failure()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="❌ DockerHub release failed\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
diff --git a/.github/workflows/dockerhub-release-leave.yaml b/.github/workflows/dockerhub-release-leave.yaml
new file mode 100644
index 00000000..f9c2e0ba
--- /dev/null
+++ b/.github/workflows/dockerhub-release-leave.yaml
@@ -0,0 +1,119 @@
+name: DockerHub Release - Leave Service
+run-name: DockerHub Release - Leave Service by ${{ github.actor }}
+on:
+  push:
+    tags:
+      - "leave-[0-9]+.[0-9]+.[0-9]+"
+    # branches:
+    #   - main
+    #   - develop
+  workflow_dispatch:
+    inputs:
+      IMAGE_VER:
+        description: "Image version (e.g., latest, v1.0.0)"
+        required: false
+        default: "latest"
+
+env:
+  DOCKERHUB_REGISTRY: docker.io
+  IMAGE_NAME: hrms-api-leave
+  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+
+jobs:
+  release-to-dockerhub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set output tags
+        id: vars
+        run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+
+      - name: Generate version
+        id: gen_ver
+        run: |
+          if [[ $GITHUB_REF == 'refs/tags/'* ]]; then
+            IMAGE_VER=${{ steps.vars.outputs.tag }}
+          elif [[ $GITHUB_REF == 'refs/heads/'* ]]; then
+            BRANCH_NAME=${GITHUB_REF#refs/heads/}
+            IMAGE_VER="${BRANCH_NAME}-latest"
+          else
+            IMAGE_VER=${{ github.event.inputs.IMAGE_VER }}
+          fi
+          if [[ $IMAGE_VER == '' ]]; then
+            IMAGE_VER='test-vBeta'
+          fi
+          echo "image_ver=${IMAGE_VER}" >> $GITHUB_OUTPUT
+          echo "Generated version: ${IMAGE_VER}"
+
+      - name: Display version
+        run: |
+          echo "Git Ref: $GITHUB_REF"
+          echo "Image Version: ${{ steps.gen_ver.outputs.image_ver }}"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: ${{env.DOCKERHUB_REGISTRY}}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=tag
+            type=ref,event=branch
+            type=raw,value=${{ steps.gen_ver.outputs.image_ver }}
+            type=raw,value=latest,enable={{is_default_branch}}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: BMA.EHR.Leave/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ steps.gen_ver.outputs.image_ver }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Image digest
+        run: echo "Image pushed with digest ${{ steps.build.outputs.digest }}"
+
+      - name: Notify Discord on success
+        if: success()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="✅ DockerHub release succeeded\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
+
+      - name: Notify Discord on failure
+        if: failure()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="❌ DockerHub release failed\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
diff --git a/.github/workflows/dockerhub-release-placement.yaml b/.github/workflows/dockerhub-release-placement.yaml
new file mode 100644
index 00000000..d4e3dade
--- /dev/null
+++ b/.github/workflows/dockerhub-release-placement.yaml
@@ -0,0 +1,101 @@
+name: DockerHub Release - Placement Service
+run-name: DockerHub Release - Placement Service by ${{ github.actor }}
+on:
+  push:
+    tags:
+      - "placement-[0-9]+.[0-9]+.[0-9]+"
+  workflow_dispatch:
+    inputs:
+      IMAGE_VER:
+        description: "Image version (e.g., latest, v1.0.0)"
+        required: false
+        default: "latest"
+
+env:
+  DOCKERHUB_REGISTRY: docker.io
+  IMAGE_NAME: hrms-api-placement
+  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+
+jobs:
+  release-to-dockerhub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set output tags
+        id: vars
+        run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+
+      - name: Generate 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 "image_ver=${IMAGE_VER}" >> $GITHUB_OUTPUT
+          echo "Generated version: ${IMAGE_VER}"
+
+      - name: Display version
+        run: |
+          echo "Git Ref: $GITHUB_REF"
+          echo "Image Version: ${{ steps.gen_ver.outputs.image_ver }}"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: ${{env.DOCKERHUB_REGISTRY}}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: BMA.EHR.Placement.Service/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ steps.gen_ver.outputs.image_ver }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest
+          labels: |
+            org.opencontainers.image.title=BMA EHR Placement Service
+            org.opencontainers.image.description=HRMS Placement API Service
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Notify Discord on success
+        if: success()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="✅ DockerHub release succeeded\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
+
+      - name: Notify Discord on failure
+        if: failure()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="❌ DockerHub release failed\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
diff --git a/.github/workflows/dockerhub-release-reportv2.yaml b/.github/workflows/dockerhub-release-reportv2.yaml
new file mode 100644
index 00000000..4dc73f3f
--- /dev/null
+++ b/.github/workflows/dockerhub-release-reportv2.yaml
@@ -0,0 +1,101 @@
+name: DockerHub Release - Report Service
+run-name: DockerHub Release - Report Service by ${{ github.actor }}
+on:
+  push:
+    tags:
+      - "reportv2-[0-9]+.[0-9]+.[0-9]+"
+  workflow_dispatch:
+    inputs:
+      IMAGE_VER:
+        description: "Image version (e.g., latest, v1.0.0)"
+        required: false
+        default: "latest"
+
+env:
+  DOCKERHUB_REGISTRY: docker.io
+  IMAGE_NAME: hrms-api-reportv2
+  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+
+jobs:
+  release-to-dockerhub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set output tags
+        id: vars
+        run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+
+      - name: Generate 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 "image_ver=${IMAGE_VER}" >> $GITHUB_OUTPUT
+          echo "Generated version: ${IMAGE_VER}"
+
+      - name: Display version
+        run: |
+          echo "Git Ref: $GITHUB_REF"
+          echo "Image Version: ${{ steps.gen_ver.outputs.image_ver }}"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: ${{env.DOCKERHUB_REGISTRY}}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: BMA.EHR.Report.Service/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ steps.gen_ver.outputs.image_ver }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest
+          labels: |
+            org.opencontainers.image.title=BMA EHR Report Service
+            org.opencontainers.image.description=HRMS Report API Service
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Notify Discord on success
+        if: success()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="✅ DockerHub release succeeded\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
+
+      - name: Notify Discord on failure
+        if: failure()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="❌ DockerHub release failed\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
diff --git a/.github/workflows/dockerhub-release-retirement.yaml b/.github/workflows/dockerhub-release-retirement.yaml
new file mode 100644
index 00000000..50ace5cd
--- /dev/null
+++ b/.github/workflows/dockerhub-release-retirement.yaml
@@ -0,0 +1,101 @@
+name: DockerHub Release - Retirement Service
+run-name: DockerHub Release - Retirement Service by ${{ github.actor }}
+on:
+  push:
+    tags:
+      - "retirement-[0-9]+.[0-9]+.[0-9]+"
+  workflow_dispatch:
+    inputs:
+      IMAGE_VER:
+        description: "Image version (e.g., latest, v1.0.0)"
+        required: false
+        default: "latest"
+
+env:
+  DOCKERHUB_REGISTRY: docker.io
+  IMAGE_NAME: hrms-api-retirement
+  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+
+jobs:
+  release-to-dockerhub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set output tags
+        id: vars
+        run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+
+      - name: Generate 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 "image_ver=${IMAGE_VER}" >> $GITHUB_OUTPUT
+          echo "Generated version: ${IMAGE_VER}"
+
+      - name: Display version
+        run: |
+          echo "Git Ref: $GITHUB_REF"
+          echo "Image Version: ${{ steps.gen_ver.outputs.image_ver }}"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: ${{env.DOCKERHUB_REGISTRY}}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: BMA.EHR.Retirement.Service/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ steps.gen_ver.outputs.image_ver }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest
+          labels: |
+            org.opencontainers.image.title=BMA EHR Retirement Service
+            org.opencontainers.image.description=HRMS Retirement API Service
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Notify Discord on success
+        if: success()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="✅ DockerHub release succeeded\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
+
+      - name: Notify Discord on failure
+        if: failure()
+        env:
+          IMAGE_VER: ${{ steps.gen_ver.outputs.image_ver }}
+        run: |
+          TAG_INFO="Tag: ${IMAGE_VER:-unknown}"
+          REF_INFO="Ref: ${GITHUB_REF}"
+          ACTOR_INFO="Actor: ${GITHUB_ACTOR}"
+          MSG="❌ DockerHub release failed\n${TAG_INFO}\n${REF_INFO}\n${ACTOR_INFO}"
+          curl -s -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"content\":\"${MSG}\"}" \
+            "$DISCORD_WEBHOOK"
diff --git a/.github/workflows/release_Retirement.yaml b/.github/workflows/release_Retirement.yaml
index 6cdceae0..3fd5bedf 100644
--- a/.github/workflows/release_Retirement.yaml
+++ b/.github/workflows/release_Retirement.yaml
@@ -1,9 +1,9 @@
 name: release-dev
 run-name: release-dev ${{ github.actor }}
 on:
-  push:
-    tags:
-      - "retirement-[0-9]+.[0-9]+.[0-9]+"
+  # push:
+  #   tags:
+  #     - "retirement-[0-9]+.[0-9]+.[0-9]+"
   workflow_dispatch:
 env:
   REGISTRY: docker.frappet.com
diff --git a/.github/workflows/release_checkin_consumer.yaml b/.github/workflows/release_checkin_consumer.yaml
index 31b015e6..f9081264 100644
--- a/.github/workflows/release_checkin_consumer.yaml
+++ b/.github/workflows/release_checkin_consumer.yaml
@@ -1,9 +1,9 @@
 name: release-dev
 run-name: release-dev ${{ github.actor }}
 on:
-  push:
-    tags:
-      - "consumer-[0-9]+.[0-9]+.[0-9]+"
+  # push:
+  #   tags:
+  #     - "consumer-[0-9]+.[0-9]+.[0-9]+"
   workflow_dispatch:
 env:
   REGISTRY: docker.frappet.com
diff --git a/.github/workflows/release_command.yaml b/.github/workflows/release_command.yaml
index 462ed688..dba3012e 100644
--- a/.github/workflows/release_command.yaml
+++ b/.github/workflows/release_command.yaml
@@ -1,9 +1,9 @@
 name: release-dev
 run-name: release-dev ${{ github.actor }}
 on:
-  push:
-    tags:
-      - "command-[0-9]+.[0-9]+.[0-9]+"
+  # push:
+  #   tags:
+  #     - "command-[0-9]+.[0-9]+.[0-9]+"
   workflow_dispatch:
 env:
   REGISTRY: docker.frappet.com
diff --git a/.github/workflows/release_discipline.yaml b/.github/workflows/release_discipline.yaml
index 0e8737f4..f4cb42da 100644
--- a/.github/workflows/release_discipline.yaml
+++ b/.github/workflows/release_discipline.yaml
@@ -1,9 +1,9 @@
 name: release-dev
 run-name: release-dev ${{ github.actor }}
 on:
-  push:
-    tags:
-      - "discipline-[0-9]+.[0-9]+.[0-9]+"
+  # push:
+  #   tags:
+  #     - "discipline-[0-9]+.[0-9]+.[0-9]+"
   workflow_dispatch:
 env:
   REGISTRY: docker.frappet.com
diff --git a/.github/workflows/release_insignia.yaml b/.github/workflows/release_insignia.yaml
index 124d1e9c..af497b37 100644
--- a/.github/workflows/release_insignia.yaml
+++ b/.github/workflows/release_insignia.yaml
@@ -1,9 +1,9 @@
 name: release-dev
 run-name: release-dev ${{ github.actor }}
 on:
-  push:
-    tags:
-      - "insignia-[0-9]+.[0-9]+.[0-9]+"
+  # push:
+  #   tags:
+  #     - "insignia-[0-9]+.[0-9]+.[0-9]+"
   workflow_dispatch:
 env:
   REGISTRY: docker.frappet.com
diff --git a/.github/workflows/release_leave.yaml b/.github/workflows/release_leave.yaml
index 4b361f5f..9b5e0014 100644
--- a/.github/workflows/release_leave.yaml
+++ b/.github/workflows/release_leave.yaml
@@ -1,9 +1,9 @@
 name: release-dev
 run-name: release-dev ${{ github.actor }}
 on:
-  push:
-    tags:
-      - "leave-[0-9]+.[0-9]+.[0-9]+"
+  # push:
+  #   tags:
+  #     - "leave-[0-9]+.[0-9]+.[0-9]+"
   workflow_dispatch:
 env:
   REGISTRY: docker.frappet.com
diff --git a/.github/workflows/release_placement.yaml b/.github/workflows/release_placement.yaml
index d9c2f266..377cbaf4 100644
--- a/.github/workflows/release_placement.yaml
+++ b/.github/workflows/release_placement.yaml
@@ -1,9 +1,9 @@
 name: release-dev
 run-name: release-dev ${{ github.actor }}
 on:
-  push:
-    tags:
-      - "placement-[0-9]+.[0-9]+.[0-9]+"
+  # push:
+  #   tags:
+  #     - "placement-[0-9]+.[0-9]+.[0-9]+"
   workflow_dispatch:
 env:
   REGISTRY: docker.frappet.com
diff --git a/.github/workflows/release_report.yaml b/.github/workflows/release_report.yaml
index 9ba5a7c4..e529729b 100644
--- a/.github/workflows/release_report.yaml
+++ b/.github/workflows/release_report.yaml
@@ -1,107 +1,107 @@
 name: release-dev
 run-name: release-dev ${{ github.actor }}
 on:
-  push:
-    tags:
-      - "reportv2-[0-9]+.[0-9]+.[0-9]+"
+  # push:
+  #   tags:
+  #     - "reportv2-[0-9]+.[0-9]+.[0-9]+"
   workflow_dispatch:
 env:
-    REGISTRY: docker.frappet.com
-    IMAGE_NAME: ehr/bma-ehr-report-v2-service
-    DEPLOY_HOST: frappet.com
-    DEPLOY_PORT: 10102
-    # COMPOSE_PATH: /home/frappet/docker/bma-ehr
-    COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-report-v2
-    TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0
+  REGISTRY: docker.frappet.com
+  IMAGE_NAME: ehr/bma-ehr-report-v2-service
+  DEPLOY_HOST: frappet.com
+  DEPLOY_PORT: 10102
+  # COMPOSE_PATH: /home/frappet/docker/bma-ehr
+  COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-report-v2
+  TOKEN_LINE: uxuK5hDzS2DsoC5piJBrWRLiz8GgY7iMZZldOWsDDF0
 
 jobs:
-    # act workflow_dispatch -W .github/workflows/release_report.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.Report.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_report.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.Report.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 }}
diff --git a/.vscode/launch.json b/.vscode/launch.json
index fd9cf53a..6be3e592 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,35 +1,60 @@
 {
-    "version": "0.2.0",
-    "configurations": [
-        {
-            // Use IntelliSense to find out which attributes exist for C# debugging
-            // Use hover for the description of the existing attributes
-            // For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md.
-            "name": ".NET Core Launch (web)",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/BMA.EHR.Leave.Service/bin/Debug/net7.0/BMA.EHR.Leave.Service.dll",
-            "args": [],
-            "cwd": "${workspaceFolder}/BMA.EHR.Leave.Service",
-            "stopAtEntry": false,
-            // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
-            "serverReadyAction": {
-                "action": "openExternally",
-                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
-            },
-            "env": {
-                "ASPNETCORE_ENVIRONMENT": "Development"
-            },
-            "sourceFileMap": {
-                "/Views": "${workspaceFolder}/Views"
-            }
-        },
-        {
-            "name": ".NET Core Attach",
-            "type": "coreclr",
-            "request": "attach"
-        }
-    ]
-}
\ No newline at end of file
+  "version": "0.2.0",
+  "configurations": [
+    {
+      // Use IntelliSense to find out which attributes exist for C# debugging
+      // Use hover for the description of the existing attributes
+      // For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md.
+      "name": ".NET Core Launch (web)",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "build",
+      // If you have changed target frameworks, make sure to update the program path.
+      "program": "${workspaceFolder}/BMA.EHR.Leave/bin/Debug/net7.0/BMA.EHR.Leave.dll",
+      "args": [],
+      "cwd": "${workspaceFolder}/BMA.EHR.Leave",
+      "stopAtEntry": false,
+      // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
+      "serverReadyAction": {
+        "action": "openExternally",
+        "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+      },
+      "env": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "sourceFileMap": {
+        "/Views": "${workspaceFolder}/Views"
+      }
+    },
+    {
+      // Use IntelliSense to find out which attributes exist for C# debugging
+      // Use hover for the description of the existing attributes
+      // For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md.
+      "name": ".NET Core Launch (web) - Insignia",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "build",
+      // If you have changed target frameworks, make sure to update the program path.
+      "program": "${workspaceFolder}/BMA.EHR.Insignia/bin/Debug/net7.0/BMA.EHR.Insignia.dll",
+      "args": [],
+      "cwd": "${workspaceFolder}/BMA.EHR.Insignia",
+      "stopAtEntry": false,
+      // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
+      "serverReadyAction": {
+        "action": "openExternally",
+        "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+      },
+      "env": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "sourceFileMap": {
+        "/Views": "${workspaceFolder}/Views"
+      }
+    },
+    {
+      "name": ".NET Core Attach",
+      "type": "coreclr",
+      "request": "attach"
+    }
+  ]
+}
diff --git a/BMA.EHR.Application/ApplicationServicesRegistration.cs b/BMA.EHR.Application/ApplicationServicesRegistration.cs
index 350b7a75..0b99a7b6 100644
--- a/BMA.EHR.Application/ApplicationServicesRegistration.cs
+++ b/BMA.EHR.Application/ApplicationServicesRegistration.cs
@@ -53,6 +53,7 @@ namespace BMA.EHR.Application
             services.AddTransient<UserDutyTimeRepository>();
             services.AddTransient<AdditionalCheckRequestRepository>();
             services.AddTransient<UserCalendarRepository>();
+            services.AddTransient<CheckInJobStatusRepository>();
 
             services.AddTransient<LeaveTypeRepository>();
             services.AddTransient<LeaveRequestRepository>();
@@ -60,6 +61,8 @@ namespace BMA.EHR.Application
 
             services.AddTransient<MinIOLeaveService>();
 
+            services.AddTransient<LeaveProcessJobStatusRepository>();
+
             return services;
         }
 
diff --git a/BMA.EHR.Application/Repositories/GenericRepository.cs b/BMA.EHR.Application/Repositories/GenericRepository.cs
index fcc2aef0..d825ccaf 100644
--- a/BMA.EHR.Application/Repositories/GenericRepository.cs
+++ b/BMA.EHR.Application/Repositories/GenericRepository.cs
@@ -53,15 +53,18 @@ namespace BMA.EHR.Application.Repositories
 
         #region " For Call External API "
 
-        protected async Task<string> GetExternalAPIAsync(string apiPath, string accessToken, string apiKey)
+        protected async Task<string> GetExternalAPIAsync(string apiPath, string accessToken, string apiKey, CancellationToken cancellationToken = default)
         {
             try
             {
+                // กำหนด timeout เป็น 30 นาที
+            using var timeoutCts = new CancellationTokenSource(TimeSpan.FromMinutes(30));
+            using var combinedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token);
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken.Replace("Bearer ", ""));
                     client.DefaultRequestHeaders.Add("api-key", apiKey);
-                    var _res = await client.GetAsync(apiPath);
+                    var _res = await client.GetAsync(apiPath,cancellationToken: combinedCts.Token);
                     if (_res.IsSuccessStatusCode)
                     {
                         var _result = await _res.Content.ReadAsStringAsync();
@@ -77,10 +80,13 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
-        protected async Task<string> SendExternalAPIAsync(HttpMethod method, string apiPath, string accessToken, object? body, string apiKey)
+        protected async Task<string> SendExternalAPIAsync(HttpMethod method, string apiPath, string accessToken, object? body, string apiKey, CancellationToken cancellationToken = default)
         {
             try
             {
+                // กำหนด timeout เป็น 30 นาที
+                using var timeoutCts = new CancellationTokenSource(TimeSpan.FromMinutes(30));
+                using var combinedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token);
                 // สร้าง request message
                 var request = new HttpRequestMessage(method, apiPath);
 
@@ -92,7 +98,7 @@ namespace BMA.EHR.Application.Repositories
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken.Replace("Bearer ", ""));
                     client.DefaultRequestHeaders.Add("api-key", apiKey);
-                    var _res = await client.SendAsync(request);
+                    var _res = await client.SendAsync(request, combinedCts.Token);
                     if (_res.IsSuccessStatusCode)
                     {
                         var _result = await _res.Content.ReadAsStringAsync();
@@ -109,11 +115,13 @@ namespace BMA.EHR.Application.Repositories
         }
 
 
-        protected async Task<string> PostExternalAPIAsync(string apiPath, string accessToken, object? body, string apiKey)
+        public async Task<string> PostExternalAPIAsync(string apiPath, string accessToken, object? body, string apiKey, CancellationToken cancellationToken = default)
         {
             try
             {
-
+                // กำหนด timeout เป็น 30 นาที
+                using var timeoutCts = new CancellationTokenSource(TimeSpan.FromMinutes(30));
+                using var combinedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token);
                 var json = JsonConvert.SerializeObject(body);
                 var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
                 //stringContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
@@ -122,7 +130,7 @@ namespace BMA.EHR.Application.Repositories
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken.Replace("Bearer ", ""));
                     client.DefaultRequestHeaders.Add("api-key", apiKey);
-                    var _res = await client.PostAsync(apiPath, stringContent);
+                    var _res = await client.PostAsync(apiPath, stringContent, combinedCts.Token);
                     if (_res.IsSuccessStatusCode)
                     {
                         var _result = await _res.Content.ReadAsStringAsync();
@@ -138,10 +146,13 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
-        protected async Task<bool> PostExternalAPIBooleanAsync(string apiPath, string accessToken, object? body, string apiKey)
+        protected async Task<bool> PostExternalAPIBooleanAsync(string apiPath, string accessToken, object? body, string apiKey, CancellationToken cancellationToken = default)
         {
             try
             {
+                // กำหนด timeout เป็น 30 นาที
+                using var timeoutCts = new CancellationTokenSource(TimeSpan.FromMinutes(30));
+                using var combinedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token);
                 var json = JsonConvert.SerializeObject(body);
                 var stringContent = new StringContent(json, UnicodeEncoding.UTF8, "application/json");
                 stringContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
@@ -150,7 +161,7 @@ namespace BMA.EHR.Application.Repositories
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken.Replace("Bearer ", ""));
                     client.DefaultRequestHeaders.Add("api-key", apiKey);
-                    var _res = await client.PostAsync(apiPath, stringContent);
+                    var _res = await client.PostAsync(apiPath, stringContent, combinedCts.Token);
                     return _res.IsSuccessStatusCode;
                 }
             }
diff --git a/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs b/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs
index a520f502..1c0741cb 100644
--- a/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs
+++ b/BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs
@@ -280,8 +280,8 @@ namespace BMA.EHR.Application.Repositories
                         FullName = $"{(p.Prefix ?? "")}{p.FirstName} {p.LastName}",
                         Position = p.Position ?? "",
                         Rank = p.PosLevel ?? "",
-                        ProfileDateAppoint = p.DateAppoint.Value,
-                        GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
+                        ProfileDateAppoint = p.DateAppoint!.Value,
+                        GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
                         PosNo = p.PosNo,
                         PositionLevelId = p.PosLevelId,
                         PositionLevelName = p.PosLevel,
@@ -297,10 +297,10 @@ namespace BMA.EHR.Application.Repositories
                             : p.ProfileInsignia!.OrderByDescending(x => x.Year).FirstOrDefault()!.InsigniaId.Value,
                         Salary = p.Amount,
                         SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                            p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                            p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                 .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                             p.Amount,
                         PositionSalaryAmount = p.PositionSalaryAmount ?? 0,
                         ProfileInsignia = p.ProfileInsignia,
@@ -409,7 +409,7 @@ namespace BMA.EHR.Application.Repositories
                 var s2_a = (from p in allProfilesByRoot
                             where p.ProfileInsignia != null
                                   && p.ProfileInsignia.Count > 0
-                                  && (p.ProfileInsignia.Where(x => x.InsigniaId.Value != coinInsignia.Id &&
+                                  && (p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != coinInsignia.Id &&
                                                                    x.InsigniaId.Value == bcpRoyal.Id)
                                       .ToList()
                                       .Count() == 0)
@@ -425,8 +425,8 @@ namespace BMA.EHR.Application.Repositories
                                 FullName = $"{(p.Prefix ?? "")}{p.FirstName} {p.LastName}",
                                 Position = p.Position ?? "",
                                 Rank = p.PosLevel ?? "",
-                                ProfileDateAppoint = p.DateAppoint.Value,
-                                GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
+                                ProfileDateAppoint = p.DateAppoint!.Value,
+                                GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
                                 PosNo = p.PosNo,
                                 PositionLevelId = p.PosLevelId,
                                 PositionLevelName = p.PosLevel,
@@ -459,22 +459,22 @@ namespace BMA.EHR.Application.Repositories
                                     : p.ProfileInsignia!.OrderByDescending(x => x.Year).FirstOrDefault()!.InsigniaId.Value,
                                 Salary = p.Amount,
                                 SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                    p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                    p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                         .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                        .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                        .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                        .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                        .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                     p.Amount,
                                 IsHigherLevel = 
                                            IsHigherLevel(p.ProfileInsignia.ToList()
-                                            .Where(x => x.InsigniaId.Value != coinInsignia.Id)
+                                            .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != coinInsignia.Id)
                                            .OrderByDescending(x => x.Year)
                                            .FirstOrDefault(),
                                          "เบญจมาภรณ์ช้างเผือก"),
                                 FirstRecvInsigniaYear = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? 0 :
-                                    p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
+                                    p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
                                         .FirstOrDefault() == null ? 0 :
-                                    p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
-                                        .FirstOrDefault().Year,
+                                    p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
+                                        .FirstOrDefault()?.Year,
                                 ProfileType = p.ProfileType,
 
                                 MarkDiscipline = p.MarkDiscipline,
@@ -555,7 +555,7 @@ namespace BMA.EHR.Application.Repositories
                 var s3 = (from p in allProfilesByRoot
                           where p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
-                                && (p.ProfileInsignia.Where(x => x.InsigniaId.Value != coinInsignia.Id &&
+                                && (p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != coinInsignia.Id &&
                                                                  x.InsigniaId.Value == jtmRoyal.Id)
                                     .ToList()
                                     .Count() == 0)
@@ -571,8 +571,8 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix ?? "")}{p.FirstName} {p.LastName}",
                               Position = p.Position ?? "",
                               Rank = p.PosLevel ?? "",
-                              ProfileDateAppoint = p.DateAppoint.Value,
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
                               PosNo = p.PosNo,
                               PositionLevelId = p.PosLevel == null
                                   ? Guid.Parse("00000000-0000-0000-0000-000000000000")
@@ -590,21 +590,21 @@ namespace BMA.EHR.Application.Repositories
                                   : p.ProfileInsignia!.OrderByDescending(x => x.Year).FirstOrDefault()!.InsigniaId.Value,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               IsHigherLevel = IsHigherLevel(p.ProfileInsignia.ToList()
-                                      .Where(x => x.InsigniaId.Value != coinInsignia.Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != coinInsignia.Id)
                                       .OrderByDescending(x => x.Year)
                                       .FirstOrDefault(),
                                   "จัตุรถาภรณ์มงกุฎไทย"),
                               FirstRecvInsigniaYear = p.ProfileInsignia == null ? 0 :
-                                  p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
+                                  p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
                                       .FirstOrDefault() == null ? 0 :
-                                  p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
-                                      .FirstOrDefault().Year,
+                                  p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
+                                      .FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount ?? 0,
                               Amount = p.Amount ?? 0,
                               RootId = p.RootId,
@@ -794,8 +794,8 @@ namespace BMA.EHR.Application.Repositories
                         FullName = $"{(p.Prefix ?? "")}{p.FirstName} {p.LastName}",
                         Position = p.Position ?? "",
                         Rank = p.PosLevel ?? "",
-                        ProfileDateAppoint = p.DateAppoint.Value,
-                        GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
+                        ProfileDateAppoint = p.DateAppoint!.Value,
+                        GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
                         PosNo = p.PosNo,
                         PositionLevelId = p.PosLevelId,
                         PositionLevelName = p.PosLevel,
@@ -811,10 +811,10 @@ namespace BMA.EHR.Application.Repositories
                             : p.ProfileInsignia!.OrderByDescending(x => x.Year).FirstOrDefault()!.InsigniaId.Value,
                         Salary = p.Amount,
                         SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                            p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                            p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                 .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                             p.Amount,
                         PositionSalaryAmount = p.PositionSalaryAmount ?? 0,
                         ProfileInsignia = p.ProfileInsignia,
@@ -923,7 +923,7 @@ namespace BMA.EHR.Application.Repositories
                 var s2 = (from p in allProfilesByRoot
                           where p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
-                                && (p.ProfileInsignia.Where(x => x.InsigniaId.Value != coinInsignia.Id &&
+                                && (p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != coinInsignia.Id &&
                                                                  x.InsigniaId.Value == jtmRoyal.Id)
                                     .ToList()
                                     .Count() == 0)
@@ -939,8 +939,8 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix ?? "")}{p.FirstName} {p.LastName}",
                               Position = p.Position ?? "",
                               Rank = p.PosLevel ?? "",
-                              ProfileDateAppoint = p.DateAppoint.Value,
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
                               PosNo = p.PosNo,
                               PositionLevelId = p.PosLevelId,
                               PositionLevelName = p.PosLevel,
@@ -956,21 +956,21 @@ namespace BMA.EHR.Application.Repositories
                                   : p.ProfileInsignia!.OrderByDescending(x => x.Year).FirstOrDefault()!.InsigniaId.Value,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               IsHigherLevel = IsHigherLevel(p.ProfileInsignia.ToList()
-                                      .Where(x => x.InsigniaId.Value != coinInsignia.Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != coinInsignia.Id)
                                       .OrderByDescending(x => x.Year)
                                       .FirstOrDefault(),
                                   "จัตุรถาภรณ์มงกุฎไทย"),
                               FirstRecvInsigniaYear = p.ProfileInsignia == null ? 0 :
-                                  p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcpRoyal.Id).OrderBy(x => x.Year)
+                                  p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == bcpRoyal.Id).OrderBy(x => x.Year)
                                       .FirstOrDefault() == null ? 0 :
-                                  p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcpRoyal.Id).OrderBy(x => x.Year)
-                                      .FirstOrDefault().Year,
+                                  p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == bcpRoyal.Id).OrderBy(x => x.Year)
+                                      .FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount ?? 0,
                               Amount = p.Amount ?? 0,
                               RootId = p.RootId,
@@ -1065,7 +1065,7 @@ namespace BMA.EHR.Application.Repositories
                 var s3 = (from p in allProfilesByRoot
                           where p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
-                                && (p.ProfileInsignia.Where(x => x.InsigniaId.Value != coinInsignia.Id &&
+                                && (p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != coinInsignia.Id &&
                                                                  x.InsigniaId.Value == jtcRoyal.Id)
                                     .ToList()
                                     .Count() == 0)
@@ -1081,8 +1081,8 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix ?? "")}{p.FirstName} {p.LastName}",
                               Position = p.Position ?? "",
                               Rank = p.PosLevel ?? "",
-                              ProfileDateAppoint = p.DateAppoint.Value,
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
                               PosNo = p.PosNo,
                               PositionLevelId = p.PosLevelId,
                               PositionLevelName = p.PosLevel,
@@ -1098,21 +1098,21 @@ namespace BMA.EHR.Application.Repositories
                                   : p.ProfileInsignia!.OrderByDescending(x => x.Year).FirstOrDefault()!.InsigniaId.Value,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               IsHigherLevel = IsHigherLevel(p.ProfileInsignia.ToList()
-                                      .Where(x => x.InsigniaId.Value != coinInsignia.Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != coinInsignia.Id)
                                       .OrderByDescending(x => x.Year)
                                       .FirstOrDefault(),
                                   "จัตุรถาภรณ์ช้างเผือก"),
                               FirstRecvInsigniaYear = p.ProfileInsignia == null ? 0 :
-                                  p.ProfileInsignia.Where(x => x.InsigniaId.Value == jtmRoyal.Id).OrderBy(x => x.Year)
+                                  p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == jtmRoyal.Id).OrderBy(x => x.Year)
                                       .FirstOrDefault() == null ? 0 :
-                                  p.ProfileInsignia.Where(x => x.InsigniaId.Value == jtmRoyal.Id).OrderBy(x => x.Year)
-                                      .FirstOrDefault().Year,
+                                  p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == jtmRoyal.Id).OrderBy(x => x.Year)
+                                      .FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -1301,8 +1301,8 @@ namespace BMA.EHR.Application.Repositories
                         FullName = $"{(p.Prefix ?? "")}{p.FirstName} {p.LastName}",
                         Position = p.Position ?? "",
                         Rank = p.PosLevel ?? "",
-                        ProfileDateAppoint = p.DateAppoint.Value,
-                        GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
+                        ProfileDateAppoint = p.DateAppoint!.Value,
+                        GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
                         PosNo = p.PosNo ?? "",
                         PositionLevelId = p.PosLevelId,
                         PositionLevelName = p.PosLevel,
@@ -1311,24 +1311,24 @@ namespace BMA.EHR.Application.Repositories
                         Gender = p.Gender ?? "",
                         LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                             p.ProfileInsignia
-                                .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                 .FirstOrDefault() == null ? "" :
                             p.ProfileInsignia
-                                .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                         LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                             p.ProfileInsignia
-                                .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                 .FirstOrDefault() == null ? Guid.Empty :
                             p.ProfileInsignia
-                                .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                         Salary = p.Amount,
                         SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                            p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                            p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                 .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                             p.Amount,
                         ProfileInsignia = p.ProfileInsignia,
                         PositionSalaryAmount = p.PositionSalaryAmount,
@@ -1426,8 +1426,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("เบญจมาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("เบญจมาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -1442,28 +1443,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? "" : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo ?? "",
                               Gender = p.Gender == null ? "" : p.Gender,
@@ -1472,7 +1473,7 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeId = p.PosTypeId,
                               PositionTypeName = p.PosType,
                               IsHigherLevel = IsHigherLevel(p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .OrderByDescending(x => x.Year)
                                       .FirstOrDefault(),
                                   "เบญจมาภรณ์ช้างเผือก"),
@@ -1573,8 +1574,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("จัตุรถาภรณ์มงกุฎไทย").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("จัตุรถาภรณ์มงกุฎไทย")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -1589,28 +1591,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? "" : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo ?? "",
                               Gender = p.Gender == null ? "" : p.Gender,
@@ -1620,12 +1622,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "จัตุรถาภรณ์มงกุฎไทย"),
@@ -1719,8 +1721,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("จัตุรถาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("จัตุรถาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -1735,28 +1738,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? "" : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo ?? "",
                               Gender = p.Gender == null ? "" : p.Gender,
@@ -1766,12 +1769,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "จัตุรถาภรณ์ช้างเผือก"),
@@ -1972,8 +1975,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ตริตาภรณ์มงกุฎไทย").Id)
+                                        x.InsigniaId.HasValue && 
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ตริตาภรณ์มงกุฎไทย")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -1988,28 +1992,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -2019,12 +2023,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ตริตาภรณ์มงกุฎไทย"),
@@ -2118,8 +2122,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ตริตาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ตริตาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -2134,28 +2139,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -2165,12 +2170,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ตริตาภรณ์ช้างเผือก"),
@@ -2180,7 +2185,7 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ชำนาญงาน").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ชำนาญงาน").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -2336,8 +2341,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์มงกุฎไทย").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์มงกุฎไทย")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -2352,28 +2358,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -2383,12 +2389,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ทวีติยาภรณ์มงกุฎไทย"),
@@ -2398,7 +2404,7 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "อาวุโส").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "อาวุโส").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -2487,8 +2493,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -2503,28 +2510,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -2534,12 +2541,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ทวีติยาภรณ์ช้างเผือก"),
@@ -2549,7 +2556,7 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "อาวุโส").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "อาวุโส").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -2706,8 +2713,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -2722,28 +2730,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -2753,12 +2761,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ทวีติยาภรณ์ช้างเผือก"),
@@ -2768,7 +2776,7 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "อาวุโส").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "อาวุโส").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -2858,8 +2866,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -2874,28 +2883,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -2905,12 +2914,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ประถมาภรณ์มงกุฎไทย"),
@@ -2920,14 +2929,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "อาวุโส").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "อาวุโส").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -3019,8 +3028,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -3035,28 +3045,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -3066,12 +3076,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ประถมาภรณ์ช้างเผือก"),
@@ -3081,14 +3091,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "อาวุโส").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "อาวุโส").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -3265,8 +3275,9 @@ namespace BMA.EHR.Application.Repositories
                           where p.PosType == "วิชาการ"
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ตริตาภรณ์มงกุฎไทย").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ตริตาภรณ์มงกุฎไทย")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -3281,28 +3292,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -3312,12 +3323,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ตริตาภรณ์มงกุฎไทย"),
@@ -3327,14 +3338,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "อาวุโส").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "อาวุโส").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -3470,8 +3481,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ตริตาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ตริตาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -3486,28 +3498,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -3517,12 +3529,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ตริตาภรณ์ช้างเผือก"),
@@ -3532,14 +3544,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ชำนาญการ").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ชำนาญการ").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -3628,8 +3640,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์มงกุฎไทย").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์มงกุฎไทย")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -3644,28 +3657,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -3675,12 +3688,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ทวีติยาภรณ์มงกุฎไทย"),
@@ -3690,14 +3703,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ชำนาญการ").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ชำนาญการ").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -3789,8 +3802,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -3805,28 +3819,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year - 5, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year - 5, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year - 5, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year - 5, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -3836,12 +3850,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ทวีติยาภรณ์ช้างเผือก"),
@@ -3851,14 +3865,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ชำนาญการ").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ชำนาญการ").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -4034,8 +4048,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -4050,28 +4065,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -4081,12 +4096,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ทวีติยาภรณ์ช้างเผือก"),
@@ -4096,14 +4111,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ชำนาญการพิเศษ").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ชำนาญการพิเศษ").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -4175,8 +4190,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -4191,28 +4207,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -4222,12 +4238,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ประถมาภรณ์มงกุฎไทย"),
@@ -4238,14 +4254,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ชำนาญการพิเศษ").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ชำนาญการพิเศษ").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -4409,8 +4425,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -4425,28 +4442,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -4456,12 +4473,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ทวีติยาภรณ์ช้างเผือก"),
@@ -4471,14 +4488,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "เชี่ยวชาญ").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "เชี่ยวชาญ").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -4568,8 +4585,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -4584,28 +4602,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -4615,12 +4633,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ประถมาภรณ์มงกุฎไทย"),
@@ -4631,14 +4649,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "เชี่ยวชาญ").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "เชี่ยวชาญ").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -4729,8 +4747,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -4745,28 +4764,28 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -4776,12 +4795,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ประถมาภรณ์ช้างเผือก"),
@@ -4791,14 +4810,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "เชี่ยวชาญ").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "เชี่ยวชาญ").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -4972,8 +4991,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -4988,29 +5008,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -5020,12 +5040,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ประถมาภรณ์ช้างเผือก"),
@@ -5035,14 +5055,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ทรงคุณวุฒิ").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ทรงคุณวุฒิ").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -5139,8 +5159,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -5155,29 +5176,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo == null ? "" : p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -5187,12 +5208,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "มหาวชิรมงกุฎ"),
@@ -5202,14 +5223,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ทรงคุณวุฒิ").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ทรงคุณวุฒิ").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -5306,8 +5327,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("มหาปรมาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("มหาปรมาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -5322,29 +5344,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
 
                               PosNo = p.PosNo,
@@ -5355,12 +5377,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "มหาปรมาภรณ์ช้างเผือก"),
@@ -5371,12 +5393,12 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ทรงคุณวุฒิ").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ทรงคุณวุฒิ").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
-                                  p.ProfileInsignia.Where(x => x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ").Id)
+                                  p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
-                                  p.ProfileInsignia.Where(x => x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                  p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -5555,8 +5577,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -5571,29 +5594,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -5603,12 +5626,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ประถมาภรณ์ช้างเผือก"),
@@ -5618,14 +5641,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ทรงคุณวุฒิ").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ทรงคุณวุฒิ").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -5722,8 +5745,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -5738,29 +5762,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -5770,12 +5794,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "มหาวชิรมงกุฎ"),
@@ -5785,14 +5809,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "อาวุโส").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "อาวุโส").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -5889,8 +5913,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("มหาปรมาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("มหาปรมาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -5905,29 +5930,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -5937,12 +5962,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "มหาปรมาภรณ์ช้างเผือก"),
@@ -5952,12 +5977,12 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ทรงคุณวุฒิ").OrderBy(p => p.Date)
                                       .FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ทรงคุณวุฒิ").OrderBy(p => p.Date)
-                                      .FirstOrDefault().Date,
+                                      .FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
-                                  p.ProfileInsignia.Where(x => x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ").Id)
+                                  p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
-                                  p.ProfileInsignia.Where(x => x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                  p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -6134,8 +6159,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -6150,29 +6176,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? "" : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo == null ? "" : p.PosNo,
                               Gender = p.Gender == null ? "" : p.Gender,
@@ -6182,12 +6208,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ทวีติยาภรณ์ช้างเผือก"),
@@ -6197,12 +6223,12 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ต้น" && x.PositionType == "อำนวยการ")
                                       .OrderBy(p => p.Date).FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ต้น" && x.PositionType == "อำนวยการ")
-                                      .OrderBy(p => p.Date).FirstOrDefault().Date,
+                                      .OrderBy(p => p.Date).FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
-                                  p.ProfileInsignia.Where(x => x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ").Id)
+                                  p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
-                                  p.ProfileInsignia.Where(x => x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                  p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -6291,8 +6317,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -6307,29 +6334,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? "" : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? "" : p.Gender,
@@ -6339,12 +6366,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ประถมาภรณ์มงกุฎไทย"),
@@ -6354,14 +6381,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ต้น" && x.PositionType == "อำนวยการ")
                                       .OrderBy(p => p.Date).FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ต้น" && x.PositionType == "อำนวยการ")
-                                      .OrderBy(p => p.Date).FirstOrDefault().Date,
+                                      .OrderBy(p => p.Date).FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -6519,8 +6546,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -6535,29 +6563,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? "" : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? "" : p.Gender,
@@ -6567,12 +6595,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ประถมาภรณ์มงกุฎไทย"),
@@ -6582,14 +6610,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "สูง" && x.PositionType == "อำนวยการ")
                                       .OrderBy(p => p.Date).FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "สูง" && x.PositionType == "อำนวยการ")
-                                      .OrderBy(p => p.Date).FirstOrDefault().Date,
+                                      .OrderBy(p => p.Date).FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -6680,8 +6708,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -6696,29 +6725,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? "" : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? "" : p.Gender,
@@ -6728,12 +6757,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ประถมาภรณ์ช้างเผือก"),
@@ -6743,14 +6772,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "สูง" && x.PositionType == "อำนวยการ")
                                       .OrderBy(p => p.Date).FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "สูง" && x.PositionType == "อำนวยการ")
-                                      .OrderBy(p => p.Date).FirstOrDefault().Date,
+                                      .OrderBy(p => p.Date).FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -6842,8 +6871,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -6858,29 +6888,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? "" : p.Gender,
@@ -6890,12 +6920,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "มหาวชิรมงกุฎ"),
@@ -6905,14 +6935,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "สูง" && x.PositionType == "อำนวยการ")
                                       .OrderBy(p => p.Date).FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "สูง" && x.PositionType == "อำนวยการ")
-                                      .OrderBy(p => p.Date).FirstOrDefault().Date,
+                                      .OrderBy(p => p.Date).FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -7083,8 +7113,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -7099,29 +7130,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -7131,12 +7162,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ประถมาภรณ์มงกุฎไทย"),
@@ -7146,14 +7177,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ต้น" && x.PositionType == "บริหาร")
                                       .OrderBy(p => p.Date).FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ต้น" && x.PositionType == "บริหาร")
-                                      .OrderBy(p => p.Date).FirstOrDefault().Date,
+                                      .OrderBy(p => p.Date).FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ทวีติยาภรณ์ช้างเผือก")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -7244,8 +7275,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -7260,29 +7292,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -7292,12 +7324,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ประถมาภรณ์ช้างเผือก"),
@@ -7307,14 +7339,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ต้น" && x.PositionType == "บริหาร")
                                       .OrderBy(p => p.Date).FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ต้น" && x.PositionType == "บริหาร")
-                                      .OrderBy(p => p.Date).FirstOrDefault().Date,
+                                      .OrderBy(p => p.Date).FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -7405,8 +7437,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -7421,29 +7454,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -7453,12 +7486,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "มหาวชิรมงกุฎ"),
@@ -7468,14 +7501,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ต้น" && x.PositionType == "บริหาร")
                                       .OrderBy(p => p.Date).FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "ต้น" && x.PositionType == "บริหาร")
-                                      .OrderBy(p => p.Date).FirstOrDefault().Date,
+                                      .OrderBy(p => p.Date).FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -7617,8 +7650,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -7633,29 +7667,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -7665,12 +7699,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "ประถมาภรณ์ช้างเผือก"),
@@ -7680,14 +7714,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "สูง" && x.PositionType == "บริหาร")
                                       .OrderBy(p => p.Date).FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "สูง" && x.PositionType == "บริหาร")
-                                      .OrderBy(p => p.Date).FirstOrDefault().Date,
+                                      .OrderBy(p => p.Date).FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์มงกุฎไทย")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -7784,8 +7818,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -7800,29 +7835,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -7832,12 +7867,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "มหาวชิรมงกุฎ"),
@@ -7847,14 +7882,14 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "สูง" && x.PositionType == "บริหาร")
                                       .OrderBy(p => p.Date).FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "สูง" && x.PositionType == "บริหาร")
-                                      .OrderBy(p => p.Date).FirstOrDefault().Date,
+                                      .OrderBy(p => p.Date).FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("ประถมาภรณ์ช้างเผือก")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -7951,8 +7986,9 @@ namespace BMA.EHR.Application.Repositories
                                 && p.ProfileInsignia != null
                                 && p.ProfileInsignia.Count > 0
                                 && (p.ProfileInsignia.Where(x =>
-                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id &&
-                                        x.InsigniaId.Value == GetInsigniaByName("มหาปรมาภรณ์ช้างเผือก").Id)
+                                        x.InsigniaId.HasValue &&
+                                        x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id &&
+                                        x.InsigniaId.Value == GetInsigniaByName("มหาปรมาภรณ์ช้างเผือก")?.Id)
                                     .ToList()
                                     .Count() == 0)
                           select new
@@ -7967,29 +8003,29 @@ namespace BMA.EHR.Application.Repositories
                               FullName = $"{(p.Prefix == null ? null : p.Prefix)}{p.FirstName} {p.LastName}",
                               Position = p.Position == null ? null : p.Position,
                               Rank = p.PosLevel ?? "",
-                              GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
-                              ProfileDateAppoint = p.DateAppoint.Value,
+                              GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
+                              ProfileDateAppoint = p.DateAppoint!.Value,
                               LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? "" :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                               LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null ? Guid.Empty :
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                      .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                      .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                               Salary = p.Amount,
                               SalaryPosition = p.PositionSalaryAmount,
                               SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                  p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                       .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                      .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                      .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                      .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                      .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                                   p.Amount,
                               PosNo = p.PosNo,
                               Gender = p.Gender == null ? null : p.Gender,
@@ -7999,12 +8035,12 @@ namespace BMA.EHR.Application.Repositories
                               PositionTypeName = p.PosType,
                               IsHigherLevel =
                                   p.ProfileInsignia
-                                      .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                      .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                       .FirstOrDefault() == null
                                       ? true
                                       : IsHigherLevel(p.ProfileInsignia
-                                              .Where(x => x.InsigniaId.Value !=
-                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                              .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value !=
+                                                          GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                               .OrderByDescending(x => x.Year)
                                               .FirstOrDefault(),
                                           "มหาปรมาภรณ์ช้างเผือก"),
@@ -8014,12 +8050,12 @@ namespace BMA.EHR.Application.Repositories
                                   p.ProfileSalary.Where(x => x.PositionLevel == "สูง" && x.PositionType == "บริหาร")
                                       .OrderBy(p => p.Date).FirstOrDefault() == null ? null :
                                   p.ProfileSalary.Where(x => x.PositionLevel == "สูง" && x.PositionType == "บริหาร")
-                                      .OrderBy(p => p.Date).FirstOrDefault().Date,
+                                      .OrderBy(p => p.Date).FirstOrDefault()?.Date,
                               FirstRecvInsigniaYear = p.ProfileInsignia.Count == 0 ? 0 :
-                                  p.ProfileInsignia.Where(x => x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ").Id)
+                                  p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ")?.Id)
                                       .OrderBy(x => x.Year).FirstOrDefault() == null ? 0 :
-                                  p.ProfileInsignia.Where(x => x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ").Id)
-                                      .OrderBy(x => x.Year).FirstOrDefault().Year,
+                                  p.ProfileInsignia.Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value == GetInsigniaByName("มหาวชิรมงกุฎ")?.Id)
+                                      .OrderBy(x => x.Year).FirstOrDefault()?.Year,
                               PositionSalaryAmount = p.PositionSalaryAmount,
                               Amount = p.Amount,
                               RootId = p.RootId,
@@ -8179,144 +8215,146 @@ namespace BMA.EHR.Application.Repositories
                 if (type.ToLower().Trim() == "officer")
                 {
                     var allOfficerProfilesByRoot = (await _userProfileRepository.GetOfficerProfileByRootIdAsync(ocId, AccessToken));
-
-                    // calculate ตามแต่ละชั้น
-                    var type_coin = allOfficerProfilesByRoot.Count() > 0 ? await GetCoinCandidate(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
-                    var type1_level1 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type1_Level1(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
-                    var type1_level2 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type1_Level2(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
-                    var type1_level3 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type1_Level3(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
-                    var type1_level4 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type1_Level4(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
-                    var type2_level5 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type2_Level5(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
-                    var type2_level6 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type2_Level6(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
-                    var type2_level7 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type2_Level7(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
-                    var type2_level8 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type2_Level8(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
-                    var type2_level9_1 =
-                        allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type2_Level9_1(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
-                    var type2_level9_2 =
-                        allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type2_Level9_2(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
-                    var type3_level10 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type3_Level10(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
-                    var type3_level11 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type3_Level11(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
-                    var type4_level10 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type4_Level10(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
-                    var type4_level11 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type4_Level11(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
-
-
-                    // union result
-                    foreach (var r in type_coin)
+                    if (allOfficerProfilesByRoot != null)
                     {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
-
-                    foreach (var r in type4_level11)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
-
-                    foreach (var r in type4_level10)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
-
-                    foreach (var r in type3_level11)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
-
-                    foreach (var r in type3_level10)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
-
-                    foreach (var r in type2_level9_2)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
-
-                    foreach (var r in type2_level9_1)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
-
-                    foreach (var r in type2_level8)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
-
-                    foreach (var r in type2_level7)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
-
-                    foreach (var r in type2_level6)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
-
-                    foreach (var r in type2_level5)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
-
-                    foreach (var r in type1_level4)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
-
-                    foreach (var r in type1_level3)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
-
-                    foreach (var r in type1_level2)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
-
-                    foreach (var r in type1_level1)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
-
-                    // ย้ายที่ตามที่ มอสแจ้ง
-                    if (period.Round != 1)
-                    {
-                        var insigniaIdList = await _dbContext.Set<Insignia>()
-                                    .Include(x => x.InsigniaType)
-                                    .Where(x => x.InsigniaType!.Name == "ชั้นสายสะพาย")
-                                    .Select(x => x.Id)
-                                    .ToListAsync();
+                        // calculate ตามแต่ละชั้น
+                        var type_coin = allOfficerProfilesByRoot.Count() > 0 ? await GetCoinCandidate(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
+                        var type1_level1 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type1_Level1(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
+                        var type1_level2 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type1_Level2(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
+                        var type1_level3 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type1_Level3(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
+                        var type1_level4 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type1_Level4(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
+                        var type2_level5 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type2_Level5(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
+                        var type2_level6 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type2_Level6(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
+                        var type2_level7 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type2_Level7(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
+                        var type2_level8 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type2_Level8(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
+                        var type2_level9_1 =
+                            allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type2_Level9_1(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
+                        var type2_level9_2 =
+                            allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type2_Level9_2(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
+                        var type3_level10 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type3_Level10(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
+                        var type3_level11 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type3_Level11(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
+                        var type4_level10 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type4_Level10(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
+                        var type4_level11 = allOfficerProfilesByRoot.Count() > 0 ? await GetInsigniaCandidate_Type4_Level11(periodId, ocId, allOfficerProfilesByRoot) : new List<InsigniaResultSet>();
 
 
-                        result_candidate = result_candidate.Where(x => insigniaIdList.Contains(x.RequestInsignia.Id)).ToList();
+                        // union result
+                        foreach (var r in type_coin)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in type4_level11)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in type4_level10)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in type3_level11)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in type3_level10)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in type2_level9_2)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in type2_level9_1)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in type2_level8)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in type2_level7)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in type2_level6)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in type2_level5)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in type1_level4)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in type1_level3)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in type1_level2)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in type1_level1)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        // ย้ายที่ตามที่ มอสแจ้ง
+                        if (period.Round != 1)
+                        {
+                            var insigniaIdList = await _dbContext.Set<Insignia>()
+                                        .Include(x => x.InsigniaType)
+                                        .Where(x => x.InsigniaType!.Name == "ชั้นสายสะพาย")
+                                        .Select(x => x.Id)
+                                        .ToListAsync();
+
+
+                            result_candidate = result_candidate.Where(x => insigniaIdList.Contains(x.RequestInsignia.Id)).ToList();
+                        }
                     }
                 }
                 else if (type.ToLower().Trim() == "employee")
@@ -8327,31 +8365,34 @@ namespace BMA.EHR.Application.Repositories
                         allEmployeeProfileByRoot = (await _userProfileRepository.GetEmployeeProfileByPositionAsync(ocId, period.InsigniaEmployees.Select(x => x.RefId!.ValueOrBlank()).ToArray(), AccessToken));
                     }
 
-                    var type_coin = allEmployeeProfileByRoot.Count() > 0 ? await GetCoinCandidate(periodId, ocId, allEmployeeProfileByRoot) : new List<InsigniaResultSet>();
-
-                    var employee_type1 = allEmployeeProfileByRoot.Count() > 0 ? await GetEmployeeInsignia_Type1(periodId, ocId, allEmployeeProfileByRoot) : new List<InsigniaResultSet>();
-                    var employee_type2 = allEmployeeProfileByRoot.Count() > 0 ? await GetEmployeeInsignia_Type2(periodId, ocId, allEmployeeProfileByRoot) : new List<InsigniaResultSet>();
-
-                    // union result
-                    foreach (var r in type_coin)
+                    if (allEmployeeProfileByRoot != null)
                     {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
+                        var type_coin = allEmployeeProfileByRoot.Count() > 0 ? await GetCoinCandidate(periodId, ocId, allEmployeeProfileByRoot) : new List<InsigniaResultSet>();
 
-                    foreach (var r in employee_type2)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
-                    }
+                        var employee_type1 = allEmployeeProfileByRoot.Count() > 0 ? await GetEmployeeInsignia_Type1(periodId, ocId, allEmployeeProfileByRoot) : new List<InsigniaResultSet>();
+                        var employee_type2 = allEmployeeProfileByRoot.Count() > 0 ? await GetEmployeeInsignia_Type2(periodId, ocId, allEmployeeProfileByRoot) : new List<InsigniaResultSet>();
 
-                    foreach (var r in employee_type1)
-                    {
-                        var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
-                        if (old == null)
-                            result_candidate.Add(r);
+                        // union result
+                        foreach (var r in type_coin)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in employee_type2)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
+
+                        foreach (var r in employee_type1)
+                        {
+                            var old = result_candidate.FirstOrDefault(x => x.ProfileId == r.ProfileId);
+                            if (old == null)
+                                result_candidate.Add(r);
+                        }
                     }
                 }
                 else
@@ -8571,7 +8612,7 @@ namespace BMA.EHR.Application.Repositories
                 if (period == null)
                     throw new Exception(GlobalMessages.CoinPeriodNotFound);
 
-                var inst_profile = allProfilesByRoot.Where(x => x.DateAppoint != null)
+                var inst_profile = allProfilesByRoot.Where(x => x.DateAppoint.HasValue && x.DateAppoint != null)
                     .Select(p => new
                     {
                         ProfileId = p.Id,
@@ -8584,8 +8625,8 @@ namespace BMA.EHR.Application.Repositories
                         FullName = $"{(p.Prefix ?? "")}{p.FirstName} {p.LastName}",
                         Position = p.Position ?? "",
                         Rank = p.PosLevel ?? "",
-                        ProfileDateAppoint = p.DateAppoint.Value,
-                        GovAge = p.DateAppoint.Value.CalculateGovAgeStr(0, 0),
+                        ProfileDateAppoint = p.DateAppoint!.Value,
+                        GovAge = p.DateStart!.Value.CalculateGovAgeStr(0, 0),
                         PosNo = p.PosNo,
                         PositionLevelId = p.PosLevelId,
                         PositionLevelName = p.PosLevel,
@@ -8594,24 +8635,24 @@ namespace BMA.EHR.Application.Repositories
                         Gender = p.Gender ?? "",
                         LastInsignia = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? "" :
                             p.ProfileInsignia
-                                .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                 .FirstOrDefault() == null ? "" :
                             p.ProfileInsignia
-                                .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                .OrderByDescending(x => x.Year).FirstOrDefault().Insignia,
+                                .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                .OrderByDescending(x => x.Year).FirstOrDefault()?.Insignia,
                         LastInsigniaId = p.ProfileInsignia == null || p.ProfileInsignia.Count == 0 ? Guid.Empty :
                             p.ProfileInsignia
-                                .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
+                                .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
                                 .FirstOrDefault() == null ? Guid.Empty :
                             p.ProfileInsignia
-                                .Where(x => x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา").Id)
-                                .OrderByDescending(x => x.Year).FirstOrDefault().InsigniaId,
+                                .Where(x => x.InsigniaId.HasValue && x.InsigniaId.Value != GetInsigniaByName("เหรียญจักรพรรดิมาลา")?.Id)
+                                .OrderByDescending(x => x.Year).FirstOrDefault()?.InsigniaId,
                         Salary = p.Amount,
                         SalaryCondition = p.ProfileSalary == null || p.ProfileSalary.Count == 0 ? 0 :
-                            p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
+                            p.ProfileSalary.Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
                                 .OrderByDescending(x => x.Order).FirstOrDefault() != null ? p.ProfileSalary
-                                .Where(x => x.Date != null).Where(x => x.Date.Value <= new DateTime(period.Year, 4, 29))
-                                .OrderByDescending(x => x.Order).FirstOrDefault().Amount :
+                                .Where(x => x.Date != null).Where(x => x.Date.HasValue && x.Date.Value <= new DateTime(period.Year, 4, 29))
+                                .OrderByDescending(x => x.Order).FirstOrDefault()?.Amount :
                             p.Amount,
                         PositionSalaryAmount = p.PositionSalaryAmount,
                         ProfileInsignia = p.ProfileInsignia,
diff --git a/BMA.EHR.Application/Repositories/Leaves/GenericLeaveRepository.cs b/BMA.EHR.Application/Repositories/Leaves/GenericLeaveRepository.cs
index 5fbbb8a1..2e550d71 100644
--- a/BMA.EHR.Application/Repositories/Leaves/GenericLeaveRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/GenericLeaveRepository.cs
@@ -2,8 +2,11 @@
 using BMA.EHR.Domain.Models.Base;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
 using System.IO.Pipes;
+using System.Net.Http.Headers;
 using System.Security.Claims;
+using System.Text;
 
 namespace BMA.EHR.Application.Repositories.Leaves
 {
@@ -43,6 +46,38 @@ namespace BMA.EHR.Application.Repositories.Leaves
 
         #region " Methods "
 
+        public async Task<string> PostExternalAPIAsync(string apiPath, string accessToken, object? body, string apiKey, CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                // กำหนด timeout เป็น 30 นาที
+                using var timeoutCts = new CancellationTokenSource(TimeSpan.FromMinutes(30));
+                using var combinedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token);
+                var json = JsonConvert.SerializeObject(body);
+                var stringContent = new StringContent(json, Encoding.UTF8, "application/json");
+                //stringContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+
+                using (var client = new HttpClient())
+                {
+                    client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken.Replace("Bearer ", ""));
+                    client.DefaultRequestHeaders.Add("api-key", apiKey);
+                    var _res = await client.PostAsync(apiPath, stringContent, combinedCts.Token);
+                    if (_res.IsSuccessStatusCode)
+                    {
+                        var _result = await _res.Content.ReadAsStringAsync();
+
+                        return _result;
+                    }
+                    return string.Empty;
+                }
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+
         public virtual async Task<IReadOnlyList<T>> GetAllAsync()
         {
             return await _dbSet.ToListAsync();
@@ -68,6 +103,24 @@ namespace BMA.EHR.Application.Repositories.Leaves
             return entity;
         }
 
+        public virtual async Task<IReadOnlyList<T>> AddRangeAsync(List<T> entities)
+        {
+            foreach (var entity in entities)
+            {
+                if (entity is EntityBase)
+                {
+                    (entity as EntityBase).CreatedUserId = UserId ?? "";
+                    (entity as EntityBase).CreatedFullName = FullName ?? "System Administrator";
+                    (entity as EntityBase).CreatedAt = DateTime.Now;
+                }
+            }
+
+            await _dbSet.AddRangeAsync(entities);
+            await _dbContext.SaveChangesAsync();
+
+            return entities;
+        }
+
         public virtual async Task<T> UpdateAsync(T entity)
         {
             if (entity is EntityBase)
diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveBeginingRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveBeginingRepository.cs
index 575a85bb..a62aa291 100644
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveBeginingRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveBeginingRepository.cs
@@ -79,7 +79,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task UpdateLeaveUsageAsync(int year, Guid typeId, Guid userId, double day)
         {
-            var pf = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            // var pf = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var pf = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
             if (pf == null)
             {
                 throw new Exception(GlobalMessages.DataNotFound);
@@ -98,9 +99,32 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
             await _dbContext.SaveChangesAsync();
         }
 
+        public async Task UpdateLeaveCountAsync(int year, Guid typeId, Guid userId, int count)
+        {
+            // var pf = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var pf = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
+            if (pf == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+
+            var data = await _dbContext.Set<LeaveBeginning>()
+                .Include(x => x.LeaveType)
+                .FirstOrDefaultAsync(x => x.LeaveYear == year && x.LeaveTypeId == typeId && x.ProfileId == pf.Id);
+
+            if (data == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+            data.LeaveCount += count;
+
+            await _dbContext.SaveChangesAsync();
+        }
+
         public async Task<LeaveBeginning?> GetByYearAndTypeIdForUserAsync(int year, Guid typeId, Guid userId)
         {
-            var pf = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            // var pf = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var pf = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
             if (pf == null)
             {
                 throw new Exception(GlobalMessages.DataNotFound);
@@ -238,7 +262,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<LeaveBeginning?> GetByYearAndTypeIdForUser2Async(int year, Guid typeId, Guid userId)
         {
-            var pf = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            // var pf = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var pf = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
             if (pf == null)
             {
                 return null;
@@ -413,5 +438,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
         public string LastName { get; set; } = string.Empty;
 
         public DateTime? DateStart { get; set; } = null;
+
+        public DateTime? DateAppoint { get; set; } = null;
     }
 }
diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
index e0e519e8..792b57cb 100644
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
@@ -253,7 +253,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<List<LeaveRequest>> GetLeaveRequestByYearAsync(int year, Guid userId)
         {
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
 
             if (profile == null)
             {
@@ -306,11 +307,11 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                 rawData = rawData
                     .Where(x => x.RootDnaId == Guid.Parse(nodeId!));
             }
-            else if (role == "PARENT")
-            {
-                rawData = rawData
-                    .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null);
-            }
+            // else if (role == "PARENT")
+            // {
+            //     rawData = rawData
+            //         .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null);
+            // }
             else if (role == "NORMAL")
             {
                 rawData = rawData
@@ -420,11 +421,11 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                 rawData = rawData
                     .Where(x => x.RootDnaId == Guid.Parse(nodeId!));
             }
-            else if (role == "PARENT")
-            {
-                rawData = rawData
-                    .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null);
-            }
+            // else if (role == "PARENT")
+            // {
+            //     rawData = rawData
+            //         .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null);
+            // }
             else if (role == "NORMAL")
             {
                 rawData = rawData
@@ -495,7 +496,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<double> GetSumLeaveByTypeForUserAsync(Guid keycloakUserId, Guid leaveTypeId, int year)
         {
-            var pf = await _userProfileRepository.GetProfileByKeycloakIdAsync(keycloakUserId, AccessToken);
+            // var pf = await _userProfileRepository.GetProfileByKeycloakIdAsync(keycloakUserId, AccessToken);
+            var pf = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(keycloakUserId, AccessToken);
             if (pf == null)
                 throw new Exception(GlobalMessages.DataNotFound);
 
@@ -556,6 +558,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
             var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                             .Include(x => x.Type)
                             .Where(x => x.LeaveStartDate.Date < beforeDate.Date)
+                            //.Where(x => x.CreatedAt < beforeDate)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveTypeId)
                             .Where(x => x.LeaveStatus == "APPROVE" || x.LeaveStatus == "DELETING")
@@ -566,6 +569,22 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
             return data;
         }
 
+        public async Task<LeaveRequest?> GetLastLeaveRequestByTypeForUserAsync2(Guid keycloakUserId, Guid leaveTypeId, DateTime beforeDate)
+        {
+            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
+                            .Include(x => x.Type)
+                            //.Where(x => x.LeaveStartDate.Date < beforeDate.Date)
+                            .Where(x => x.CreatedAt < beforeDate)
+                            .Where(x => x.KeycloakUserId == keycloakUserId)
+                            .Where(x => x.Type.Id == leaveTypeId)
+                            .Where(x => x.LeaveStatus == "APPROVE" || x.LeaveStatus == "DELETING")
+                            //.Where(x => x.LeaveStatus != "REJECT" && x.LeaveStatus != "DELETE")
+                            .OrderByDescending(x => x.CreatedAt)
+                            .FirstOrDefaultAsync();
+
+            return data;
+        }
+
         public async Task<List<LeaveRequest>> GetCancelLeaveRequestForAdminAsync(int year, Guid type, string status, string role, string? nodeId, int? node)
         {
             var rawData = _dbContext.Set<LeaveRequest>().AsNoTracking()
@@ -608,11 +627,11 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                 rawData = rawData
                     .Where(x => x.RootDnaId == Guid.Parse(nodeId!));
             }
-            else if (role == "PARENT")
-            {
-                rawData = rawData
-                    .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null);
-            }
+            // else if (role == "PARENT")
+            // {
+            //     rawData = rawData
+            //         .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null);
+            // }
             else if (role == "NORMAL")
             {
                 rawData = rawData
@@ -631,7 +650,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
         {
             try
             {
-                var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken ?? "");
+                // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken ?? "");
+                var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(data.KeycloakUserId, AccessToken ?? "");
                 if (profile == null)
                 {
                     throw new Exception(GlobalMessages.DataNotFound);
@@ -656,6 +676,9 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                         thisYear = thisYear + 1;
                     }
                     await _leaveBeginningRepository.UpdateLeaveUsageAsync(thisYear, data.Type.Id, data.KeycloakUserId, -1 * data.LeaveTotal);
+                    // update leave count ลดลง 1 ครั้ง
+                    await _leaveBeginningRepository.UpdateLeaveCountAsync(thisYear, data.Type.Id, data.KeycloakUserId, -1);
+                    
 
                     var _baseAPI = _configuration["API"];
                     var apiUrlSalary = $"{_baseAPI}/org/profile/leave/cancel/{data.Id}";
@@ -704,7 +727,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                 throw new Exception(GlobalMessages.DataNotFound);
             }
 
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(rawData.KeycloakUserId, AccessToken ?? "");
+            // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(rawData.KeycloakUserId, AccessToken ?? "");
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(rawData.KeycloakUserId, AccessToken ?? "");
             if (profile == null)
             {
                 throw new Exception(GlobalMessages.DataNotFound);
@@ -729,6 +753,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                 }
 
                 await _leaveBeginningRepository.UpdateLeaveUsageAsync(thisYear, rawData.Type.Id, rawData.KeycloakUserId, -1 * rawData.LeaveTotal);
+                // update leave count ลดลง 1 ครั้ง
+                await _leaveBeginningRepository.UpdateLeaveCountAsync(thisYear, rawData.Type.Id, rawData.KeycloakUserId, -1);
 
                 var _baseAPI = _configuration["API"];
                 var apiUrlSalary = $"{_baseAPI}/org/profile/leave/cancel/{rawData.Id}";
@@ -790,7 +816,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                 throw new Exception(GlobalMessages.DataNotFound);
             }
 
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(rawData.KeycloakUserId, AccessToken ?? "");
+            // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(rawData.KeycloakUserId, AccessToken ?? "");
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(rawData.KeycloakUserId, AccessToken ?? "");
             if (profile == null)
             {
                 throw new Exception(GlobalMessages.DataNotFound);
@@ -1214,7 +1241,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
             }
             else
             {
-                var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(rawData.KeycloakUserId, AccessToken);
+                // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(rawData.KeycloakUserId, AccessToken);
+                var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(rawData.KeycloakUserId, AccessToken);
                 if (profile == null)
                 {
                     throw new Exception(GlobalMessages.DataNotFound);
@@ -1235,6 +1263,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
                 // TODO : Update ไปตาราง beginning
                 await _leaveBeginningRepository.UpdateLeaveUsageAsync(thisYear, rawData.Type.Id, rawData.KeycloakUserId, rawData.LeaveTotal);
+                // update leave count เพิ่มขึ้น 1 ครั้ง
+                await _leaveBeginningRepository.UpdateLeaveCountAsync(thisYear, rawData.Type.Id, rawData.KeycloakUserId, 1);
 
 
                 var _baseAPI = _configuration["API"];
@@ -1258,6 +1288,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                             status = "approve",
                             reason = rawData.LeaveDetail,
                             leaveId = rawData.Id,
+                            leaveSubTypeName = rawData.LeaveSubTypeName,
+                            coupleDayLevelCountry = rawData.CoupleDayLevelCountry,
                         });
                         // var _result = await _res.Content.ReadAsStringAsync();
                     }
@@ -1281,6 +1313,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                             status = "approve",
                             reason = rawData.LeaveDetail,
                             leaveId = rawData.Id,
+                            leaveSubTypeName = rawData.LeaveSubTypeName,
+                            coupleDayLevelCountry = rawData.CoupleDayLevelCountry,
                         });
                     }
                 }
@@ -1377,7 +1411,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
             }
             else
             {
-                var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(rawData.KeycloakUserId, AccessToken);
+                // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(rawData.KeycloakUserId, AccessToken);
+                var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(rawData.KeycloakUserId, AccessToken);
                 if (profile == null)
                 {
                     throw new Exception(GlobalMessages.DataNotFound);
@@ -1664,10 +1699,10 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
             {
                 data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId)).ToList();
             }
-            else if (role == "PARENT")
-            {
-                data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId) && x.Child1DnaId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId) && x.Child1DnaId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 data = data.Where(x =>
@@ -1683,7 +1718,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
             if (role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "BROTHER" || role == "PARENT")
             {
                 data = data
-                    .Where(x => nodeByReq == 4 ? x.Child4Id == Guid.Parse(nodeIdByReq) : nodeByReq == 3 ? x.Child3Id == Guid.Parse(nodeIdByReq) : nodeByReq == 2 ? x.Child2Id == Guid.Parse(nodeIdByReq) : nodeByReq == 1 ? x.Child1Id == Guid.Parse(nodeIdByReq) : nodeByReq == 0 ? x.RootId == Guid.Parse(nodeIdByReq) : true)
+                    .Where(x => nodeByReq == 4 ? x.Child4DnaId == Guid.Parse(nodeIdByReq) : nodeByReq == 3 ? x.Child3DnaId == Guid.Parse(nodeIdByReq) : nodeByReq == 2 ? x.Child2DnaId == Guid.Parse(nodeIdByReq) : nodeByReq == 1 ? x.Child1DnaId == Guid.Parse(nodeIdByReq) : nodeByReq == 0 ? x.RootDnaId == Guid.Parse(nodeIdByReq) : true)
                     .ToList();
             }
             // รายงานการลางานจำแนกตามเพศฯ Template ให้หน่วยงานแสดงก่อนส่วนราชการ
@@ -1824,6 +1859,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                             .Include(x => x.Type)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveTypeId)
+                            //.Where(x => x.CreatedAt >= startDate && x.CreatedAt <= endDate)
                             .Where(x => x.LeaveStartDate.Date >= startDate.Date && x.LeaveStartDate.Date <= endDate.Date)
                             .Where(x => x.LeaveStatus == "APPROVE" || x.LeaveStatus == "DELETING")
                             .ToListAsync();
@@ -1834,6 +1870,23 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                 return 0;
         }
 
+        public async Task<double> GetSumApproveLeaveTotalByTypeAndRangeForUser2(Guid keycloakUserId, Guid leaveTypeId, DateTime startDate, DateTime endDate)
+        {
+            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
+                            .Include(x => x.Type)
+                            .Where(x => x.KeycloakUserId == keycloakUserId)
+                            .Where(x => x.Type.Id == leaveTypeId)
+                            .Where(x => x.CreatedAt.Date >= startDate && x.CreatedAt < endDate)
+                            //.Where(x => x.LeaveStartDate.Date >= startDate.Date && x.LeaveStartDate.Date <= endDate.Date)
+                            .Where(x => x.LeaveStatus == "APPROVE" || x.LeaveStatus == "DELETING")
+                            .ToListAsync();
+
+            if (data.Count > 0)
+                return data.Sum(x => x.LeaveTotal);
+            else
+                return 0;
+        }
+
         public async Task<int> GetCountApproveLeaveByTypeAndRangeForUser(Guid keycloakUserId, Guid leaveTypeId, DateTime startDate, DateTime endDate)
         {
             var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
@@ -1841,6 +1894,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveTypeId)
                             .Where(x => x.LeaveStartDate.Date >= startDate.Date && x.LeaveStartDate.Date <= endDate.Date)
+                            //.Where(x => x.CreatedAt >= startDate && x.CreatedAt <= endDate)
                             .Where(x => x.LeaveStatus == "APPROVE" || x.LeaveStatus == "DELETING")
                             .ToListAsync();
 
diff --git a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/AdditionalCheckRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/AdditionalCheckRequestRepository.cs
index 12f51207..0544e261 100644
--- a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/AdditionalCheckRequestRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/AdditionalCheckRequestRepository.cs
@@ -74,7 +74,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
             await base.AddAsync(entity);
 
             var userId = UserId != null ? Guid.Parse(UserId) : Guid.Empty;
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken ?? "");
+            // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken ?? "");
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken ?? "");
 
             // fix issue : SIT ระบบบันทึกเวลาปฏิบัติงาน>>ลงเวลากรณีพิเศษ (ไม่มีแจ้งเตือนไปยังผู้บังคับบัญชา) #969
             // send noti + inbox + mail
@@ -144,7 +145,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
             }
         }
 
-        public async Task<List<AdditionalCheckRequest>> GetAdditionalCheckRequestsByAdminRole(int year, int month, string role, string nodeId, int? node)
+        public async Task<List<AdditionalCheckRequest>> GetAdditionalCheckRequestsByAdminRole(int year, int month, string role, string nodeId, int? node, string? keyword)
         {
             try
             {
@@ -152,6 +153,17 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
                                     .Where(x => (x.CheckDate.Year == year && x.CheckDate.Month == month))
                                     .OrderByDescending(x => x.CreatedAt.Date)
                                     .ToListAsync();
+
+                if (!string.IsNullOrEmpty(keyword))
+                {
+                    data = data.Where(x =>
+                    (
+                        (x.Prefix ?? "") + (x.FirstName ?? "") + " " + (x.LastName ?? "")).Contains(keyword)
+                        || x.Description.Contains(keyword)
+
+                    ).ToList();
+                }
+
                 if (role == "OWNER")
                 {
                     node = null;
@@ -173,11 +185,11 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
                     data = data
                         .Where(x => x.RootDnaId == Guid.Parse(nodeId!)).ToList();
                 }
-                else if (role == "PARENT")
-                {
-                    data = data
-                        .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null && x.Child1DnaId != Guid.Empty).ToList();
-                }
+                // else if (role == "PARENT")
+                // {
+                //     data = data
+                //         .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null && x.Child1DnaId != Guid.Empty).ToList();
+                // }
                 else if (role == "NORMAL")
                 {
                     data = data.Where(x =>
diff --git a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/CheckInJobStatusRepository.cs b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/CheckInJobStatusRepository.cs
new file mode 100644
index 00000000..302bdd12
--- /dev/null
+++ b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/CheckInJobStatusRepository.cs
@@ -0,0 +1,135 @@
+using BMA.EHR.Application.Common.Interfaces;
+using BMA.EHR.Domain.Models.Leave.TimeAttendants;
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
+
+namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
+{
+    public class CheckInJobStatusRepository : GenericLeaveRepository<Guid, CheckInJobStatus>
+    {
+        #region " Fields "
+
+        private readonly ILeaveDbContext _dbContext;
+
+        #endregion
+
+        #region " Constructor and Destructor "
+
+        public CheckInJobStatusRepository(ILeaveDbContext dbContext,
+                                          IHttpContextAccessor httpContextAccessor) : base(dbContext, httpContextAccessor)
+        {
+            _dbContext = dbContext;
+        }
+
+        #endregion
+
+        #region " Methods "
+
+        /// <summary>
+        /// ดึงข้อมูล Job Status จาก TaskId
+        /// </summary>
+        public async Task<CheckInJobStatus?> GetByTaskIdAsync(Guid taskId)
+        {
+            var data = await _dbContext.Set<CheckInJobStatus>()
+                                .Where(x => x.TaskId == taskId)
+                                .FirstOrDefaultAsync();
+
+            return data;
+        }
+
+        /// <summary>
+        /// ดึงข้อมูล Job Status จาก UserId และสถานะ
+        /// </summary>
+        public async Task<List<CheckInJobStatus>> GetByUserIdAndStatusAsync(Guid userId, string status)
+        {
+            var data = await _dbContext.Set<CheckInJobStatus>()
+                                .Where(x => x.KeycloakUserId == userId && x.Status == status)
+                                .OrderByDescending(x => x.CreatedDate)
+                                .ToListAsync();
+
+            return data;
+        }
+
+        /// <summary>
+        /// ดึงข้อมูล Job Status ที่ยัง pending หรือ processing
+        /// </summary>
+        public async Task<List<CheckInJobStatus>> GetPendingOrProcessingJobsAsync(Guid userId)
+        {
+            var data = await _dbContext.Set<CheckInJobStatus>()
+                                .Where(x => x.KeycloakUserId == userId && 
+                                       (x.Status == "PENDING" || x.Status == "PROCESSING"))
+                                //.OrderByDescending(x => x.CreatedDate)
+                                .ToListAsync();
+
+            return data;
+        }
+
+        /// <summary>
+        /// อัปเดตสถานะเป็น Processing
+        /// </summary>
+        public async Task<CheckInJobStatus> UpdateToProcessingAsync(Guid taskId)
+        {
+            var job = await GetByTaskIdAsync(taskId);
+            if (job != null)
+            {
+                job.Status = "PROCESSING";
+                job.ProcessingDate = DateTime.Now;
+                await UpdateAsync(job);
+            }
+            return job!;
+        }
+
+        /// <summary>
+        /// อัปเดตสถานะเป็น Completed
+        /// </summary>
+        public async Task<CheckInJobStatus> UpdateToCompletedAsync(Guid taskId, string? additionalData = null)
+        {
+            var job = await GetByTaskIdAsync(taskId);
+            if (job != null)
+            {
+                job.Status = "COMPLETED";
+                job.CompletedDate = DateTime.Now;
+                if (!string.IsNullOrEmpty(additionalData))
+                {
+                    job.AdditionalData = additionalData;
+                }
+                await UpdateAsync(job);
+            }
+            return job!;
+        }
+
+        /// <summary>
+        /// อัปเดตสถานะเป็น Failed
+        /// </summary>
+        public async Task<CheckInJobStatus> UpdateToFailedAsync(Guid taskId, string errorMessage)
+        {
+            var job = await GetByTaskIdAsync(taskId);
+            if (job != null)
+            {
+                job.Status = "FAILED";
+                job.CompletedDate = DateTime.Now;
+                job.ErrorMessage = errorMessage;
+                await UpdateAsync(job);
+            }
+            return job!;
+        }
+
+        /// <summary>
+        /// ล้างข้อมูล Job Status ที่เก่าเกิน X วัน
+        /// </summary>
+        public async Task<int> CleanupOldJobsAsync(int daysOld = 30)
+        {
+            var cutoffDate = DateTime.Now.AddDays(-daysOld);
+            var oldJobs = await _dbContext.Set<CheckInJobStatus>()
+                                .Where(x => x.CreatedDate < cutoffDate)
+                                .ToListAsync();
+
+            _dbContext.Set<CheckInJobStatus>().RemoveRange(oldJobs);
+            await _dbContext.SaveChangesAsync();
+
+            return oldJobs.Count;
+        }
+
+        #endregion
+    }
+}
diff --git a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/DutyTimeRepository.cs b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/DutyTimeRepository.cs
index 2db889ac..e96c35a9 100644
--- a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/DutyTimeRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/DutyTimeRepository.cs
@@ -61,9 +61,12 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
             return await _dbContext.Set<DutyTime>().Where(x => x.IsActive).ToListAsync();
         }
 
-        public async Task<DutyTime?> GetDefaultAsync()
+        public async Task<DutyTime?> GetDefaultAsync(CancellationToken cancellationToken = default)
         {
-            return await _dbContext.Set<DutyTime>().Where(x => x.IsDefault).FirstOrDefaultAsync();
+            // กำหนด timeout เป็น 30 นาที
+            using var timeoutCts = new CancellationTokenSource(TimeSpan.FromMinutes(30));
+            using var combinedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token);
+            return await _dbContext.Set<DutyTime>().Where(x => x.IsDefault).FirstOrDefaultAsync(combinedCts.Token);
         }
 
         #endregion
diff --git a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/LeaveProcessJobStatusRepository.cs b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/LeaveProcessJobStatusRepository.cs
new file mode 100644
index 00000000..5e9944ad
--- /dev/null
+++ b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/LeaveProcessJobStatusRepository.cs
@@ -0,0 +1,795 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Text.Json;
+using System.IO;
+using BMA.EHR.Application.Common.Interfaces;
+using BMA.EHR.Application.Repositories.Leaves.LeaveRequests;
+using BMA.EHR.Application.Repositories.MetaData;
+using BMA.EHR.Application.Responses.Profiles;
+using BMA.EHR.Domain.Extensions;
+using BMA.EHR.Domain.Models.Leave.TimeAttendants;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+
+namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
+{
+    public class LeaveProcessJobStatusRepository: GenericLeaveRepository<Guid, LeaveProcessJobStatus>
+    {
+         #region " Fields "
+
+        private readonly ILeaveDbContext _dbContext;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly UserProfileRepository _userProfileRepository;
+        private readonly HolidayRepository _holidayRepository;
+        private readonly DutyTimeRepository _dutyTimeRepository;
+        private readonly UserDutyTimeRepository _userDutyTimeRepository;
+        private readonly ProcessUserTimeStampRepository _processUserTimeStampRepository;
+        private readonly LeaveRequestRepository _leaveRequestRepository;
+        private readonly IConfiguration _configuration;
+        private readonly IWebHostEnvironment _env;
+
+        #endregion
+
+        #region " Constructor and Destructor "
+
+        public LeaveProcessJobStatusRepository(ILeaveDbContext dbContext,
+                                               IHttpContextAccessor httpContextAccessor,
+                                               UserProfileRepository userProfileRepository,
+                                               HolidayRepository holidayRepository,
+                                               DutyTimeRepository dutyTimeRepository,
+                                               UserDutyTimeRepository userDutyTimeRepository,
+                                               ProcessUserTimeStampRepository processUserTimeStampRepository,
+                                               LeaveRequestRepository leaveRequestRepository,
+                                               IConfiguration configuration,
+                                               IWebHostEnvironment env) : base(dbContext, httpContextAccessor)
+        {
+            _dbContext = dbContext;
+            _httpContextAccessor = httpContextAccessor;
+            _userProfileRepository = userProfileRepository;
+            _holidayRepository = holidayRepository;
+            _configuration = configuration;
+            _leaveRequestRepository = leaveRequestRepository;
+            _dutyTimeRepository = dutyTimeRepository;
+            _userDutyTimeRepository = userDutyTimeRepository;
+            _processUserTimeStampRepository = processUserTimeStampRepository;
+            _env = env;
+        }
+
+        #endregion
+
+        #region " Methods "
+
+        /// <summary>
+        /// ดึงข้อมูล Job Status จาก TaskId
+        /// </summary>
+        public async Task<LeaveProcessJobStatus?> GetByTaskIdAsync(Guid id)
+        {
+            var data = await _dbContext.Set<LeaveProcessJobStatus>()
+                                .Where(x => x.Id == id)
+                                .FirstOrDefaultAsync();
+
+            return data;
+        }
+
+        /// <summary>
+        /// ดึงข้อมูล Job Status จาก UserId และสถานะ
+        /// </summary>
+        public async Task<List<LeaveProcessJobStatus>> GetByUserIdAndStatusAsync(Guid userId, string status)
+        {
+            var data = await _dbContext.Set<LeaveProcessJobStatus>()
+                                .Where(x => x.CreatedUserId == userId.ToString("D") && x.Status == status)
+                                .OrderByDescending(x => x.CreatedDate)
+                                .ToListAsync();
+
+            return data;
+        }
+
+        /// <summary>
+        /// ดึงข้อมูล Job Status จาก UserId
+        /// </summary>
+        public async Task<List<LeaveProcessJobStatus>> GetByUserIdAsync(Guid userId)
+        {
+            var data = await _dbContext.Set<LeaveProcessJobStatus>()
+                                .Where(x => x.CreatedUserId == userId.ToString("D"))
+                                .OrderByDescending(x => x.CreatedDate)
+                                .ToListAsync();
+
+            return data;
+        }
+
+        /// <summary>
+        /// ดึงข้อมูล Job Status ที่ยัง pending หรือ processing
+        /// </summary>
+        public async Task<List<LeaveProcessJobStatus>> GetPendingOrProcessingJobsAsync(Guid userId)
+        {
+            var data = await _dbContext.Set<LeaveProcessJobStatus>()
+                                .Where(x => x.CreatedUserId == userId.ToString("D") && 
+                                       (x.Status == "PENDING" || x.Status == "PROCESSING"))
+                                //.OrderByDescending(x => x.CreatedDate)
+                                .ToListAsync();
+
+            return data;
+        }
+
+        public async Task<List<LeaveProcessJobStatus>> GetPendingJobsAsync()
+        {
+            var data = await _dbContext.Set<LeaveProcessJobStatus>()
+                                .Where(x => x.Status == "PENDING")
+                                .ToListAsync();
+
+            return data;
+        }
+
+        /// <summary>
+        /// อัปเดตสถานะเป็น Processing
+        /// </summary>
+        public async Task<LeaveProcessJobStatus> UpdateToProcessingAsync(Guid id)
+        {
+            var job = await GetByTaskIdAsync(id);
+            if (job != null)
+            {
+                job.Status = "PROCESSING";
+                job.ProcessingDate = DateTime.Now;
+                await UpdateAsync(job);
+            }
+            return job!;
+        }
+
+        /// <summary>
+        /// อัปเดตสถานะเป็น Completed
+        /// </summary>
+        public async Task<LeaveProcessJobStatus> UpdateToCompletedAsync(Guid id, string? additionalData = null)
+        {
+            var job = await GetByTaskIdAsync(id);
+            if (job != null)
+            {
+                job.Status = "COMPLETED";
+                job.CompletedDate = DateTime.Now;
+                await UpdateAsync(job);
+            }
+            return job!;
+        }
+
+        /// <summary>
+        /// อัปเดตสถานะเป็น Failed
+        /// </summary>
+        public async Task<LeaveProcessJobStatus> UpdateToFailedAsync(Guid id, string errorMessage)
+        {
+            var job = await GetByTaskIdAsync(id);
+            if (job != null)
+            {
+                job.Status = "FAILED";
+                job.CompletedDate = DateTime.Now;
+                job.ErrorMessage = errorMessage;
+                await UpdateAsync(job);
+            }
+            return job!;
+        }
+
+        public async Task ProcessTaskAsync(Guid rootDnaId, DateTime? startDate, DateTime? endDate)
+        {
+
+            var profiles = new List<GetProfileByKeycloakIdRootDto>();
+            var dateStart = startDate?.Date ?? DateTime.Now.Date;
+            var dateEnd = endDate?.Date ?? DateTime.Now.Date;
+
+            var holidays = await _holidayRepository.GetHolidayAsync(dateStart, dateEnd);
+            var weekend = _holidayRepository.GetWeekEnd(dateStart, dateEnd);
+            var excludeDates = holidays.Union(weekend).ToList();
+
+            var dateList = new List<LoopDate>();
+            for (DateTime i = dateStart; i <= dateEnd; i = i.AddDays(1))
+            {
+                if (holidays.Contains(i))
+                {
+                    var d = await _holidayRepository.GetHolidayAsync(i);
+                    dateList.Add(new LoopDate
+                    {
+                        date = i,
+                        isHoliday = true,
+                        isWeekEnd = false,
+                        dateRemark = d
+                    });
+                }
+                else if (weekend.Contains(i))
+                {
+                    dateList.Add(new LoopDate
+                    {
+                        date = i,
+                        isHoliday = true,
+                        isWeekEnd = false,
+                        dateRemark = "วันหยุด"
+                    });
+                }
+                else
+                {
+                    dateList.Add(new LoopDate
+                    {
+                        date = i,
+                        isHoliday = false,
+                        isWeekEnd = false,
+                        dateRemark = ""
+                    });
+                }
+            }
+
+            var defaultRound = await _dutyTimeRepository.GetDefaultAsync();
+            if (defaultRound == null)
+            {
+                throw new Exception("ไม่พบรอบการลงเวลา Default");
+            }
+
+            var employees = new List<DateResultReport>();
+
+            foreach (var dd in dateList.Where(x => !x.isHoliday && !x.isWeekEnd))
+            {
+                profiles = await _userProfileRepository.GetAllOfficerByRootDnaId(rootDnaId.ToString(),dd.date);
+                foreach (var p in profiles)
+                {
+                    var count = 1;
+                    var keycloakUserId = p.Keycloak ?? Guid.Empty;
+
+                    var timeStamps = await _processUserTimeStampRepository.GetTimestampByDateAsync(keycloakUserId, dd.date);
+
+                    var fullName = $"{p.Prefix}{p.FirstName} {p.LastName}";
+
+                    var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(p.Id, dd.date);
+                    var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
+                    var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
+
+                    var duty = userRound ?? defaultRound;
+
+                    // check วันลาของแต่ละคน
+                    var leaveReq = await _leaveRequestRepository.GetLeavePeriodAsync(keycloakUserId, dd.date);
+                    var remarkStr = string.Empty;
+                    var status = string.Empty;
+                    var stampType = string.Empty;
+                    var stampAmount = 0.0;
+
+                    if (leaveReq != null)
+                    {
+                        switch (leaveReq.Type.Code.ToUpper())
+                        {
+                            case "LV-001":
+                            case "LV-002":
+                            case "LV-005":
+                                remarkStr += leaveReq.Type.Name;
+                                var leaveRange = leaveReq.LeaveRange == null ? "" : leaveReq.LeaveRange.ToUpper();
+                                
+                                if(leaveReq.LeaveStartDate.Date == leaveReq.LeaveEndDate.Date)
+                                {
+                                    if (leaveRange == "MORNING")
+                                        remarkStr += "ครึ่งวันเช้า";
+                                    else if (leaveRange == "AFTERNOON")
+                                        remarkStr += "ครึ่งวันบ่าย";
+
+
+                                    // var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                                    // if (leaveRangeEnd == "MORNING")
+                                    //     remarkStr += "ครึ่งวันเช้า";
+                                    // else if (leaveRangeEnd == "AFTERNOON")
+                                    //     remarkStr += "ครึ่งวันบ่าย";
+
+                                    var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                                    if (leaveRange != leaveRangeEnd)
+                                    {
+                                        if (leaveRangeEnd == "MORNING")
+                                            remarkStr += " - ครึ่งวันเช้า";
+                                        else if (leaveRangeEnd == "AFTERNOON")
+                                            remarkStr += " - ครึ่งวันบ่าย";
+                                    }
+                                }
+                                else
+                                {
+                                    if(dd.date == leaveReq.LeaveStartDate.Date)
+                                    {
+                                        if (leaveRange == "MORNING")
+                                            remarkStr += "ครึ่งวันเช้า";
+                                        else if (leaveRange == "AFTERNOON")
+                                            remarkStr += "ครึ่งวันบ่าย";
+                                    }
+                                    else if(dd.date == leaveReq.LeaveEndDate.Date)
+                                    {
+                                        var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                                        if (leaveRangeEnd == "MORNING")
+                                            remarkStr += "ครึ่งวันเช้า";
+                                        else if (leaveRangeEnd == "AFTERNOON")
+                                            remarkStr += "ครึ่งวันบ่าย";
+                                        else
+                                            remarkStr += "เต็มวัน";
+                                    }
+                                    else
+                                    {
+                                        remarkStr += "เต็มวัน";
+                                    }
+                                }                            
+                                
+
+                                break;
+                            default:
+                                remarkStr += leaveReq.Type.Name;
+                                break;
+                        }
+                        status = "LEAVE";
+                        if(leaveReq.LeaveStartDate.Date == dd.date)
+                        {
+                            stampType = leaveReq.LeaveRange ?? "";
+                            stampAmount = leaveReq.LeaveRange != "ALL" ? 0.5 : 1;
+                        }
+                        else if(leaveReq.LeaveEndDate.Date == dd.date)
+                        {
+                            stampAmount = leaveReq.LeaveRangeEnd != "ALL" ? 0.5 : 1;
+                            stampType = leaveReq.LeaveRangeEnd ?? "";
+                        }
+                        else
+                            stampAmount = leaveReq.LeaveRange != "ALL" || leaveReq.LeaveRangeEnd != "ALL" ? 0.5 : 1;
+                        if(stampType == "ALL") stampType = "FULL_DAY";
+                    }
+                    else
+                    {
+                        if (timeStamps == null)
+                        {
+                            if (dd.date <= DateTime.Now.Date)
+                            {
+                                remarkStr = "ขาดราชการ";
+                                status = "ABSENT";
+                                stampType = "FULL_DAY";
+                                stampAmount = 1;
+                                if (dd.isHoliday == true)
+                                {
+                                    remarkStr = $"วันหยุด ({dd.dateRemark})";
+                                    status = "HOLIDAY";
+                                }
+                                else if (dd.isWeekEnd)
+                                {
+                                    remarkStr = dd.dateRemark;
+                                    status = "WEEKEND";
+                                }
+                            }
+                            else remarkStr = "";
+                        }
+                        else
+                        {
+                            // check status ของการลงเวลา
+                            if (timeStamps.CheckOut != null)
+                            {
+                                if (timeStamps.CheckOutStatus == "ABSENT")
+                                {
+                                    remarkStr = "ขาดราชการ" + (!timeStamps.IsLocationCheckOut ? $" (นอกสถานที่:{timeStamps.CheckOutLocationName})".Trim() : "");
+                                    status = "ABSENT";
+                                    stampType = "FULL_DAY";
+                                    stampAmount = 1;
+                                }
+                                else if (timeStamps.CheckInStatus == "ABSENT")
+                                {
+                                    remarkStr = "ขาดราชการ" + (!timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
+                                    status = "ABSENT";
+                                    stampType = "FULL_DAY";
+                                    stampAmount = 1;
+                                }
+                                else if (timeStamps.CheckInStatus == "LATE")
+                                {
+                                    remarkStr = "สาย" + (!timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
+                                    status = "LATE";
+                                    stampType = "FULL_DAY";
+                                    stampAmount = 1;
+                                    //lateTotal += 1;
+                                }
+                                else
+                                    remarkStr = !timeStamps.IsLocationCheckIn ? $" นอกสถานที่:{timeStamps.CheckInLocationName}".Trim() : "";
+                            }
+                            else
+                            {
+                                if (timeStamps.CheckInStatus == "ABSENT")
+                                {
+                                    status = "ABSENT";
+                                    stampType = "FULL_DAY";
+                                    stampAmount = 1;
+                                    remarkStr = "ขาดราชการ" + (!timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
+                                }
+                                else if (timeStamps.CheckInStatus == "LATE")
+                                {
+                                    status = "LATE";    
+                                    stampType = "FULL_DAY";
+                                    stampAmount = 1;
+                                    remarkStr = "สาย" + (!timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
+                                    //lateTotal += 1;
+                                }
+                                else
+                                    remarkStr = !timeStamps.IsLocationCheckIn ? $" นอกสถานที่:{timeStamps.CheckInLocationName}".Trim() : "";
+                            }
+                        }
+                    }
+
+                    var emp = new DateResultReport
+                    {
+                        profileId = p.Id.ToString(),
+                        stampDate = dd.date,
+                        stampType = stampType,
+                        stampAmount = stampAmount,                    
+                        remark = remarkStr,
+                        status = status
+                    };
+
+                    employees.Add(emp);
+                    count++;
+                }        
+
+                // Write employees to JSON file
+                // var fileName = $"employees_{DateTime.Now:yyyyMMdd_HHmmss}.txt";
+                // var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Exports", fileName);
+
+                // // Ensure directory exists
+                // var directory = Path.GetDirectoryName(filePath);
+                // if (!string.IsNullOrEmpty(directory) && !Directory.Exists(directory))
+                // {
+                //     Directory.CreateDirectory(directory);
+                // }
+
+                // var jsonOptions = new JsonSerializerOptions
+                // {
+                //     WriteIndented = true,
+                //     Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+                // };
+
+                // var jsonContent = JsonSerializer.Serialize(employees, jsonOptions);
+                // await File.WriteAllTextAsync(filePath, jsonContent);
+            }
+
+            //call api
+            var apiPath = $"{_configuration["API"]}/org/unauthorize/profile/absent-late/batch";
+            var apiKey = _configuration["API_KEY"];
+            var body = new
+            {
+                records = employees.Where(x => x.status == "ABSENT" || x.status == "LATE").ToList()
+            };
+
+            var apiResult = await PostExternalAPIAsync(apiPath, AccessToken ?? "", body, apiKey);
+            if(apiResult == "")
+            {
+                throw new Exception($"เรียก API {apiPath} ไม่สำเร็จ");
+            }        
+        }
+
+        public async Task ProcessEmpTaskAsync(Guid rootDnaId, DateTime? startDate, DateTime? endDate)
+        {
+
+            var profiles = new List<GetProfileByKeycloakIdRootDto>();
+            var dateStart = startDate?.Date ?? DateTime.Now.Date;
+            var dateEnd = endDate?.Date ?? DateTime.Now.Date;
+
+            var holidays = await _holidayRepository.GetHolidayAsync(dateStart, dateEnd);
+            var weekend = _holidayRepository.GetWeekEnd(dateStart, dateEnd);
+            var excludeDates = holidays.Union(weekend).ToList();
+
+            var dateList = new List<LoopDate>();
+            for (DateTime i = dateStart; i <= dateEnd; i = i.AddDays(1))
+            {
+                if (holidays.Contains(i))
+                {
+                    var d = await _holidayRepository.GetHolidayAsync(i);
+                    dateList.Add(new LoopDate
+                    {
+                        date = i,
+                        isHoliday = true,
+                        isWeekEnd = false,
+                        dateRemark = d
+                    });
+                }
+                else if (weekend.Contains(i))
+                {
+                    dateList.Add(new LoopDate
+                    {
+                        date = i,
+                        isHoliday = true,
+                        isWeekEnd = false,
+                        dateRemark = "วันหยุด"
+                    });
+                }
+                else
+                {
+                    dateList.Add(new LoopDate
+                    {
+                        date = i,
+                        isHoliday = false,
+                        isWeekEnd = false,
+                        dateRemark = ""
+                    });
+                }
+            }
+
+            var defaultRound = await _dutyTimeRepository.GetDefaultAsync();
+            if (defaultRound == null)
+            {
+                throw new Exception("ไม่พบรอบการลงเวลา Default");
+            }
+
+            var employees = new List<DateResultReport>();
+
+            foreach (var dd in dateList.Where(x => !x.isHoliday && !x.isWeekEnd))
+            {
+                profiles = await _userProfileRepository.GetAllEmployeeByRootDnaId(rootDnaId.ToString(),dd.date);
+                foreach (var p in profiles)
+                {
+                    var count = 1;
+                    var keycloakUserId = p.Keycloak ?? Guid.Empty;
+
+                    var timeStamps = await _processUserTimeStampRepository.GetTimestampByDateAsync(keycloakUserId, dd.date);
+
+                    var fullName = $"{p.Prefix}{p.FirstName} {p.LastName}";
+
+                    var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(p.Id, dd.date);
+                    var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
+                    var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
+
+                    var duty = userRound ?? defaultRound;
+
+                    // check วันลาของแต่ละคน
+                    var leaveReq = await _leaveRequestRepository.GetLeavePeriodAsync(keycloakUserId, dd.date);
+                    var remarkStr = string.Empty;
+                    var status = string.Empty;
+                    var stampType = string.Empty;
+                    var stampAmount = 0.0;
+
+                    if (leaveReq != null)
+                    {
+                        switch (leaveReq.Type.Code.ToUpper())
+                        {
+                            case "LV-001":
+                            case "LV-002":
+                            case "LV-005":
+                                remarkStr += leaveReq.Type.Name;
+                                var leaveRange = leaveReq.LeaveRange == null ? "" : leaveReq.LeaveRange.ToUpper();
+                                
+                                if(leaveReq.LeaveStartDate.Date == leaveReq.LeaveEndDate.Date)
+                                {
+                                    if (leaveRange == "MORNING")
+                                        remarkStr += "ครึ่งวันเช้า";
+                                    else if (leaveRange == "AFTERNOON")
+                                        remarkStr += "ครึ่งวันบ่าย";
+
+
+                                    // var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                                    // if (leaveRangeEnd == "MORNING")
+                                    //     remarkStr += "ครึ่งวันเช้า";
+                                    // else if (leaveRangeEnd == "AFTERNOON")
+                                    //     remarkStr += "ครึ่งวันบ่าย";
+
+                                    var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                                    if (leaveRange != leaveRangeEnd)
+                                    {
+                                        if (leaveRangeEnd == "MORNING")
+                                            remarkStr += " - ครึ่งวันเช้า";
+                                        else if (leaveRangeEnd == "AFTERNOON")
+                                            remarkStr += " - ครึ่งวันบ่าย";
+                                    }
+                                }
+                                else
+                                {
+                                    if(dd.date == leaveReq.LeaveStartDate.Date)
+                                    {
+                                        if (leaveRange == "MORNING")
+                                            remarkStr += "ครึ่งวันเช้า";
+                                        else if (leaveRange == "AFTERNOON")
+                                            remarkStr += "ครึ่งวันบ่าย";
+                                    }
+                                    else if(dd.date == leaveReq.LeaveEndDate.Date)
+                                    {
+                                        var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                                        if (leaveRangeEnd == "MORNING")
+                                            remarkStr += "ครึ่งวันเช้า";
+                                        else if (leaveRangeEnd == "AFTERNOON")
+                                            remarkStr += "ครึ่งวันบ่าย";
+                                    }
+                                    else
+                                    {
+                                        remarkStr += "เต็มวัน";
+                                    }
+                                }                            
+                                break;
+                            default:
+                                remarkStr += leaveReq.Type.Name;
+                                break;
+                        }
+                        status = "LEAVE";
+                        if(leaveReq.LeaveStartDate.Date == dd.date)
+                        {
+                            stampType = leaveReq.LeaveRange ?? "";
+                            stampAmount = leaveReq.LeaveRange != "ALL" ? 0.5 : 1;
+                        }
+                        else if(leaveReq.LeaveEndDate.Date == dd.date)
+                        {
+                            stampAmount = leaveReq.LeaveRangeEnd != "ALL" ? 0.5 : 1;
+                            stampType = leaveReq.LeaveRangeEnd ?? "";
+                        }
+                        else
+                            stampAmount = leaveReq.LeaveRange != "ALL" || leaveReq.LeaveRangeEnd != "ALL" ? 0.5 : 1;
+                        if(stampType == "ALL") stampType = "FULL_DAY";
+                        //stampAmount = leaveReq.LeaveRange != "ALL" || leaveReq.LeaveRangeEnd != "ALL" ? 0.5 : 1;
+                    }
+                    else
+                    {
+                        if (timeStamps == null)
+                        {
+                            if (dd.date <= DateTime.Now.Date)
+                            {
+                                remarkStr = "ขาดราชการ";
+                                status = "ABSENT";
+                                stampType = "FULL_DAY";
+                                stampAmount = 1;
+                                if (dd.isHoliday == true)
+                                {
+                                    remarkStr = $"วันหยุด ({dd.dateRemark})";
+                                    status = "HOLIDAY";
+                                }
+                                else if (dd.isWeekEnd)
+                                {
+                                    remarkStr = dd.dateRemark;
+                                    status = "WEEKEND";
+                                }
+                            }
+                            else remarkStr = "";
+                        }
+                        else
+                        {
+                            // check status ของการลงเวลา
+                            if (timeStamps.CheckOut != null)
+                            {
+                                if (timeStamps.CheckOutStatus == "ABSENT")
+                                {
+                                    remarkStr = "ขาดราชการ" + (!timeStamps.IsLocationCheckOut ? $" (นอกสถานที่:{timeStamps.CheckOutLocationName})".Trim() : "");
+                                    status = "ABSENT";
+                                    stampType = "FULL_DAY";
+                                    stampAmount = 1;
+                                }
+                                else if (timeStamps.CheckInStatus == "ABSENT")
+                                {
+                                    remarkStr = "ขาดราชการ" + (!timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
+                                    status = "ABSENT";
+                                    stampType = "FULL_DAY";
+                                    stampAmount = 1;
+                                }
+                                else if (timeStamps.CheckInStatus == "LATE")
+                                {
+                                    remarkStr = "สาย" + (!timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
+                                    status = "LATE";
+                                    stampType = "FULL_DAY";
+                                    stampAmount = 1;
+                                    //lateTotal += 1;
+                                }
+                                else
+                                    remarkStr = !timeStamps.IsLocationCheckIn ? $" นอกสถานที่:{timeStamps.CheckInLocationName}".Trim() : "";
+                            }
+                            else
+                            {
+                                if (timeStamps.CheckInStatus == "ABSENT")
+                                {
+                                    status = "ABSENT";
+                                    stampType = "FULL_DAY";
+                                    stampAmount = 1;
+                                    remarkStr = "ขาดราชการ" + (!timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
+                                }
+                                else if (timeStamps.CheckInStatus == "LATE")
+                                {
+                                    status = "LATE";    
+                                    stampType = "FULL_DAY";
+                                    stampAmount = 1;
+                                    remarkStr = "สาย" + (!timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
+                                    //lateTotal += 1;
+                                }
+                                else
+                                    remarkStr = !timeStamps.IsLocationCheckIn ? $" นอกสถานที่:{timeStamps.CheckInLocationName}".Trim() : "";
+                            }
+                        }
+                    }
+
+                    var emp = new DateResultReport
+                    {
+                        profileId = p.Id.ToString(),
+                        stampDate = dd.date,
+                        stampType = stampType,
+                        stampAmount = stampAmount,                    
+                        remark = remarkStr,
+                        status = status
+                    };
+
+                    employees.Add(emp);
+                    count++;
+                }        
+
+                // Write employees to JSON file
+                // var fileName = $"employees_{DateTime.Now:yyyyMMdd_HHmmss}.txt";
+                // var filePath = Path.Combine(_env.ContentRootPath, "Exports", fileName);
+
+                // // Ensure directory exists
+                // var directory = Path.GetDirectoryName(filePath);
+                // if (!string.IsNullOrEmpty(directory) && !Directory.Exists(directory))
+                // {
+                //     Directory.CreateDirectory(directory);
+                // }
+
+                // var jsonOptions = new JsonSerializerOptions
+                // {
+                //     WriteIndented = true,
+                //     Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+                // };
+
+                // var jsonContent = JsonSerializer.Serialize(employees, jsonOptions);
+                // Console.WriteLine($"Writing file to: {filePath}");
+                // await File.WriteAllTextAsync(filePath, jsonContent);
+                // Console.WriteLine($"File written successfully: {fileName}");
+            }
+
+            // call api
+            var apiPath = $"{_configuration["API"]}/org/unauthorize/profile-employee/absent-late/batch";
+            var apiKey = _configuration["API_KEY"];
+            var body = new
+            {
+                records = employees.Where(x => x.status == "ABSENT" || x.status == "LATE").ToList()
+            };
+
+            var apiResult = await PostExternalAPIAsync(apiPath, AccessToken ?? "", body, apiKey);
+            if(apiResult == "")
+            {
+                throw new Exception($"เรียก API {apiPath} ไม่สำเร็จ");
+            }        
+        }
+
+
+        public async Task ProcessPendingJobsAsync()
+        {
+            var pendingJobs = await GetPendingJobsAsync();
+            Console.WriteLine($"พบงานที่ค้างอยู่ในสถานะ PENDING จำนวน {pendingJobs.Count} งาน");
+
+            foreach (var job in pendingJobs)
+            {
+                try
+                {
+                    // อัปเดตสถานะเป็น Processing
+                    await UpdateToProcessingAsync(job.Id);
+
+                    // ทำงานที่ต้องการที่นี่ (เช่น เรียก API, ประมวลผลข้อมูล ฯลฯ)
+                    await ProcessTaskAsync(job.RootDnaId,job.StartDate, job.EndDate);
+                    await ProcessEmpTaskAsync(job.RootDnaId,job.StartDate, job.EndDate);
+
+                    // อัปเดตสถานะเป็น Completed
+                    await UpdateToCompletedAsync(job.Id);
+                }
+                catch (Exception ex)
+                {
+                    // หากเกิดข้อผิดพลาด อัปเดตสถานะเป็น Failed พร้อมข้อความแสดงข้อผิดพลาด
+                    await UpdateToFailedAsync(job.Id, ex.Message);
+                }
+            }
+        }
+        
+        #endregion
+    }
+
+    class LoopDate
+    {
+        public DateTime date { get; set; }
+
+        public bool isHoliday { get; set; }
+
+        public bool isWeekEnd { get; set; }
+
+        public string dateRemark { get; set; }
+
+    }
+
+    class DateResultReport
+    {
+        public string? profileId { get; set; }
+        public DateTime stampDate { get; set; }
+        public string stampType { get; set; }
+        public double stampAmount { get; set; }     
+        public string remark { get; set; }
+        public string status { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs
index 64d32a19..77aba421 100644
--- a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs
@@ -172,10 +172,10 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
             {
                 data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId)).ToList();
             }
-            else if (role == "PARENT")
-            {
-                data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId) && x.Child1DnaId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     data = data.Where(x => x.RootDnaId == Guid.Parse(nodeId) && x.Child1DnaId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 data = data.Where(x =>
@@ -191,11 +191,11 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
             if (role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "BROTHER" || role == "PARENT")
             {
                 data = data.Where(x =>
-                    nodeByReq == 4 ? x.Child4Id == Guid.Parse(nodeIdByReq) :
-                    nodeByReq == 3 ? x.Child3Id == Guid.Parse(nodeIdByReq) :
-                    nodeByReq == 2 ? x.Child2Id == Guid.Parse(nodeIdByReq) :
-                    nodeByReq == 1 ? x.Child1Id == Guid.Parse(nodeIdByReq) :
-                    nodeByReq == 0 ? x.RootId == Guid.Parse(nodeIdByReq) : true
+                    nodeByReq == 4 ? x.Child4DnaId == Guid.Parse(nodeIdByReq) :
+                    nodeByReq == 3 ? x.Child3DnaId == Guid.Parse(nodeIdByReq) :
+                    nodeByReq == 2 ? x.Child2DnaId == Guid.Parse(nodeIdByReq) :
+                    nodeByReq == 1 ? x.Child1DnaId == Guid.Parse(nodeIdByReq) :
+                    nodeByReq == 0 ? x.RootDnaId == Guid.Parse(nodeIdByReq) : true
                 ).ToList();
             }
             return data;
@@ -227,6 +227,19 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
             return data;
         }
 
+        public async Task<List<ProcessUserTimeStamp>> GetTimeStampHistoryAsync2(Guid keycloakId, int year)
+        {
+            var fiscalDateStart = new DateTime(year - 1, 10, 1);
+            var fiscalDateEnd = new DateTime(year, 9, 30);
+
+            var data = await _dbContext.Set<ProcessUserTimeStamp>()
+                                .Where(u => u.KeycloakUserId == keycloakId)
+                                .Where(u => u.CheckIn.Date >= fiscalDateStart && u.CheckIn.Date <= fiscalDateEnd)
+                                .OrderByDescending(u => u.CheckIn.Date)
+                                .ToListAsync();
+            return data;
+        }
+
         public async Task<int> GetTimeStampHistoryForAdminCountAsync(DateTime startDate, DateTime endDate)
         {
             var data = await _dbContext.Set<ProcessUserTimeStamp>()
@@ -288,12 +301,12 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
                     .Where(x => x.RootDnaId == Guid.Parse(nodeId!))
                     .ToList();
             }
-            else if (role == "PARENT")
-            {
-                data = data
-                    .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null)
-                    .ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     data = data
+            //         .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null)
+            //         .ToList();
+            // }
             else if (role == "NORMAL")
             {
                 data = data.Where(x =>
diff --git a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserDutyTimeRepository.cs b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserDutyTimeRepository.cs
index 3eefefe0..b34bc4db 100644
--- a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserDutyTimeRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserDutyTimeRepository.cs
@@ -101,14 +101,17 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
             return data;
         }
 
-        public async Task<UserDutyTime?> GetLastEffectRound(Guid profileId)
+        public async Task<UserDutyTime?> GetLastEffectRound(Guid profileId, DateTime? effectiveDate = null, CancellationToken cancellationToken = default)
         {
+            // กำหนด timeout เป็น 30 นาที
+            using var timeoutCts = new CancellationTokenSource(TimeSpan.FromMinutes(30));
+            using var combinedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token);
+            effectiveDate ??= DateTime.Now;
             var data = await _dbContext.Set<UserDutyTime>()
                             .Where(x => x.ProfileId == profileId)
-                            .Where(x => x.IsProcess)
-                            .Where(x => x.EffectiveDate.Value.Date <= DateTime.Now.Date)
+                            .Where(x => x.EffectiveDate.Value.Date <= effectiveDate.Value.Date)
                             .OrderByDescending(x => x.EffectiveDate)
-                            .FirstOrDefaultAsync();
+                            .FirstOrDefaultAsync(combinedCts.Token);
 
             return data;
         }
diff --git a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserTimeStampRepository.cs b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserTimeStampRepository.cs
index b7a766e9..6dffcb6c 100644
--- a/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserTimeStampRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/TimeAttendants/UserTimeStampRepository.cs
@@ -74,12 +74,16 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
             return data;
         }
 
-        public async Task<UserTimeStamp?> GetLastRecord(Guid keycloakId)
+        public async Task<UserTimeStamp?> GetLastRecord(Guid keycloakId, CancellationToken cancellationToken = default)
         {
+            // กำหนด timeout เป็น 30 นาที
+            using var timeoutCts = new CancellationTokenSource(TimeSpan.FromMinutes(30));
+            using var combinedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token);
+
             var data = await _dbContext.Set<UserTimeStamp>()
                                 .Where(u => u.KeycloakUserId == keycloakId)
                                 .OrderByDescending(u => u.CheckIn)
-                                .FirstOrDefaultAsync();
+                                .FirstOrDefaultAsync(combinedCts.Token);
 
             return data;
         }
@@ -136,12 +140,12 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
                     .Where(x => x.RootDnaId == Guid.Parse(nodeId!))
                     .ToList();
             }
-            else if (role == "PARENT")
-            {
-                data = data
-                    .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null)
-                    .ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     data = data
+            //         .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null)
+            //         .ToList();
+            // }
             else if (role == "NORMAL")
             {
                 data = data.Where(x =>
diff --git a/BMA.EHR.Application/Repositories/MessageQueue/InboxRepository.cs b/BMA.EHR.Application/Repositories/MessageQueue/InboxRepository.cs
index f0d0bc0c..46019cfc 100644
--- a/BMA.EHR.Application/Repositories/MessageQueue/InboxRepository.cs
+++ b/BMA.EHR.Application/Repositories/MessageQueue/InboxRepository.cs
@@ -51,7 +51,8 @@ namespace BMA.EHR.Application.Repositories.MessageQueue
                 //     // throw new Exception(GlobalMessages.DataNotFound);
                 // }
 
-                var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+                //var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+                var apiUrl = $"{_configuration["API"]}/org/dotnet/get-profileId";
                 var profileId = "";
                 using (var client = new HttpClient())
                 {
diff --git a/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs b/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs
index eeb1d71e..a9d5ceb7 100644
--- a/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs
+++ b/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs
@@ -55,7 +55,8 @@ namespace BMA.EHR.Application.Repositories.MessageQueue
                 //     // throw new Exception(GlobalMessages.DataNotFound);
                 // }
 
-                var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+                //var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+                var apiUrl = $"{_configuration["API"]}/org/dotnet/get-profileId";
                 var profileId = "";
                 using (var client = new HttpClient())
                 {
@@ -131,7 +132,8 @@ namespace BMA.EHR.Application.Repositories.MessageQueue
                 // {
                 //     return 0;
                 // }
-                var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+                //var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+                var apiUrl = $"{_configuration["API"]}/org/dotnet/get-profileId";
                 var profileId = "";
                 using (var client = new HttpClient())
                 {
diff --git a/BMA.EHR.Application/Repositories/PermissionRepository.cs b/BMA.EHR.Application/Repositories/PermissionRepository.cs
index d5ac981a..a63207ec 100644
--- a/BMA.EHR.Application/Repositories/PermissionRepository.cs
+++ b/BMA.EHR.Application/Repositories/PermissionRepository.cs
@@ -10,6 +10,7 @@ using System.Net.Http.Headers;
 using Microsoft.Extensions.Configuration;
 using System.Security.Claims;
 using System.Net.Http.Json;
+using BMA.EHR.Application.Responses.Leaves;
 
 namespace BMA.EHR.Application.Repositories
 {
@@ -62,6 +63,10 @@ namespace BMA.EHR.Application.Repositories
                         new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
                     client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = await client.GetAsync(apiPath);
+                    if (!req.IsSuccessStatusCode)
+                    {
+                        throw new Exception("Error calling permission API");
+                    }
                     var res = await req.Content.ReadAsStringAsync();
                     return res;
                 }
@@ -72,6 +77,39 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
+        public async Task<GetPermissionWithActingResultDto?> GetPermissionWithActingAPIAsync(string action, string system)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/permission/dotnet-acting/{action}/{system}";
+
+                using (var client = new HttpClient())
+                {
+                    client.DefaultRequestHeaders.Authorization =
+                        new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
+                    var req = await client.GetAsync(apiPath);
+                    if (!req.IsSuccessStatusCode)
+                    {
+                        throw new Exception("Error calling permission API");
+                    }
+                    var apiResult = await req.Content.ReadAsStringAsync();
+                    //return res;
+
+                    if (apiResult != null)
+                    {
+                        var raw = JsonConvert.DeserializeObject<GetPermissionWithActingResultDto>(apiResult);
+                        return raw;
+                    }
+                    return null;
+                }
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
         public async Task<dynamic> GetPermissionOrgAPIAsync(string action, string system, string profileId)
         {
             try
diff --git a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs
index c094738e..a1dd7936 100644
--- a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs
@@ -893,7 +893,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                             select new
                             {
                                 RowNo = 1,
-                                DepartmentName = _userProfileRepository.GetOc(g.Key.OcId, 0, AccessToken).Root, //_organizationCommonRepository.GetOrganizationNameFullPath(g.Key.OcId, false, false),
+                                DepartmentName = _userProfileRepository.GetOc(g.Key.OcId, 0, AccessToken)?.Root ?? "-", //_organizationCommonRepository.GetOrganizationNameFullPath(g.Key.OcId, false, false),
                                 G1Male = g.Sum(x => x.Gendor == "ชาย" && x.RequestInsigniaName == "เหรียญจักรพรรดิมาลา" ? 1 : 0),
                                 G1Female = g.Sum(x => x.Gendor == "หญิง" && x.RequestInsigniaName == "เหรียญจักรพรรดิมาลา" ? 1 : 0),
                                 G2Male = g.Sum(x => x.Gendor == "ชาย" ? 1 : 0),
diff --git a/BMA.EHR.Application/Repositories/UserProfileRepository.cs b/BMA.EHR.Application/Repositories/UserProfileRepository.cs
index 15e06ca9..4f081f77 100644
--- a/BMA.EHR.Application/Repositories/UserProfileRepository.cs
+++ b/BMA.EHR.Application/Repositories/UserProfileRepository.cs
@@ -157,7 +157,7 @@ namespace BMA.EHR.Application.Repositories
 
                 return null;
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 throw;
             }
@@ -186,6 +186,55 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
+
+
+        public async Task<GetProfileByKeycloakIdDto?> GetProfileByKeycloakIdNewAsync(Guid keycloakId, string? accessToken,CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/by-keycloak/{keycloakId}";
+                var apiKey = _configuration["API_KEY"];
+
+                var apiResult = await GetExternalAPIAsync(apiPath, accessToken ?? "", apiKey, cancellationToken);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetProfileByKeycloakIdResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                }
+
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        public async Task<GetProfileByKeycloakIdDto?> GetProfileByKeycloakIdNew2Async(Guid keycloakId, string? accessToken)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/by-keycloak2/{keycloakId}";
+                var apiKey = _configuration["API_KEY"];
+
+                var apiResult = await GetExternalAPIAsync(apiPath, accessToken ?? "", apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetProfileByKeycloakIdResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                }
+
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+
         public async Task<GetProfileLeaveByKeycloakDto?> GetProfileLeaveByKeycloakIdAsync(Guid keycloakId, string? accessToken)
         {
             try
@@ -209,6 +258,66 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
+        public async Task<List<GetOcStaff>?> GetOCStaffAsync(Guid profileId, string? accessToken)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/find-staff";
+                var apiKey = _configuration["API_KEY"];
+                var body = new
+                {
+                    assignId = "SYS_LEAVE_LIST",
+                    profileId = profileId
+                };
+
+                //var profiles = new List<GetOcStaff>();
+
+                var apiResult = await PostExternalAPIAsync(apiPath, accessToken ?? "", body, apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetOcStaffResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                }
+
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        public async Task<GetProfileLeaveByKeycloakDto?> GetProfileLeaveReportByKeycloakIdAsync(Guid keycloakId, string? accessToken, string? report)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/profile-leave/keycloak";
+                var apiKey = _configuration["API_KEY"];
+                var body = new
+                {
+                    keycloakId = keycloakId,
+                    report = report
+                };
+
+                //var profiles = new List<SearchProfileDto>();
+
+                var apiResult = await PostExternalAPIAsync(apiPath, accessToken, body, apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetProfileLeaveByKeycloakResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                }
+
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
         public async Task<GetProfileByKeycloakIdDto?> GetProfileByProfileIdAsync(Guid profileId, string? accessToken)
         {
             try
@@ -232,6 +341,31 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
+
+        public async Task<GetProfileByKeycloakIdDto?> GetProfileByProfileIdNoAuthAsync(Guid profileId, string? accessToken)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/unauthorize/profile/{profileId}";
+                var apiKey = _configuration["API_KEY"];
+
+                var apiResult = await GetExternalAPIAsync(apiPath, accessToken ?? "", apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetProfileByKeycloakIdResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                }
+
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+
         public async Task<bool> UpdateDutyTimeAsync(Guid profileId, Guid roundId, DateTime effectiveDate, string? accessToken)
         {
             try
@@ -520,7 +654,7 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
-        public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileByAdminRole(string? accessToken, int? node, string? nodeId, string role, string? revisionId, int? reqNode, string? reqNodeId)
+        public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileByAdminRole(string? accessToken, int? node, string? nodeId, string role, string? revisionId, int? reqNode, string? reqNodeId, DateTime? startDate, DateTime? endDate)
         {
             try
             {
@@ -533,7 +667,9 @@ namespace BMA.EHR.Application.Repositories
                     role = role,
                     revisionId = revisionId,
                     reqNode = reqNode,
-                    reqNodeId = reqNodeId
+                    reqNodeId = reqNodeId,
+                    //startDate = startDate,
+                    //endDate = endDate
                 };
 
                 var profiles = new List<SearchProfileDto>();
@@ -554,6 +690,187 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
+        public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileByAdminRolev2(string? accessToken, int? node, string? nodeId, string role, string? revisionId, int? reqNode, string? reqNodeId, DateTime? startDate, DateTime? endDate)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/officer-by-admin-rolev2";
+                var apiKey = _configuration["API_KEY"];
+                var body = new
+                {
+                    node = node,
+                    nodeId = nodeId,
+                    role = role,
+                    // revisionId = revisionId,
+                    reqNode = reqNode,
+                    reqNodeId = reqNodeId,
+                    // startDate = startDate,
+                    // endDate = endDate
+                    date = endDate
+                };
+                Console.WriteLine(body);
+
+                var profiles = new List<SearchProfileDto>();
+
+                var apiResult = await PostExternalAPIAsync(apiPath, accessToken, body, apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetListProfileByKeycloakIdRootResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                }
+
+                return new List<GetProfileByKeycloakIdRootDto>();
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileByAdminRolev3(string? accessToken, int? node, string? nodeId, string role, string? revisionId, int? reqNode, string? reqNodeId, DateTime? startDate, DateTime? endDate)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/officer-by-admin-rolev3";
+                var apiKey = _configuration["API_KEY"];
+                var body = new
+                {
+                    node = node,
+                    nodeId = nodeId,
+                    role = role,
+                    // revisionId = revisionId,
+                    reqNode = reqNode,
+                    reqNodeId = reqNodeId,
+                    startDate = startDate,
+                    endDate = endDate
+                };
+
+                var profiles = new List<SearchProfileDto>();
+
+                var apiResult = await PostExternalAPIAsync(apiPath, accessToken, body, apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetListProfileByKeycloakIdRootResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                }
+
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        public async Task<List<GetProfileByKeycloakIdRootDto>> GetAllOfficerByRootDnaId(string? rootDnaId, DateTime date)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/unauthorize/officer-list";
+                var apiKey = _configuration["API_KEY"];
+                var body = new
+                {
+                    reqNode = 0,
+                    reqNodeId = rootDnaId,
+                    date = date
+                };
+                //Console.WriteLine(body);
+
+                var profiles = new List<SearchProfileDto>();
+
+                var apiResult = await PostExternalAPIAsync(apiPath, "", body, apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetListProfileByKeycloakIdRootResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                    else 
+                        return new List<GetProfileByKeycloakIdRootDto>();
+                }
+                else
+                return new List<GetProfileByKeycloakIdRootDto>();
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        public async Task<List<GetProfileByKeycloakIdRootDto>> GetAllEmployeeByRootDnaId(string? rootDnaId, DateTime date)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/unauthorize/employee-list";
+                var apiKey = _configuration["API_KEY"];
+                var body = new
+                {
+                    reqNode = 0,
+                    reqNodeId = rootDnaId,
+                    startDate = date,
+                    endDate = date
+                };
+                //Console.WriteLine(body);
+
+                var profiles = new List<SearchProfileDto>();
+
+                var apiResult = await PostExternalAPIAsync(apiPath, "", body, apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetListProfileByKeycloakIdRootResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                    else 
+                        return new List<GetProfileByKeycloakIdRootDto>();
+                }
+                else
+                return new List<GetProfileByKeycloakIdRootDto>();
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileByAdminRolev4(string? accessToken, int? node, string? nodeId, string role, string? revisionId, int? reqNode, string? reqNodeId, DateTime? startDate, DateTime? endDate)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/officer-by-admin-rolev4";
+                var apiKey = _configuration["API_KEY"];
+                var body = new
+                {
+                    node = node,
+                    nodeId = nodeId,
+                    role = role,
+                    // revisionId = revisionId,
+                    reqNode = reqNode,
+                    reqNodeId = reqNodeId,
+                    // startDate = startDate,
+                    // endDate = endDate
+                    date = endDate
+                };
+                Console.WriteLine(body);
+
+                var profiles = new List<SearchProfileDto>();
+
+                var apiResult = await PostExternalAPIAsync(apiPath, accessToken, body, apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetListProfileByKeycloakIdRootResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                }
+
+                return new List<GetProfileByKeycloakIdRootDto>();
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
         public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileWithKeycloakAllOfficerRetireFilterAndRevision(string? accessToken, int? node, string? nodeId, bool isAll, bool? isRetirement, string? revisionId)
         {
             try
@@ -686,7 +1003,7 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
-        public async Task<List<GetProfileByKeycloakIdRootDto>> GetEmployeeByAdminRole(string? accessToken, int? node, string? nodeId, string role, string? revisionId, int? reqNode, string? reqNodeId)
+        public async Task<List<GetProfileByKeycloakIdRootDto>> GetEmployeeByAdminRole(string? accessToken, int? node, string? nodeId, string role, string? revisionId, int? reqNode, string? reqNodeId, DateTime? startDate, DateTime? endDate)
         {
             try
             {
@@ -699,7 +1016,9 @@ namespace BMA.EHR.Application.Repositories
                     role = role,
                     revisionId = revisionId,
                     reqNode = reqNode,
-                    reqNodeId = reqNodeId
+                    reqNodeId = reqNodeId,
+                    startDate = startDate,
+                    endDate = endDate
                 };
 
                 var profiles = new List<SearchProfileDto>();
@@ -720,7 +1039,7 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
-        public async Task<GetProfileByKeycloakIdRootAddTotalDto> SearchProfile(string? citizenId, string? firstName, string? lastName, string accessToken, int page, int pageSize, string? role, string? nodeId, int? node)
+        public async Task<GetProfileByKeycloakIdRootAddTotalDto> SearchProfile(string? citizenId, string? firstName, string? lastName, string accessToken, int page, int pageSize, string? role, string? nodeId, int? node,string? selectedNodeId,int? selectedNode )
         {
             try
             {
@@ -736,6 +1055,8 @@ namespace BMA.EHR.Application.Repositories
                     node = node,
                     page = page,
                     pageSize = pageSize,
+                    selectedNodeId = selectedNodeId,
+                    selectedNode = selectedNode
                 };
 
                 var profiles = new List<GetProfileByKeycloakIdRootDto>();
@@ -938,7 +1259,7 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
-        public GetOrganizationResponseDTO? GetOc(Guid ocId, int level, string? accessToken)
+        public GetOrganizationResponseDTO? GetOcByNodeId(Guid ocId, int level, string? accessToken)
         {
             try
             {
@@ -969,6 +1290,38 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
+
+        public GetOrganizationResponseDTO? GetOc(Guid ocId, int level, string? accessToken)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/find/allv2";
+                var apiKey = _configuration["API_KEY"];
+                var body = new
+                {
+                    nodeId = ocId,
+                    node = level
+
+                };
+
+                var apiResult = PostExternalAPIAsync(apiPath, accessToken ?? "", body, apiKey).Result;
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetOrganizationResponseResultDTO>(apiResult);
+                    if (raw != null && raw.Result != null)
+                    {
+                        return raw.Result;
+                    }
+                }
+
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
         public GetProfileByIdDto GetOfficerProfileById(Guid id, string? accessToken)
         {
             try
diff --git a/BMA.EHR.Application/Responses/Leaves/GetPermissionWithActingDto.cs b/BMA.EHR.Application/Responses/Leaves/GetPermissionWithActingDto.cs
new file mode 100644
index 00000000..083c4b20
--- /dev/null
+++ b/BMA.EHR.Application/Responses/Leaves/GetPermissionWithActingDto.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BMA.EHR.Domain.Shared;
+using Newtonsoft.Json;
+
+namespace BMA.EHR.Application.Responses.Leaves
+{
+    public class GetPermissionWithActingDto
+    {
+        public string privilege {get; set;} = string.Empty;
+        public bool isAct {get; set;} = false;
+        public List<ActingPermission> posMasterActs {get; set;} = new();
+    }
+
+    public class ActingPermission
+    {
+        public string posNo {get; set;} = string.Empty;
+        //public string? privilege {get; set;} = "PARENT";
+        [JsonConverter(typeof(PrivilegeConverter))]
+        public string privilege {get; set;} = "CHILD";
+
+        public Guid? rootDnaId {get; set;}
+        public Guid? child1DnaId {get; set;}
+        public Guid? child2DnaId {get; set;}
+        public Guid? child3DnaId {get; set;}
+        public Guid? child4DnaId {get; set;}
+    }
+
+    public class GetPermissionWithActingResultDto
+    {
+        public int status {get; set;} = 0;
+        public string message {get; set;} = string.Empty;
+        public GetPermissionWithActingDto result {get; set;} = new();
+    }
+}
\ No newline at end of file
diff --git a/BMA.EHR.Application/Responses/Leaves/GetProfileLeaveByKeycloakDto.cs b/BMA.EHR.Application/Responses/Leaves/GetProfileLeaveByKeycloakDto.cs
index 52a9b948..9d13d834 100644
--- a/BMA.EHR.Application/Responses/Leaves/GetProfileLeaveByKeycloakDto.cs
+++ b/BMA.EHR.Application/Responses/Leaves/GetProfileLeaveByKeycloakDto.cs
@@ -2,19 +2,27 @@
 {
     public class GetProfileLeaveByKeycloakDto
     {
+        public string ProfileType { get; set; }
+        public string Prefix { get; set; }
+        public string FirstName { get; set; }
+        public string LastName { get; set; }
+        public string CitizenId { get; set; }
         public DateTime BirthDate { get; set; }
         public DateTime RetireDate { get; set; }
         public string GovAge { get; set; } = string.Empty;
         public string Age { get; set; } = string.Empty;
         public DateTime DateAppoint { get; set; }
         public DateTime DateCurrent { get; set; }
-        public int Amount { get; set; }
+        public int? Amount { get; set; } = 0;
         public string? TelephoneNumber { get; set; } = string.Empty;
-        public string PositionName { get; set; } = string.Empty;
+        public string Position { get; set; } = string.Empty;
         public string PosLevel { get; set; } = string.Empty;
         public string PosType { get; set; } = string.Empty;
+        public string? PositionLeaveName { get; set; }
+        public string? PosExecutiveName { get; set; }
         public string CurrentAddress { get; set; } = string.Empty;
         public string Oc { get; set; } = string.Empty;
+        public bool isCommission { get; set; } = false;
         public string Root { get; set; } = string.Empty;
         public string? Child1 { get; set; }
         public string? Child2 { get; set; }
diff --git a/BMA.EHR.Application/Responses/Profiles/GetOcStaff.cs b/BMA.EHR.Application/Responses/Profiles/GetOcStaff.cs
new file mode 100644
index 00000000..fa3ce936
--- /dev/null
+++ b/BMA.EHR.Application/Responses/Profiles/GetOcStaff.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BMA.EHR.Application.Responses.Profiles
+{
+    public class GetOcStaff
+    {
+        public Guid ProfileId { get; set; }
+        public Guid Keycloak { get; set; }
+        public string FullName { get; set; } = null!;
+        public Guid? RootId { get; set; }
+        public Guid? OrgChild1Id { get; set; }
+        public Guid? OrgChild2Id { get; set; }
+        public Guid? OrgChild3Id { get; set; }
+        public Guid? OrgChild4Id { get; set; }
+        public Guid? RootDnaId { get; set; }
+        public Guid? Child1DnaId { get; set; }
+        public Guid? Child2DnaId { get; set; }
+        public Guid? Child3DnaId { get; set; }
+        public Guid? Child4DnaId { get; set; }
+
+    }
+
+    public class GetOcStaffResultDto
+    {
+        public string Message { get; set; } = string.Empty;
+
+        public int Status { get; set; } = -1;
+
+        public List<GetOcStaff> Result { get; set; } = new();
+
+    }
+}
\ No newline at end of file
diff --git a/BMA.EHR.Application/Responses/Profiles/GetProfileByKeycloakIdDto.cs b/BMA.EHR.Application/Responses/Profiles/GetProfileByKeycloakIdDto.cs
index bb377f3e..8e319904 100644
--- a/BMA.EHR.Application/Responses/Profiles/GetProfileByKeycloakIdDto.cs
+++ b/BMA.EHR.Application/Responses/Profiles/GetProfileByKeycloakIdDto.cs
@@ -44,6 +44,8 @@ namespace BMA.EHR.Application.Responses.Profiles
         public string? ProfileType { get; set; }
         public bool? IsLeave { get; set; }
 
+        public bool? IsProbation { get; set; }
+
         public string? Root { get; set; }
         public string? Child1 { get; set; }
         public string? Child2 { get; set; }
@@ -80,6 +82,8 @@ namespace BMA.EHR.Application.Responses.Profiles
         public string? CurrentZipCode { get; set; }
 
         public string? PositionLeaveName { get; set; }
+       
+        public string? PosExecutiveName { get; set; }
 
         public string? CommanderPositionName { get; set; } = string.Empty;
 
diff --git a/BMA.EHR.Application/Responses/Profiles/GetProfileByKeycloakIdRootDto.cs b/BMA.EHR.Application/Responses/Profiles/GetProfileByKeycloakIdRootDto.cs
index 1110ca9e..2eff51dd 100644
--- a/BMA.EHR.Application/Responses/Profiles/GetProfileByKeycloakIdRootDto.cs
+++ b/BMA.EHR.Application/Responses/Profiles/GetProfileByKeycloakIdRootDto.cs
@@ -25,6 +25,12 @@ namespace BMA.EHR.Application.Responses.Profiles
         public DateTime? DateStart { get; set; }
 
         public DateTime? DateAppoint { get; set; }
+
+        public string? RootDnaId { get; set; }
+        public string? Child1DnaId { get; set; }
+        public string? Child2DnaId { get; set; }
+        public string? Child3DnaId { get; set; }
+        public string? Child4DnaId { get; set; }
     }
 
     public class GetProfileByKeycloakIdRootAddTotalDto
diff --git a/BMA.EHR.CheckInConsumer/Program.cs b/BMA.EHR.CheckInConsumer/Program.cs
index 1a5a68d1..0ae439cf 100644
--- a/BMA.EHR.CheckInConsumer/Program.cs
+++ b/BMA.EHR.CheckInConsumer/Program.cs
@@ -95,7 +95,6 @@ async Task CallRestApi(string requestData)
     }
 }
 
-
 public class ResponseObject
 {
     [JsonPropertyName("status")]
diff --git a/BMA.EHR.CheckInConsumer/appsettings.json b/BMA.EHR.CheckInConsumer/appsettings.json
index b180f90c..76f86c86 100644
--- a/BMA.EHR.CheckInConsumer/appsettings.json
+++ b/BMA.EHR.CheckInConsumer/appsettings.json
@@ -1,9 +1,9 @@
 {
-    "Rabbit": {
-        "Host": "192.168.1.40",
-        "User": "admin",
-        "Password": "Test123456",
-        "Queue": "bma-checkin-queue"
-    },
-    "API": "https://localhost:7283/api/v1"
-}
\ No newline at end of file
+  "Rabbit": {
+    "Host": "192.168.1.63",
+    "User": "admin",
+    "Password": "12345678",
+    "Queue": "hrms-checkin-queue-dev"
+  },
+  "API": "https://localhost:7283/api/v1"
+}
diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs
index a9d14a71..619756c2 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs
@@ -93,7 +93,8 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
         public async Task<ActionResult<ResponseObject>> GetDisciplineUser(string status = "ALL", string type = "ALL", int year = 0, int page = 1, int pageSize = 25, string keyword = "", string? sortBy = null, bool descending = false)
         {
             var id = "";
-            var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+            //var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+            var apiUrl = $"{_configuration["API"]}/org/dotnet/get-profileId";
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
@@ -357,7 +358,8 @@ 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 apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+            var apiUrl = $"{_configuration["API"]}/org/dotnet/get-profileId";
             var id = "";
             var type = "";
             using (var client = new HttpClient())
@@ -784,7 +786,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -824,11 +826,11 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
                 data_search = data_search
                     .Where(x => x.rootDnaId == nodeId).ToList();
             }
-            else if (role == "PARENT")
-            {
-                data_search = data_search
-                    .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     data_search = data_search
+            //         .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 data_search = data_search.Where(x =>
diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineDirectorController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineDirectorController.cs
index 202eaa44..c4bd24ae 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineDirectorController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineDirectorController.cs
@@ -392,7 +392,7 @@ namespace BMA.EHR.DisciplineDirector.Service.Controllers
                 return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
 
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, token.Replace("Bearer ", ""));
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNewAsync(userId, token.Replace("Bearer ", ""));
             if (profile == null)
                 return Error(GlobalMessages.DataNotFound);
 
diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
index e5be6189..85388209 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
@@ -1242,14 +1242,22 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpPost("command25/report")]
-        public async Task<ActionResult<ResponseObject>> PostReportCommand25([FromBody] ReportPersonRequest req)
+        public async Task<ActionResult<ResponseObject>> PostReportCommand25([FromBody] ReportPersonAndCommandRequest req)
         {
             try
             {
                 var data = await _context.DisciplineReport_Profiles
                             .Where(x => req.refIds.Contains(x.Id.ToString()))
                             .ToListAsync();
-                data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
+                // data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
+                data.ForEach(profile =>
+                {
+                    profile.Status = !string.IsNullOrEmpty(req.status) 
+                        ? req.status.Trim().ToUpper() : null;
+                    profile.CommandTypeId = !string.IsNullOrEmpty(req.commandTypeId) && Guid.TryParse(req.commandTypeId, out var cmdTypeId) 
+                        ? cmdTypeId : null;
+                    profile.CommandCode = req.commandCode ?? null;
+                });
                 await _context.SaveChangesAsync();
                 return Success();
             }
@@ -1276,7 +1284,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                             .Where(x => req.refIds.Contains(x.Id.ToString()))
                             // .Where(x => x.Status.ToUpper() == "REPORT")
                             .ToListAsync();
-                data.ForEach(profile => profile.Status = "PENDING");
+                // data.ForEach(profile => profile.Status = "PENDING");
+                data.ForEach(profile =>
+                {
+                    profile.Status = "PENDING";
+                    profile.CommandTypeId = null;
+                    profile.CommandCode = null;
+                });
                 await _context.SaveChangesAsync();
                 return Success();
             }
@@ -1429,14 +1443,22 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpPost("command26/report")]
-        public async Task<ActionResult<ResponseObject>> PostReportCommand26([FromBody] ReportPersonRequest req)
+        public async Task<ActionResult<ResponseObject>> PostReportCommand26([FromBody] ReportPersonAndCommandRequest req)
         {
             try
             {
                 var data = await _context.DisciplineReport_Profiles
                             .Where(x => req.refIds.Contains(x.Id.ToString()))
                             .ToListAsync();
-                data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
+                // data.ForEach(profile => profile.Status = req.status.Trim().ToUpper());
+                data.ForEach(profile =>
+                {
+                    profile.Status = !string.IsNullOrEmpty(req.status)
+                        ? req.status.Trim().ToUpper() : null;
+                    profile.CommandTypeId = !string.IsNullOrEmpty(req.commandTypeId) && Guid.TryParse(req.commandTypeId, out var cmdTypeId)
+                        ? cmdTypeId : null;
+                    profile.CommandCode = req.commandCode ?? null;
+                });
                 await _context.SaveChangesAsync();
                 return Success();
             }
@@ -1463,7 +1485,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                             .Where(x => req.refIds.Contains(x.Id.ToString()))
                             // .Where(x => x.Status.ToUpper() == "REPORT")
                             .ToListAsync();
-                data.ForEach(profile => profile.Status = "PENDING");
+                // data.ForEach(profile => profile.Status = "PENDING");
+                data.ForEach(profile =>
+                {
+                    profile.Status = "PENDING";
+                    profile.CommandTypeId = null;
+                    profile.CommandCode = null;
+                });
                 await _context.SaveChangesAsync();
                 return Success();
             }
diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs
index 732c518b..3e171f9b 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs
@@ -71,6 +71,13 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
+
+            // ถ้า FE ส่ง status = PENDING กรอง start/end suspend not null
+            bool isPending =
+                !string.IsNullOrEmpty(profileType) &&
+                !string.IsNullOrEmpty(status) &&
+                status.Trim().ToUpper() == "PENDING";
+
             // กรองสิทธิ์
             string role = jsonData["result"]?.ToString() ?? "";
             var nodeId = string.Empty;
@@ -102,14 +109,14 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
             var data_search = (from x in _context.DisciplineReport_Profiles.Include(x => x.DisciplineDisciplinary)
                                where
                                (
-                                endDate != null &&  startDate != null?
+                                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) ||
@@ -137,14 +144,19 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
                                (
                                     !string.IsNullOrEmpty(status) ? x.Status!.Trim().ToUpper() == status : true
                                )
+                               // ถ้า FE ส่ง status = PENDING กรอง start/end suspend not null
+                               &&
+                               (
+                                    isPending
+                                        ? x.StartDateSuspend != null && x.EndDateSuspend != null
+                                        : true
+                               )
                                &&
                                (
                                     role == "OWNER"
                                         ? true
                                     : role == "ROOT"
                                         ? x.rootDnaId == nodeId
-                                    : role == "PARENT"
-                                        ? x.rootDnaId == nodeId && x.child1DnaId != null
                                     : role == "CHILD"
                                         ? (
                                             profileAdmin.Node == 4 ? x.child4DnaId == nodeId :
@@ -177,125 +189,119 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
                                 )
                                select x).ToList();
             var query = data_search
-                            .Select(x => new
-                            {
-                                Id = x.Id,
-                                CitizenId = x.CitizenId,
-                                Prefix = x.Prefix,
-                                FirstName = x.FirstName,
-                                LastName = x.LastName,
-                                ProfileId = x.PersonId,
-                                Organization = x.Organization,
-                                root = x.root,
-                                rootId = x.rootId,
-                                rootDnaId = x.rootDnaId,
-                                rootShortName = x.rootShortName,
-                                child1 = x.child1,
-                                child1Id = x.child1Id,
-                                child1DnaId = x.child1DnaId,
-                                child1ShortName = x.child1ShortName,
-                                child2 = x.child2,
-                                child2Id = x.child2Id,
-                                child2DnaId = x.child2DnaId,
-                                child2ShortName = x.child2ShortName,
-                                child3 = x.child3,
-                                child3Id = x.child3Id,
-                                child3DnaId = x.child3DnaId,
-                                child3ShortName = x.child3ShortName,
-                                child4 = x.child4,
-                                child4Id = x.child4Id,
-                                child4DnaId = x.child4DnaId,
-                                child4ShortName = x.child4ShortName,
-                                posMasterNo = x.posMasterNo,
-                                posTypeId = x.posTypeId,
-                                posTypeName = x.posTypeName,
-                                posLevelId = x.posLevelId,
-                                posLevelName = x.posLevelName,
+                .Select(x => new
+                {
+                    Id = x.Id,
+                    CitizenId = x.CitizenId,
+                    Prefix = x.Prefix,
+                    FirstName = x.FirstName,
+                    LastName = x.LastName,
+                    ProfileId = x.PersonId,
+                    Organization = x.Organization,
+                    root = x.root,
+                    rootId = x.rootId,
+                    rootDnaId = x.rootDnaId,
+                    rootShortName = x.rootShortName,
+                    child1 = x.child1,
+                    child1Id = x.child1Id,
+                    child1DnaId = x.child1DnaId,
+                    child1ShortName = x.child1ShortName,
+                    child2 = x.child2,
+                    child2Id = x.child2Id,
+                    child2DnaId = x.child2DnaId,
+                    child2ShortName = x.child2ShortName,
+                    child3 = x.child3,
+                    child3Id = x.child3Id,
+                    child3DnaId = x.child3DnaId,
+                    child3ShortName = x.child3ShortName,
+                    child4 = x.child4,
+                    child4Id = x.child4Id,
+                    child4DnaId = x.child4DnaId,
+                    child4ShortName = x.child4ShortName,
+                    posMasterNo = x.posMasterNo,
+                    posTypeId = x.posTypeId,
+                    posTypeName = x.posTypeName,
+                    posLevelId = x.posLevelId,
+                    posLevelName = x.posLevelName,
 
-                                Position = x.Position,
-                                PosNo = x.PosNo,
-                                PositionLevel = x.PositionLevel == null ? "" : x.PositionLevel,
-                                PositionType = x.PositionType == null ? "" : x.PositionType,
-                                Salary = x.Salary,
-                                Status = x.Status,
-                                DescriptionSuspend = x.DescriptionSuspend,
-                                StartDateSuspend = x.StartDateSuspend,
-                                EndDateSuspend = x.EndDateSuspend,
-                                Title = x.DisciplineDisciplinary.Title,
-                                OffenseDetails = x.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
-                                DisciplinaryFaultLevel = x.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
-                                DisciplinaryCaseFault = x.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
-                                profileType = x.profileType,
-                                CreatedAt = x.CreatedAt,
-                            });
+                    Position = x.Position,
+                    PosNo = x.PosNo,
+                    PositionLevel = x.PositionLevel == null ? "" : x.PositionLevel,
+                    PositionType = x.PositionType == null ? "" : x.PositionType,
+                    Salary = x.Salary,
+                    Status = x.Status,
+                    DescriptionSuspend = x.DescriptionSuspend,
+                    StartDateSuspend = x.StartDateSuspend,
+                    EndDateSuspend = x.EndDateSuspend,
+                    Title = x.DisciplineDisciplinary.Title,
+                    OffenseDetails = x.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
+                    DisciplinaryFaultLevel = x.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
+                    DisciplinaryCaseFault = x.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
+                    profileType = x.profileType,
+                    CreatedAt = x.CreatedAt,
+                });
 
-                            bool desc = descending ?? false;
-                            if (!string.IsNullOrEmpty(sortBy))
-                            {
-                                if (sortBy == "title")
-                                {
-                                    query = desc ? query.OrderByDescending(x => x.Title)
-                                                    : query.OrderBy(x => x.Title);
-                                }
-                                else if (sortBy == "prefix" || sortBy == "firstName" || sortBy == "lastName")
-                                {
-                                   query = desc ? 
-                                        query
-                                        //.OrderByDescending(x => x.Prefix)
-                                        .OrderByDescending(x => x.FirstName)
-                                        .ThenByDescending(x => x.LastName) :
-                                        query
-                                        //.OrderBy(x => x.Prefix)
-                                        .OrderBy(x => x.FirstName)
-                                        .ThenBy(x => x.LastName);
-                                }
-                                else if (sortBy == "position")
-                                {
-                                    query = desc ? query.OrderByDescending(x => x.Position)
-                                                    : query.OrderBy(x => x.Position);
-                                }
-                                else if (sortBy == "positionType" || sortBy == "positionLevel")
-                                {
-                                    query = desc ? 
-                                        query
-                                        .OrderByDescending(x => x.PositionType)
-                                        .ThenByDescending(x => x.PositionLevel) : 
-                                        query
-                                        .OrderBy(x => x.PositionType)
-                                        .ThenBy(x => x.PositionLevel);
-                                }
-                                else if (sortBy == "organization")
-                                {
-                                    query = desc ? query.OrderByDescending(x => x.Organization)
-                                                    : query.OrderBy(x => x.Organization);
-                                }
-                                else if (sortBy == "startDateSuspend")
-                                {
-                                    query = desc ? query.OrderByDescending(x => x.StartDateSuspend)
-                                                    : query.OrderBy(x => x.StartDateSuspend);
-                                }
-                                else if (sortBy == "endDateSuspend")
-                                {
-                                    query = desc ? query.OrderByDescending(x => x.EndDateSuspend)
-                                                    : query.OrderBy(x => x.EndDateSuspend);
-                                }
-                                else if (sortBy == "descriptionSuspend")
-                                {
-                                    query = desc ? query.OrderByDescending(x => x.DescriptionSuspend)
-                                                    : query.OrderBy(x => x.DescriptionSuspend);
-                                }
-                                else
-                                {
-                                    query = query.OrderByDescending(x => x.profileType)
-                                                    .ThenByDescending(x => x.CreatedAt)
-                                                    .ThenByDescending(x => x.CitizenId);
-                                }
-                            }
+            bool desc = descending ?? false;
+            if (!string.IsNullOrEmpty(sortBy))
+            {
+                if (sortBy == "title")
+                {
+                    query = desc ? query.OrderByDescending(x => x.Title)
+                                    : query.OrderBy(x => x.Title);
+                }
+                else if (sortBy == "prefix" || sortBy == "firstName" || sortBy == "lastName")
+                {
+                    query = desc ?
+                        query.OrderByDescending(x => x.FirstName).ThenByDescending(x => x.LastName) :
+                        query.OrderBy(x => x.FirstName).ThenBy(x => x.LastName);
+                }
+                else if (sortBy == "position")
+                {
+                    query = desc ? query.OrderByDescending(x => x.Position)
+                                    : query.OrderBy(x => x.Position);
+                }
+                else if (sortBy == "positionType" || sortBy == "positionLevel")
+                {
+                    query = desc ?
+                        query
+                        .OrderByDescending(x => x.PositionType)
+                        .ThenByDescending(x => x.PositionLevel) :
+                        query
+                        .OrderBy(x => x.PositionType)
+                        .ThenBy(x => x.PositionLevel);
+                }
+                else if (sortBy == "organization")
+                {
+                    query = desc ? query.OrderByDescending(x => x.Organization)
+                                    : query.OrderBy(x => x.Organization);
+                }
+                else if (sortBy == "startDateSuspend")
+                {
+                    query = desc ? query.OrderByDescending(x => x.StartDateSuspend)
+                                    : query.OrderBy(x => x.StartDateSuspend);
+                }
+                else if (sortBy == "endDateSuspend")
+                {
+                    query = desc ? query.OrderByDescending(x => x.EndDateSuspend)
+                                    : query.OrderBy(x => x.EndDateSuspend);
+                }
+                else if (sortBy == "descriptionSuspend")
+                {
+                    query = desc ? query.OrderByDescending(x => x.DescriptionSuspend)
+                                    : query.OrderBy(x => x.DescriptionSuspend);
+                }
+                else
+                {
+                    query = query.OrderByDescending(x => x.profileType)
+                                    .ThenByDescending(x => x.CreatedAt)
+                                    .ThenByDescending(x => x.CitizenId);
+                }
+            }
 
-                           var data = query
-                            .Skip((page - 1) * pageSize)
-                            .Take(pageSize)
-                            .ToList();
+            var data = query
+                .Skip((page - 1) * pageSize)
+                .Take(pageSize)
+                .ToList();
 
             return Success(new { data, total = data_search.Count() });
         }
diff --git a/BMA.EHR.Discipline.Service/Requests/ReportPersonRequest.cs b/BMA.EHR.Discipline.Service/Requests/ReportPersonRequest.cs
index 1bd61c56..f7a16efc 100644
--- a/BMA.EHR.Discipline.Service/Requests/ReportPersonRequest.cs
+++ b/BMA.EHR.Discipline.Service/Requests/ReportPersonRequest.cs
@@ -8,4 +8,12 @@ namespace BMA.EHR.Discipline.Service.Requests
         public string[] refIds { get; set; }
         public string? status { get; set; }
     }
+
+    public class ReportPersonAndCommandRequest
+    {
+        public string[] refIds { get; set; }
+        public string? status { get; set; }
+        public string? commandTypeId { get; set; }
+        public string? commandCode { get; set; }
+    }
 }
diff --git a/BMA.EHR.Domain/Common/BaseController.cs b/BMA.EHR.Domain/Common/BaseController.cs
index 44d8dac0..26f71bf5 100644
--- a/BMA.EHR.Domain/Common/BaseController.cs
+++ b/BMA.EHR.Domain/Common/BaseController.cs
@@ -1,4 +1,5 @@
-using BMA.EHR.Domain.Shared;
+using BMA.EHR.Domain.Extensions;
+using BMA.EHR.Domain.Shared;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
@@ -81,6 +82,20 @@ namespace BMA.EHR.Domain.Common
         }
 
 
+        #endregion
+
+        #region " Properties "
+
+        protected string? EmpType => User.GetEmpType();
+        protected Guid? OrgChild1DnaId => User.GetOrgChild1DnaId();
+        protected Guid? OrgChild2DnaId => User.GetOrgChild2DnaId();
+        protected Guid? OrgChild3DnaId => User.GetOrgChild3DnaId();
+        protected Guid? OrgChild4DnaId => User.GetOrgChild4DnaId();
+        protected Guid? OrgRootDnaId => User.GetOrgRootDnaId();
+        protected Guid? ProfileId => User.GetProfileId();
+        protected string? Prefix => User.GetPrefix();
+        protected string? FullNameFromClaim => User.GetName();
+
         #endregion
 
         #endregion
diff --git a/BMA.EHR.Domain/Common/TokenUserInfo.cs b/BMA.EHR.Domain/Common/TokenUserInfo.cs
new file mode 100644
index 00000000..cdae6fb1
--- /dev/null
+++ b/BMA.EHR.Domain/Common/TokenUserInfo.cs
@@ -0,0 +1,39 @@
+namespace BMA.EHR.Domain.Common
+{
+    public class TokenUserInfo
+    {
+        // Existing properties
+        public string KeycloakId { get; set; } = string.Empty;
+        public string? PreferredUsername { get; set; }
+        public string? GivenName { get; set; }
+        public string? FamilyName { get; set; }
+
+        // New properties to add
+        public string? EmpType { get; set; }
+        public Guid? OrgChild1DnaId { get; set; }
+        public Guid? OrgChild2DnaId { get; set; }
+        public Guid? OrgChild3DnaId { get; set; }
+        public Guid? OrgChild4DnaId { get; set; }
+        public Guid? OrgRootDnaId { get; set; }
+        public Guid? ProfileId { get; set; }
+        public string? Prefix { get; set; }
+        public string? Name { get; set; }
+    }
+
+    // Claim type constants
+    public static class BmaClaimTypes
+    {
+        public const string EmpType = "empType";
+        public const string OrgChild1DnaId = "orgChild1DnaId";
+        public const string OrgChild2DnaId = "orgChild2DnaId";
+        public const string OrgChild3DnaId = "orgChild3DnaId";
+        public const string OrgChild4DnaId = "orgChild4DnaId";
+        public const string OrgRootDnaId = "orgRootDnaId";
+        public const string ProfileId = "profileId";
+        public const string Prefix = "prefix";
+        public const string Name = "name";
+        public const string GivenName = "given_name";
+        public const string FamilyName = "family_name";
+        public const string PreferredUsername = "preferred_username";
+    }
+}
diff --git a/BMA.EHR.Domain/Extensions/ClaimsPrincipalExtensions.cs b/BMA.EHR.Domain/Extensions/ClaimsPrincipalExtensions.cs
new file mode 100644
index 00000000..26a7c189
--- /dev/null
+++ b/BMA.EHR.Domain/Extensions/ClaimsPrincipalExtensions.cs
@@ -0,0 +1,30 @@
+using BMA.EHR.Domain.Common;
+using System.Security.Claims;
+
+namespace BMA.EHR.Domain.Extensions
+{
+    public static class ClaimsPrincipalExtensions
+    {
+        public static string? GetClaimValue(this ClaimsPrincipal user, string claimType)
+        {
+            return user?.FindFirst(claimType)?.Value;
+        }
+
+        public static Guid? GetGuidClaim(this ClaimsPrincipal user, string claimType)
+        {
+            var value = user?.GetClaimValue(claimType);
+            return Guid.TryParse(value, out var guid) ? guid : null;
+        }
+
+        // Convenience methods for common claims
+        public static string? GetEmpType(this ClaimsPrincipal user) => user.GetClaimValue(BmaClaimTypes.EmpType);
+        public static Guid? GetOrgChild1DnaId(this ClaimsPrincipal user) => user.GetGuidClaim(BmaClaimTypes.OrgChild1DnaId);
+        public static Guid? GetOrgChild2DnaId(this ClaimsPrincipal user) => user.GetGuidClaim(BmaClaimTypes.OrgChild2DnaId);
+        public static Guid? GetOrgChild3DnaId(this ClaimsPrincipal user) => user.GetGuidClaim(BmaClaimTypes.OrgChild3DnaId);
+        public static Guid? GetOrgChild4DnaId(this ClaimsPrincipal user) => user.GetGuidClaim(BmaClaimTypes.OrgChild4DnaId);
+        public static Guid? GetOrgRootDnaId(this ClaimsPrincipal user) => user.GetGuidClaim(BmaClaimTypes.OrgRootDnaId);
+        public static Guid? GetProfileId(this ClaimsPrincipal user) => user.GetGuidClaim(BmaClaimTypes.ProfileId);
+        public static string? GetPrefix(this ClaimsPrincipal user) => user.GetClaimValue(BmaClaimTypes.Prefix);
+        public static string? GetName(this ClaimsPrincipal user) => user.GetClaimValue(BmaClaimTypes.Name);
+    }
+}
diff --git a/BMA.EHR.Domain/Extensions/DateTimeExtension.cs b/BMA.EHR.Domain/Extensions/DateTimeExtension.cs
index a6a07c79..bbfc0a12 100644
--- a/BMA.EHR.Domain/Extensions/DateTimeExtension.cs
+++ b/BMA.EHR.Domain/Extensions/DateTimeExtension.cs
@@ -174,6 +174,29 @@ namespace BMA.EHR.Domain.Extensions
             }
         }
 
+        public static (int Years, int Months, int Days) GetDifference(this DateTime from, DateTime to)
+        {
+            if (from > to) (from, to) = (to, from); // swap ถ้าลำดับสลับ
+
+            int years = to.Year - from.Year;
+            int months = to.Month - from.Month;
+            int days = to.Day - from.Day;
+
+            if (days < 0)
+            {
+                months--;
+                days += DateTime.DaysInMonth(to.Year, to.Month == 1 ? 12 : to.Month - 1);
+            }
+
+            if (months < 0)
+            {
+                years--;
+                months += 12;
+            }
+
+            return (years, months, days);
+        }
+
         public static int CalculateAge(this DateTime date, int plusYear = 0, int subtractYear = 0)
         {
             try
diff --git a/BMA.EHR.Domain/Middlewares/CombinedErrorHandlerAndLoggingMiddleware.cs b/BMA.EHR.Domain/Middlewares/CombinedErrorHandlerAndLoggingMiddleware.cs
index a9de25fc..4216fa43 100644
--- a/BMA.EHR.Domain/Middlewares/CombinedErrorHandlerAndLoggingMiddleware.cs
+++ b/BMA.EHR.Domain/Middlewares/CombinedErrorHandlerAndLoggingMiddleware.cs
@@ -18,6 +18,10 @@ namespace BMA.EHR.Domain.Middlewares
     {
         private readonly RequestDelegate _next;
         private readonly IConfiguration _configuration;
+        private static ElasticClient? _elasticClient;
+        private static readonly object _lock = new object();
+        private static readonly Dictionary<string, (GetProfileByKeycloakIdLocal Profile, DateTime ExpiryTime)> _profileCache = new();
+        private static readonly TimeSpan _cacheExpiry = TimeSpan.FromMinutes(10);
 
         private string Uri = "";
         private string IndexFormat = "";
@@ -31,19 +35,28 @@ namespace BMA.EHR.Domain.Middlewares
             Uri = _configuration["ElasticConfiguration:Uri"] ?? "http://192.168.1.40:9200";
             IndexFormat = _configuration["ElasticConfiguration:IndexFormat"] ?? "bma-ehr-log-index";
             SystemName = _configuration["ElasticConfiguration:SystemName"] ?? "Unknown";
+
+            // สร้าง ElasticClient แค่ครั้งเดียว
+            if (_elasticClient == null)
+            {
+                lock (_lock)
+                {
+                    if (_elasticClient == null)
+                    {
+                        var settings = new ConnectionSettings(new Uri(Uri))
+                            .DefaultIndex(IndexFormat)
+                            .DisableDirectStreaming() // เพิ่มประสิทธิภาพ
+                            .RequestTimeout(TimeSpan.FromSeconds(5)); // กำหนด timeout
+                        _elasticClient = new ElasticClient(settings);
+                    }
+                }
+            }
         }
 
         public async Task Invoke(HttpContext context)
         {
-            Console.WriteLine("=== CombinedErrorHandlerAndLoggingMiddleware Start ===");
-
-            var settings = new ConnectionSettings(new Uri(Uri))
-                .DefaultIndex(IndexFormat);
-            var client = new ElasticClient(settings);
-
             var startTime = DateTime.UtcNow;
             var stopwatch = Stopwatch.StartNew();
-            string? responseBodyJson = null;
             string? requestBodyJson = null;
             Exception? caughtException = null;
 
@@ -64,27 +77,41 @@ namespace BMA.EHR.Domain.Middlewares
                 string keycloakId = Guid.Empty.ToString("D");
                 var token = context.Request.Headers["Authorization"];
                 GetProfileByKeycloakIdLocal? pf = null;
+                var tokenUserInfo = await ExtractTokenUserInfoAsync(token);
 
-                // ลองดึง keycloakId จาก JWT token ก่อน (ถ้ามี)
-                try
-                {
-                    keycloakId = await ExtractKeycloakIdFromToken(token);
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine($"Error extracting keycloakId from token: {ex.Message}");
-                }
+                // Store tokenUserInfo in HttpContext.Items for controllers to use
+                context.Items["TokenUserInfo"] = tokenUserInfo;
 
-                try
+                // ดึง keycloakId จาก JWT token
+                keycloakId = tokenUserInfo.KeycloakId;
+
+                // ดึง profile จาก claims หรือ cache หรือ API
+                if (Guid.TryParse(keycloakId, out var parsedId) && parsedId != Guid.Empty)
                 {
-                    if (Guid.TryParse(keycloakId, out var parsedId) && parsedId != Guid.Empty)
+                    // Build profile from token claims if available
+                    if (tokenUserInfo.OrgRootDnaId.HasValue && tokenUserInfo.ProfileId.HasValue)
                     {
-                        pf = await GetProfileByKeycloakIdAsync(parsedId, token);
+                        pf = new GetProfileByKeycloakIdLocal
+                        {
+                            Id = tokenUserInfo.ProfileId.Value,
+                            CitizenId = tokenUserInfo.PreferredUsername,
+                            Prefix = tokenUserInfo.Prefix,
+                            FirstName = tokenUserInfo.GivenName,
+                            LastName = tokenUserInfo.FamilyName,
+                            RootDnaId = tokenUserInfo.OrgRootDnaId,
+                            Child1DnaId = tokenUserInfo.OrgChild1DnaId,
+                            Child2DnaId = tokenUserInfo.OrgChild2DnaId,
+                            Child3DnaId = tokenUserInfo.OrgChild3DnaId,
+                            Child4DnaId = tokenUserInfo.OrgChild4DnaId,
+                        };
+                        Console.WriteLine($"[INFO] Using claims for profile - OrgRootDnaId: {pf.RootDnaId}, ProfileId: {pf.Id}");
+                    }
+                    else
+                    {
+                        // Fallback to API only if critical claims are missing
+                        Console.WriteLine("[WARN] Critical claims missing, falling back to API call");
+                        pf = await GetProfileWithCacheAsync(parsedId, token);
                     }
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine($"Error getting profile: {ex.Message}");
                 }
 
                 try
@@ -103,17 +130,17 @@ namespace BMA.EHR.Domain.Middlewares
                             Console.WriteLine($"Updated keycloakId from authenticated user: {keycloakId}");
 
                             // อัพเดต profile ด้วย keycloakId ที่ถูกต้อง
-                            try
-                            {
-                                if (Guid.TryParse(keycloakId, out var parsedId))
-                                {
-                                    pf = await GetProfileByKeycloakIdAsync(parsedId, token);
-                                }
-                            }
-                            catch (Exception ex)
-                            {
-                                Console.WriteLine($"Error updating profile after authentication: {ex.Message}");
-                            }
+                            // try
+                            // {
+                            //     if (Guid.TryParse(keycloakId, out var parsedId))
+                            //     {
+                            //         //pf = await GetProfileByKeycloakIdAsync(parsedId, token);
+                            //     }
+                            // }
+                            // catch (Exception ex)
+                            // {
+                            //     Console.WriteLine($"Error updating profile after authentication: {ex.Message}");
+                            // }
                         }
                     }
 
@@ -142,14 +169,48 @@ namespace BMA.EHR.Domain.Middlewares
                 finally
                 {
                     stopwatch.Stop();
-                    await LogRequest(context, client, startTime, stopwatch, pf, keycloakId, requestBodyJson, memoryStream, caughtException);
-
-                    // เขียนข้อมูลกลับไปยัง original Response body
+                    
+                    // อ่านข้อมูล response ก่อนที่ stream จะถูก dispose
+                    string? responseBodyForLogging = null;
+                    if (memoryStream.Length > 0)
+                    {
+                        memoryStream.Seek(0, SeekOrigin.Begin);
+                        using var reader = new StreamReader(memoryStream, leaveOpen: true);
+                        responseBodyForLogging = await reader.ReadToEndAsync();
+                        memoryStream.Seek(0, SeekOrigin.Begin);
+                    }
+                    
+                    // เก็บข้อมูลที่จำเป็นจาก HttpContext ก่อนที่มันจะถูก dispose
+                    var logData = new
+                    {
+                        RemoteIpAddress = context.Connection.RemoteIpAddress?.ToString(),
+                        HostValue = context.Request.Host.Value,
+                        Method = context.Request.Method,
+                        Path = context.Request.Path.ToString(),
+                        QueryString = context.Request.QueryString.ToString(),
+                        StatusCode = context.Response.StatusCode,
+                        ContentType = context.Response.ContentType ?? ""
+                    };
+                    
+                    // เขียนข้อมูลกลับไปยัง original Response body ก่อน
                     if (memoryStream.Length > 0)
                     {
                         memoryStream.Seek(0, SeekOrigin.Begin);
                         await memoryStream.CopyToAsync(originalBodyStream);
                     }
+
+                    // ทำ logging แบบ await
+                    Console.WriteLine("[DEBUG] Starting logging...");
+                    try 
+                    { 
+                        await LogRequestAsync(_elasticClient!, startTime, stopwatch, pf, keycloakId, requestBodyJson, responseBodyForLogging, caughtException, logData);
+                        Console.WriteLine("[DEBUG] Logging completed successfully");
+                    } 
+                    catch (Exception ex) 
+                    { 
+                        Console.WriteLine($"[ERROR] Logging error: {ex.Message}");
+                        Console.WriteLine($"[ERROR] Stack trace: {ex.StackTrace}");
+                    }
                 }
             }
 
@@ -379,15 +440,16 @@ namespace BMA.EHR.Domain.Middlewares
             }
         }
 
-        private async Task LogRequest(HttpContext context, ElasticClient client, DateTime startTime, Stopwatch stopwatch,
-            GetProfileByKeycloakIdLocal? pf, string keycloakId, string? requestBodyJson, MemoryStream memoryStream, Exception? caughtException)
+        private async Task LogRequestAsync(ElasticClient client, DateTime startTime, Stopwatch stopwatch,
+            GetProfileByKeycloakIdLocal? pf, string keycloakId, string? requestBodyJson, string? responseBodyForLogging, Exception? caughtException, dynamic contextData)
         {
+            Console.WriteLine("[DEBUG] LogRequestAsync called");
             try
             {
                 var processTime = stopwatch.ElapsedMilliseconds;
                 var endTime = DateTime.UtcNow;
 
-                var statusCode = caughtException != null ? (int)HttpStatusCode.InternalServerError : context.Response.StatusCode;
+                var statusCode = caughtException != null ? (int)HttpStatusCode.InternalServerError : (int)contextData.StatusCode;
 
                 var logType = caughtException != null ? "error" : statusCode switch
                 {
@@ -399,58 +461,41 @@ namespace BMA.EHR.Domain.Middlewares
                 string? message = null;
                 string? responseBodyJson = null;
 
-                // อ่านข้อมูลจาก Response
-                if (memoryStream.Length > 0)
+                // ใช้ response body ที่ส่งมาจากการอ่านก่อนหน้า
+                if (!string.IsNullOrEmpty(responseBodyForLogging))
                 {
-                    memoryStream.Seek(0, SeekOrigin.Begin);
-                    var responseBody = new StreamReader(memoryStream).ReadToEnd();
+                    var contentType = (string)contextData.ContentType;
+                    var isFileResponse = !contentType.StartsWith("application/json") && !contentType.StartsWith("text/html") && (
+                        contentType.StartsWith("application/") ||
+                        contentType.StartsWith("image/") ||
+                        contentType.StartsWith("audio/")
+                    );
 
-                    if (!string.IsNullOrEmpty(responseBody))
+                    if (isFileResponse)
                     {
-                        var contentType = context.Response.ContentType;
-                        var isFileResponse = !contentType.StartsWith("application/json") && !contentType.StartsWith("text/html") && (
-                            contentType.StartsWith("application/") ||
-                            contentType.StartsWith("image/") ||
-                            contentType.StartsWith("audio/") ||
-                            context.Response.Headers.ContainsKey("Content-Disposition")
-                        );
-
-                        if (isFileResponse)
+                        responseBodyJson = "";
+                        message = "success";
+                    }
+                    else
+                    {
+                        // ใช้ response body ที่มีอยู่แล้วโดยไม่ serialize ซ้ำ
+                        responseBodyJson = responseBodyForLogging;
+                        
+                        try
                         {
-                            responseBodyJson = "";
-                            message = "success";
+                            var json = JsonSerializer.Deserialize<JsonElement>(responseBodyForLogging);
+                            if (json.ValueKind == JsonValueKind.Array)
+                            {
+                                message = "success";
+                            }
+                            else if (json.TryGetProperty("message", out var messageElement))
+                            {
+                                message = messageElement.GetString();
+                            }
                         }
-                        else
+                        catch
                         {
-                            try
-                            {
-                                var jsonOptions = new JsonSerializerOptions
-                                {
-                                    PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                                    Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-                                    WriteIndented = true,
-                                    Converters = { new DateTimeFixConverter() }
-                                };
-                                responseBodyJson = JsonSerializer.Serialize(JsonSerializer.Deserialize<object>(responseBody), jsonOptions);
-
-                                var json = JsonSerializer.Deserialize<JsonElement>(responseBody);
-                                if (json.ValueKind == JsonValueKind.Array)
-                                {
-                                    message = "success";
-                                }
-                                else
-                                {
-                                    if (json.TryGetProperty("message", out var messageElement))
-                                    {
-                                        message = messageElement.GetString();
-                                    }
-                                }
-                            }
-                            catch
-                            {
-                                responseBodyJson = responseBody;
-                                message = caughtException?.Message ?? "Unknown error";
-                            }
+                            message = caughtException?.Message ?? "Unknown error";
                         }
                     }
                 }
@@ -463,15 +508,16 @@ namespace BMA.EHR.Domain.Middlewares
                 var logData = new
                 {
                     logType = logType,
-                    ip = context.Connection.RemoteIpAddress?.ToString(),
-                    rootId = pf?.RootId,
+                    ip = (string)contextData.RemoteIpAddress,
+                    //rootId = pf?.RootId,
+                    rootId = pf?.RootDnaId,
                     systemName = SystemName,
                     startTimeStamp = startTime.ToString("o"),
                     endTimeStamp = endTime.ToString("o"),
                     processTime = processTime,
-                    host = context.Request.Host.Value,
-                    method = context.Request.Method,
-                    endpoint = context.Request.Path + context.Request.QueryString,
+                    host = (string)contextData.HostValue,
+                    method = (string)contextData.Method,
+                    endpoint = (string)contextData.Path + (string)contextData.QueryString,
                     responseCode = statusCode == 304 ? "200" : statusCode.ToString(),
                     responseDescription = message,
                     input = requestBodyJson,
@@ -482,11 +528,19 @@ namespace BMA.EHR.Domain.Middlewares
                     exception = caughtException?.ToString()
                 };
 
-                await client.IndexDocumentAsync(logData);
+                Console.WriteLine($"[DEBUG] Sending log to Elasticsearch: {logType} - {(string)contextData.Method} {(string)contextData.Path}");
+                var response = await client.IndexDocumentAsync(logData);
+                Console.WriteLine($"[DEBUG] Elasticsearch response: IsValid={response.IsValid}, Index={response.Index}");
+                
+                if (!response.IsValid)
+                {
+                    Console.WriteLine($"[ERROR] Elasticsearch error: {response.OriginalException?.Message ?? response.ServerError?.ToString()}");
+                }
             }
             catch (Exception ex)
             {
-                Console.WriteLine($"Error logging request: {ex.Message}");
+                Console.WriteLine($"[ERROR] Error logging request: {ex.Message}");
+                Console.WriteLine($"[ERROR] Stack trace: {ex.StackTrace}");
             }
         }
 
@@ -536,11 +590,19 @@ namespace BMA.EHR.Domain.Middlewares
 
         private async Task<string> ExtractKeycloakIdFromToken(string? authorizationHeader)
         {
+            var tokenInfo = await ExtractTokenUserInfoAsync(authorizationHeader);
+            return tokenInfo.KeycloakId;
+        }
+
+        private async Task<TokenUserInfo> ExtractTokenUserInfoAsync(string? authorizationHeader)
+        {
+            var defaultResult = new TokenUserInfo { KeycloakId = Guid.Empty.ToString("D") };
+            
             try
             {
                 if (string.IsNullOrEmpty(authorizationHeader) || !authorizationHeader.StartsWith("Bearer "))
                 {
-                    return Guid.Empty.ToString("D");
+                    return defaultResult;
                 }
 
                 var token = authorizationHeader.Replace("Bearer ", "");
@@ -549,7 +611,7 @@ namespace BMA.EHR.Domain.Middlewares
                 var parts = token.Split('.');
                 if (parts.Length != 3)
                 {
-                    return Guid.Empty.ToString("D");
+                    return defaultResult;
                 }
 
                 // Decode Base64Url payload (JWT uses Base64Url encoding, not standard Base64)
@@ -570,31 +632,136 @@ namespace BMA.EHR.Domain.Middlewares
 
                 Console.WriteLine($"JWT Payload: {payloadJson}");
 
-                // Parse JSON และดึง sub (subject) claim
+                // Parse JSON และดึง claims ต่างๆ
                 var jsonDoc = JsonDocument.Parse(payloadJson);
+                var result = new TokenUserInfo();
 
-                // ลองหา keycloak ID ใน claims ต่างๆ
-                string? keycloakId = null;
-
+                // ดึง keycloak ID
                 if (jsonDoc.RootElement.TryGetProperty("sub", out var subElement))
                 {
-                    keycloakId = subElement.GetString();
+                    result.KeycloakId = subElement.GetString() ?? Guid.Empty.ToString("D");
                 }
                 else if (jsonDoc.RootElement.TryGetProperty("nameid", out var nameidElement))
                 {
-                    keycloakId = nameidElement.GetString();
+                    result.KeycloakId = nameidElement.GetString() ?? Guid.Empty.ToString("D");
                 }
                 else if (jsonDoc.RootElement.TryGetProperty("user_id", out var userIdElement))
                 {
-                    keycloakId = userIdElement.GetString();
+                    result.KeycloakId = userIdElement.GetString() ?? Guid.Empty.ToString("D");
+                }
+                else
+                {
+                    result.KeycloakId = Guid.Empty.ToString("D");
                 }
 
-                return keycloakId ?? Guid.Empty.ToString("D");
+                // ดึง preferred_username
+                if (jsonDoc.RootElement.TryGetProperty("preferred_username", out var preferredUsernameElement))
+                {
+                    result.PreferredUsername = preferredUsernameElement.GetString();
+                    Console.WriteLine($"Extracted preferred_username: {result.PreferredUsername}");
+                }
+
+                // ดึง given_name
+                if (jsonDoc.RootElement.TryGetProperty("given_name", out var givenNameElement))
+                {
+                    result.GivenName = givenNameElement.GetString();
+                    Console.WriteLine($"Extracted given_name: {result.GivenName}");
+                }
+
+                // ดึง family_name
+                if (jsonDoc.RootElement.TryGetProperty("family_name", out var familyNameElement))
+                {
+                    result.FamilyName = familyNameElement.GetString();
+                    Console.WriteLine($"Extracted family_name: {result.FamilyName}");
+                }
+
+                // ดึง empType
+                if (jsonDoc.RootElement.TryGetProperty("empType", out var empTypeElement))
+                {
+                    result.EmpType = empTypeElement.GetString();
+                    Console.WriteLine($"Extracted empType: {result.EmpType}");
+                }
+
+                // ดึง orgChild1DnaId
+                if (jsonDoc.RootElement.TryGetProperty("orgChild1DnaId", out var orgChild1Element))
+                {
+                    if (Guid.TryParse(orgChild1Element.GetString(), out var orgChild1Guid))
+                    {
+                        result.OrgChild1DnaId = orgChild1Guid;
+                        Console.WriteLine($"Extracted orgChild1DnaId: {result.OrgChild1DnaId}");
+                    }
+                }
+
+                // ดึง orgChild2DnaId
+                if (jsonDoc.RootElement.TryGetProperty("orgChild2DnaId", out var orgChild2Element))
+                {
+                    if (Guid.TryParse(orgChild2Element.GetString(), out var orgChild2Guid))
+                    {
+                        result.OrgChild2DnaId = orgChild2Guid;
+                        Console.WriteLine($"Extracted orgChild2DnaId: {result.OrgChild2DnaId}");
+                    }
+                }
+
+                // ดึง orgChild3DnaId
+                if (jsonDoc.RootElement.TryGetProperty("orgChild3DnaId", out var orgChild3Element))
+                {
+                    if (Guid.TryParse(orgChild3Element.GetString(), out var orgChild3Guid))
+                    {
+                        result.OrgChild3DnaId = orgChild3Guid;
+                        Console.WriteLine($"Extracted orgChild3DnaId: {result.OrgChild3DnaId}");
+                    }
+                }
+
+                // ดึง orgChild4DnaId
+                if (jsonDoc.RootElement.TryGetProperty("orgChild4DnaId", out var orgChild4Element))
+                {
+                    if (Guid.TryParse(orgChild4Element.GetString(), out var orgChild4Guid))
+                    {
+                        result.OrgChild4DnaId = orgChild4Guid;
+                        Console.WriteLine($"Extracted orgChild4DnaId: {result.OrgChild4DnaId}");
+                    }
+                }
+
+                // ดึง orgRootDnaId
+                if (jsonDoc.RootElement.TryGetProperty("orgRootDnaId", out var orgRootElement))
+                {
+                    if (Guid.TryParse(orgRootElement.GetString(), out var orgRootGuid))
+                    {
+                        result.OrgRootDnaId = orgRootGuid;
+                        Console.WriteLine($"Extracted orgRootDnaId: {result.OrgRootDnaId}");
+                    }
+                }
+
+                // ดึง profileId
+                if (jsonDoc.RootElement.TryGetProperty("profileId", out var profileIdElement))
+                {
+                    if (Guid.TryParse(profileIdElement.GetString(), out var profileIdGuid))
+                    {
+                        result.ProfileId = profileIdGuid;
+                        Console.WriteLine($"Extracted profileId: {result.ProfileId}");
+                    }
+                }
+
+                // ดึง prefix
+                if (jsonDoc.RootElement.TryGetProperty("prefix", out var prefixElement))
+                {
+                    result.Prefix = prefixElement.GetString();
+                    Console.WriteLine($"Extracted prefix: {result.Prefix}");
+                }
+
+                // ดึง name
+                if (jsonDoc.RootElement.TryGetProperty("name", out var nameElement))
+                {
+                    result.Name = nameElement.GetString();
+                    Console.WriteLine($"Extracted name: {result.Name}");
+                }
+
+                return result;
             }
             catch (Exception ex)
             {
-                Console.WriteLine($"Error extracting keycloak ID from token: {ex.Message}");
-                return Guid.Empty.ToString("D");
+                Console.WriteLine($"Error extracting token user info: {ex.Message}");
+                return defaultResult;
             }
         }
 
@@ -625,7 +792,8 @@ namespace BMA.EHR.Domain.Middlewares
         {
             try
             {
-                var apiPath = $"{_configuration["API"]}/org/dotnet/keycloak/{keycloakId}";
+                //var apiPath = $"{_configuration["API"]}/org/dotnet/by-keycloak/{keycloakId}";
+                var apiPath = $"{_configuration["API"]}/org/dotnet/user-logs/{keycloakId}";
                 var apiKey = _configuration["API_KEY"];
 
                 var apiResult = await GetExternalAPIAsync(apiPath, accessToken ?? "", apiKey);
@@ -640,7 +808,58 @@ namespace BMA.EHR.Domain.Middlewares
             }
             catch
             {
-                throw;
+                return null;
+            }
+        }
+
+        private async Task<GetProfileByKeycloakIdLocal?> GetProfileWithCacheAsync(Guid keycloakId, string? accessToken)
+        {
+            var cacheKey = keycloakId.ToString();
+            
+            // ตรวจสอบ cache
+            lock (_profileCache)
+            {
+                if (_profileCache.TryGetValue(cacheKey, out var cached))
+                {
+                    if (cached.ExpiryTime > DateTime.UtcNow)
+                    {
+                        return cached.Profile;
+                    }
+                    // ลบ cache ที่หมดอายุ
+                    _profileCache.Remove(cacheKey);
+                }
+            }
+
+            // ดึงข้อมูลจาก API
+            try
+            {
+                var profile = await GetProfileByKeycloakIdAsync(keycloakId, accessToken);
+                if (profile != null)
+                {
+                    // เก็บใน cache
+                    lock (_profileCache)
+                    {
+                        _profileCache[cacheKey] = (profile, DateTime.UtcNow.Add(_cacheExpiry));
+                        
+                        // ลบ cache เก่าที่เกิน 1000 รายการ
+                        if (_profileCache.Count > 1000)
+                        {
+                            var expiredKeys = _profileCache
+                                .Where(x => x.Value.ExpiryTime < DateTime.UtcNow)
+                                .Select(x => x.Key)
+                                .ToList();
+                            foreach (var key in expiredKeys)
+                            {
+                                _profileCache.Remove(key);
+                            }
+                        }
+                    }
+                }
+                return profile;
+            }
+            catch
+            {
+                return null;
             }
         }
 
diff --git a/BMA.EHR.Domain/Models/Leave/Requests/LeaveBeginning.cs b/BMA.EHR.Domain/Models/Leave/Requests/LeaveBeginning.cs
index 9c459c69..153b7d22 100644
--- a/BMA.EHR.Domain/Models/Leave/Requests/LeaveBeginning.cs
+++ b/BMA.EHR.Domain/Models/Leave/Requests/LeaveBeginning.cs
@@ -24,12 +24,15 @@ namespace BMA.EHR.Domain.Models.Leave.Requests
         [Required, Comment("ปีงบประมาณ")]
         public int LeaveYear { get; set; } = 0;
 
-        [Required, Comment("จำนวนวันลายกมา")]
+        [Required, Comment("จำนวนวันลาทั้งหมด")]
         public double LeaveDays { get; set; } = 0.0;
 
         [Required, Comment("จำนวนวันลาที่ใช้ไป")]
         public double LeaveDaysUsed { get; set; } = 0.0;
 
+        [Comment("จำนวนครั้งที่ลาสะสม")]
+        public int LeaveCount { get; set; } = 0;
+
         public Guid? RootDnaId { get; set; }
 
         public Guid? Child1DnaId { get; set; }
@@ -39,5 +42,11 @@ namespace BMA.EHR.Domain.Models.Leave.Requests
         public Guid? Child3DnaId { get; set; }
 
         public Guid? Child4DnaId { get; set; }
+
+        [Required, Comment("จำนวนวันลายกมา")]
+        public double BeginningLeaveDays { get; set; } = 0.0;
+
+        [Comment("จำนวนครั้งที่ลายกมา")]
+        public int BeginningLeaveCount { get; set; } = 0;
     }
 }
diff --git a/BMA.EHR.Domain/Models/Leave/Requests/LeaveRequestApprover.cs b/BMA.EHR.Domain/Models/Leave/Requests/LeaveRequestApprover.cs
index 10e7175d..f974d004 100644
--- a/BMA.EHR.Domain/Models/Leave/Requests/LeaveRequestApprover.cs
+++ b/BMA.EHR.Domain/Models/Leave/Requests/LeaveRequestApprover.cs
@@ -17,6 +17,15 @@ namespace BMA.EHR.Domain.Models.Leave.Requests
 
         public string PositionName { get; set; } = string.Empty;
 
+        [Comment("ประเภทระดับตำแหน่ง")]
+        public string PositionLevelName { get; set; } = string.Empty;
+
+        [Comment("ตำแหน่งทางการบริหาร")]
+        public string PosExecutiveName { get; set; } = string.Empty;
+
+        [Comment("สังกัด")]
+        public string OrganizationName { get; set; } = string.Empty;
+
         [Comment("ตำแหน่งใต้ลายเช็นต์")]
         public string? PositionSign { get; set; } = string.Empty;
 
diff --git a/BMA.EHR.Domain/Models/Leave/TimeAttendants/CheckInJobStatus.cs b/BMA.EHR.Domain/Models/Leave/TimeAttendants/CheckInJobStatus.cs
new file mode 100644
index 00000000..922f966b
--- /dev/null
+++ b/BMA.EHR.Domain/Models/Leave/TimeAttendants/CheckInJobStatus.cs
@@ -0,0 +1,39 @@
+using BMA.EHR.Domain.Models.Base;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Domain.Models.Leave.TimeAttendants
+{
+    public class CheckInJobStatus : EntityBase
+    {
+        [Required, Comment("Task ID สำหรับติดตามสถานะงาน")]
+        public Guid TaskId { get; set; } = Guid.Empty;
+
+        [Required, Comment("รหัส User ของ Keycloak")]
+        public Guid KeycloakUserId { get; set; } = Guid.Empty;
+
+        [Comment("วันเวลาที่สร้างงาน")]
+        public DateTime CreatedDate { get; set; } = DateTime.Now;
+
+        [Comment("วันเวลาที่เริ่มประมวลผล")]
+        public DateTime? ProcessingDate { get; set; }
+
+        [Comment("วันเวลาที่เสร็จสิ้นการประมวลผล")]
+        public DateTime? CompletedDate { get; set; }
+
+        [Required, Comment("สถานะงาน: PENDING, PROCESSING, COMPLETED, FAILED")]
+        public string Status { get; set; } = "PENDING";
+
+        [Comment("ประเภทการลงเวลา: CHECK_IN, CHECK_OUT")]
+        public string? CheckType { get; set; }
+
+        [Comment("CheckInId สำหรับ Check-Out")]
+        public Guid? CheckInId { get; set; }
+
+        [Comment("ข้อความแสดงข้อผิดพลาด")]
+        public string? ErrorMessage { get; set; }
+
+        [Comment("ข้อมูลเพิ่มเติม (JSON)")]
+        public string? AdditionalData { get; set; }
+    }
+}
diff --git a/BMA.EHR.Domain/Models/Leave/TimeAttendants/LeaveProcessJobStatus.cs b/BMA.EHR.Domain/Models/Leave/TimeAttendants/LeaveProcessJobStatus.cs
new file mode 100644
index 00000000..be986189
--- /dev/null
+++ b/BMA.EHR.Domain/Models/Leave/TimeAttendants/LeaveProcessJobStatus.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+using BMA.EHR.Domain.Models.Base;
+using Microsoft.EntityFrameworkCore;
+
+namespace BMA.EHR.Domain.Models.Leave.TimeAttendants
+{
+    public class LeaveProcessJobStatus: EntityBase
+    {
+        [Required, Comment("วันเริ่มต้น")]
+        public DateTime StartDate { get; set; }
+
+        [Required, Comment("วันสิ้นสุด")]
+        public DateTime EndDate { get; set; }
+
+        [Required, Comment("รหัส Root DNA Id")]
+        public Guid RootDnaId { get; set; } = Guid.Empty;
+
+        [Comment("วันเวลาที่สร้างงาน")]
+        public DateTime CreatedDate { get; set; } = DateTime.Now;
+
+        [Comment("วันเวลาที่เริ่มประมวลผล")]
+        public DateTime? ProcessingDate { get; set; }
+
+        [Comment("วันเวลาที่เสร็จสิ้นการประมวลผล")]
+        public DateTime? CompletedDate { get; set; }
+
+        [Required, Comment("สถานะงาน: PENDING, PROCESSING, COMPLETED, FAILED")]
+        public string Status { get; set; } = "PENDING";   
+
+        [Comment("ข้อความแสดงข้อผิดพลาด")]
+        public string? ErrorMessage { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/BMA.EHR.Domain/Shared/GlobalMessages.cs b/BMA.EHR.Domain/Shared/GlobalMessages.cs
index 8746de95..a99dc3c9 100644
--- a/BMA.EHR.Domain/Shared/GlobalMessages.cs
+++ b/BMA.EHR.Domain/Shared/GlobalMessages.cs
@@ -8,6 +8,8 @@
 
         public static readonly string DataNotFound = "ไม่พบข้อมูลในระบบ";
 
+        public static readonly string ProfileNotFound = "ไม่พบข้อมูลในระบบทะเบียนประวัติ";
+
         public static readonly string NotAuthorized = "กรุณาเข้าสู่ระบบก่อนใช้งาน!";
 
         public static readonly string ForbiddenAccess = "คุณไม่ได้รับอนุญาติให้เข้าใช้งาน!";
diff --git a/BMA.EHR.Domain/Shared/PrivilegeConverter.cs b/BMA.EHR.Domain/Shared/PrivilegeConverter.cs
new file mode 100644
index 00000000..4dc7fd85
--- /dev/null
+++ b/BMA.EHR.Domain/Shared/PrivilegeConverter.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace BMA.EHR.Domain.Shared
+{
+    public class PrivilegeConverter : JsonConverter
+{
+    public override bool CanConvert(Type objectType)
+    {
+        return objectType == typeof(string);
+    }
+
+    public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+    {
+        if (reader.TokenType == JsonToken.Null)
+        {
+            return "CHILD"; 
+        }
+        return reader.Value;
+    }
+
+    public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+    {
+        writer.WriteValue(value);
+    }
+}
+}
\ No newline at end of file
diff --git a/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260115140500_add_fields_table_eaveequestpprover.Designer.cs b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260115140500_add_fields_table_eaveequestpprover.Designer.cs
new file mode 100644
index 00000000..8a505bde
--- /dev/null
+++ b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260115140500_add_fields_table_eaveequestpprover.Designer.cs
@@ -0,0 +1,1612 @@
+// <auto-generated />
+using System;
+using BMA.EHR.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    [DbContext(typeof(LeaveDbContext))]
+    [Migration("20260115140500_add_fields_table_eaveequestpprover")]
+    partial class add_fields_table_eaveequestpprover
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Documents.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Detail")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("FileSize")
+                        .HasColumnType("int");
+
+                    b.Property<string>("FileType")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128)");
+
+                    b.Property<Guid>("ObjectRefId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Document");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Commons.LeaveType", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("Code")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รหัสประเภทการลา");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<int>("Limit")
+                        .HasColumnType("int")
+                        .HasComment("จำนวนวันลาสูงสุดประจำปี");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อประเภทการลา");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LeaveTypes");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveBeginning", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<double>("LeaveDays")
+                        .HasColumnType("double")
+                        .HasComment("จำนวนวันลายกมา");
+
+                    b.Property<double>("LeaveDaysUsed")
+                        .HasColumnType("double")
+                        .HasComment("จำนวนวันลาที่ใช้ไป");
+
+                    b.Property<Guid>("LeaveTypeId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัสประเภทการลา");
+
+                    b.Property<int>("LeaveYear")
+                        .HasColumnType("int")
+                        .HasComment("ปีงบประมาณ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaveTypeId");
+
+                    b.ToTable("LeaveBeginnings");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveDocument", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("LeaveRequestId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaveRequestId");
+
+                    b.ToTable("LeaveDocuments");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("AbsentDayAt")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("AbsentDayGetIn")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("AbsentDayLocation")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("AbsentDayRegistorDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("AbsentDaySummon")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<double?>("Amount")
+                        .HasColumnType("double");
+
+                    b.Property<string>("ApproveStep")
+                        .HasColumnType("longtext")
+                        .HasComment("step การอนุมัติ st1 = จทน.อนุมัตื,st2 = ผู้บังคับบัญชา อนุมัติ ");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CancelLeaveWrote")
+                        .HasColumnType("longtext")
+                        .HasComment("เขียนที่ (ขอยกเลิก)");
+
+                    b.Property<string>("Child1")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child1Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child2")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child3")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child4")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CitizenId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CommanderPosition")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayCountryHistory")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("CoupleDayEndDateHistory")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CoupleDayLevel")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayLevelCountry")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayPosition")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("CoupleDayStartDateHistory")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CoupleDaySumTotalHistory")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayTotalHistory")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<DateTime?>("DateAppoint")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Dear")
+                        .HasColumnType("longtext")
+                        .HasComment("เรียนใคร");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("HajjDayStatus")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("LeaveAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานที่ติดต่อขณะลา");
+
+                    b.Property<DateTime?>("LeaveBirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LeaveCancelComment")
+                        .HasColumnType("longtext")
+                        .HasComment("เหตุผลในการขอยกเลิก");
+
+                    b.Property<Guid?>("LeaveCancelDocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LeaveCancelStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะของคำขอยกเลิก");
+
+                    b.Property<string>("LeaveComment")
+                        .HasColumnType("longtext")
+                        .HasComment("ความเห็นของผู้บังคับบัญชา");
+
+                    b.Property<string>("LeaveDetail")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รายละเอียดการลา");
+
+                    b.Property<string>("LeaveDirectorComment")
+                        .HasColumnType("longtext")
+                        .HasComment("ความเห็นของผู้อำนวยการสำนัก");
+
+                    b.Property<Guid?>("LeaveDraftDocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("LeaveEndDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เดือน ปีสิ้นสุดลา");
+
+                    b.Property<DateTime?>("LeaveGovernmentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime?>("LeaveLast")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LeaveNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("หมายเลขที่ติดต่อขณะลา");
+
+                    b.Property<string>("LeaveRange")
+                        .HasColumnType("longtext")
+                        .HasComment("ช่วงของการลาของวันเริ่ม เช่น ลาทั้งวัน ครึ่งวันเช้า ครึ่งวันบ่าย");
+
+                    b.Property<string>("LeaveRangeEnd")
+                        .HasColumnType("longtext")
+                        .HasComment("ช่วงของการลาของวันสิ้นสุด เช่น ลาทั้งวัน ครึ่งวันเช้า ครึ่งวันบ่าย");
+
+                    b.Property<int?>("LeaveSalary")
+                        .HasColumnType("int");
+
+                    b.Property<string>("LeaveSalaryText")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("LeaveStartDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เดือน ปีเริ่มต้นลา");
+
+                    b.Property<string>("LeaveStatus")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะของคำร้อง");
+
+                    b.Property<string>("LeaveSubTypeName")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("LeaveTotal")
+                        .HasColumnType("double");
+
+                    b.Property<string>("LeaveTypeCode")
+                        .HasColumnType("longtext")
+                        .HasComment("code ของประเภทการลา");
+
+                    b.Property<string>("LeaveWrote")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เขียนที่");
+
+                    b.Property<string>("OrdainDayBuddhistLentAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayBuddhistLentName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayLocationAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayLocationName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayLocationNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("OrdainDayOrdination")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("OrdainDayStatus")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("OrganizationName")
+                        .HasColumnType("longtext")
+                        .HasComment("สังกัดผู้ยื่นขอ");
+
+                    b.Property<string>("PositionLevelName")
+                        .HasColumnType("longtext")
+                        .HasComment("ระดับผู้ยื่นขอ");
+
+                    b.Property<string>("PositionName")
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งผู้ยื่นขอ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ProfileType")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("RestDayCurrentTotal")
+                        .HasColumnType("double");
+
+                    b.Property<double>("RestDayOldTotal")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Root")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("RootId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("StudyDayCountry")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayDegreeLevel")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayScholarship")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDaySubject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayTrainingName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayTrainingSubject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayUniversityName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TypeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("WifeDayDateBorn")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("WifeDayName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaveCancelDocumentId");
+
+                    b.HasIndex("LeaveDraftDocumentId");
+
+                    b.HasIndex("TypeId");
+
+                    b.ToTable("LeaveRequests");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequestApprover", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("ApproveStatus")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApproveType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("KeycloakId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("LeaveRequestId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("OrganizationName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สังกัด");
+
+                    b.Property<string>("PosExecutiveName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งทางการบริหาร");
+
+                    b.Property<string>("PositionLevelName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ประเภทระดับตำแหน่ง");
+
+                    b.Property<string>("PositionName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PositionSign")
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งใต้ลายเช็นต์");
+
+                    b.Property<string>("Prefix")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Seq")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaveRequestId");
+
+                    b.ToTable("LeaveRequestApprovers");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.AdditionalCheckRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CheckDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("*วันที่ลงเวลา");
+
+                    b.Property<bool>("CheckInEdit")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("*ขอลงเวลาช่วงเช้า");
+
+                    b.Property<bool>("CheckOutEdit")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("*ขอลงเวลาช่วงบ่าย");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .HasColumnType("longtext")
+                        .HasComment("หมายเหตุในการการอนุมัติ/ไม่อนุมัติ");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("*หมายเหตุขอลงเวลาพิเศษ");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak ที่ร้องขอ");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<double?>("Latitude")
+                        .HasColumnType("double");
+
+                    b.Property<double?>("Longitude")
+                        .HasColumnType("double");
+
+                    b.Property<string>("POI")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะการอนุมัติ");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AdditionalCheckRequests");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.DutyTime", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("คำอธิบาย");
+
+                    b.Property<string>("EndTimeAfternoon")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาออกงานช่วงบ่าย");
+
+                    b.Property<string>("EndTimeMorning")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาออกงานช่วงเช้า");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("สถานะการเปิดใช้งาน (เปิด/ปิด)");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("สถานะว่ารอบใดเป็นค่า Default ของข้าราชการ (สำหรับทุกคนที่ยังไม่ได้ทำการเลือกรอบ)");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("StartTimeAfternoon")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาเข้างานช่วงบ่าย");
+
+                    b.Property<string>("StartTimeMorning")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาเข้างานช่วงเช้า");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DutyTimes");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.ProcessUserTimeStamp", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CheckIn")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา เข้างาน");
+
+                    b.Property<string>("CheckInImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-In");
+
+                    b.Property<double>("CheckInLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-In");
+
+                    b.Property<string>("CheckInLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-In");
+
+                    b.Property<double>("CheckInLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-In");
+
+                    b.Property<string>("CheckInPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-In");
+
+                    b.Property<string>("CheckInRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-In");
+
+                    b.Property<string>("CheckInStatus")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะ Check-In");
+
+                    b.Property<DateTime?>("CheckOut")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา ออกงาน");
+
+                    b.Property<string>("CheckOutImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-Out");
+
+                    b.Property<double>("CheckOutLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-Out");
+
+                    b.Property<string>("CheckOutLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-Out");
+
+                    b.Property<double>("CheckOutLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-Out");
+
+                    b.Property<string>("CheckOutPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-Out");
+
+                    b.Property<string>("CheckOutRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-Out");
+
+                    b.Property<string>("CheckOutStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะ Check-Out");
+
+                    b.Property<string>("Child1")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child1Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child2")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child3")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child4")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CitizenId")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("EditReason")
+                        .HasColumnType("longtext")
+                        .HasComment("เหตุผลการอนุมัติ/ไม่อนุมัติขอลงเวลาพิเศษ");
+
+                    b.Property<string>("EditStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะการของลงเวลาพิเศษ");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsLocationCheckIn")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-In");
+
+                    b.Property<bool>("IsLocationCheckOut")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-Out");
+
+                    b.Property<bool>("IsProcess")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("นำไปประมวลผลแล้วหรือยัง");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ProfileType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Root")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("RootId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ProcessUserTimeStamps");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserCalendar", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("Calendar")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ปฏิทินการทำงานของ ขรก ปกติ หรือ 6 วันต่อสัปดาห์");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserCalendars");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserDutyTime", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<Guid>("DutyTimeId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัสรอบการลงเวลา");
+
+                    b.Property<DateTime?>("EffectiveDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันที่มีผล");
+
+                    b.Property<bool>("IsProcess")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("ทำการประมวลผลแล้วหรือยัง");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("longtext")
+                        .HasComment("หมายเหตุ");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DutyTimeId");
+
+                    b.ToTable("UserDutyTimes");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserTimeStamp", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CheckIn")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา เข้างาน");
+
+                    b.Property<string>("CheckInImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-In");
+
+                    b.Property<double>("CheckInLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-In");
+
+                    b.Property<string>("CheckInLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-In");
+
+                    b.Property<double>("CheckInLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-In");
+
+                    b.Property<string>("CheckInPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-In");
+
+                    b.Property<string>("CheckInRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-In");
+
+                    b.Property<DateTime?>("CheckOut")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา ออกงาน");
+
+                    b.Property<string>("CheckOutImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-Out");
+
+                    b.Property<double>("CheckOutLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-Out");
+
+                    b.Property<string>("CheckOutLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-Out");
+
+                    b.Property<double>("CheckOutLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-Out");
+
+                    b.Property<string>("CheckOutPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-Out");
+
+                    b.Property<string>("CheckOutRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-Out");
+
+                    b.Property<string>("Child1")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child1Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child2")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child3")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child4")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CitizenId")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsLocationCheckIn")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-In");
+
+                    b.Property<bool>("IsLocationCheckOut")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-Out");
+
+                    b.Property<bool>("IsProcess")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("นำไปประมวลผลแล้วหรือยัง");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ProfileType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Root")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("RootId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserTimeStamps");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveBeginning", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Commons.LeaveType", "LeaveType")
+                        .WithMany()
+                        .HasForeignKey("LeaveTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LeaveType");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveDocument", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", "LeaveRequest")
+                        .WithMany("LeaveDocument")
+                        .HasForeignKey("LeaveRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("LeaveRequest");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "LeaveCancelDocument")
+                        .WithMany()
+                        .HasForeignKey("LeaveCancelDocumentId");
+
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "LeaveDraftDocument")
+                        .WithMany()
+                        .HasForeignKey("LeaveDraftDocumentId");
+
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Commons.LeaveType", "Type")
+                        .WithMany()
+                        .HasForeignKey("TypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LeaveCancelDocument");
+
+                    b.Navigation("LeaveDraftDocument");
+
+                    b.Navigation("Type");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequestApprover", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", "LeaveRequest")
+                        .WithMany("Approvers")
+                        .HasForeignKey("LeaveRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LeaveRequest");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserDutyTime", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.TimeAttendants.DutyTime", "DutyTime")
+                        .WithMany()
+                        .HasForeignKey("DutyTimeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DutyTime");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.Navigation("Approvers");
+
+                    b.Navigation("LeaveDocument");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260115140500_add_fields_table_eaveequestpprover.cs b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260115140500_add_fields_table_eaveequestpprover.cs
new file mode 100644
index 00000000..02aee038
--- /dev/null
+++ b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260115140500_add_fields_table_eaveequestpprover.cs
@@ -0,0 +1,54 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    /// <inheritdoc />
+    public partial class add_fields_table_eaveequestpprover : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "OrganizationName",
+                table: "LeaveRequestApprovers",
+                type: "longtext",
+                nullable: false,
+                comment: "สังกัด")
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AddColumn<string>(
+                name: "PosExecutiveName",
+                table: "LeaveRequestApprovers",
+                type: "longtext",
+                nullable: false,
+                comment: "ตำแหน่งทางการบริหาร")
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AddColumn<string>(
+                name: "PositionLevelName",
+                table: "LeaveRequestApprovers",
+                type: "longtext",
+                nullable: false,
+                comment: "ประเภทระดับตำแหน่ง")
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "OrganizationName",
+                table: "LeaveRequestApprovers");
+
+            migrationBuilder.DropColumn(
+                name: "PosExecutiveName",
+                table: "LeaveRequestApprovers");
+
+            migrationBuilder.DropColumn(
+                name: "PositionLevelName",
+                table: "LeaveRequestApprovers");
+        }
+    }
+}
diff --git a/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260120032158_Add RMQ Task Control.Designer.cs b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260120032158_Add RMQ Task Control.Designer.cs
new file mode 100644
index 00000000..a7f4e1fb
--- /dev/null
+++ b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260120032158_Add RMQ Task Control.Designer.cs	
@@ -0,0 +1,1705 @@
+// <auto-generated />
+using System;
+using BMA.EHR.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    [DbContext(typeof(LeaveDbContext))]
+    [Migration("20260120032158_Add RMQ Task Control")]
+    partial class AddRMQTaskControl
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Documents.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Detail")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("FileSize")
+                        .HasColumnType("int");
+
+                    b.Property<string>("FileType")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128)");
+
+                    b.Property<Guid>("ObjectRefId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Document");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Commons.LeaveType", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("Code")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รหัสประเภทการลา");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<int>("Limit")
+                        .HasColumnType("int")
+                        .HasComment("จำนวนวันลาสูงสุดประจำปี");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อประเภทการลา");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LeaveTypes");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveBeginning", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<double>("LeaveDays")
+                        .HasColumnType("double")
+                        .HasComment("จำนวนวันลายกมา");
+
+                    b.Property<double>("LeaveDaysUsed")
+                        .HasColumnType("double")
+                        .HasComment("จำนวนวันลาที่ใช้ไป");
+
+                    b.Property<Guid>("LeaveTypeId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัสประเภทการลา");
+
+                    b.Property<int>("LeaveYear")
+                        .HasColumnType("int")
+                        .HasComment("ปีงบประมาณ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaveTypeId");
+
+                    b.ToTable("LeaveBeginnings");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveDocument", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("LeaveRequestId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaveRequestId");
+
+                    b.ToTable("LeaveDocuments");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("AbsentDayAt")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("AbsentDayGetIn")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("AbsentDayLocation")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("AbsentDayRegistorDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("AbsentDaySummon")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<double?>("Amount")
+                        .HasColumnType("double");
+
+                    b.Property<string>("ApproveStep")
+                        .HasColumnType("longtext")
+                        .HasComment("step การอนุมัติ st1 = จทน.อนุมัตื,st2 = ผู้บังคับบัญชา อนุมัติ ");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CancelLeaveWrote")
+                        .HasColumnType("longtext")
+                        .HasComment("เขียนที่ (ขอยกเลิก)");
+
+                    b.Property<string>("Child1")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child1Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child2")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child3")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child4")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CitizenId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CommanderPosition")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayCountryHistory")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("CoupleDayEndDateHistory")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CoupleDayLevel")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayLevelCountry")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayPosition")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("CoupleDayStartDateHistory")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CoupleDaySumTotalHistory")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayTotalHistory")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<DateTime?>("DateAppoint")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Dear")
+                        .HasColumnType("longtext")
+                        .HasComment("เรียนใคร");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("HajjDayStatus")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("LeaveAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานที่ติดต่อขณะลา");
+
+                    b.Property<DateTime?>("LeaveBirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LeaveCancelComment")
+                        .HasColumnType("longtext")
+                        .HasComment("เหตุผลในการขอยกเลิก");
+
+                    b.Property<Guid?>("LeaveCancelDocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LeaveCancelStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะของคำขอยกเลิก");
+
+                    b.Property<string>("LeaveComment")
+                        .HasColumnType("longtext")
+                        .HasComment("ความเห็นของผู้บังคับบัญชา");
+
+                    b.Property<string>("LeaveDetail")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รายละเอียดการลา");
+
+                    b.Property<string>("LeaveDirectorComment")
+                        .HasColumnType("longtext")
+                        .HasComment("ความเห็นของผู้อำนวยการสำนัก");
+
+                    b.Property<Guid?>("LeaveDraftDocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("LeaveEndDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เดือน ปีสิ้นสุดลา");
+
+                    b.Property<DateTime?>("LeaveGovernmentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime?>("LeaveLast")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LeaveNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("หมายเลขที่ติดต่อขณะลา");
+
+                    b.Property<string>("LeaveRange")
+                        .HasColumnType("longtext")
+                        .HasComment("ช่วงของการลาของวันเริ่ม เช่น ลาทั้งวัน ครึ่งวันเช้า ครึ่งวันบ่าย");
+
+                    b.Property<string>("LeaveRangeEnd")
+                        .HasColumnType("longtext")
+                        .HasComment("ช่วงของการลาของวันสิ้นสุด เช่น ลาทั้งวัน ครึ่งวันเช้า ครึ่งวันบ่าย");
+
+                    b.Property<int?>("LeaveSalary")
+                        .HasColumnType("int");
+
+                    b.Property<string>("LeaveSalaryText")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("LeaveStartDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เดือน ปีเริ่มต้นลา");
+
+                    b.Property<string>("LeaveStatus")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะของคำร้อง");
+
+                    b.Property<string>("LeaveSubTypeName")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("LeaveTotal")
+                        .HasColumnType("double");
+
+                    b.Property<string>("LeaveTypeCode")
+                        .HasColumnType("longtext")
+                        .HasComment("code ของประเภทการลา");
+
+                    b.Property<string>("LeaveWrote")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เขียนที่");
+
+                    b.Property<string>("OrdainDayBuddhistLentAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayBuddhistLentName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayLocationAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayLocationName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayLocationNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("OrdainDayOrdination")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("OrdainDayStatus")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("OrganizationName")
+                        .HasColumnType("longtext")
+                        .HasComment("สังกัดผู้ยื่นขอ");
+
+                    b.Property<string>("PositionLevelName")
+                        .HasColumnType("longtext")
+                        .HasComment("ระดับผู้ยื่นขอ");
+
+                    b.Property<string>("PositionName")
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งผู้ยื่นขอ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ProfileType")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("RestDayCurrentTotal")
+                        .HasColumnType("double");
+
+                    b.Property<double>("RestDayOldTotal")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Root")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("RootId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("StudyDayCountry")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayDegreeLevel")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayScholarship")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDaySubject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayTrainingName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayTrainingSubject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayUniversityName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TypeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("WifeDayDateBorn")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("WifeDayName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaveCancelDocumentId");
+
+                    b.HasIndex("LeaveDraftDocumentId");
+
+                    b.HasIndex("TypeId");
+
+                    b.ToTable("LeaveRequests");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequestApprover", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("ApproveStatus")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApproveType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("KeycloakId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("LeaveRequestId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("OrganizationName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สังกัด");
+
+                    b.Property<string>("PosExecutiveName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งทางการบริหาร");
+
+                    b.Property<string>("PositionLevelName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ประเภทระดับตำแหน่ง");
+
+                    b.Property<string>("PositionName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PositionSign")
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งใต้ลายเช็นต์");
+
+                    b.Property<string>("Prefix")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Seq")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaveRequestId");
+
+                    b.ToTable("LeaveRequestApprovers");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.AdditionalCheckRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CheckDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("*วันที่ลงเวลา");
+
+                    b.Property<bool>("CheckInEdit")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("*ขอลงเวลาช่วงเช้า");
+
+                    b.Property<bool>("CheckOutEdit")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("*ขอลงเวลาช่วงบ่าย");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .HasColumnType("longtext")
+                        .HasComment("หมายเหตุในการการอนุมัติ/ไม่อนุมัติ");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("*หมายเหตุขอลงเวลาพิเศษ");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak ที่ร้องขอ");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<double?>("Latitude")
+                        .HasColumnType("double");
+
+                    b.Property<double?>("Longitude")
+                        .HasColumnType("double");
+
+                    b.Property<string>("POI")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะการอนุมัติ");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AdditionalCheckRequests");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.CheckInJobStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("AdditionalData")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อมูลเพิ่มเติม (JSON)");
+
+                    b.Property<Guid?>("CheckInId")
+                        .HasColumnType("char(36)")
+                        .HasComment("CheckInId สำหรับ Check-Out");
+
+                    b.Property<string>("CheckType")
+                        .HasColumnType("longtext")
+                        .HasComment("ประเภทการลงเวลา: CHECK_IN, CHECK_OUT");
+
+                    b.Property<DateTime?>("CompletedDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่เสร็จสิ้นการประมวลผล");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่สร้างงาน");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("ErrorMessage")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความแสดงข้อผิดพลาด");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<DateTime?>("ProcessingDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่เริ่มประมวลผล");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะงาน: PENDING, PROCESSING, COMPLETED, FAILED");
+
+                    b.Property<Guid>("TaskId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Task ID สำหรับติดตามสถานะงาน");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckInJobStatuses");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.DutyTime", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("คำอธิบาย");
+
+                    b.Property<string>("EndTimeAfternoon")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาออกงานช่วงบ่าย");
+
+                    b.Property<string>("EndTimeMorning")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาออกงานช่วงเช้า");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("สถานะการเปิดใช้งาน (เปิด/ปิด)");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("สถานะว่ารอบใดเป็นค่า Default ของข้าราชการ (สำหรับทุกคนที่ยังไม่ได้ทำการเลือกรอบ)");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("StartTimeAfternoon")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาเข้างานช่วงบ่าย");
+
+                    b.Property<string>("StartTimeMorning")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาเข้างานช่วงเช้า");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DutyTimes");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.ProcessUserTimeStamp", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CheckIn")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา เข้างาน");
+
+                    b.Property<string>("CheckInImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-In");
+
+                    b.Property<double>("CheckInLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-In");
+
+                    b.Property<string>("CheckInLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-In");
+
+                    b.Property<double>("CheckInLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-In");
+
+                    b.Property<string>("CheckInPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-In");
+
+                    b.Property<string>("CheckInRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-In");
+
+                    b.Property<string>("CheckInStatus")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะ Check-In");
+
+                    b.Property<DateTime?>("CheckOut")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา ออกงาน");
+
+                    b.Property<string>("CheckOutImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-Out");
+
+                    b.Property<double>("CheckOutLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-Out");
+
+                    b.Property<string>("CheckOutLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-Out");
+
+                    b.Property<double>("CheckOutLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-Out");
+
+                    b.Property<string>("CheckOutPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-Out");
+
+                    b.Property<string>("CheckOutRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-Out");
+
+                    b.Property<string>("CheckOutStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะ Check-Out");
+
+                    b.Property<string>("Child1")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child1Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child2")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child3")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child4")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CitizenId")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("EditReason")
+                        .HasColumnType("longtext")
+                        .HasComment("เหตุผลการอนุมัติ/ไม่อนุมัติขอลงเวลาพิเศษ");
+
+                    b.Property<string>("EditStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะการของลงเวลาพิเศษ");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsLocationCheckIn")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-In");
+
+                    b.Property<bool>("IsLocationCheckOut")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-Out");
+
+                    b.Property<bool>("IsProcess")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("นำไปประมวลผลแล้วหรือยัง");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ProfileType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Root")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("RootId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ProcessUserTimeStamps");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserCalendar", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("Calendar")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ปฏิทินการทำงานของ ขรก ปกติ หรือ 6 วันต่อสัปดาห์");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserCalendars");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserDutyTime", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<Guid>("DutyTimeId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัสรอบการลงเวลา");
+
+                    b.Property<DateTime?>("EffectiveDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันที่มีผล");
+
+                    b.Property<bool>("IsProcess")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("ทำการประมวลผลแล้วหรือยัง");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("longtext")
+                        .HasComment("หมายเหตุ");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DutyTimeId");
+
+                    b.ToTable("UserDutyTimes");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserTimeStamp", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CheckIn")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา เข้างาน");
+
+                    b.Property<string>("CheckInImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-In");
+
+                    b.Property<double>("CheckInLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-In");
+
+                    b.Property<string>("CheckInLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-In");
+
+                    b.Property<double>("CheckInLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-In");
+
+                    b.Property<string>("CheckInPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-In");
+
+                    b.Property<string>("CheckInRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-In");
+
+                    b.Property<DateTime?>("CheckOut")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา ออกงาน");
+
+                    b.Property<string>("CheckOutImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-Out");
+
+                    b.Property<double>("CheckOutLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-Out");
+
+                    b.Property<string>("CheckOutLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-Out");
+
+                    b.Property<double>("CheckOutLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-Out");
+
+                    b.Property<string>("CheckOutPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-Out");
+
+                    b.Property<string>("CheckOutRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-Out");
+
+                    b.Property<string>("Child1")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child1Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child2")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child3")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child4")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CitizenId")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsLocationCheckIn")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-In");
+
+                    b.Property<bool>("IsLocationCheckOut")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-Out");
+
+                    b.Property<bool>("IsProcess")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("นำไปประมวลผลแล้วหรือยัง");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ProfileType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Root")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("RootId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserTimeStamps");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveBeginning", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Commons.LeaveType", "LeaveType")
+                        .WithMany()
+                        .HasForeignKey("LeaveTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LeaveType");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveDocument", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", "LeaveRequest")
+                        .WithMany("LeaveDocument")
+                        .HasForeignKey("LeaveRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("LeaveRequest");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "LeaveCancelDocument")
+                        .WithMany()
+                        .HasForeignKey("LeaveCancelDocumentId");
+
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "LeaveDraftDocument")
+                        .WithMany()
+                        .HasForeignKey("LeaveDraftDocumentId");
+
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Commons.LeaveType", "Type")
+                        .WithMany()
+                        .HasForeignKey("TypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LeaveCancelDocument");
+
+                    b.Navigation("LeaveDraftDocument");
+
+                    b.Navigation("Type");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequestApprover", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", "LeaveRequest")
+                        .WithMany("Approvers")
+                        .HasForeignKey("LeaveRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LeaveRequest");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserDutyTime", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.TimeAttendants.DutyTime", "DutyTime")
+                        .WithMany()
+                        .HasForeignKey("DutyTimeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DutyTime");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.Navigation("Approvers");
+
+                    b.Navigation("LeaveDocument");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260120032158_Add RMQ Task Control.cs b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260120032158_Add RMQ Task Control.cs
new file mode 100644
index 00000000..f8d2090b
--- /dev/null
+++ b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260120032158_Add RMQ Task Control.cs	
@@ -0,0 +1,58 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    /// <inheritdoc />
+    public partial class AddRMQTaskControl : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "CheckInJobStatuses",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, comment: "PrimaryKey", collation: "ascii_general_ci"),
+                    CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, comment: "สร้างข้อมูลเมื่อ"),
+                    CreatedUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่สร้างข้อมูล")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    LastUpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "แก้ไขข้อมูลล่าสุดเมื่อ"),
+                    LastUpdateUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่แก้ไขข้อมูลล่าสุด")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CreatedFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่สร้างข้อมูล")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    LastUpdateFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่แก้ไขข้อมูลล่าสุด")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    TaskId = table.Column<Guid>(type: "char(36)", nullable: false, comment: "Task ID สำหรับติดตามสถานะงาน", collation: "ascii_general_ci"),
+                    KeycloakUserId = table.Column<Guid>(type: "char(36)", nullable: false, comment: "รหัส User ของ Keycloak", collation: "ascii_general_ci"),
+                    CreatedDate = table.Column<DateTime>(type: "datetime(6)", nullable: false, comment: "วันเวลาที่สร้างงาน"),
+                    ProcessingDate = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "วันเวลาที่เริ่มประมวลผล"),
+                    CompletedDate = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "วันเวลาที่เสร็จสิ้นการประมวลผล"),
+                    Status = table.Column<string>(type: "longtext", nullable: false, comment: "สถานะงาน: PENDING, PROCESSING, COMPLETED, FAILED")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CheckType = table.Column<string>(type: "longtext", nullable: true, comment: "ประเภทการลงเวลา: CHECK_IN, CHECK_OUT")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CheckInId = table.Column<Guid>(type: "char(36)", nullable: true, comment: "CheckInId สำหรับ Check-Out", collation: "ascii_general_ci"),
+                    ErrorMessage = table.Column<string>(type: "longtext", nullable: true, comment: "ข้อความแสดงข้อผิดพลาด")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    AdditionalData = table.Column<string>(type: "longtext", nullable: true, comment: "ข้อมูลเพิ่มเติม (JSON)")
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CheckInJobStatuses", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "CheckInJobStatuses");
+        }
+    }
+}
diff --git a/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260205034753_Add LeaveCount to LeaveBeginning.Designer.cs b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260205034753_Add LeaveCount to LeaveBeginning.Designer.cs
new file mode 100644
index 00000000..acd7320f
--- /dev/null
+++ b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260205034753_Add LeaveCount to LeaveBeginning.Designer.cs	
@@ -0,0 +1,1709 @@
+// <auto-generated />
+using System;
+using BMA.EHR.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    [DbContext(typeof(LeaveDbContext))]
+    [Migration("20260205034753_Add LeaveCount to LeaveBeginning")]
+    partial class AddLeaveCounttoLeaveBeginning
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Documents.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Detail")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("FileSize")
+                        .HasColumnType("int");
+
+                    b.Property<string>("FileType")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128)");
+
+                    b.Property<Guid>("ObjectRefId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Document");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Commons.LeaveType", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("Code")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รหัสประเภทการลา");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<int>("Limit")
+                        .HasColumnType("int")
+                        .HasComment("จำนวนวันลาสูงสุดประจำปี");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อประเภทการลา");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LeaveTypes");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveBeginning", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<int>("LeaveCount")
+                        .HasColumnType("int")
+                        .HasComment("จำนวนครั้งที่ลาสะสม");
+
+                    b.Property<double>("LeaveDays")
+                        .HasColumnType("double")
+                        .HasComment("จำนวนวันลายกมา");
+
+                    b.Property<double>("LeaveDaysUsed")
+                        .HasColumnType("double")
+                        .HasComment("จำนวนวันลาที่ใช้ไป");
+
+                    b.Property<Guid>("LeaveTypeId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัสประเภทการลา");
+
+                    b.Property<int>("LeaveYear")
+                        .HasColumnType("int")
+                        .HasComment("ปีงบประมาณ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaveTypeId");
+
+                    b.ToTable("LeaveBeginnings");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveDocument", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("LeaveRequestId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaveRequestId");
+
+                    b.ToTable("LeaveDocuments");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("AbsentDayAt")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("AbsentDayGetIn")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("AbsentDayLocation")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("AbsentDayRegistorDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("AbsentDaySummon")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<double?>("Amount")
+                        .HasColumnType("double");
+
+                    b.Property<string>("ApproveStep")
+                        .HasColumnType("longtext")
+                        .HasComment("step การอนุมัติ st1 = จทน.อนุมัตื,st2 = ผู้บังคับบัญชา อนุมัติ ");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CancelLeaveWrote")
+                        .HasColumnType("longtext")
+                        .HasComment("เขียนที่ (ขอยกเลิก)");
+
+                    b.Property<string>("Child1")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child1Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child2")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child3")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child4")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CitizenId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CommanderPosition")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayCountryHistory")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("CoupleDayEndDateHistory")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CoupleDayLevel")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayLevelCountry")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayPosition")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("CoupleDayStartDateHistory")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CoupleDaySumTotalHistory")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayTotalHistory")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<DateTime?>("DateAppoint")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Dear")
+                        .HasColumnType("longtext")
+                        .HasComment("เรียนใคร");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("HajjDayStatus")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("LeaveAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานที่ติดต่อขณะลา");
+
+                    b.Property<DateTime?>("LeaveBirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LeaveCancelComment")
+                        .HasColumnType("longtext")
+                        .HasComment("เหตุผลในการขอยกเลิก");
+
+                    b.Property<Guid?>("LeaveCancelDocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LeaveCancelStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะของคำขอยกเลิก");
+
+                    b.Property<string>("LeaveComment")
+                        .HasColumnType("longtext")
+                        .HasComment("ความเห็นของผู้บังคับบัญชา");
+
+                    b.Property<string>("LeaveDetail")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รายละเอียดการลา");
+
+                    b.Property<string>("LeaveDirectorComment")
+                        .HasColumnType("longtext")
+                        .HasComment("ความเห็นของผู้อำนวยการสำนัก");
+
+                    b.Property<Guid?>("LeaveDraftDocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("LeaveEndDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เดือน ปีสิ้นสุดลา");
+
+                    b.Property<DateTime?>("LeaveGovernmentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime?>("LeaveLast")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LeaveNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("หมายเลขที่ติดต่อขณะลา");
+
+                    b.Property<string>("LeaveRange")
+                        .HasColumnType("longtext")
+                        .HasComment("ช่วงของการลาของวันเริ่ม เช่น ลาทั้งวัน ครึ่งวันเช้า ครึ่งวันบ่าย");
+
+                    b.Property<string>("LeaveRangeEnd")
+                        .HasColumnType("longtext")
+                        .HasComment("ช่วงของการลาของวันสิ้นสุด เช่น ลาทั้งวัน ครึ่งวันเช้า ครึ่งวันบ่าย");
+
+                    b.Property<int?>("LeaveSalary")
+                        .HasColumnType("int");
+
+                    b.Property<string>("LeaveSalaryText")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("LeaveStartDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เดือน ปีเริ่มต้นลา");
+
+                    b.Property<string>("LeaveStatus")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะของคำร้อง");
+
+                    b.Property<string>("LeaveSubTypeName")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("LeaveTotal")
+                        .HasColumnType("double");
+
+                    b.Property<string>("LeaveTypeCode")
+                        .HasColumnType("longtext")
+                        .HasComment("code ของประเภทการลา");
+
+                    b.Property<string>("LeaveWrote")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เขียนที่");
+
+                    b.Property<string>("OrdainDayBuddhistLentAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayBuddhistLentName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayLocationAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayLocationName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayLocationNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("OrdainDayOrdination")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("OrdainDayStatus")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("OrganizationName")
+                        .HasColumnType("longtext")
+                        .HasComment("สังกัดผู้ยื่นขอ");
+
+                    b.Property<string>("PositionLevelName")
+                        .HasColumnType("longtext")
+                        .HasComment("ระดับผู้ยื่นขอ");
+
+                    b.Property<string>("PositionName")
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งผู้ยื่นขอ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ProfileType")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("RestDayCurrentTotal")
+                        .HasColumnType("double");
+
+                    b.Property<double>("RestDayOldTotal")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Root")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("RootId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("StudyDayCountry")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayDegreeLevel")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayScholarship")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDaySubject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayTrainingName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayTrainingSubject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayUniversityName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TypeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("WifeDayDateBorn")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("WifeDayName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaveCancelDocumentId");
+
+                    b.HasIndex("LeaveDraftDocumentId");
+
+                    b.HasIndex("TypeId");
+
+                    b.ToTable("LeaveRequests");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequestApprover", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("ApproveStatus")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApproveType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("KeycloakId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("LeaveRequestId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("OrganizationName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สังกัด");
+
+                    b.Property<string>("PosExecutiveName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งทางการบริหาร");
+
+                    b.Property<string>("PositionLevelName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ประเภทระดับตำแหน่ง");
+
+                    b.Property<string>("PositionName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PositionSign")
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งใต้ลายเช็นต์");
+
+                    b.Property<string>("Prefix")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Seq")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaveRequestId");
+
+                    b.ToTable("LeaveRequestApprovers");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.AdditionalCheckRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CheckDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("*วันที่ลงเวลา");
+
+                    b.Property<bool>("CheckInEdit")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("*ขอลงเวลาช่วงเช้า");
+
+                    b.Property<bool>("CheckOutEdit")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("*ขอลงเวลาช่วงบ่าย");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .HasColumnType("longtext")
+                        .HasComment("หมายเหตุในการการอนุมัติ/ไม่อนุมัติ");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("*หมายเหตุขอลงเวลาพิเศษ");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak ที่ร้องขอ");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<double?>("Latitude")
+                        .HasColumnType("double");
+
+                    b.Property<double?>("Longitude")
+                        .HasColumnType("double");
+
+                    b.Property<string>("POI")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะการอนุมัติ");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AdditionalCheckRequests");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.CheckInJobStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("AdditionalData")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อมูลเพิ่มเติม (JSON)");
+
+                    b.Property<Guid?>("CheckInId")
+                        .HasColumnType("char(36)")
+                        .HasComment("CheckInId สำหรับ Check-Out");
+
+                    b.Property<string>("CheckType")
+                        .HasColumnType("longtext")
+                        .HasComment("ประเภทการลงเวลา: CHECK_IN, CHECK_OUT");
+
+                    b.Property<DateTime?>("CompletedDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่เสร็จสิ้นการประมวลผล");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่สร้างงาน");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("ErrorMessage")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความแสดงข้อผิดพลาด");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<DateTime?>("ProcessingDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่เริ่มประมวลผล");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะงาน: PENDING, PROCESSING, COMPLETED, FAILED");
+
+                    b.Property<Guid>("TaskId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Task ID สำหรับติดตามสถานะงาน");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckInJobStatuses");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.DutyTime", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("คำอธิบาย");
+
+                    b.Property<string>("EndTimeAfternoon")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาออกงานช่วงบ่าย");
+
+                    b.Property<string>("EndTimeMorning")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาออกงานช่วงเช้า");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("สถานะการเปิดใช้งาน (เปิด/ปิด)");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("สถานะว่ารอบใดเป็นค่า Default ของข้าราชการ (สำหรับทุกคนที่ยังไม่ได้ทำการเลือกรอบ)");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("StartTimeAfternoon")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาเข้างานช่วงบ่าย");
+
+                    b.Property<string>("StartTimeMorning")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาเข้างานช่วงเช้า");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DutyTimes");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.ProcessUserTimeStamp", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CheckIn")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา เข้างาน");
+
+                    b.Property<string>("CheckInImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-In");
+
+                    b.Property<double>("CheckInLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-In");
+
+                    b.Property<string>("CheckInLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-In");
+
+                    b.Property<double>("CheckInLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-In");
+
+                    b.Property<string>("CheckInPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-In");
+
+                    b.Property<string>("CheckInRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-In");
+
+                    b.Property<string>("CheckInStatus")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะ Check-In");
+
+                    b.Property<DateTime?>("CheckOut")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา ออกงาน");
+
+                    b.Property<string>("CheckOutImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-Out");
+
+                    b.Property<double>("CheckOutLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-Out");
+
+                    b.Property<string>("CheckOutLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-Out");
+
+                    b.Property<double>("CheckOutLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-Out");
+
+                    b.Property<string>("CheckOutPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-Out");
+
+                    b.Property<string>("CheckOutRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-Out");
+
+                    b.Property<string>("CheckOutStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะ Check-Out");
+
+                    b.Property<string>("Child1")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child1Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child2")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child3")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child4")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CitizenId")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("EditReason")
+                        .HasColumnType("longtext")
+                        .HasComment("เหตุผลการอนุมัติ/ไม่อนุมัติขอลงเวลาพิเศษ");
+
+                    b.Property<string>("EditStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะการของลงเวลาพิเศษ");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsLocationCheckIn")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-In");
+
+                    b.Property<bool>("IsLocationCheckOut")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-Out");
+
+                    b.Property<bool>("IsProcess")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("นำไปประมวลผลแล้วหรือยัง");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ProfileType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Root")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("RootId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ProcessUserTimeStamps");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserCalendar", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("Calendar")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ปฏิทินการทำงานของ ขรก ปกติ หรือ 6 วันต่อสัปดาห์");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserCalendars");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserDutyTime", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<Guid>("DutyTimeId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัสรอบการลงเวลา");
+
+                    b.Property<DateTime?>("EffectiveDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันที่มีผล");
+
+                    b.Property<bool>("IsProcess")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("ทำการประมวลผลแล้วหรือยัง");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("longtext")
+                        .HasComment("หมายเหตุ");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DutyTimeId");
+
+                    b.ToTable("UserDutyTimes");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserTimeStamp", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CheckIn")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา เข้างาน");
+
+                    b.Property<string>("CheckInImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-In");
+
+                    b.Property<double>("CheckInLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-In");
+
+                    b.Property<string>("CheckInLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-In");
+
+                    b.Property<double>("CheckInLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-In");
+
+                    b.Property<string>("CheckInPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-In");
+
+                    b.Property<string>("CheckInRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-In");
+
+                    b.Property<DateTime?>("CheckOut")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา ออกงาน");
+
+                    b.Property<string>("CheckOutImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-Out");
+
+                    b.Property<double>("CheckOutLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-Out");
+
+                    b.Property<string>("CheckOutLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-Out");
+
+                    b.Property<double>("CheckOutLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-Out");
+
+                    b.Property<string>("CheckOutPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-Out");
+
+                    b.Property<string>("CheckOutRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-Out");
+
+                    b.Property<string>("Child1")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child1Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child2")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child3")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child4")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CitizenId")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsLocationCheckIn")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-In");
+
+                    b.Property<bool>("IsLocationCheckOut")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-Out");
+
+                    b.Property<bool>("IsProcess")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("นำไปประมวลผลแล้วหรือยัง");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ProfileType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Root")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("RootId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserTimeStamps");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveBeginning", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Commons.LeaveType", "LeaveType")
+                        .WithMany()
+                        .HasForeignKey("LeaveTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LeaveType");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveDocument", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", "LeaveRequest")
+                        .WithMany("LeaveDocument")
+                        .HasForeignKey("LeaveRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("LeaveRequest");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "LeaveCancelDocument")
+                        .WithMany()
+                        .HasForeignKey("LeaveCancelDocumentId");
+
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "LeaveDraftDocument")
+                        .WithMany()
+                        .HasForeignKey("LeaveDraftDocumentId");
+
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Commons.LeaveType", "Type")
+                        .WithMany()
+                        .HasForeignKey("TypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LeaveCancelDocument");
+
+                    b.Navigation("LeaveDraftDocument");
+
+                    b.Navigation("Type");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequestApprover", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", "LeaveRequest")
+                        .WithMany("Approvers")
+                        .HasForeignKey("LeaveRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LeaveRequest");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserDutyTime", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.TimeAttendants.DutyTime", "DutyTime")
+                        .WithMany()
+                        .HasForeignKey("DutyTimeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DutyTime");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.Navigation("Approvers");
+
+                    b.Navigation("LeaveDocument");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260205034753_Add LeaveCount to LeaveBeginning.cs b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260205034753_Add LeaveCount to LeaveBeginning.cs
new file mode 100644
index 00000000..35fecaea
--- /dev/null
+++ b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260205034753_Add LeaveCount to LeaveBeginning.cs	
@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    /// <inheritdoc />
+    public partial class AddLeaveCounttoLeaveBeginning : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "LeaveCount",
+                table: "LeaveBeginnings",
+                type: "int",
+                nullable: false,
+                defaultValue: 0,
+                comment: "จำนวนครั้งที่ลาสะสม");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "LeaveCount",
+                table: "LeaveBeginnings");
+        }
+    }
+}
diff --git a/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260210091134_Add BeginningLeave and LeaveCount to LeaveBeginning.Designer.cs b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260210091134_Add BeginningLeave and LeaveCount to LeaveBeginning.Designer.cs
new file mode 100644
index 00000000..934ba1a9
--- /dev/null
+++ b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260210091134_Add BeginningLeave and LeaveCount to LeaveBeginning.Designer.cs	
@@ -0,0 +1,1717 @@
+// <auto-generated />
+using System;
+using BMA.EHR.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    [DbContext(typeof(LeaveDbContext))]
+    [Migration("20260210091134_Add BeginningLeave and LeaveCount to LeaveBeginning")]
+    partial class AddBeginningLeaveandLeaveCounttoLeaveBeginning
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Documents.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Detail")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("FileSize")
+                        .HasColumnType("int");
+
+                    b.Property<string>("FileType")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128)");
+
+                    b.Property<Guid>("ObjectRefId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Document");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Commons.LeaveType", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("Code")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รหัสประเภทการลา");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<int>("Limit")
+                        .HasColumnType("int")
+                        .HasComment("จำนวนวันลาสูงสุดประจำปี");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อประเภทการลา");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LeaveTypes");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveBeginning", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<int>("BeginningLeaveCount")
+                        .HasColumnType("int")
+                        .HasComment("จำนวนครั้งที่ลายกมา");
+
+                    b.Property<double>("BeginningLeaveDays")
+                        .HasColumnType("double")
+                        .HasComment("จำนวนวันลายกมา");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<int>("LeaveCount")
+                        .HasColumnType("int")
+                        .HasComment("จำนวนครั้งที่ลาสะสม");
+
+                    b.Property<double>("LeaveDays")
+                        .HasColumnType("double")
+                        .HasComment("จำนวนวันลาทั้งหมด");
+
+                    b.Property<double>("LeaveDaysUsed")
+                        .HasColumnType("double")
+                        .HasComment("จำนวนวันลาที่ใช้ไป");
+
+                    b.Property<Guid>("LeaveTypeId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัสประเภทการลา");
+
+                    b.Property<int>("LeaveYear")
+                        .HasColumnType("int")
+                        .HasComment("ปีงบประมาณ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaveTypeId");
+
+                    b.ToTable("LeaveBeginnings");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveDocument", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("LeaveRequestId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaveRequestId");
+
+                    b.ToTable("LeaveDocuments");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("AbsentDayAt")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("AbsentDayGetIn")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("AbsentDayLocation")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("AbsentDayRegistorDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("AbsentDaySummon")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<double?>("Amount")
+                        .HasColumnType("double");
+
+                    b.Property<string>("ApproveStep")
+                        .HasColumnType("longtext")
+                        .HasComment("step การอนุมัติ st1 = จทน.อนุมัตื,st2 = ผู้บังคับบัญชา อนุมัติ ");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CancelLeaveWrote")
+                        .HasColumnType("longtext")
+                        .HasComment("เขียนที่ (ขอยกเลิก)");
+
+                    b.Property<string>("Child1")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child1Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child2")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child3")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child4")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CitizenId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CommanderPosition")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayCountryHistory")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("CoupleDayEndDateHistory")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CoupleDayLevel")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayLevelCountry")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayPosition")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("CoupleDayStartDateHistory")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CoupleDaySumTotalHistory")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayTotalHistory")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<DateTime?>("DateAppoint")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Dear")
+                        .HasColumnType("longtext")
+                        .HasComment("เรียนใคร");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("HajjDayStatus")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("LeaveAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานที่ติดต่อขณะลา");
+
+                    b.Property<DateTime?>("LeaveBirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LeaveCancelComment")
+                        .HasColumnType("longtext")
+                        .HasComment("เหตุผลในการขอยกเลิก");
+
+                    b.Property<Guid?>("LeaveCancelDocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LeaveCancelStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะของคำขอยกเลิก");
+
+                    b.Property<string>("LeaveComment")
+                        .HasColumnType("longtext")
+                        .HasComment("ความเห็นของผู้บังคับบัญชา");
+
+                    b.Property<string>("LeaveDetail")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รายละเอียดการลา");
+
+                    b.Property<string>("LeaveDirectorComment")
+                        .HasColumnType("longtext")
+                        .HasComment("ความเห็นของผู้อำนวยการสำนัก");
+
+                    b.Property<Guid?>("LeaveDraftDocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("LeaveEndDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เดือน ปีสิ้นสุดลา");
+
+                    b.Property<DateTime?>("LeaveGovernmentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime?>("LeaveLast")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LeaveNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("หมายเลขที่ติดต่อขณะลา");
+
+                    b.Property<string>("LeaveRange")
+                        .HasColumnType("longtext")
+                        .HasComment("ช่วงของการลาของวันเริ่ม เช่น ลาทั้งวัน ครึ่งวันเช้า ครึ่งวันบ่าย");
+
+                    b.Property<string>("LeaveRangeEnd")
+                        .HasColumnType("longtext")
+                        .HasComment("ช่วงของการลาของวันสิ้นสุด เช่น ลาทั้งวัน ครึ่งวันเช้า ครึ่งวันบ่าย");
+
+                    b.Property<int?>("LeaveSalary")
+                        .HasColumnType("int");
+
+                    b.Property<string>("LeaveSalaryText")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("LeaveStartDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เดือน ปีเริ่มต้นลา");
+
+                    b.Property<string>("LeaveStatus")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะของคำร้อง");
+
+                    b.Property<string>("LeaveSubTypeName")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("LeaveTotal")
+                        .HasColumnType("double");
+
+                    b.Property<string>("LeaveTypeCode")
+                        .HasColumnType("longtext")
+                        .HasComment("code ของประเภทการลา");
+
+                    b.Property<string>("LeaveWrote")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เขียนที่");
+
+                    b.Property<string>("OrdainDayBuddhistLentAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayBuddhistLentName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayLocationAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayLocationName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayLocationNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("OrdainDayOrdination")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("OrdainDayStatus")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("OrganizationName")
+                        .HasColumnType("longtext")
+                        .HasComment("สังกัดผู้ยื่นขอ");
+
+                    b.Property<string>("PositionLevelName")
+                        .HasColumnType("longtext")
+                        .HasComment("ระดับผู้ยื่นขอ");
+
+                    b.Property<string>("PositionName")
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งผู้ยื่นขอ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ProfileType")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("RestDayCurrentTotal")
+                        .HasColumnType("double");
+
+                    b.Property<double>("RestDayOldTotal")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Root")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("RootId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("StudyDayCountry")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayDegreeLevel")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayScholarship")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDaySubject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayTrainingName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayTrainingSubject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayUniversityName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TypeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("WifeDayDateBorn")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("WifeDayName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaveCancelDocumentId");
+
+                    b.HasIndex("LeaveDraftDocumentId");
+
+                    b.HasIndex("TypeId");
+
+                    b.ToTable("LeaveRequests");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequestApprover", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("ApproveStatus")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApproveType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("KeycloakId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("LeaveRequestId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("OrganizationName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สังกัด");
+
+                    b.Property<string>("PosExecutiveName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งทางการบริหาร");
+
+                    b.Property<string>("PositionLevelName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ประเภทระดับตำแหน่ง");
+
+                    b.Property<string>("PositionName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PositionSign")
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งใต้ลายเช็นต์");
+
+                    b.Property<string>("Prefix")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Seq")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaveRequestId");
+
+                    b.ToTable("LeaveRequestApprovers");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.AdditionalCheckRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CheckDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("*วันที่ลงเวลา");
+
+                    b.Property<bool>("CheckInEdit")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("*ขอลงเวลาช่วงเช้า");
+
+                    b.Property<bool>("CheckOutEdit")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("*ขอลงเวลาช่วงบ่าย");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .HasColumnType("longtext")
+                        .HasComment("หมายเหตุในการการอนุมัติ/ไม่อนุมัติ");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("*หมายเหตุขอลงเวลาพิเศษ");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak ที่ร้องขอ");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<double?>("Latitude")
+                        .HasColumnType("double");
+
+                    b.Property<double?>("Longitude")
+                        .HasColumnType("double");
+
+                    b.Property<string>("POI")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะการอนุมัติ");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AdditionalCheckRequests");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.CheckInJobStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("AdditionalData")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อมูลเพิ่มเติม (JSON)");
+
+                    b.Property<Guid?>("CheckInId")
+                        .HasColumnType("char(36)")
+                        .HasComment("CheckInId สำหรับ Check-Out");
+
+                    b.Property<string>("CheckType")
+                        .HasColumnType("longtext")
+                        .HasComment("ประเภทการลงเวลา: CHECK_IN, CHECK_OUT");
+
+                    b.Property<DateTime?>("CompletedDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่เสร็จสิ้นการประมวลผล");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่สร้างงาน");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("ErrorMessage")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความแสดงข้อผิดพลาด");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<DateTime?>("ProcessingDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่เริ่มประมวลผล");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะงาน: PENDING, PROCESSING, COMPLETED, FAILED");
+
+                    b.Property<Guid>("TaskId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Task ID สำหรับติดตามสถานะงาน");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckInJobStatuses");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.DutyTime", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("คำอธิบาย");
+
+                    b.Property<string>("EndTimeAfternoon")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาออกงานช่วงบ่าย");
+
+                    b.Property<string>("EndTimeMorning")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาออกงานช่วงเช้า");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("สถานะการเปิดใช้งาน (เปิด/ปิด)");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("สถานะว่ารอบใดเป็นค่า Default ของข้าราชการ (สำหรับทุกคนที่ยังไม่ได้ทำการเลือกรอบ)");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("StartTimeAfternoon")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาเข้างานช่วงบ่าย");
+
+                    b.Property<string>("StartTimeMorning")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาเข้างานช่วงเช้า");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DutyTimes");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.ProcessUserTimeStamp", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CheckIn")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา เข้างาน");
+
+                    b.Property<string>("CheckInImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-In");
+
+                    b.Property<double>("CheckInLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-In");
+
+                    b.Property<string>("CheckInLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-In");
+
+                    b.Property<double>("CheckInLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-In");
+
+                    b.Property<string>("CheckInPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-In");
+
+                    b.Property<string>("CheckInRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-In");
+
+                    b.Property<string>("CheckInStatus")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะ Check-In");
+
+                    b.Property<DateTime?>("CheckOut")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา ออกงาน");
+
+                    b.Property<string>("CheckOutImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-Out");
+
+                    b.Property<double>("CheckOutLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-Out");
+
+                    b.Property<string>("CheckOutLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-Out");
+
+                    b.Property<double>("CheckOutLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-Out");
+
+                    b.Property<string>("CheckOutPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-Out");
+
+                    b.Property<string>("CheckOutRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-Out");
+
+                    b.Property<string>("CheckOutStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะ Check-Out");
+
+                    b.Property<string>("Child1")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child1Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child2")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child3")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child4")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CitizenId")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("EditReason")
+                        .HasColumnType("longtext")
+                        .HasComment("เหตุผลการอนุมัติ/ไม่อนุมัติขอลงเวลาพิเศษ");
+
+                    b.Property<string>("EditStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะการของลงเวลาพิเศษ");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsLocationCheckIn")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-In");
+
+                    b.Property<bool>("IsLocationCheckOut")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-Out");
+
+                    b.Property<bool>("IsProcess")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("นำไปประมวลผลแล้วหรือยัง");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ProfileType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Root")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("RootId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ProcessUserTimeStamps");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserCalendar", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("Calendar")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ปฏิทินการทำงานของ ขรก ปกติ หรือ 6 วันต่อสัปดาห์");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserCalendars");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserDutyTime", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<Guid>("DutyTimeId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัสรอบการลงเวลา");
+
+                    b.Property<DateTime?>("EffectiveDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันที่มีผล");
+
+                    b.Property<bool>("IsProcess")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("ทำการประมวลผลแล้วหรือยัง");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("longtext")
+                        .HasComment("หมายเหตุ");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DutyTimeId");
+
+                    b.ToTable("UserDutyTimes");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserTimeStamp", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CheckIn")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา เข้างาน");
+
+                    b.Property<string>("CheckInImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-In");
+
+                    b.Property<double>("CheckInLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-In");
+
+                    b.Property<string>("CheckInLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-In");
+
+                    b.Property<double>("CheckInLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-In");
+
+                    b.Property<string>("CheckInPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-In");
+
+                    b.Property<string>("CheckInRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-In");
+
+                    b.Property<DateTime?>("CheckOut")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา ออกงาน");
+
+                    b.Property<string>("CheckOutImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-Out");
+
+                    b.Property<double>("CheckOutLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-Out");
+
+                    b.Property<string>("CheckOutLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-Out");
+
+                    b.Property<double>("CheckOutLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-Out");
+
+                    b.Property<string>("CheckOutPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-Out");
+
+                    b.Property<string>("CheckOutRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-Out");
+
+                    b.Property<string>("Child1")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child1Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child2")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child3")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child4")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CitizenId")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsLocationCheckIn")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-In");
+
+                    b.Property<bool>("IsLocationCheckOut")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-Out");
+
+                    b.Property<bool>("IsProcess")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("นำไปประมวลผลแล้วหรือยัง");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ProfileType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Root")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("RootId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserTimeStamps");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveBeginning", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Commons.LeaveType", "LeaveType")
+                        .WithMany()
+                        .HasForeignKey("LeaveTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LeaveType");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveDocument", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", "LeaveRequest")
+                        .WithMany("LeaveDocument")
+                        .HasForeignKey("LeaveRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("LeaveRequest");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "LeaveCancelDocument")
+                        .WithMany()
+                        .HasForeignKey("LeaveCancelDocumentId");
+
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "LeaveDraftDocument")
+                        .WithMany()
+                        .HasForeignKey("LeaveDraftDocumentId");
+
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Commons.LeaveType", "Type")
+                        .WithMany()
+                        .HasForeignKey("TypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LeaveCancelDocument");
+
+                    b.Navigation("LeaveDraftDocument");
+
+                    b.Navigation("Type");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequestApprover", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", "LeaveRequest")
+                        .WithMany("Approvers")
+                        .HasForeignKey("LeaveRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LeaveRequest");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserDutyTime", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.TimeAttendants.DutyTime", "DutyTime")
+                        .WithMany()
+                        .HasForeignKey("DutyTimeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DutyTime");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.Navigation("Approvers");
+
+                    b.Navigation("LeaveDocument");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260210091134_Add BeginningLeave and LeaveCount to LeaveBeginning.cs b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260210091134_Add BeginningLeave and LeaveCount to LeaveBeginning.cs
new file mode 100644
index 00000000..a54ad519
--- /dev/null
+++ b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260210091134_Add BeginningLeave and LeaveCount to LeaveBeginning.cs	
@@ -0,0 +1,62 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    /// <inheritdoc />
+    public partial class AddBeginningLeaveandLeaveCounttoLeaveBeginning : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<double>(
+                name: "LeaveDays",
+                table: "LeaveBeginnings",
+                type: "double",
+                nullable: false,
+                comment: "จำนวนวันลาทั้งหมด",
+                oldClrType: typeof(double),
+                oldType: "double",
+                oldComment: "จำนวนวันลายกมา");
+
+            migrationBuilder.AddColumn<int>(
+                name: "BeginningLeaveCount",
+                table: "LeaveBeginnings",
+                type: "int",
+                nullable: false,
+                defaultValue: 0,
+                comment: "จำนวนครั้งที่ลายกมา");
+
+            migrationBuilder.AddColumn<double>(
+                name: "BeginningLeaveDays",
+                table: "LeaveBeginnings",
+                type: "double",
+                nullable: false,
+                defaultValue: 0.0,
+                comment: "จำนวนวันลายกมา");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "BeginningLeaveCount",
+                table: "LeaveBeginnings");
+
+            migrationBuilder.DropColumn(
+                name: "BeginningLeaveDays",
+                table: "LeaveBeginnings");
+
+            migrationBuilder.AlterColumn<double>(
+                name: "LeaveDays",
+                table: "LeaveBeginnings",
+                type: "double",
+                nullable: false,
+                comment: "จำนวนวันลายกมา",
+                oldClrType: typeof(double),
+                oldType: "double",
+                oldComment: "จำนวนวันลาทั้งหมด");
+        }
+    }
+}
diff --git a/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260330020909_Add Leave Process Job Status.Designer.cs b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260330020909_Add Leave Process Job Status.Designer.cs
new file mode 100644
index 00000000..815f8188
--- /dev/null
+++ b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260330020909_Add Leave Process Job Status.Designer.cs	
@@ -0,0 +1,1802 @@
+// <auto-generated />
+using System;
+using BMA.EHR.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    [DbContext(typeof(LeaveDbContext))]
+    [Migration("20260330020909_Add Leave Process Job Status")]
+    partial class AddLeaveProcessJobStatus
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Documents.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Detail")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("FileSize")
+                        .HasColumnType("int");
+
+                    b.Property<string>("FileType")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128)");
+
+                    b.Property<Guid>("ObjectRefId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Document");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Commons.LeaveType", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("Code")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รหัสประเภทการลา");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<int>("Limit")
+                        .HasColumnType("int")
+                        .HasComment("จำนวนวันลาสูงสุดประจำปี");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อประเภทการลา");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LeaveTypes");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveBeginning", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<int>("BeginningLeaveCount")
+                        .HasColumnType("int")
+                        .HasComment("จำนวนครั้งที่ลายกมา");
+
+                    b.Property<double>("BeginningLeaveDays")
+                        .HasColumnType("double")
+                        .HasComment("จำนวนวันลายกมา");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<int>("LeaveCount")
+                        .HasColumnType("int")
+                        .HasComment("จำนวนครั้งที่ลาสะสม");
+
+                    b.Property<double>("LeaveDays")
+                        .HasColumnType("double")
+                        .HasComment("จำนวนวันลาทั้งหมด");
+
+                    b.Property<double>("LeaveDaysUsed")
+                        .HasColumnType("double")
+                        .HasComment("จำนวนวันลาที่ใช้ไป");
+
+                    b.Property<Guid>("LeaveTypeId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัสประเภทการลา");
+
+                    b.Property<int>("LeaveYear")
+                        .HasColumnType("int")
+                        .HasComment("ปีงบประมาณ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaveTypeId");
+
+                    b.ToTable("LeaveBeginnings");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveDocument", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("LeaveRequestId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaveRequestId");
+
+                    b.ToTable("LeaveDocuments");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("AbsentDayAt")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("AbsentDayGetIn")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("AbsentDayLocation")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("AbsentDayRegistorDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("AbsentDaySummon")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<double?>("Amount")
+                        .HasColumnType("double");
+
+                    b.Property<string>("ApproveStep")
+                        .HasColumnType("longtext")
+                        .HasComment("step การอนุมัติ st1 = จทน.อนุมัตื,st2 = ผู้บังคับบัญชา อนุมัติ ");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CancelLeaveWrote")
+                        .HasColumnType("longtext")
+                        .HasComment("เขียนที่ (ขอยกเลิก)");
+
+                    b.Property<string>("Child1")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child1Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child2")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child3")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child4")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CitizenId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CommanderPosition")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayCountryHistory")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("CoupleDayEndDateHistory")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CoupleDayLevel")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayLevelCountry")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayPosition")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("CoupleDayStartDateHistory")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CoupleDaySumTotalHistory")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("CoupleDayTotalHistory")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<DateTime?>("DateAppoint")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Dear")
+                        .HasColumnType("longtext")
+                        .HasComment("เรียนใคร");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("HajjDayStatus")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("LeaveAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานที่ติดต่อขณะลา");
+
+                    b.Property<DateTime?>("LeaveBirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LeaveCancelComment")
+                        .HasColumnType("longtext")
+                        .HasComment("เหตุผลในการขอยกเลิก");
+
+                    b.Property<Guid?>("LeaveCancelDocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LeaveCancelStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะของคำขอยกเลิก");
+
+                    b.Property<string>("LeaveComment")
+                        .HasColumnType("longtext")
+                        .HasComment("ความเห็นของผู้บังคับบัญชา");
+
+                    b.Property<string>("LeaveDetail")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รายละเอียดการลา");
+
+                    b.Property<string>("LeaveDirectorComment")
+                        .HasColumnType("longtext")
+                        .HasComment("ความเห็นของผู้อำนวยการสำนัก");
+
+                    b.Property<Guid?>("LeaveDraftDocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("LeaveEndDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เดือน ปีสิ้นสุดลา");
+
+                    b.Property<DateTime?>("LeaveGovernmentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime?>("LeaveLast")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LeaveNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("หมายเลขที่ติดต่อขณะลา");
+
+                    b.Property<string>("LeaveRange")
+                        .HasColumnType("longtext")
+                        .HasComment("ช่วงของการลาของวันเริ่ม เช่น ลาทั้งวัน ครึ่งวันเช้า ครึ่งวันบ่าย");
+
+                    b.Property<string>("LeaveRangeEnd")
+                        .HasColumnType("longtext")
+                        .HasComment("ช่วงของการลาของวันสิ้นสุด เช่น ลาทั้งวัน ครึ่งวันเช้า ครึ่งวันบ่าย");
+
+                    b.Property<int?>("LeaveSalary")
+                        .HasColumnType("int");
+
+                    b.Property<string>("LeaveSalaryText")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("LeaveStartDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เดือน ปีเริ่มต้นลา");
+
+                    b.Property<string>("LeaveStatus")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะของคำร้อง");
+
+                    b.Property<string>("LeaveSubTypeName")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("LeaveTotal")
+                        .HasColumnType("double");
+
+                    b.Property<string>("LeaveTypeCode")
+                        .HasColumnType("longtext")
+                        .HasComment("code ของประเภทการลา");
+
+                    b.Property<string>("LeaveWrote")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เขียนที่");
+
+                    b.Property<string>("OrdainDayBuddhistLentAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayBuddhistLentName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayLocationAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayLocationName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrdainDayLocationNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("OrdainDayOrdination")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("OrdainDayStatus")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("OrganizationName")
+                        .HasColumnType("longtext")
+                        .HasComment("สังกัดผู้ยื่นขอ");
+
+                    b.Property<string>("PositionLevelName")
+                        .HasColumnType("longtext")
+                        .HasComment("ระดับผู้ยื่นขอ");
+
+                    b.Property<string>("PositionName")
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งผู้ยื่นขอ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ProfileType")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("RestDayCurrentTotal")
+                        .HasColumnType("double");
+
+                    b.Property<double>("RestDayOldTotal")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Root")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("RootId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("StudyDayCountry")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayDegreeLevel")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayScholarship")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDaySubject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayTrainingName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayTrainingSubject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StudyDayUniversityName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TypeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("WifeDayDateBorn")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("WifeDayName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaveCancelDocumentId");
+
+                    b.HasIndex("LeaveDraftDocumentId");
+
+                    b.HasIndex("TypeId");
+
+                    b.ToTable("LeaveRequests");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequestApprover", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("ApproveStatus")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApproveType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("KeycloakId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("LeaveRequestId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("OrganizationName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สังกัด");
+
+                    b.Property<string>("PosExecutiveName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งทางการบริหาร");
+
+                    b.Property<string>("PositionLevelName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ประเภทระดับตำแหน่ง");
+
+                    b.Property<string>("PositionName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PositionSign")
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งใต้ลายเช็นต์");
+
+                    b.Property<string>("Prefix")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Seq")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaveRequestId");
+
+                    b.ToTable("LeaveRequestApprovers");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.AdditionalCheckRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CheckDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("*วันที่ลงเวลา");
+
+                    b.Property<bool>("CheckInEdit")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("*ขอลงเวลาช่วงเช้า");
+
+                    b.Property<bool>("CheckOutEdit")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("*ขอลงเวลาช่วงบ่าย");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .HasColumnType("longtext")
+                        .HasComment("หมายเหตุในการการอนุมัติ/ไม่อนุมัติ");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("*หมายเหตุขอลงเวลาพิเศษ");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak ที่ร้องขอ");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<double?>("Latitude")
+                        .HasColumnType("double");
+
+                    b.Property<double?>("Longitude")
+                        .HasColumnType("double");
+
+                    b.Property<string>("POI")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะการอนุมัติ");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AdditionalCheckRequests");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.CheckInJobStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("AdditionalData")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อมูลเพิ่มเติม (JSON)");
+
+                    b.Property<Guid?>("CheckInId")
+                        .HasColumnType("char(36)")
+                        .HasComment("CheckInId สำหรับ Check-Out");
+
+                    b.Property<string>("CheckType")
+                        .HasColumnType("longtext")
+                        .HasComment("ประเภทการลงเวลา: CHECK_IN, CHECK_OUT");
+
+                    b.Property<DateTime?>("CompletedDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่เสร็จสิ้นการประมวลผล");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่สร้างงาน");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("ErrorMessage")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความแสดงข้อผิดพลาด");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<DateTime?>("ProcessingDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่เริ่มประมวลผล");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะงาน: PENDING, PROCESSING, COMPLETED, FAILED");
+
+                    b.Property<Guid>("TaskId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Task ID สำหรับติดตามสถานะงาน");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckInJobStatuses");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.DutyTime", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("คำอธิบาย");
+
+                    b.Property<string>("EndTimeAfternoon")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาออกงานช่วงบ่าย");
+
+                    b.Property<string>("EndTimeMorning")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาออกงานช่วงเช้า");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("สถานะการเปิดใช้งาน (เปิด/ปิด)");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("สถานะว่ารอบใดเป็นค่า Default ของข้าราชการ (สำหรับทุกคนที่ยังไม่ได้ทำการเลือกรอบ)");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("StartTimeAfternoon")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาเข้างานช่วงบ่าย");
+
+                    b.Property<string>("StartTimeMorning")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("เวลาเข้างานช่วงเช้า");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DutyTimes");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.LeaveProcessJobStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime?>("CompletedDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่เสร็จสิ้นการประมวลผล");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่สร้างงาน");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันสิ้นสุด");
+
+                    b.Property<string>("ErrorMessage")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความแสดงข้อผิดพลาด");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<DateTime?>("ProcessingDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่เริ่มประมวลผล");
+
+                    b.Property<Guid>("RootDnaId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Root DNA Id");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเริ่มต้น");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะงาน: PENDING, PROCESSING, COMPLETED, FAILED");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LeaveProcessJobStatuses");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.ProcessUserTimeStamp", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CheckIn")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา เข้างาน");
+
+                    b.Property<string>("CheckInImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-In");
+
+                    b.Property<double>("CheckInLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-In");
+
+                    b.Property<string>("CheckInLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-In");
+
+                    b.Property<double>("CheckInLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-In");
+
+                    b.Property<string>("CheckInPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-In");
+
+                    b.Property<string>("CheckInRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-In");
+
+                    b.Property<string>("CheckInStatus")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะ Check-In");
+
+                    b.Property<DateTime?>("CheckOut")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา ออกงาน");
+
+                    b.Property<string>("CheckOutImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-Out");
+
+                    b.Property<double>("CheckOutLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-Out");
+
+                    b.Property<string>("CheckOutLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-Out");
+
+                    b.Property<double>("CheckOutLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-Out");
+
+                    b.Property<string>("CheckOutPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-Out");
+
+                    b.Property<string>("CheckOutRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-Out");
+
+                    b.Property<string>("CheckOutStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะ Check-Out");
+
+                    b.Property<string>("Child1")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child1Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child2")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child3")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child4")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CitizenId")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("EditReason")
+                        .HasColumnType("longtext")
+                        .HasComment("เหตุผลการอนุมัติ/ไม่อนุมัติขอลงเวลาพิเศษ");
+
+                    b.Property<string>("EditStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะการของลงเวลาพิเศษ");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsLocationCheckIn")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-In");
+
+                    b.Property<bool>("IsLocationCheckOut")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-Out");
+
+                    b.Property<bool>("IsProcess")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("นำไปประมวลผลแล้วหรือยัง");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ProfileType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Root")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("RootId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ProcessUserTimeStamps");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserCalendar", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("Calendar")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ปฏิทินการทำงานของ ขรก ปกติ หรือ 6 วันต่อสัปดาห์");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserCalendars");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserDutyTime", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<Guid>("DutyTimeId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัสรอบการลงเวลา");
+
+                    b.Property<DateTime?>("EffectiveDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันที่มีผล");
+
+                    b.Property<bool>("IsProcess")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("ทำการประมวลผลแล้วหรือยัง");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("ProfileId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Profile ในระบบทะเบียนประวัติ");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("longtext")
+                        .HasComment("หมายเหตุ");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DutyTimeId");
+
+                    b.ToTable("UserDutyTimes");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserTimeStamp", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CheckIn")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา เข้างาน");
+
+                    b.Property<string>("CheckInImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-In");
+
+                    b.Property<double>("CheckInLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-In");
+
+                    b.Property<string>("CheckInLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-In");
+
+                    b.Property<double>("CheckInLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-In");
+
+                    b.Property<string>("CheckInPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-In");
+
+                    b.Property<string>("CheckInRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-In");
+
+                    b.Property<DateTime?>("CheckOut")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วัน เวลา ออกงาน");
+
+                    b.Property<string>("CheckOutImageUrl")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("รูปถ่ายสถานที่  Check-Out");
+
+                    b.Property<double>("CheckOutLat")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดละติจูด Check-Out");
+
+                    b.Property<string>("CheckOutLocationName")
+                        .HasColumnType("longtext")
+                        .HasComment("กรณีเลือกนอกสถานที่ตั้ง ต้องระบุข้อมูลชื่อสถานะที่ Check-Out");
+
+                    b.Property<double>("CheckOutLon")
+                        .HasColumnType("double")
+                        .HasComment("พิกัดลองจิจูด Check-Out");
+
+                    b.Property<string>("CheckOutPOI")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ชื่อสถานที่ ได้มาจากระบบ ArcGis ของกองสารสนเทศภูมิศาสตร์ Check-Out");
+
+                    b.Property<string>("CheckOutRemark")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความหมายเหตุที่ต้องการระบุเพิ่ม(มีเผื่อไว้อาจไม่ได้ใช้) Check-Out");
+
+                    b.Property<string>("Child1")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child1DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child1Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child2")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child2DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child2Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child3")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child3DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child3Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Child4")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("Child4DnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("Child4Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CitizenId")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsLocationCheckIn")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-In");
+
+                    b.Property<bool>("IsLocationCheckOut")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง Check-Out");
+
+                    b.Property<bool>("IsProcess")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("นำไปประมวลผลแล้วหรือยัง");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<string>("Prefix")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ProfileType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Root")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("RootDnaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("RootId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserTimeStamps");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveBeginning", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Commons.LeaveType", "LeaveType")
+                        .WithMany()
+                        .HasForeignKey("LeaveTypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LeaveType");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveDocument", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", "LeaveRequest")
+                        .WithMany("LeaveDocument")
+                        .HasForeignKey("LeaveRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("LeaveRequest");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "LeaveCancelDocument")
+                        .WithMany()
+                        .HasForeignKey("LeaveCancelDocumentId");
+
+                    b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "LeaveDraftDocument")
+                        .WithMany()
+                        .HasForeignKey("LeaveDraftDocumentId");
+
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Commons.LeaveType", "Type")
+                        .WithMany()
+                        .HasForeignKey("TypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LeaveCancelDocument");
+
+                    b.Navigation("LeaveDraftDocument");
+
+                    b.Navigation("Type");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequestApprover", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", "LeaveRequest")
+                        .WithMany("Approvers")
+                        .HasForeignKey("LeaveRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LeaveRequest");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.UserDutyTime", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Leave.TimeAttendants.DutyTime", "DutyTime")
+                        .WithMany()
+                        .HasForeignKey("DutyTimeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DutyTime");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.Requests.LeaveRequest", b =>
+                {
+                    b.Navigation("Approvers");
+
+                    b.Navigation("LeaveDocument");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260330020909_Add Leave Process Job Status.cs b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260330020909_Add Leave Process Job Status.cs
new file mode 100644
index 00000000..1567dc5e
--- /dev/null
+++ b/BMA.EHR.Infrastructure/Migrations/LeaveDb/20260330020909_Add Leave Process Job Status.cs	
@@ -0,0 +1,54 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    /// <inheritdoc />
+    public partial class AddLeaveProcessJobStatus : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "LeaveProcessJobStatuses",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, comment: "PrimaryKey", collation: "ascii_general_ci"),
+                    CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, comment: "สร้างข้อมูลเมื่อ"),
+                    CreatedUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่สร้างข้อมูล")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    LastUpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "แก้ไขข้อมูลล่าสุดเมื่อ"),
+                    LastUpdateUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่แก้ไขข้อมูลล่าสุด")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CreatedFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่สร้างข้อมูล")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    LastUpdateFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่แก้ไขข้อมูลล่าสุด")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    StartDate = table.Column<DateTime>(type: "datetime(6)", nullable: false, comment: "วันเริ่มต้น"),
+                    EndDate = table.Column<DateTime>(type: "datetime(6)", nullable: false, comment: "วันสิ้นสุด"),
+                    RootDnaId = table.Column<Guid>(type: "char(36)", nullable: false, comment: "รหัส Root DNA Id", collation: "ascii_general_ci"),
+                    CreatedDate = table.Column<DateTime>(type: "datetime(6)", nullable: false, comment: "วันเวลาที่สร้างงาน"),
+                    ProcessingDate = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "วันเวลาที่เริ่มประมวลผล"),
+                    CompletedDate = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "วันเวลาที่เสร็จสิ้นการประมวลผล"),
+                    Status = table.Column<string>(type: "longtext", nullable: false, comment: "สถานะงาน: PENDING, PROCESSING, COMPLETED, FAILED")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ErrorMessage = table.Column<string>(type: "longtext", nullable: true, comment: "ข้อความแสดงข้อผิดพลาด")
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_LeaveProcessJobStatuses", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "LeaveProcessJobStatuses");
+        }
+    }
+}
diff --git a/BMA.EHR.Infrastructure/Migrations/LeaveDb/LeaveDbContextModelSnapshot.cs b/BMA.EHR.Infrastructure/Migrations/LeaveDb/LeaveDbContextModelSnapshot.cs
index c0a77c10..4e384f55 100644
--- a/BMA.EHR.Infrastructure/Migrations/LeaveDb/LeaveDbContextModelSnapshot.cs
+++ b/BMA.EHR.Infrastructure/Migrations/LeaveDb/LeaveDbContextModelSnapshot.cs
@@ -128,6 +128,14 @@ namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
                         .HasComment("PrimaryKey")
                         .HasAnnotation("Relational:JsonPropertyName", "id");
 
+                    b.Property<int>("BeginningLeaveCount")
+                        .HasColumnType("int")
+                        .HasComment("จำนวนครั้งที่ลายกมา");
+
+                    b.Property<double>("BeginningLeaveDays")
+                        .HasColumnType("double")
+                        .HasComment("จำนวนวันลายกมา");
+
                     b.Property<Guid?>("Child1DnaId")
                         .HasColumnType("char(36)");
 
@@ -184,9 +192,13 @@ namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
                         .HasColumnOrder(102)
                         .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
 
+                    b.Property<int>("LeaveCount")
+                        .HasColumnType("int")
+                        .HasComment("จำนวนครั้งที่ลาสะสม");
+
                     b.Property<double>("LeaveDays")
                         .HasColumnType("double")
-                        .HasComment("จำนวนวันลายกมา");
+                        .HasComment("จำนวนวันลาทั้งหมด");
 
                     b.Property<double>("LeaveDaysUsed")
                         .HasColumnType("double")
@@ -727,6 +739,21 @@ namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
                     b.Property<Guid>("LeaveRequestId")
                         .HasColumnType("char(36)");
 
+                    b.Property<string>("OrganizationName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สังกัด");
+
+                    b.Property<string>("PosExecutiveName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ตำแหน่งทางการบริหาร");
+
+                    b.Property<string>("PositionLevelName")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("ประเภทระดับตำแหน่ง");
+
                     b.Property<string>("PositionName")
                         .IsRequired()
                         .HasColumnType("longtext");
@@ -867,6 +894,99 @@ namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
                     b.ToTable("AdditionalCheckRequests");
                 });
 
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.CheckInJobStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<string>("AdditionalData")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อมูลเพิ่มเติม (JSON)");
+
+                    b.Property<Guid?>("CheckInId")
+                        .HasColumnType("char(36)")
+                        .HasComment("CheckInId สำหรับ Check-Out");
+
+                    b.Property<string>("CheckType")
+                        .HasColumnType("longtext")
+                        .HasComment("ประเภทการลงเวลา: CHECK_IN, CHECK_OUT");
+
+                    b.Property<DateTime?>("CompletedDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่เสร็จสิ้นการประมวลผล");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่สร้างงาน");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<string>("ErrorMessage")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความแสดงข้อผิดพลาด");
+
+                    b.Property<Guid>("KeycloakUserId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส User ของ Keycloak");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<DateTime?>("ProcessingDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่เริ่มประมวลผล");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะงาน: PENDING, PROCESSING, COMPLETED, FAILED");
+
+                    b.Property<Guid>("TaskId")
+                        .HasColumnType("char(36)")
+                        .HasComment("Task ID สำหรับติดตามสถานะงาน");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckInJobStatuses");
+                });
+
             modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.DutyTime", b =>
                 {
                     b.Property<Guid>("Id")
@@ -952,6 +1072,91 @@ namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
                     b.ToTable("DutyTimes");
                 });
 
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.LeaveProcessJobStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime?>("CompletedDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่เสร็จสิ้นการประมวลผล");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่สร้างงาน");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันสิ้นสุด");
+
+                    b.Property<string>("ErrorMessage")
+                        .HasColumnType("longtext")
+                        .HasComment("ข้อความแสดงข้อผิดพลาด");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<DateTime?>("ProcessingDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเวลาที่เริ่มประมวลผล");
+
+                    b.Property<Guid>("RootDnaId")
+                        .HasColumnType("char(36)")
+                        .HasComment("รหัส Root DNA Id");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันเริ่มต้น");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("longtext")
+                        .HasComment("สถานะงาน: PENDING, PROCESSING, COMPLETED, FAILED");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LeaveProcessJobStatuses");
+                });
+
             modelBuilder.Entity("BMA.EHR.Domain.Models.Leave.TimeAttendants.ProcessUserTimeStamp", b =>
                 {
                     b.Property<Guid>("Id")
diff --git a/BMA.EHR.Infrastructure/Persistence/LeaveDbContext.cs b/BMA.EHR.Infrastructure/Persistence/LeaveDbContext.cs
index c6d37b7a..10064197 100644
--- a/BMA.EHR.Infrastructure/Persistence/LeaveDbContext.cs
+++ b/BMA.EHR.Infrastructure/Persistence/LeaveDbContext.cs
@@ -22,6 +22,8 @@ namespace BMA.EHR.Infrastructure.Persistence
 
         public DbSet<UserCalendar> UserCalendars { get; set; }
 
+        public DbSet<CheckInJobStatus> CheckInJobStatuses { get; set; }
+
         #endregion
 
         #region " Leave System "
@@ -38,6 +40,8 @@ namespace BMA.EHR.Infrastructure.Persistence
 
         #endregion
 
+        public DbSet<LeaveProcessJobStatus> LeaveProcessJobStatuses { get; set; }
+
 
         public LeaveDbContext(DbContextOptions<LeaveDbContext> options) : base(options)
         {
diff --git a/BMA.EHR.Insignia/Controllers/InsigniaManageController.cs b/BMA.EHR.Insignia/Controllers/InsigniaManageController.cs
index 80a8ef31..6c0b809f 100644
--- a/BMA.EHR.Insignia/Controllers/InsigniaManageController.cs
+++ b/BMA.EHR.Insignia/Controllers/InsigniaManageController.cs
@@ -331,7 +331,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
             if (req.Total + total > insigniaManage.Total)
                 return Error(GlobalMessages.InsigniaManageOrgLimit);
 
-            var ocData = _userProfileRepository.GetOc(req.OrganizationOrganizationId, 0, AccessToken);
+            var ocData = _userProfileRepository.GetOcByNodeId(req.OrganizationOrganizationId, 0, AccessToken);
             var root = ocData?.Root ?? null;
             var rootDnaId = ocData?.RootDnaId ?? null;
             await _context.InsigniaManageOrganiations.AddAsync(
@@ -407,6 +407,10 @@ namespace BMA.EHR.Insignia.Service.Controllers
             if (uppdated == null)
                 return Error(GlobalMessages.InsigniaManageNotFound);
 
+            var ocData = _userProfileRepository.GetOcByNodeId(uppdated.OrganizationId, 0, AccessToken);
+            var root = ocData?.Root ?? null;
+            var rootDnaId = ocData?.RootDnaId ?? null;
+
             var insigniaManage = await _context.InsigniaManages.AsQueryable()
                         .Include(x => x.InsigniaManageOrganiations)
                         .FirstOrDefaultAsync(x => x.Id == uppdated.InsigniaManage.Id);
@@ -416,6 +420,9 @@ namespace BMA.EHR.Insignia.Service.Controllers
             if (req.Total + total > insigniaManage.Total)
                 return Error(GlobalMessages.InsigniaManageOrgLimit);
 
+            uppdated.Organization = root;
+            uppdated.RootDnaId = rootDnaId;
+
             uppdated.Total = req.Total;
             uppdated.LastUpdateFullName = FullName ?? "System Administrator";
             uppdated.LastUpdateUserId = UserId ?? "";
@@ -639,7 +646,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -724,11 +731,11 @@ namespace BMA.EHR.Insignia.Service.Controllers
                 rawData = rawData
                     .Where(x => x.RootDnaId == Guid.Parse(nodeId!)).ToList();
             }
-            else if (role == "PARENT")
-            {
-                rawData = rawData
-                    .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     rawData = rawData
+            //         .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 rawData = rawData.Where(x =>
@@ -943,7 +950,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -1026,11 +1033,11 @@ namespace BMA.EHR.Insignia.Service.Controllers
                 rawData = rawData
                     .Where(x => x.RootDnaId == Guid.Parse(nodeId!)).ToList();
             }
-            else if (role == "PARENT")
-            {
-                rawData = rawData
-                    .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     rawData = rawData
+            //         .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 rawData = rawData.Where(x =>
diff --git a/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs b/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs
index 005f9882..415a0de2 100644
--- a/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs
+++ b/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs
@@ -2641,6 +2641,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
                 {
                     if (item.CitizanId == null) continue;
                     var _profile = await _userProfileRepository.GetOfficerProfileByCitizenId(item.CitizanId, AccessToken);
+                    if (_profile == null)
+                        continue;
                     var profile = insigniaNote.InsigniaNoteProfiles.FirstOrDefault(x => x.ProfileId == _profile.Id);
                     if (profile == null)
                     {
@@ -3096,7 +3098,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
                 var doc = await _documentService.UploadFileAsync(file, file.FileName);
                 insigniaNoteProfile.DocReturnInsignia = doc;
             }
-            var root = _userProfileRepository.GetOc(req.OrgId, 0, AccessToken)?.Root ?? null;
+            var root = _userProfileRepository.GetOcByNodeId(req.OrgId, 0, AccessToken)?.Root ?? null;
             if (req.OrgId != Guid.Parse("00000000-0000-0000-0000-000000000000"))
             {
                 if (root == null)
@@ -3146,7 +3148,10 @@ namespace BMA.EHR.Insignia.Service.Controllers
                 var doc = await _documentService.UploadFileAsync(file, file.FileName);
                 insigniaNoteProfile.DocReceiveInsignia = doc;
             }
-            var root = _userProfileRepository.GetOc(req.OrgId, 0, AccessToken)?.Root ?? null;
+
+            var orgData = _userProfileRepository.GetOcByNodeId(req.OrgId,0, AccessToken);
+            var root = orgData?.Root ?? null;
+            var rootDnaId = orgData?.RootDnaId ?? null;
             if (req.OrgId != Guid.Parse("00000000-0000-0000-0000-000000000000"))
             {
                 if (root == null)
@@ -3157,6 +3162,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
                 root = "สำนักนายกรัฐมนตรี";
             }
             insigniaNoteProfile.OrgReceiveInsignia = root;
+            insigniaNoteProfile.RootDnaId = rootDnaId;
             insigniaNoteProfile.OrgReceiveInsigniaId = req.OrgId;
             insigniaNoteProfile.DateReceiveInsignia = req.Date;
             insigniaNoteProfile.LastUpdateFullName = FullName ?? "System Administrator";
diff --git a/BMA.EHR.Insignia/Program.cs b/BMA.EHR.Insignia/Program.cs
index a4dd716a..88c1c2ac 100644
--- a/BMA.EHR.Insignia/Program.cs
+++ b/BMA.EHR.Insignia/Program.cs
@@ -131,7 +131,7 @@ var builder = WebApplication.CreateBuilder(args);
     {
         options.ServerName = "Insignia-Server";  // ← ระบุชื่อ server
         options.WorkerCount = 5;  // ← 
-        options.Queues = new[] { "insignia" };  // ← worker จะรันเฉพาะ queue "insignia"
+        options.Queues = new[] { "insignia","default" };  // ← worker จะรันเฉพาะ queue "insignia"
     });
 
 
diff --git a/BMA.EHR.Insignia/appsettings.json b/BMA.EHR.Insignia/appsettings.json
index 3d74b2ae..4e160482 100644
--- a/BMA.EHR.Insignia/appsettings.json
+++ b/BMA.EHR.Insignia/appsettings.json
@@ -9,8 +9,8 @@
     }
   },
   "ElasticConfiguration": {
-    "Uri": "http://192.168.1.40:9200",
-    "IndexFormat": "bma-ehr-log-index",
+    "Uri": "http://192.168.1.63:9200",
+    "IndexFormat": "hrms-log-index",
     "SystemName": "insignia"
   },
   "AllowedHosts": "*",
@@ -31,10 +31,11 @@
     //"DisciplineConnection": "server=hrms.chin.in.th;user=root;password=ey2qVVyyqGYw8CyA7h8X72559r2Ad84K;port=53636;database=hrms_discipline;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
   },
   "Jwt": {
-    //"Key": "j7C9RO_p4nRtuwCH4z9Db_A_6We42tkD_p4lZtDrezc",
-    //"Issuer": "https://hrms-id.chin.in.th/realms/hrms"
-    "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
-    "Issuer": "https://id.frappet.synology.me/realms/hrms"
+    //"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
+    "Key": "j7C9RO_p4nRtuwCH4z9Db_A_6We42tkD_p4lZtDrezc",
+    "Issuer": "https://hrmsbkk-id.case-collection.com/realms/hrms"
+    //"Key": "xY2VR-EFvvNPsMs39u8ooVBWQL6mPwrNJOh3koJFTgU",
+    //"Issuer": "https://hrms-id.bangkok.go.th/realms/hrms"
   },
   "EPPlus": {
     "ExcelPackage": {
@@ -55,11 +56,17 @@
   "Node": {
     "API": "https://bma-ehr.frappet.synology.me/api/v1/probation"
   },
-  "API": "https://bma-ehr.frappet.synology.me/api/v1",
   "RabbitMQ": {
     "URL": "localhost",
     "UserName": "frappet",
     "Password": "FPTadmin2357"
   },
+  "Domain": "https://hrmsbkk.case-collection.com",
+  "APIPROBATION": "https://hrmsbkk.case-collection.com/api/v1/probation",
+  "API": "https://hrmsbkk.case-collection.com/api/v1",
+  "APIV2": "https://hrmsbkk.case-collection.com/api/v2",
+  "VITE_URL_MGT": "https://hrmsbkk-mgt.case-collection.com",
+  //"API": "https://bma-ehr.frappet.synology.me/api/v1",
+  //"API": "https://bma-hrms.bangkok.go.th/api/v1",
   "API_KEY": "fKRL16yyEgbyTEJdsMw2h64tGSCmkW685PRtM3CygzX1JOSdptT9UJtpgWwKM8FybRTJups3GTFwj27ZRvlPdIkv3XgCoVJaD5LmR06ozuEPvCCRSdp2WFthg08V5xHc56fTPfZLpr1VmXrhd6dvYhHIqKkQUJR02Rlkss11cLRWEQOssEFVA4xdu2J5DIRO1EM5m7wRRvEwcDB4mYRXD9HH52SMq6iYqUWEWsMwLdbk7QW9yYESUEuzMW5gWrb6vIeWZxJV5bTz1PcWUyR7eO9Fyw1F5DiQYc9JgzTC1mW7cv31fEtTtrfbJYKIb5EbWilqIEUKC6A0UKBDDek35ML0006cqRVm0pvdOH6jeq7VQyYrhdXe59dBEyhYGUIfozoVBvW7Up4QBuOMjyPjSqJPlMBKwaseptfrblxQV1AOOivSBpf1ZcQyOZ8JktRtKUDSuXsmG0lsXwFlI3JCeSHdpVdgZWFYcJPegqfrB6KotR02t9AVkpLs1ZWrixwz"
 }
diff --git a/BMA.EHR.Leave/BMA.EHR.Leave.csproj b/BMA.EHR.Leave/BMA.EHR.Leave.csproj
index 83132dd1..28f42590 100644
--- a/BMA.EHR.Leave/BMA.EHR.Leave.csproj
+++ b/BMA.EHR.Leave/BMA.EHR.Leave.csproj
@@ -45,6 +45,7 @@
 		<PackageReference Include="Microsoft.IdentityModel.Logging" Version="6.31.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
 		<PackageReference Include="NEST" Version="7.17.5" />
+		<PackageReference Include="NodaTime" Version="3.3.0" />
 		<PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="6.0.5.128" />
 		<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
 		<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
diff --git a/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs b/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs
index 4c37f19d..e580b00a 100644
--- a/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs
@@ -141,7 +141,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
                 }
-                else if (role == "ROOT" || role == "PARENT")
+                else if (role == "ROOT" /*|| role == "PARENT"*/)
                 {
                     nodeId = profileAdmin?.RootDnaId;
                 }
@@ -166,11 +166,11 @@ namespace BMA.EHR.Leave.Service.Controllers
                     resData = resData
                         .Where(x => x.RootDnaId == Guid.Parse(nodeId!)).ToList();
                 }
-                else if (role == "PARENT")
-                {
-                    resData = resData
-                        .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null).ToList();
-                }
+                // else if (role == "PARENT")
+                // {
+                //     resData = resData
+                //         .Where(x => x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId != null).ToList();
+                // }
                 else if (role == "NORMAL")
                 {
                     resData = resData
@@ -201,6 +201,9 @@ namespace BMA.EHR.Leave.Service.Controllers
                         item.LeaveYear,
                         item.LeaveDays,
                         item.LeaveDaysUsed,
+                        item.LeaveCount,
+                        item.BeginningLeaveDays,
+                        item.BeginningLeaveCount,
                         item.CreatedAt,
                         item.CreatedFullName,
                         item.LastUpdatedAt,
@@ -394,6 +397,9 @@ namespace BMA.EHR.Leave.Service.Controllers
                 leaveBeginning.LeaveYear = req.LeaveYear;
                 leaveBeginning.LeaveDays = req.LeaveDays;
                 leaveBeginning.LeaveDaysUsed = req.LeaveDaysUsed;
+                leaveBeginning.LeaveCount = req.LeaveCount;
+                leaveBeginning.BeginningLeaveDays = req.BeginningLeaveDays;
+                leaveBeginning.BeginningLeaveCount = req.BeginningLeaveCount;
 
                 leaveBeginning.ProfileId = req.ProfileId;
                 leaveBeginning.Prefix = profile.Prefix;
@@ -462,6 +468,9 @@ namespace BMA.EHR.Leave.Service.Controllers
                 leaveBeginning.LeaveYear = req.LeaveYear;
                 leaveBeginning.LeaveDays = req.LeaveDays;
                 leaveBeginning.LeaveDaysUsed = req.LeaveDaysUsed;
+                leaveBeginning.LeaveCount = req.LeaveCount;
+                leaveBeginning.BeginningLeaveDays = req.BeginningLeaveDays;
+                leaveBeginning.BeginningLeaveCount = req.BeginningLeaveCount;
 
                 leaveBeginning.ProfileId = req.ProfileId;
                 leaveBeginning.Prefix = profile.Prefix;
@@ -489,6 +498,126 @@ namespace BMA.EHR.Leave.Service.Controllers
             }
         }
 
+        [HttpPut("schedule")]
+        [AllowAnonymous]
+        public async Task<ActionResult<ResponseObject>> ScheduleUpdateLeaveBeginningAsync([FromBody] ScheduleEditLeaveBeginningDto req)
+        {
+            try
+            {
+                var profile = await _userProfileRepository.GetProfileByProfileIdNoAuthAsync(req.ProfileId, AccessToken);
+                if(profile == null)
+                {
+                    return Error("ไม่พบข้อมูลข้าราชการหรือลูกจ้าง", StatusCodes.Status404NotFound);
+                }   
+                // check duplicate
+                var oldData = await _context.LeaveBeginnings.FirstOrDefaultAsync(x => x.ProfileId == req.ProfileId
+                    && x.LeaveTypeId == req.LeaveTypeId
+                    && x.LeaveYear == req.LeaveYear);
+
+                if (oldData is not null)
+                {
+                    //return Error("ไม่สามารถบันทึกข้อมูล เนื่องจากมีข้อมูลในระบบแล้ว");
+                    oldData.LeaveTypeId = req.LeaveTypeId;
+                    oldData.LeaveYear = req.LeaveYear;
+                    oldData.LeaveDays = req.LeaveDays;
+                    // oldData.LeaveDaysUsed = req.LeaveDaysUsed;
+                    // oldData.LeaveCount = req.LeaveCount;
+                    // oldData.BeginningLeaveDays = req.BeginningLeaveDays;
+                    // oldData.BeginningLeaveCount = req.BeginningLeaveCount;
+
+                    oldData.ProfileId = req.ProfileId;
+                    oldData.Prefix = profile.Prefix;
+                    oldData.FirstName = profile.FirstName;
+                    oldData.LastName = profile.LastName;
+                    oldData.RootDnaId = profile.RootDnaId;
+                    oldData.Child1DnaId = profile.Child1DnaId;
+                    oldData.Child2DnaId = profile.Child2DnaId;
+                    oldData.Child3DnaId = profile.Child3DnaId;
+                    oldData.Child4DnaId = profile.Child4DnaId;
+
+                    oldData.LastUpdateUserId = "";
+                    oldData.LastUpdateFullName = "System";
+                    oldData.LastUpdatedAt = DateTime.Now;
+
+                    await _leaveBeginningRepository.UpdateAsync(oldData);
+                }
+                else
+                {
+                    var leaveBeginning = new LeaveBeginning();
+                    leaveBeginning.LeaveTypeId = req.LeaveTypeId;
+                    leaveBeginning.LeaveYear = req.LeaveYear;
+                    leaveBeginning.LeaveDays = req.LeaveDays;
+                    leaveBeginning.LeaveDaysUsed = 0;
+                    leaveBeginning.LeaveCount = 0;
+                    leaveBeginning.BeginningLeaveDays = 0;
+                    leaveBeginning.BeginningLeaveCount = 0;
+
+                    leaveBeginning.ProfileId = req.ProfileId;
+                    leaveBeginning.Prefix = profile.Prefix;
+                    leaveBeginning.FirstName = profile.FirstName;
+                    leaveBeginning.LastName = profile.LastName;
+
+                    leaveBeginning.RootDnaId = profile.RootDnaId;
+                    leaveBeginning.Child1DnaId = profile.Child1DnaId;
+                    leaveBeginning.Child2DnaId = profile.Child2DnaId;
+                    leaveBeginning.Child3DnaId = profile.Child3DnaId;
+                    leaveBeginning.Child4DnaId = profile.Child4DnaId;
+
+                    leaveBeginning.CreatedUserId = "";
+                    leaveBeginning.CreatedFullName = "System";
+                    leaveBeginning.CreatedAt = DateTime.Now;
+
+                    await _leaveBeginningRepository.AddAsync(leaveBeginning);
+                }
+                return Success();
+            }
+            catch (Exception ex)
+            {
+                return Error(ex);
+            }
+        }
+
+
+        [HttpPut("schedule/update-dna")]
+        [AllowAnonymous]
+        public async Task<ActionResult<ResponseObject>> ScheduleUpdateDnaAsync([FromBody] List<ScheduleUpdateDnaDto> req)
+        {
+            try
+            {
+                foreach(var item in req)
+                {
+                    // var profile = await _userProfileRepository.GetProfileByProfileIdNoAuthAsync(item.ProfileId, AccessToken);
+                    // if(profile == null)
+                    // {
+                    //     return Error("ไม่พบข้อมูลข้าราชการหรือลูกจ้าง", StatusCodes.Status404NotFound);
+                    // }   
+                    // check duplicate
+                    var oldData = await _context.LeaveBeginnings.Where(x => x.ProfileId == item.ProfileId).ToListAsync();
+                    
+                    foreach(var o in oldData)
+                    {
+                        o.RootDnaId = item.RootDnaId;
+                        o.Child1DnaId = item.Child1DnaId;
+                        o.Child2DnaId = item.Child2DnaId;
+                        o.Child3DnaId = item.Child3DnaId;
+                        o.Child4DnaId = item.Child4DnaId;
+
+                        o.LastUpdateUserId = "";
+                        o.LastUpdateFullName = "System";
+                        o.LastUpdatedAt = DateTime.Now;
+
+                        await _leaveBeginningRepository.UpdateAsync(o);
+                    }
+                }
+
+                
+                return Success();
+            }
+            catch (Exception ex)
+            {
+                return Error(ex);
+            }
+        }
 
         #endregion
     }
diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index d4edffb2..8ff74510 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -3,9 +3,12 @@ using BMA.EHR.Application.Repositories.Commands;
 using BMA.EHR.Application.Repositories.Leaves.LeaveRequests;
 using BMA.EHR.Application.Repositories.Leaves.TimeAttendants;
 using BMA.EHR.Application.Repositories.MessageQueue;
+using BMA.EHR.Application.Responses.Leaves;
 using BMA.EHR.Application.Responses.Profiles;
 using BMA.EHR.Domain.Common;
+using BMA.EHR.Domain.Extensions;
 using BMA.EHR.Domain.Models.Leave.TimeAttendants;
+using BMA.EHR.Domain.Models.Notifications;
 using BMA.EHR.Domain.Shared;
 using BMA.EHR.Infrastructure.Persistence;
 using BMA.EHR.Leave.Service.DTOs.AdditionalCheck;
@@ -46,6 +49,7 @@ namespace BMA.EHR.Leave.Service.Controllers
 
         private readonly DutyTimeRepository _dutyTimeRepository;
         private readonly LeaveDbContext _context;
+        private readonly ApplicationDBContext _appDbContext;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IWebHostEnvironment _hostingEnvironment;
         private readonly IConfiguration _configuration;
@@ -58,6 +62,7 @@ namespace BMA.EHR.Leave.Service.Controllers
         private readonly LeaveRequestRepository _leaveRequestRepository;
         private readonly UserCalendarRepository _userCalendarRepository;
         private readonly PermissionRepository _permission;
+        private readonly CheckInJobStatusRepository _checkInJobStatusRepository;
 
         private readonly CommandRepository _commandRepository;
 
@@ -71,6 +76,8 @@ namespace BMA.EHR.Leave.Service.Controllers
 
         private readonly HttpClient _httpClient;
 
+        private readonly LeaveProcessJobStatusRepository _leaveProcessJobStatusRepository;
+
         #endregion
 
         #region " Constuctor and Destructor "
@@ -92,10 +99,14 @@ namespace BMA.EHR.Leave.Service.Controllers
                                 ObjectPool<IModel> objectPool,
                                 PermissionRepository permission,
                                 NotificationRepository notificationRepository,
-                                HttpClient httpClient)
+                                CheckInJobStatusRepository checkInJobStatusRepository,
+                                HttpClient httpClient,
+                                ApplicationDBContext appDbContext,
+                                LeaveProcessJobStatusRepository leaveProcessJobStatusRepository)
         {
             _dutyTimeRepository = dutyTimeRepository;
             _context = context;
+            _appDbContext = appDbContext;
             _httpContextAccessor = httpContextAccessor;
             _hostingEnvironment = hostingEnvironment;
             _configuration = configuration;
@@ -109,7 +120,8 @@ namespace BMA.EHR.Leave.Service.Controllers
             _commandRepository = commandRepository;
             _leaveRequestRepository = leaveRequestRepository;
             _notificationRepository = notificationRepository;
-
+            _checkInJobStatusRepository = checkInJobStatusRepository;
+            _leaveProcessJobStatusRepository = leaveProcessJobStatusRepository;
             _objectPool = objectPool;
             _permission = permission;
 
@@ -137,7 +149,13 @@ namespace BMA.EHR.Leave.Service.Controllers
         {
             get
             {
-                if (UserId != null || UserId != "")
+                // First try to get from claims
+                var ocIdFromClaims = OrgRootDnaId;
+                if (ocIdFromClaims.HasValue && ocIdFromClaims.Value != Guid.Empty)
+                    return ocIdFromClaims.Value;
+
+                // Fallback to API call for backward compatibility
+                if (UserId != null && UserId != "")
                     return _userProfileRepository.GetUserOCId(Guid.Parse(UserId!), AccessToken);
                 else
                     return Guid.Empty;
@@ -425,18 +443,26 @@ namespace BMA.EHR.Leave.Service.Controllers
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status401Unauthorized)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        public async Task<ActionResult<ResponseObject>> CheckTimeAsync()
+        public async Task<ActionResult<ResponseObject>> CheckTimeAsync(CancellationToken cancellationToken = default)
         {
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
-            var data = await _userTimeStampRepository.GetLastRecord(userId);
+            
+            // Get user's last check-in record and profile in parallel
+            var dataTask = _userTimeStampRepository.GetLastRecord(userId);
+            var profileTask = _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
+            var defaultRoundTask = _dutyTimeRepository.GetDefaultAsync();
+            
+            await Task.WhenAll(dataTask, profileTask, defaultRoundTask);
+            
+            var data = await dataTask;
+            var profile = await profileTask;
+            var getDefaultRound = await defaultRoundTask;
 
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
             if (profile == null)
             {
                 throw new Exception(GlobalMessages.DataNotFound);
             }
 
-            var getDefaultRound = await _dutyTimeRepository.GetDefaultAsync();
             if (getDefaultRound == null)
             {
                 return Error("ไม่พบรอบลงเวลา Default", StatusCodes.Status404NotFound);
@@ -448,65 +474,43 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             var duty = userRound ?? getDefaultRound;
 
-            // TODO : รอดุึงรอบที่ผูกกับ user
-            //var duty = await _dutyTimeRepository.GetDefaultAsync();
-            CheckInResultDto ret;
-
-            if (data == null)
-            {
-                ret = new CheckInResultDto
-                {
-                    StartTimeMorning = duty == null ? "00:00" : duty.StartTimeMorning,
-                    EndTimeMorning = duty == null ? "00:00" : duty.EndTimeMorning,
-                    StartTimeAfternoon = duty == null ? "00:00" : duty.StartTimeAfternoon,
-                    EndTimeAfternoon = duty == null ? "00:00" : duty.EndTimeAfternoon,
-                    Description = duty == null ? "-" : duty.Description,
-                    CheckInTime = null,
-                    CheckInId = null,
-                };
-            }
-            else
+            // Determine check-in status and data
+            DateTime? checkInTime = null;
+            Guid? checkInId = null;
+            
+            if (data != null)
             {
                 if (data.CheckOut != null)
                 {
                     // fix issue SIT ระบบบันทึกเวลาปฏิบัติงาน>>ลงเวลาเข้า-ออกงาน (กรณีลงเวลาออกอีกวัน) #921
-                    var cur_date = DateTime.Now.Date;
-                    // ถ้า check-in + check-out ไปแล้ว
-                    if (data.CheckIn.Date == cur_date && data.CheckOut.Value.Date == cur_date)
+                    var currentDate = DateTime.Now.Date;
+                    // ถ้า check-in + check-out ไปแล้วในวันเดียวกัน
+                    if (data.CheckIn.Date == currentDate && data.CheckOut.Value.Date == currentDate)
                     {
                         return Error("คุณได้ทำการลงเวลาเข้าและออกเรียบร้อยแล้ว คุณจะสามารถลงเวลาได้อีกครั้งในวันถัดไป");
                     }
-                    else
-                    {
-                        ret = new CheckInResultDto
-                        {
-                            StartTimeMorning = duty == null ? "00:00" : duty.StartTimeMorning,
-                            EndTimeMorning = duty == null ? "00:00" : duty.EndTimeMorning,
-                            StartTimeAfternoon = duty == null ? "00:00" : duty.StartTimeAfternoon,
-                            EndTimeAfternoon = duty == null ? "00:00" : duty.EndTimeAfternoon,
-                            Description = duty == null ? "-" : duty.Description,
-                            CheckInTime = null,
-                            CheckInId = null,
-                        };
-                    }
+                    // ถ้า check-out คนละวัน ให้แสดงว่ายังไม่ได้ check-in วันนี้
                 }
                 else
                 {
-                    ret = new CheckInResultDto
-                    {
-                        StartTimeMorning = duty == null ? "00:00" : duty.StartTimeMorning,
-                        EndTimeMorning = duty == null ? "00:00" : duty.EndTimeMorning,
-                        StartTimeAfternoon = duty == null ? "00:00" : duty.StartTimeAfternoon,
-                        EndTimeAfternoon = duty == null ? "00:00" : duty.EndTimeAfternoon,
-                        Description = duty == null ? "-" : duty.Description,
-                        CheckInTime = data.CheckIn,
-                        CheckInId = data.Id,
-                    };
+                    // มี check-in แต่ยังไม่ check-out
+                    checkInTime = data.CheckIn;
+                    checkInId = data.Id;
                 }
-
-
             }
 
+            // Create response DTO (duty is never null here due to fallback logic)
+            var ret = new CheckInResultDto
+            {
+                StartTimeMorning = duty.StartTimeMorning,
+                EndTimeMorning = duty.EndTimeMorning,
+                StartTimeAfternoon = duty.StartTimeAfternoon,
+                EndTimeAfternoon = duty.EndTimeAfternoon,
+                Description = duty.Description,
+                CheckInTime = checkInTime,
+                CheckInId = checkInId,
+            };
+
             return Success(ret);
         }
 
@@ -527,6 +531,27 @@ namespace BMA.EHR.Leave.Service.Controllers
             // prepare data and convert request body and send to queue
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
             var currentDate = DateTime.Now;
+            
+            // ตรวจสอบว่ามีงานที่กำลัง pending หรือ processing อยู่หรือไม่
+            var existingJobs = await _checkInJobStatusRepository.GetPendingOrProcessingJobsAsync(userId);
+            if (existingJobs != null && existingJobs.Count > 0)
+            {
+                // กรองเฉพาะงานที่เป็นประเภทเดียวกัน (CHECK_IN หรือ CHECK_OUT)
+                var checkType = data.CheckInId == null ? "CHECK_IN" : "CHECK_OUT";
+                var sameTypeJob = existingJobs.FirstOrDefault(j => j.CheckType == checkType);
+                
+                if (sameTypeJob != null)
+                {
+                    
+                    return Error($"มีงาน {checkType} กำลังดำเนินการอยู่", StatusCodes.Status500InternalServerError);
+                    // var timeDiff = (currentDate - sameTypeJob.CreatedDate).TotalMinutes;
+                    // if (timeDiff < 2)
+                    // {
+                    //     return Error($"มีงาน {checkType} กำลังดำเนินการอยู่ กรุณารอสักครู่", StatusCodes.Status409Conflict);
+                    // }
+                }
+            }
+            
             var checkFileBytes = new byte[0];
 
             // fix issue : ระบบลงเวลาปฏิบัติงาน>>รูปภาพไม่แสดงในฝั่งของ Admin #804
@@ -540,11 +565,15 @@ namespace BMA.EHR.Leave.Service.Controllers
                 }
             }
 
+            // add task id for check in queue
+            string taskId = Guid.NewGuid().ToString();
+
             var checkData = new CheckTimeDtoRB
             {
                 UserId = userId,
                 CurrentDate = currentDate,
                 CheckInId = data.CheckInId,
+                TaskId = Guid.Parse(taskId),
                 Lat = data.Lat,
                 Lon = data.Lon,
                 POI = data.POI,
@@ -557,6 +586,8 @@ namespace BMA.EHR.Leave.Service.Controllers
             };
 
             var channel = _objectPool.Get();
+            CheckInJobStatus? jobStatus = null;
+            
             try
             {
                 var queue = _configuration["Rabbit:Queue"] ?? "basic-queue";
@@ -564,12 +595,29 @@ namespace BMA.EHR.Leave.Service.Controllers
                 var serializedObject = JsonConvert.SerializeObject(checkData);
                 var body = Encoding.UTF8.GetBytes(serializedObject);
 
-                // add task id for check in queue
-                string taskId = Guid.NewGuid().ToString();
                 var properties = channel.CreateBasicProperties();
                 properties.Persistent = true;
-                properties.MessageId = userId.ToString("D");// ระบบลงเวลาต้องมีการเช็คสถานะใน rabbitMQ ด้วยว่ามีการรอรันอยู่ไหม ลงเวลาเข้า/ออกงาน #894
+                properties.MessageId = taskId;
 
+                // บันทึกสถานะงานก่อนส่งไป RabbitMQ
+                jobStatus = new CheckInJobStatus
+                {
+                    TaskId = Guid.Parse(taskId),
+                    KeycloakUserId = userId,
+                    CreatedDate = currentDate,
+                    Status = "PENDING",
+                    CheckType = data.CheckInId == null ? "CHECK_IN" : "CHECK_OUT",
+                    CheckInId = data.CheckInId,
+                    AdditionalData = JsonConvert.SerializeObject(new
+                    {
+                        IsLocation = data.IsLocation,
+                        LocationName = data.LocationName,
+                        POI = data.POI
+                    })
+                };
+                await _checkInJobStatusRepository.AddAsync(jobStatus);
+
+                // ส่งไป RabbitMQ
                 channel.BasicPublish(exchange: "",
                                      routingKey: queue,
                                      basicProperties: properties,
@@ -577,12 +625,101 @@ namespace BMA.EHR.Leave.Service.Controllers
 
                 return Success(new { date = currentDate, taskId = taskId, keycloakId = userId });
             }
+            catch (Exception ex)
+            {
+                // ถ้าส่งไป queue ไม่สำเร็จ ให้ลบ job status ที่สร้างไว้ออก
+                if (jobStatus != null)
+                {
+                    try
+                    {
+                        await _checkInJobStatusRepository.DeleteAsync(jobStatus);
+                    }
+                    catch
+                    {
+                        // Ignore delete error
+                    }
+                }
+                return Error($"ไม่สามารถส่งงานไปยัง Queue ได้: {ex.Message}");
+                //throw new Exception($"ไม่สามารถส่งงานไปยัง Queue ได้: {ex.Message}");
+            }
             finally
             {
                 _objectPool.Return(channel);
             }
         }
 
+        /// <summary>
+        /// ตรวจสอบสถานะงาน check-in ด้วย Task ID
+        /// </summary>
+        /// <param name="taskId">Task ID ที่ได้จากการเรียก CheckInAsync</param>
+        /// <returns>
+        /// </returns>
+        /// <response code="200">เมื่อทำรายการสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="404">ไม่พบข้อมูลงาน</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpGet("job-status/{taskId:guid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> GetJobStatusAsync(Guid taskId)
+        {
+            var jobStatus = await _checkInJobStatusRepository.GetByTaskIdAsync(taskId);
+
+            if (jobStatus == null)
+            {
+                return Error("ไม่พบข้อมูลงาน", StatusCodes.Status404NotFound);
+            }
+
+            var result = new
+            {
+                taskId = jobStatus.TaskId,
+                keycloakUserId = jobStatus.KeycloakUserId,
+                status = jobStatus.Status,
+                checkType = jobStatus.CheckType,
+                checkInId = jobStatus.CheckInId,
+                createdDate = jobStatus.CreatedDate,
+                processingDate = jobStatus.ProcessingDate,
+                completedDate = jobStatus.CompletedDate,
+                errorMessage = jobStatus.ErrorMessage,
+                additionalData = jobStatus.AdditionalData != null ? 
+                    JsonConvert.DeserializeObject(jobStatus.AdditionalData) : null
+            };
+
+            return Success(result);
+        }
+
+        /// <summary>
+        /// ดึงรายการงานที่ยัง pending หรือ processing ของผู้ใช้
+        /// </summary>
+        /// <returns>
+        /// </returns>
+        /// <response code="200">เมื่อทำรายการสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpGet("pending-jobs")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> GetPendingJobsAsync()
+        {
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+            var jobs = await _checkInJobStatusRepository.GetPendingOrProcessingJobsAsync(userId);
+
+            var result = jobs.Select(job => new
+            {
+                taskId = job.TaskId,
+                status = job.Status,
+                checkType = job.CheckType,
+                checkInId = job.CheckInId,
+                createdDate = job.CreatedDate,
+                processingDate = job.ProcessingDate
+            }).ToList();
+
+            return Success(new { count = result.Count, jobs = result });
+        }
+
         [HttpGet("check-status")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status401Unauthorized)]
@@ -590,61 +727,62 @@ namespace BMA.EHR.Leave.Service.Controllers
         public async Task<ActionResult<ResponseObject>> CheckInCheckStatus()
         {
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
-            var currentDate = DateTime.Now;
-            var channel = _objectPool.Get();
+            // var currentDate = DateTime.Now;
+            // var channel = _objectPool.Get();
             try
             {
-                var _url = _configuration["Rabbit:URL"] ?? "";
-                var _queue = _configuration["Rabbit:Queue"] ?? "basic-queue";
+            //     var _url = _configuration["Rabbit:URL"] ?? "";
+            //     var _queue = _configuration["Rabbit:Queue"] ?? "basic-queue";
 
-                // Step 1: ตรวจสอบจำนวน message ทั้งหมดในคิว
-                string queueUrl = $"{_url}{_queue}";
-                var queueResponse = await _httpClient.GetAsync(queueUrl);
-                if (!queueResponse.IsSuccessStatusCode)
-                {
-                    return Error("Error accessing RabbitMQ API", (int)queueResponse.StatusCode);
-                }
+            //     // Step 1: ตรวจสอบจำนวน message ทั้งหมดในคิว
+            //     string queueUrl = $"{_url}{_queue}";
+            //     var queueResponse = await _httpClient.GetAsync(queueUrl);
+            //     if (!queueResponse.IsSuccessStatusCode)
+            //     {
+            //         return Error("Error accessing RabbitMQ API", (int)queueResponse.StatusCode);
+            //     }
 
-                var queueContent = await queueResponse.Content.ReadAsStringAsync();
-                var queueData = JObject.Parse(queueContent);
-                int totalMessages = queueData["messages"]?.Value<int>() ?? 0;
+            //     var queueContent = await queueResponse.Content.ReadAsStringAsync();
+            //     var queueData = JObject.Parse(queueContent);
+            //     int totalMessages = queueData["messages"]?.Value<int>() ?? 0;
 
-                // Step 2: วนลูปดึง message ทีละ 100 งาน
-                int batchSize = 100;
-                var allMessages = new List<string>();
-                int processedMessages = 0;
+            //     // Step 2: วนลูปดึง message ทีละ 100 งาน
+            //     int batchSize = 100;
+            //     var allMessages = new List<string>();
+            //     int processedMessages = 0;
 
-                while (processedMessages < totalMessages)
-                {
-                    var requestBody = new StringContent(
-                        $"{{\"count\":{batchSize},\"requeue\":true,\"encoding\":\"auto\",\"ackmode\":\"ack_requeue_true\"}}",
-                        Encoding.UTF8,
-                        "application/json"
-                    );
+            //     while (processedMessages < totalMessages)
+            //     {
+            //         var requestBody = new StringContent(
+            //             $"{{\"count\":{batchSize},\"requeue\":true,\"encoding\":\"auto\",\"ackmode\":\"ack_requeue_true\"}}",
+            //             Encoding.UTF8,
+            //             "application/json"
+            //         );
 
-                    string getMessagesUrl = $"{_url}{_queue}/get";
-                    var response = await _httpClient.PostAsync(getMessagesUrl, requestBody);
-                    if (!response.IsSuccessStatusCode)
-                    {
-                        return StatusCode((int)response.StatusCode, "Error retrieving messages from RabbitMQ.");
-                    }
+            //         string getMessagesUrl = $"{_url}{_queue}/get";
+            //         var response = await _httpClient.PostAsync(getMessagesUrl, requestBody);
+            //         if (!response.IsSuccessStatusCode)
+            //         {
+            //             return StatusCode((int)response.StatusCode, "Error retrieving messages from RabbitMQ.");
+            //         }
 
-                    var content = await response.Content.ReadAsStringAsync();
-                    var messages = JArray.Parse(content);
+            //         var content = await response.Content.ReadAsStringAsync();
+            //         var messages = JArray.Parse(content);
 
-                    if (messages.Count == 0)
-                    {
-                        break;
-                    }
+            //         if (messages.Count == 0)
+            //         {
+            //             break;
+            //         }
 
-                    processedMessages += messages.Count;
-                    allMessages.AddRange(messages.Select(m => m["properties"].ToString()));
-                }
+            //         processedMessages += messages.Count;
+            //         allMessages.AddRange(messages.Select(m => m["properties"].ToString()));
+            //     }
 
+                var jobs = await _checkInJobStatusRepository.GetPendingOrProcessingJobsAsync(userId);
                 // Step 3: ค้นหา taskIds ที่อยู่ใน messages ทั้งหมด
-                var foundTasks = allMessages.FirstOrDefault(x => x.Contains(userId.ToString("D")));
+                //var foundTasks = allMessages.FirstOrDefault(x => x.Contains(userId.ToString("D")));
 
-                return Success(new { keycloakId = userId, InQueue = foundTasks != null });
+                return Success(new { keycloakId = userId, InQueue = (jobs != null && jobs.Count > 0) });
 
             }
             catch (Exception ex)
@@ -653,7 +791,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             }
             finally
             {
-                _objectPool.Return(channel);
+                //_objectPool.Return(channel);
             }
         }
 
@@ -790,160 +928,462 @@ namespace BMA.EHR.Leave.Service.Controllers
         public async Task<ActionResult<ResponseObject>> ProcessCheckInAsync([FromBody] CheckTimeDtoRB data)
         {
             var userId = data.UserId ?? Guid.Empty;
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, data.Token);
+            var taskId = data.TaskId ?? Guid.Empty;
 
-            if (profile == null)
-                return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
-
-            if (data.CheckInFileName == "no-file") throw new Exception(GlobalMessages.NoFileToUpload);
-            var currentDate = data.CurrentDate ?? DateTime.Now;
-
-            var check_status = data.CheckInId == null ? "check-in-picture" : "check-out-picture";
-
-            var fileName = $"{_bucketName}/{userId}/{currentDate.ToString("dd-MM-yyyy")}/{check_status}/{data.CheckInFileName}";
-            using (var ms = new MemoryStream(data.CheckInFileBytes ?? new byte[0]))
+            try
             {
-                await _minIOService.UploadFileAsync(fileName, ms);
-            }
-
-            var defaultRound = await _dutyTimeRepository.GetDefaultAsync();
-            if (defaultRound == null)
-            {
-                return Error("ไม่พบรอบการลงเวลาทำงาน Default", StatusCodes.Status404NotFound);
-            }
-
-            var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(profile.Id);
-            var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
-            var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
-
-            // TODO : รอดุึงรอบที่ผูกกับ user
-            var duty = userRound ?? defaultRound;
-
-            // create check in object 
-            if (data.CheckInId == null)
-            {
-                // validate duplicate check in
-                var currentCheckIn = await _userTimeStampRepository.GetTimestampByDateAsync(userId, currentDate);
-
-                if (currentCheckIn != null)
+                // อัปเดตสถานะเป็น PROCESSING
+                if (taskId != Guid.Empty)
                 {
-                    return Error(new Exception("ไม่สามารถลงเวลาได้ เนื่องจากมีการลงเวลาในวันนี้แล้ว!"), StatusCodes.Status400BadRequest);
+                    await _checkInJobStatusRepository.UpdateToProcessingAsync(taskId);
                 }
 
-                var checkin = new UserTimeStamp
+                var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, data.Token);
+
+                if (profile == null)
                 {
-                    KeycloakUserId = userId,
-                    CheckInLat = data.Lat,
-                    CheckInLon = data.Lon,
-                    IsLocationCheckIn = data.IsLocation,
-                    CheckInLocationName = data.LocationName,
-                    CheckInPOI = data.POI,
-                    CheckInRemark = data.Remark,
-                    CheckInImageUrl = fileName,
-                    CheckIn = currentDate,
-                    Prefix = profile.Prefix,
-                    FirstName = profile.FirstName,
-                    LastName = profile.LastName,
-                    CitizenId = profile.CitizenId,
+                    await _checkInJobStatusRepository.UpdateToFailedAsync(taskId, "ไม่พบข้อมูลผู้ใช้");
+                    //var staffList = await  _userProfileRepository.GetOCStaffAsync(profile)
+                    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+                }
 
-                    Root = profile.Root,
-                    Child1 = profile.Child1,
-                    Child2 = profile.Child2,
-                    Child3 = profile.Child3,
-                    Child4 = profile.Child4,
+                var currentDate = data.CurrentDate ?? DateTime.Now;
 
-                    RootId = profile.RootId,
-                    Child1Id = profile.Child1Id,
-                    Child2Id = profile.Child2Id,
-                    Child3Id = profile.Child3Id,
-                    Child4Id = profile.Child4Id,
-                    Gender = profile.Gender,
-
-                    ProfileId = profile.Id,
-                    ProfileType = profile.ProfileType,
-
-                    RootDnaId = profile.RootDnaId,
-                    Child1DnaId = profile.Child1DnaId,
-                    Child2DnaId = profile.Child2DnaId,
-                    Child3DnaId = profile.Child3DnaId,
-                    Child4DnaId = profile.Child4DnaId,
-                };
-
-                var startTime = "";
-                if (!data.IsLocation && data.LocationName == "ไปประชุม / อบรม / สัมมนา")
+                if (data.CheckInFileName == "no-file") 
                 {
-                    startTime = "09:30";
+                    //throw new Exception(GlobalMessages.NoFileToUpload);
+                    await _checkInJobStatusRepository.UpdateToFailedAsync(taskId, GlobalMessages.NoFileToUpload);
+
+                    // send notification to user
+                    var noti1 = new Notification
+                    {
+                        Body = $"ประมวลผลการลงเวลาวันที่ {currentDate.ToString("dd-MM-yyyy")} ไม่สำเร็จ \r\nเนื่องจาก {GlobalMessages.NoFileToUpload}",
+                        ReceiverUserId = profile.Id,
+                        Type = "",
+                        Payload = "",
+                    };
+                    _appDbContext.Set<Notification>().Add(noti1);
+                    await _appDbContext.SaveChangesAsync();
+
+                    return Error(GlobalMessages.NoFileToUpload, StatusCodes.Status400BadRequest);
+                }
+                
+                // last check-in record
+                var lastCheckIn = await _userTimeStampRepository.GetLastRecord(userId);
+
+                var check_status = data.CheckInId == null ? "check-in-picture" : "check-out-picture";
+                var check_out_status = "check-out-picture";
+
+                var fileName = $"{_bucketName}/{userId}/{currentDate.ToString("dd-MM-yyyy")}/{check_status}/{data.CheckInFileName}";
+                var fileNameCheckOut = $"{_bucketName}/{userId}/{currentDate.ToString("dd-MM-yyyy")}/{check_out_status}/{data.CheckInFileName}";
+                using (var ms = new MemoryStream(data.CheckInFileBytes ?? new byte[0]))
+                {
+                    try
+                    {
+                        await _minIOService.UploadFileAsync(fileName, ms);
+                        // if (lastCheckIn != null && lastCheckIn.CheckOut == null)
+                        // {
+                        //     // ยังไม่เคย check-out มาก่อน หรือ check-out เป็น null ให้ใช้ชื่อไฟล์แบบ check-out
+                        //     await _minIOService.UploadFileAsync(fileNameCheckOut, ms);
+                        // }
+                    }
+                    catch (Exception ex)
+                    {
+                        await _checkInJobStatusRepository.UpdateToFailedAsync(taskId, $"ไม่สามารถอัปโหลดรูปภาพได้: {ex.Message}");
+
+                        // send notification to user
+                        var noti1 = new Notification
+                        {
+                            Body = $"ประมวลผลการลงเวลาวันที่ {currentDate.ToString("dd-MM-yyyy")} ไม่สำเร็จ \r\nเนื่องจากไม่สามารถอัปโหลดรูปภาพได้ {ex.Message}",
+                            ReceiverUserId = profile.Id,
+                            Type = "",
+                            Payload = "",
+                        };
+                        _appDbContext.Set<Notification>().Add(noti1);
+                        await _appDbContext.SaveChangesAsync();
+
+
+                        return Error($"ไม่สามารถอัปโหลดรูปภาพได้: {ex.Message}", StatusCodes.Status500InternalServerError);
+                    }
+                    
+                }
+
+                if (lastCheckIn != null && lastCheckIn.CheckOut == null)
+                {
+                    using (var ms2 = new MemoryStream(data.CheckInFileBytes ?? new byte[0]))
+                    {
+                        try
+                        {
+                            await _minIOService.UploadFileAsync(fileNameCheckOut, ms2);
+                            // if (lastCheckIn != null && lastCheckIn.CheckOut == null)
+                            // {
+                            //     // ยังไม่เคย check-out มาก่อน หรือ check-out เป็น null ให้ใช้ชื่อไฟล์แบบ check-out
+                            //     await _minIOService.UploadFileAsync(fileNameCheckOut, ms);
+                            // }
+                        }
+                        catch (Exception ex)
+                        {
+                            await _checkInJobStatusRepository.UpdateToFailedAsync(taskId, $"ไม่สามารถอัปโหลดรูปภาพได้: {ex.Message}");
+
+                            // send notification to user
+                            var noti1 = new Notification
+                            {
+                                Body = $"ประมวลผลการลงเวลาวันที่ {currentDate.ToString("dd-MM-yyyy")} ไม่สำเร็จ \r\nเนื่องจากไม่สามารถอัปโหลดรูปภาพได้ {ex.Message}",
+                                ReceiverUserId = profile.Id,
+                                Type = "",
+                                Payload = "",
+                            };
+                            _appDbContext.Set<Notification>().Add(noti1);
+                            await _appDbContext.SaveChangesAsync();
+
+
+                            return Error($"ไม่สามารถอัปโหลดรูปภาพได้: {ex.Message}", StatusCodes.Status500InternalServerError);
+                        }
+                        
+                    }
+                }
+
+
+                var defaultRound = await _dutyTimeRepository.GetDefaultAsync();
+                if (defaultRound == null)
+                {
+                    await _checkInJobStatusRepository.UpdateToFailedAsync(taskId, "ไม่พบรอบการลงเวลาทำงาน Default");
+                    // send notification to user
+                    var noti1 = new Notification
+                    {
+                        Body = $"ประมวลผลการลงเวลาวันที่ {currentDate.ToString("dd-MM-yyyy")} ไม่สำเร็จ \r\nเนื่องจากไม่พบรอบการลงเวลาทำงาน Default",
+                        ReceiverUserId = profile.Id,
+                        Type = "",
+                        Payload = "",
+                    };
+                    _appDbContext.Set<Notification>().Add(noti1);
+                    await _appDbContext.SaveChangesAsync();
+                    return Error("ไม่พบรอบการลงเวลาทำงาน Default", StatusCodes.Status404NotFound);
+                }
+
+                var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(profile.Id, currentDate);
+                var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
+                var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
+
+                // TODO : รอดุึงรอบที่ผูกกับ user
+                var duty = userRound ?? defaultRound;
+
+                // create check in object 
+                if (data.CheckInId == null)
+                {
+                    if (lastCheckIn != null && lastCheckIn.CheckOut == null)
+                    {
+                        var checkout = await _userTimeStampRepository.GetByIdAsync(lastCheckIn!.Id);
+                        if(checkout != null)
+                        {
+                            var currentCheckInProcess = await _processUserTimeStampRepository.GetTimestampByDateAsync(userId, checkout.CheckIn.Date);
+                            var checkout_process = await _processUserTimeStampRepository.GetByIdAsync(currentCheckInProcess!.Id);
+                            var endTime1 = "";
+                            var startTime1 = "";
+                            var endTimeMorning1 = "";
+                            if (!data.IsLocation && data.LocationName == "ไปประชุม / อบรม / สัมมนา")
+                            {
+                                startTime1 = "13:00";
+                                endTime1 = "14:30";
+                                endTimeMorning1 = "12:00";
+                            }
+                            else
+                            {
+                                endTime1 = duty.EndTimeAfternoon;
+                                startTime1 = duty.StartTimeAfternoon;
+                                endTimeMorning1 = duty.EndTimeMorning;
+                            }
+                                
+                            string checkOutStatus = "NORMAL";
+                            var leaveReq1 = await _leaveRequestRepository.GetLeavePeriodAsync(userId, currentDate.Date);
+                            if (leaveReq1 != null)
+                            {
+                                var leaveRange = leaveReq1.LeaveRangeEnd == null ? "" : leaveReq1.LeaveRangeEnd.ToUpper();
+                                if (leaveRange == "AFTERNOON" || leaveRange == "ALL")
+                                {
+                                    if(DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) <
+                                        DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {endTimeMorning1}"))
+                                        checkOutStatus = "ABSENT";
+                                    else
+                                        checkOutStatus = "NORMAL";
+                                }
+                                else
+                                {
+                                    // fix issue : SIT ระบบบันทึกเวลาปฏิบัติงาน>>ลงเวลาเข้า-ออกงาน (กรณีลงเวลาออกอีกวัน) #921
+                                    var currentDateTime = DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm"));
+                                    var dutyEndTimeAfternoon = DateTime.Parse($"{checkout.CheckIn.ToString("yyyy-MM-dd")} {endTime1}");
+                                    var dutyEndTimeMorning = DateTime.Parse($"{checkout.CheckIn.ToString("yyyy-MM-dd")} {endTimeMorning1}");
+
+
+                                    if(currentDateTime.Date > checkout.CheckIn.Date)
+                                    {
+                                        // ถ้า check-out เป็นวันถัดไป สถานะปกติเสมอ
+                                        checkOutStatus = "NORMAL";
+                                    }
+                                    else
+                                    {
+                                        // ถ้า check-out เป็นวันเดียวกับ check-in
+                                        // ตรวจสอบเวลาว่าสิ้นสุดก่อนบ่ายหรือไม่
+                                        if(currentDateTime < dutyEndTimeMorning) // ถ้าออกก่อนเวลาสิ้นสุดตอนเช้า ขาดราชการ
+                                        {
+                                            checkOutStatus = "ABSENT";
+                                        }
+                                        else if(currentDateTime >= dutyEndTimeAfternoon) // ถ้าออกหลังเวลาสิ้นสุดตอนบ่าย ปกติ
+                                        {
+                                            checkOutStatus = "NORMAL";
+                                        }
+                                        else
+                                        {
+                                            checkOutStatus = "ABSENT";
+                                        }
+                                    }
+                                }    
+                            }     
+                            else
+                            {
+                                // fix issue : SIT ระบบบันทึกเวลาปฏิบัติงาน>>ลงเวลาเข้า-ออกงาน (กรณีลงเวลาออกอีกวัน) #921
+                                var currentDateTime = DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm"));
+                                var dutyEndTimeAfternoon = DateTime.Parse($"{checkout.CheckIn.ToString("yyyy-MM-dd")} {endTime1}");
+                                var dutyEndTimeMorning = DateTime.Parse($"{checkout.CheckIn.ToString("yyyy-MM-dd")} {endTimeMorning1}");
+
+
+                                if(currentDateTime.Date > checkout.CheckIn.Date)
+                                {
+                                    // ถ้า check-out เป็นวันถัดไป สถานะปกติเสมอ
+                                    checkOutStatus = "NORMAL";
+                                }
+                                else
+                                {
+                                    // ถ้า check-out เป็นวันเดียวกับ check-in
+                                    // ตรวจสอบเวลาว่าสิ้นสุดก่อนบ่ายหรือไม่
+                                    if(currentDateTime < dutyEndTimeMorning) // ถ้าออกก่อนเวลาสิ้นสุดตอนเช้า ขาดราชการ
+                                    {
+                                        checkOutStatus = "ABSENT";
+                                    }
+                                    else if(currentDateTime >= dutyEndTimeAfternoon) // ถ้าออกหลังเวลาสิ้นสุดตอนบ่าย ปกติ
+                                    {
+                                        checkOutStatus = "NORMAL";
+                                    }
+                                    else
+                                    {
+                                        checkOutStatus = "ABSENT";
+                                    }
+                                }
+                                
+                            }   
+
+                            if (checkout_process != null)
+                            {
+                                checkout_process.CheckOutLat = data.Lat;
+                                checkout_process.CheckOutLon = data.Lon;
+                                checkout_process.IsLocationCheckOut = data.IsLocation;
+                                checkout_process.CheckOutLocationName = data.LocationName;
+                                checkout_process.CheckOutPOI = data.POI;
+                                checkout_process.CheckOutRemark = data.Remark;
+                                checkout_process.CheckOutImageUrl = fileNameCheckOut;
+                                checkout_process.CheckOut = currentDate;
+                                checkout_process.CheckOutStatus = checkOutStatus;
+
+                                await _processUserTimeStampRepository.UpdateAsync(checkout_process);
+                            }
+                        }                     
+                    }
+                    
+                    // validate duplicate check in
+                    var currentCheckIn = await _userTimeStampRepository.GetTimestampByDateAsync(userId, currentDate);
+
+                    if (currentCheckIn != null)
+                    {
+                        await _checkInJobStatusRepository.UpdateToFailedAsync(taskId, "ไม่สามารถลงเวลาได้ เนื่องจากมีการลงเวลาในวันนี้แล้ว");
+
+                        // send notification to user
+                        var noti1 = new Notification
+                        {
+                            Body = $"ประมวลผลการลงเวลาวันที่ {currentDate.ToString("dd-MM-yyyy")} ไม่สำเร็จ \r\nเนื่องจากมีการลงเวลาในวันนี้แล้ว",
+                            ReceiverUserId = profile.Id,
+                            Type = "",
+                            Payload = "",
+                        };
+                        _appDbContext.Set<Notification>().Add(noti1);
+                        await _appDbContext.SaveChangesAsync();
+
+                        return Error(new Exception("ไม่สามารถลงเวลาได้ เนื่องจากมีการลงเวลาในวันนี้แล้ว!"), StatusCodes.Status400BadRequest);
+                    }
+
+                    var checkin = new UserTimeStamp
+                    {
+                        KeycloakUserId = userId,
+                        CheckInLat = data.Lat,
+                        CheckInLon = data.Lon,
+                        IsLocationCheckIn = data.IsLocation,
+                        CheckInLocationName = data.LocationName,
+                        CheckInPOI = data.POI,
+                        CheckInRemark = data.Remark,
+                        CheckInImageUrl = fileName,
+                        CheckIn = currentDate,
+                        Prefix = profile.Prefix,
+                        FirstName = profile.FirstName,
+                        LastName = profile.LastName,
+                        CitizenId = profile.CitizenId,
+
+                        Root = profile.Root,
+                        Child1 = profile.Child1,
+                        Child2 = profile.Child2,
+                        Child3 = profile.Child3,
+                        Child4 = profile.Child4,
+
+                        RootId = profile.RootId,
+                        Child1Id = profile.Child1Id,
+                        Child2Id = profile.Child2Id,
+                        Child3Id = profile.Child3Id,
+                        Child4Id = profile.Child4Id,
+                        Gender = profile.Gender,
+
+                        ProfileId = profile.Id,
+                        ProfileType = profile.ProfileType,
+
+                        RootDnaId = profile.RootDnaId,
+                        Child1DnaId = profile.Child1DnaId,
+                        Child2DnaId = profile.Child2DnaId,
+                        Child3DnaId = profile.Child3DnaId,
+                        Child4DnaId = profile.Child4DnaId,
+                    };
+
+                    var startTime = "";
+                    var endTime = "";
+                    if (!data.IsLocation && data.LocationName == "ไปประชุม / อบรม / สัมมนา")
+                    {
+                        //startTime = "09:30";
+                        startTime = "10:30";
+                        endTime = "12:00";
+                    }
+                    else
+                    {
+                        startTime = duty.StartTimeMorning;
+                        endTime = duty.EndTimeMorning;
+                    }
+
+                    string checkInStatus = "NORMAL";
+                    var leaveReq = await _leaveRequestRepository.GetLeavePeriodAsync(userId, currentDate.Date);
+                    if (leaveReq != null)
+                    {
+                        var leaveRange = leaveReq.LeaveRange == null ? "" : leaveReq.LeaveRange.ToUpper();
+                        if (leaveRange == "MORNING" || leaveRange == "ALL")
+                            checkInStatus = "NORMAL";
+                        else
+                        {
+                            checkInStatus = DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) >
+                                                DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {startTime}") ?
+                                                DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) >
+                                                DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}") ?
+                                                "ABSENT" :
+                                                "LATE" :
+                                                "NORMAL";
+                        }
+                    }           
+                    else
+                    {
+                        checkInStatus = DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) >
+                                            DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {startTime}") ?
+                                            DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) >
+                                            DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}") ?
+                                            "ABSENT" :
+                                            "LATE" :
+                                            "NORMAL";
+                    }
+                    
+
+                    // process - รอทำใน queue
+                    var checkin_process = new ProcessUserTimeStamp
+                    {
+                        KeycloakUserId = userId,
+                        CheckInLat = data.Lat,
+                        CheckInLon = data.Lon,
+                        IsLocationCheckIn = data.IsLocation,
+                        CheckInLocationName = data.LocationName,
+                        CheckInPOI = data.POI,
+                        CheckInRemark = data.Remark,
+                        CheckInImageUrl = fileName,
+                        CheckIn = currentDate,
+                        CheckInStatus = checkInStatus,
+                        Prefix = profile.Prefix,
+                        FirstName = profile.FirstName,
+                        LastName = profile.LastName,
+                        CitizenId = profile.CitizenId,
+
+                        Root = profile.Root,
+                        Child1 = profile.Child1,
+                        Child2 = profile.Child2,
+                        Child3 = profile.Child3,
+                        Child4 = profile.Child4,
+
+                        RootId = profile.RootId,
+                        Child1Id = profile.Child1Id,
+                        Child2Id = profile.Child2Id,
+                        Child3Id = profile.Child3Id,
+                        Child4Id = profile.Child4Id,
+                        Gender = profile.Gender,
+
+                        ProfileId = profile.Id,
+                        ProfileType = profile.ProfileType,
+
+
+                        RootDnaId = profile.RootDnaId,
+                        Child1DnaId = profile.Child1DnaId,
+                        Child2DnaId = profile.Child2DnaId,
+                        Child3DnaId = profile.Child3DnaId,
+                        Child4DnaId = profile.Child4DnaId,
+                    };
+
+                    await _userTimeStampRepository.AddAsync(checkin);
+                    await _processUserTimeStampRepository.AddAsync(checkin_process);
                 }
                 else
-                    startTime = duty.StartTimeMorning;
-
-                var checkInStatus = DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) >
-                                        DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {startTime}") ?
-
-                                        DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) >
-                                        DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}") ?
-                                        "ABSENT" :
-                                        "LATE" :
-                                        "NORMAL";
-
-                // process - รอทำใน queue
-                var checkin_process = new ProcessUserTimeStamp
                 {
-                    KeycloakUserId = userId,
-                    CheckInLat = data.Lat,
-                    CheckInLon = data.Lon,
-                    IsLocationCheckIn = data.IsLocation,
-                    CheckInLocationName = data.LocationName,
-                    CheckInPOI = data.POI,
-                    CheckInRemark = data.Remark,
-                    CheckInImageUrl = fileName,
-                    CheckIn = currentDate,
-                    CheckInStatus = checkInStatus,
-                    Prefix = profile.Prefix,
-                    FirstName = profile.FirstName,
-                    LastName = profile.LastName,
-                    CitizenId = profile.CitizenId,
+                    var checkout = await _userTimeStampRepository.GetByIdAsync(data.CheckInId.Value);
+                    //var currentCheckIn = await _userTimeStampRepository.GetTimestampByDateAsync(userId, currentDate);
+                    
+                    if (checkout == null)
+                    {
+                        await _checkInJobStatusRepository.UpdateToFailedAsync(taskId, "ไม่พบข้อมูลการลงเวลาทำงาน");
 
-                    Root = profile.Root,
-                    Child1 = profile.Child1,
-                    Child2 = profile.Child2,
-                    Child3 = profile.Child3,
-                    Child4 = profile.Child4,
+                        // send notification to user
+                        var noti1 = new Notification
+                        {
+                            Body = $"ประมวลผลการลงเวลาวันที่ {currentDate.ToString("dd-MM-yyyy")} ไม่สำเร็จ \r\nเนื่องจากไม่พบข้อมูลการลงเวลาทำงาน",
+                            ReceiverUserId = profile.Id,
+                            Type = "",
+                            Payload = "",
+                        };
+                        _appDbContext.Set<Notification>().Add(noti1);
+                        await _appDbContext.SaveChangesAsync();
 
-                    RootId = profile.RootId,
-                    Child1Id = profile.Child1Id,
-                    Child2Id = profile.Child2Id,
-                    Child3Id = profile.Child3Id,
-                    Child4Id = profile.Child4Id,
-                    Gender = profile.Gender,
+                        return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
+                    }
 
-                    ProfileId = profile.Id,
-                    ProfileType = profile.ProfileType,
+                    var currentCheckInProcess = await _processUserTimeStampRepository.GetTimestampByDateAsync(userId, checkout.CheckIn.Date);
+                    
+                    if (currentCheckInProcess == null)
+                    {
+                        await _checkInJobStatusRepository.UpdateToFailedAsync(taskId, "ไม่พบข้อมูลการประมวลผลเวลาทำงาน (CheckIn)");
 
+                        // send notification to user
+                        var noti1 = new Notification
+                        {
+                            Body = $"ประมวลผลการลงเวลาวันที่ {currentDate.ToString("dd-MM-yyyy")} ไม่สำเร็จ \r\nเนื่องจากไม่พบข้อมูลการประมวลผลเวลาทำงาน (CheckIn)",
+                            ReceiverUserId = profile.Id,
+                            Type = "",
+                            Payload = "",
+                        };
+                        _appDbContext.Set<Notification>().Add(noti1);
+                        await _appDbContext.SaveChangesAsync();
 
-                    RootDnaId = profile.RootDnaId,
-                    Child1DnaId = profile.Child1DnaId,
-                    Child2DnaId = profile.Child2DnaId,
-                    Child3DnaId = profile.Child3DnaId,
-                    Child4DnaId = profile.Child4DnaId,
-                };
+                        return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
+                    }
 
-                await _userTimeStampRepository.AddAsync(checkin);
-                await _processUserTimeStampRepository.AddAsync(checkin_process);
-            }
-            else
-            {
+                    var checkout_process = await _processUserTimeStampRepository.GetByIdAsync(currentCheckInProcess.Id);
 
-
-                var checkout = await _userTimeStampRepository.GetByIdAsync(data.CheckInId.Value);
-
-                var currentCheckInProcess = await _processUserTimeStampRepository.GetTimestampByDateAsync(userId, checkout.CheckIn.Date);
-
-                var checkout_process = await _processUserTimeStampRepository.GetByIdAsync(currentCheckInProcess.Id);
-
-
-                if (checkout != null)
-                {
+                    // Update checkout record
                     checkout.CheckOutLat = data.Lat;
                     checkout.CheckOutLon = data.Lon;
                     checkout.IsLocationCheckOut = data.IsLocation;
@@ -954,44 +1394,186 @@ namespace BMA.EHR.Leave.Service.Controllers
                     checkout.CheckOut = currentDate;
 
                     await _userTimeStampRepository.UpdateAsync(checkout);
-                }
-                else
-                {
-                    return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
-                }
-                // fix issue : SIT ระบบบันทึกเวลาปฏิบัติงาน>>ลงเวลาเข้า-ออกงาน (กรณีลงเวลาออกอีกวัน) #921
-                var checkOutStatus = DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) <
-                                     DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ?
-                                    // "ABSENT" :
-                                    checkout.CheckIn.Date < currentDate.Date ? "NORMAL" :
-                                    "ABSENT" :
-                                     DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) <
-                                     DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}") ?
-                                     "ABSENT" :
-                                     "NORMAL";
 
-                if (checkout_process != null)
-                {
-                    checkout_process.CheckOutLat = data.Lat;
-                    checkout_process.CheckOutLon = data.Lon;
-                    checkout_process.IsLocationCheckOut = data.IsLocation;
-                    checkout_process.CheckOutLocationName = data.LocationName;
-                    checkout_process.CheckOutPOI = data.POI;
-                    checkout_process.CheckOutRemark = data.Remark;
-                    checkout_process.CheckOutImageUrl = fileName;
-                    checkout_process.CheckOut = currentDate;
-                    checkout_process.CheckOutStatus = checkOutStatus;
+                    var endTime = "";
+                    var startTime = "";
+                    var endTimeMorning = "";
+                    if (!data.IsLocation && data.LocationName == "ไปประชุม / อบรม / สัมมนา")
+                    {
+                        startTime = "13:00";
+                        endTime = "14:30";
+                        endTimeMorning = "12:00";
+                    }
+                    else
+                    {
+                        endTime = duty.EndTimeAfternoon;
+                        startTime = duty.StartTimeAfternoon;
+                        endTimeMorning = duty.EndTimeMorning;
+                    }
+                    string checkOutStatus = "NORMAL";
+                    var leaveReq = await _leaveRequestRepository.GetLeavePeriodAsync(userId, currentDate.Date);
+                    if (leaveReq != null)
+                    {
+                        var leaveRange = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                        if (leaveRange == "AFTERNOON" || leaveRange == "ALL")
+                        {
+                            if (checkout.CheckIn.Date < currentDate.Date)
+                            {
+                                // ถ้า check-out เป็นวันถัดไป สถานะปกติเสมอ
+                                checkOutStatus = "NORMAL";
+                            }
+                            else
+                            {
+                                if(DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) <
+                                    DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {endTimeMorning}"))
+                                    checkOutStatus = "ABSENT";
+                                else
+                                    checkOutStatus = "NORMAL";
+                            }
+                            
+                        }
+                        else
+                        {
+                            // fix issue : SIT ระบบบันทึกเวลาปฏิบัติงาน>>ลงเวลาเข้า-ออกงาน (กรณีลงเวลาออกอีกวัน) #921
+                            var currentDateTime = DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm"));
+                            var dutyEndTimeAfternoon = DateTime.Parse($"{checkout.CheckIn.ToString("yyyy-MM-dd")} {endTime}");
+                            var dutyEndTimeMorning = DateTime.Parse($"{checkout.CheckIn.ToString("yyyy-MM-dd")} {endTimeMorning}");
 
-                    await _processUserTimeStampRepository.UpdateAsync(checkout_process);
+
+                            if(currentDateTime.Date > checkout.CheckIn.Date)
+                            {
+                                // ถ้า check-out เป็นวันถัดไป สถานะปกติเสมอ
+                                checkOutStatus = "NORMAL";
+                            }
+                            else
+                            {
+                                // ถ้า check-out เป็นวันเดียวกับ check-in
+                                // ตรวจสอบเวลาว่าสิ้นสุดก่อนบ่ายหรือไม่
+                                if(currentDateTime < dutyEndTimeMorning) // ถ้าออกก่อนเวลาสิ้นสุดตอนเช้า ขาดราชการ
+                                {
+                                    checkOutStatus = "ABSENT";
+                                }
+                                else if(currentDateTime >= dutyEndTimeAfternoon) // ถ้าออกหลังเวลาสิ้นสุดตอนบ่าย ปกติ
+                                {
+                                    checkOutStatus = "NORMAL";
+                                }
+                                else
+                                {
+                                    checkOutStatus = "ABSENT";
+                                }
+                            }
+                            // checkOutStatus = DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) <
+                            //                     DateTime.Parse($"{checkout.CheckIn.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ?
+                            //                     // "ABSENT" :
+                            //                     checkout.CheckIn.Date < currentDate.Date ? "NORMAL" :
+                            //                     DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) >=
+                            //                     DateTime.Parse($"{checkout.CheckIn.ToString("yyyy-MM-dd")} {endTime}") ?
+                            //                     "NORMAL" :
+                            //                     "ABSENT" :
+                            //                     DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) <
+                            //                     DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {endTimeMorning}") ?
+                            //                     "ABSENT" :
+                            //                     "NORMAL";
+                        }    
+                    }     
+                    else
+                    {
+                        // fix issue : SIT ระบบบันทึกเวลาปฏิบัติงาน>>ลงเวลาเข้า-ออกงาน (กรณีลงเวลาออกอีกวัน) #921
+                        var currentDateTime = DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm"));
+                        var dutyEndTimeAfternoon = DateTime.Parse($"{checkout.CheckIn.ToString("yyyy-MM-dd")} {endTime}");
+                        var dutyEndTimeMorning = DateTime.Parse($"{checkout.CheckIn.ToString("yyyy-MM-dd")} {endTimeMorning}");
+
+
+                        if(currentDateTime.Date > checkout.CheckIn.Date)
+                        {
+                            // ถ้า check-out เป็นวันถัดไป สถานะปกติเสมอ
+                            checkOutStatus = "NORMAL";
+                        }
+                        else
+                        {
+                            // ถ้า check-out เป็นวันเดียวกับ check-in
+                            // ตรวจสอบเวลาว่าสิ้นสุดก่อนบ่ายหรือไม่
+                            if(currentDateTime < dutyEndTimeMorning) // ถ้าออกก่อนเวลาสิ้นสุดตอนเช้า ขาดราชการ
+                            {
+                                checkOutStatus = "ABSENT";
+                            }
+                            else if(currentDateTime >= dutyEndTimeAfternoon) // ถ้าออกหลังเวลาสิ้นสุดตอนบ่าย ปกติ
+                            {
+                                checkOutStatus = "NORMAL";
+                            }
+                            else
+                            {
+                                checkOutStatus = "ABSENT";
+                            }
+                        }
+                        // checkOutStatus = DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) <
+                        //                     DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ?
+                        //                     // "ABSENT" :
+                        //                     checkout.CheckIn.Date < currentDate.Date ? "NORMAL" :
+                        //                     DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) >=
+                        //                     DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {endTime}") ?
+                        //                     "NORMAL" :
+                        //                     "ABSENT" :
+                        //                     DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) <
+                        //                     DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {endTimeMorning}") ?
+                        //                     "ABSENT" :
+                        //                     "NORMAL";
+                    }        
+
+                    if (checkout_process != null)
+                    {
+                        checkout_process.CheckOutLat = data.Lat;
+                        checkout_process.CheckOutLon = data.Lon;
+                        checkout_process.IsLocationCheckOut = data.IsLocation;
+                        checkout_process.CheckOutLocationName = data.LocationName;
+                        checkout_process.CheckOutPOI = data.POI;
+                        checkout_process.CheckOutRemark = data.Remark;
+                        checkout_process.CheckOutImageUrl = fileName;
+                        checkout_process.CheckOut = currentDate;
+                        checkout_process.CheckOutStatus = checkOutStatus;
+
+                        await _processUserTimeStampRepository.UpdateAsync(checkout_process);
+                    }
+                    else
+                    {
+                        await _checkInJobStatusRepository.UpdateToFailedAsync(taskId, "ไม่พบข้อมูลการประมวลผลเวลาทำงาน");
+                        // send notification to user
+                        var noti1 = new Notification
+                        {
+                            Body = $"ประมวลผลการลงเวลาวันที่ {currentDate.ToString("dd-MM-yyyy")} ไม่สำเร็จ \r\nเนื่องจากไม่พบข้อมูลการประมวลผลเวลาทำงาน",
+                            ReceiverUserId = profile.Id,
+                            Type = "",
+                            Payload = "",
+                        };
+                        _appDbContext.Set<Notification>().Add(noti1);
+                        await _appDbContext.SaveChangesAsync();
+                        return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
+                    }
                 }
-                else
+                // อัปเดตสถานะเป็น COMPLETED
+                if (taskId != Guid.Empty)
                 {
-                    return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
+                    var additionalData = JsonConvert.SerializeObject(new
+                    {
+                        CheckInType = data.CheckInId == null ? "check-in" : "check-out",
+                        FileName = fileName,
+                        ProcessedDate = currentDate
+                    });
+                    await _checkInJobStatusRepository.UpdateToCompletedAsync(taskId, additionalData);
                 }
 
+                var checkInType = data.CheckInId == null ? "check-in" : "check-out";
+                return Success(new { user = $"{profile.FirstName} {profile.LastName}", date = currentDate, type = checkInType }); ;
+            }
+            catch (Exception ex)
+            {
+                // อัปเดตสถานะเป็น FAILED
+                if (taskId != Guid.Empty)
+                {
+                    await _checkInJobStatusRepository.UpdateToFailedAsync(taskId, ex.Message);
+                }
+                return Error(ex);
             }
-            var checkInType = data.CheckInId == null ? "check-in" : "check-out";
-            return Success(new { user = $"{profile.FirstName} {profile.LastName}", date = currentDate, type = checkInType }); ;
         }
 
         /// <summary>
@@ -1009,7 +1591,7 @@ namespace BMA.EHR.Leave.Service.Controllers
         public async Task<ActionResult<ResponseObject>> CheckInOldAsync([FromForm] CheckTimeDto data)
         {
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
 
             if (profile == null)
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
@@ -1174,7 +1756,7 @@ namespace BMA.EHR.Leave.Service.Controllers
         {
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
 
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
             if (profile == null)
             {
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
@@ -1200,7 +1782,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             // var test = await _processUserTimeStampRepository.GetTimeStampHistoryAsync(userId, year);
             // return Success(test);
 
-            var data = (await _processUserTimeStampRepository.GetTimeStampHistoryAsync(userId, year))
+            var data = (await _processUserTimeStampRepository.GetTimeStampHistoryAsync2(userId, year))
                             .Select(d => new CheckInHistoryDto
                             {
                                 CheckInId = d.Id,
@@ -1214,7 +1796,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                                "LATE" :
                                                "NORMAL",
                                 CheckInIsLocation = d.IsLocationCheckIn,
-                                CheckInLocationName = d.CheckInLocationName,
+                                CheckInLocationName = d.CheckInLocationName ?? "",
                                 CheckOutDate = d.CheckOut == null ? null : d.CheckOut.Value.Date,
                                 CheckOutTime = d.CheckOut == null ? "" : d.CheckOut.Value.ToString("HH:mm:ss"),
                                 CheckOutLocation = d.CheckOutPOI ?? "",
@@ -1229,7 +1811,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                                 "NORMAL",
 
                                 CheckOutIsLocation = d.IsLocationCheckOut,
-                                CheckOutLocationName = d.CheckOutLocationName,
+                                CheckOutLocationName = d.CheckOutLocationName ?? "",
 
                                 IsEdit = _processUserTimeStampRepository.IsEditRequest(userId, d.CheckIn.Date)
 
@@ -1316,7 +1898,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -1463,7 +2045,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             }
             else
             {
-                var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(d.KeycloakUserId, AccessToken);
+                var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(d.KeycloakUserId, AccessToken);
                 if (profile == null)
                 {
                     return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
@@ -1625,7 +2207,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -1871,11 +2453,11 @@ namespace BMA.EHR.Leave.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
-            var profile = await _userProfileRepository.SearchProfile(req.CitizenId, req.FirstName, req.LastName, AccessToken ?? "", req.Page, req.PageSize, role, nodeId, profileAdmin?.Node);
+            var profile = await _userProfileRepository.SearchProfile(req.CitizenId, req.FirstName, req.LastName, AccessToken ?? "", req.Page, req.PageSize, role, nodeId, profileAdmin?.Node, req.SelectedNodeId == null ? null : req.SelectedNodeId.Value.ToString("D"), req.SelectedNode);
 
             // Get default round once
             var getDefaultRound = await _dutyTimeRepository.GetDefaultAsync();
@@ -1919,7 +2501,16 @@ namespace BMA.EHR.Leave.Service.Controllers
                     FullName = $"{p.Prefix ?? ""}{p.FirstName ?? ""} {p.LastName ?? ""}",
                     StartTimeMorning = duty.StartTimeMorning,
                     LeaveTimeAfterNoon = duty.EndTimeAfternoon,
-                    EffectiveDate = effectiveDate?.EffectiveDate?.Date
+                    EffectiveDate = effectiveDate?.EffectiveDate?.Date,
+                    Prefix = p.Prefix ?? "",
+                    FirstName = p.FirstName ?? "",
+                    LastName = p.LastName ?? "",
+                    RootDnaId = p.RootDnaId,
+                    Child1DnaId = p.Child1DnaId,
+                    Child2DnaId = p.Child2DnaId,
+                    Child3DnaId = p.Child3DnaId,
+                    Child4DnaId = p.Child4DnaId
+
                 };
                 resultSet.Add(res);
             }
@@ -1986,6 +2577,64 @@ namespace BMA.EHR.Leave.Service.Controllers
         }
 
 
+        [HttpPost("round/multiple")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> CreateChangeRoundMultipleAsync([FromBody] List<CreateChangeRoundMultipleDto> reqs)
+        {
+            var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_WORK_ROUND_EDIT");
+            var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
+            if (jsonData["status"]?.ToString() != "200")
+            {
+                return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
+            }
+            var currentDate = DateTime.Now.Date;
+
+            List<UserDutyTime> dataList = new List<UserDutyTime>();
+
+            foreach(var req in reqs)
+            {
+                // var profile = await _userProfileRepository.GetProfileByProfileIdAsync(req.ProfileId, AccessToken);
+                // if (profile == null)
+                // {
+                //     return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+                // }
+
+                if (req.EffectiveDate.Date < currentDate)
+                {
+                    continue; // move to next item if effective date is in the past, not return error
+                    // return Error(new Exception($"กำหนดรอบลงเวลาของ {req.FirstName} {req.LastName} ผิดพลาด เนื่องจากวันที่มีผลต้องมากกว่าหรือเท่ากับวันที่ปัจจุบัน({currentDate.ToString("yyyy-MM-dd")})"), StatusCodes.Status400BadRequest);
+                }
+
+                var old = await _userDutyTimeRepository.GetExist(req.ProfileId, req.EffectiveDate);
+
+                if (old != null)
+                {
+                    continue; // move to next item if already exist, not return error
+                    //return Error(new Exception($"กำหนดรอบลงเวลาของ {req.FirstName} {req.LastName} ผิดพลาด เนื่องจากมีการกำหนดรอบการทำงานในวันที่นี้ไว้แล้ว"), StatusCodes.Status400BadRequest);
+                }
+
+                var data = new UserDutyTime
+                {
+                    ProfileId = req.ProfileId,
+                    DutyTimeId = req.RoundId,
+                    EffectiveDate = req.EffectiveDate,
+                    Remark = req.Remark,
+
+                    RootDnaId = req.RootDnaId,
+                    Child1DnaId = req.Child1DnaId,
+                    Child2DnaId = req.Child2DnaId,
+                    Child3DnaId = req.Child3DnaId,
+                    Child4DnaId = req.Child4DnaId,
+                };
+                dataList.Add(data);              
+            }
+
+            await _userDutyTimeRepository.AddRangeAsync(dataList);
+            return Success();
+        }
+
         /// <summary>
         /// LV1_015 - ประวัติการเปลี่ยนรอบการลงเวลา (ADMIN)
         /// </summary>
@@ -2126,7 +2775,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -2337,16 +2986,16 @@ namespace BMA.EHR.Leave.Service.Controllers
         /// <response code="200">เมื่อทำรายการสำเร็จ</response>
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
-        [HttpGet("user/checkout-check")]
+        [HttpGet("user/checkout-check/{isSeminar}")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status401Unauthorized)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        public async Task<ActionResult<ResponseObject>> CheckoutCheckAsync()
+        public async Task<ActionResult<ResponseObject>> CheckoutCheckAsync(string isSeminar = "N")
         {
             var time = DateTime.Now;
 
             var userId = UserId != null ? Guid.Parse(UserId) : Guid.Empty;
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
             if (profile == null)
             {
                 throw new Exception(GlobalMessages.DataNotFound);
@@ -2375,7 +3024,13 @@ namespace BMA.EHR.Leave.Service.Controllers
             //var endTime = DateTimeOffset.Parse($"{DateTime.Now.Date.ToString("yyyy-MM-dd")}T{duty.EndTimeAfternoon}:00.0000000+07:00").ToLocalTime().DateTime;
 
              //var endTime = DateTime.Parse($"{DateTime.Now.Date.ToString("yyyy-MM-dd")}T{duty.EndTimeAfternoon}:00.0000000+07:00");
-            var endTime = DateTime.Parse($"{DateTime.Now.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}");
+            var endTime = isSeminar.Trim().ToUpper() == "Y"
+                          ? DateTime.Parse($"{DateTime.Now.Date.ToString("yyyy-MM-dd")} 14:30")
+                          : DateTime.Parse($"{DateTime.Now.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}");
+
+            var endTimeMorning = DateTime.Parse($"{DateTime.Now.Date.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}");
+            var endTimeDisplay = endTime;
+
             var status = string.Empty;
             if(lastCheckIn == null)
             {
@@ -2389,7 +3044,33 @@ namespace BMA.EHR.Leave.Service.Controllers
             {
                 if (time < endTime)
                 {
-                    status = "ABSENT";
+
+                    //string checkOutStatus = "NORMAL";
+                    var leaveReq = await _leaveRequestRepository.GetLeavePeriodAsync(userId, time.Date);
+                    if (leaveReq != null)
+                    {
+                        var leaveRange = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                        if (leaveRange == "AFTERNOON" || leaveRange == "ALL")
+                        {
+                            if(time < endTimeMorning)
+                            {
+                                status = "ABSENT";
+                                endTimeDisplay = endTimeMorning;
+                            }
+                            else
+                            {
+                                status = "NORMAL";
+                            }
+                        }
+                        else
+                        {
+                            status = "ABSENT";
+                        }
+                    }
+                    else
+                    {
+                        status = "ABSENT";
+                    }
                 }
                 else
                 {
@@ -2404,7 +3085,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 Status = status,
                 StatusText = status == "ABSENT" ? "ขาดราชการ" : "ปกติ",
                 ServerTime = time,
-                EndTime = endTime
+                EndTime = endTimeDisplay
             });
 
         }
@@ -2434,7 +3115,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             }
 
             var userId = UserId != null ? Guid.Parse(UserId) : Guid.Empty;
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
             if (profile == null)
             {
                 throw new Exception(GlobalMessages.DataNotFound);
@@ -2483,13 +3164,14 @@ namespace BMA.EHR.Leave.Service.Controllers
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
         public async Task<ActionResult<ResponseObject>> GetAdditionalCheckRequestAsync([Required] int year, [Required] int month, [Required] int page = 1, [Required] int pageSize = 10, string keyword = "", string? sortBy = "", bool? descending = false)
         {
-            var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_CHECKIN_SPECIAL");
-            var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
-            if (jsonData["status"]?.ToString() != "200")
+            var jsonData = await _permission.GetPermissionWithActingAPIAsync("LIST", "SYS_CHECKIN_SPECIAL");
+            //var jsonData = JsonConvert.DeserializeObject<GetPermissionWithActingResultDto>(getPermission);
+            if (jsonData!.status != 200)
             {
-                return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
+                return Error(jsonData.message, StatusCodes.Status403Forbidden);
             }
-            string role = jsonData["result"]?.ToString();
+            //string role = jsonData["result"]?.ToString();
+            string role = jsonData.result.privilege;
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
@@ -2519,13 +3201,89 @@ namespace BMA.EHR.Leave.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
 
             //var rawData = await _additionalCheckRequestRepository.GetAdditionalCheckRequests(year, month);
-            var rawData = await _additionalCheckRequestRepository.GetAdditionalCheckRequestsByAdminRole(year, month, role, nodeId, profileAdmin?.Node);
+            var rawData = await _additionalCheckRequestRepository.GetAdditionalCheckRequestsByAdminRole(year, month, role, nodeId, profileAdmin?.Node, keyword);
+
+            // ถ้ามีการรักษาการ
+            if (jsonData.result.isAct)
+            {
+                var posActs = jsonData.result.posMasterActs;
+                foreach(var act in posActs)
+                {
+                    var actRole = act.privilege;
+                    string actNodeId = string.Empty;
+                    int? actNode;
+
+                    if (role == "NORMAL" || role == "CHILD")
+                    {
+                        actNodeId = act.child4DnaId != null ?
+                                    act.child4DnaId.Value.ToString("D") :
+                                    act.child3DnaId != null ?
+                                    act.child3DnaId.Value.ToString("D") :
+                                    act.child2DnaId != null ?
+                                    act.child2DnaId.Value.ToString("D") :
+                                    act.child1DnaId != null ?
+                                    act.child1DnaId.Value.ToString("D") :
+                                    act.rootDnaId != null ? 
+                                    act.rootDnaId.Value.ToString("D") :
+                                    "";
+                        actNode =   act.child4DnaId != null ?
+                                    4 :
+                                    act.child3DnaId != null ?
+                                    3 :
+                                    act.child2DnaId != null ?
+                                    2 :
+                                    act.child1DnaId != null ?
+                                    1 :
+                                    act.rootDnaId != null ? 
+                                    0 :
+                                    null;
+                    }
+                    else if (role == "BROTHER")
+                    {
+                        actNodeId = act.child3DnaId != null ?
+                                    act.child3DnaId.Value.ToString("D") :
+                                    act.child2DnaId != null ?
+                                    act.child2DnaId.Value.ToString("D") :
+                                    act.child1DnaId != null ?
+                                    act.rootDnaId!.Value.ToString("D") :
+                                    act.rootDnaId != null ? 
+                                    act.rootDnaId.Value.ToString("D") :
+                                    "";
+                        actNode =   act.child4DnaId != null ?
+                                    4 :
+                                    act.child3DnaId != null ?
+                                    4 :
+                                    act.child2DnaId != null ?
+                                    3 :
+                                    act.child1DnaId != null ?
+                                    2 :
+                                    act.rootDnaId != null ? 
+                                    0 :
+                                    null;
+                    }
+                    else if (role == "ROOT" /*|| role == "PARENT"*/)
+                    {
+                        actNodeId = act.rootDnaId!.Value.ToString("D");
+                        actNode = 0;
+                    }
+
+                    var rawDataAct = await _additionalCheckRequestRepository.GetAdditionalCheckRequestsByAdminRole(year, month, actRole, actNodeId, profileAdmin?.Node, keyword);
+                    if (rawDataAct != null)
+                    {
+                        if (rawData != null)
+                            rawData = rawData.Union(rawDataAct).ToList();
+                        else
+                            rawData = rawDataAct;
+                    }
+                }
+            }
+            var total = rawData.Count;
 
             var getDefaultRound = await _dutyTimeRepository.GetDefaultAsync();
             if (getDefaultRound == null)
@@ -2535,19 +3293,76 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             var result = new List<GetAdditionalCheckRequestDto>();
 
-            foreach (var data in rawData)
+
+            if (!string.IsNullOrWhiteSpace(sortBy))
             {
-                var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
-                if (profile == null)
+                switch (sortBy.ToUpper())
                 {
-                    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+                    case "FULLNAME":
+                        if (descending == true)
+                            rawData = rawData.OrderByDescending(x => x.Prefix)
+                                .ThenByDescending(x => x.FirstName)
+                                .ThenByDescending(x => x.LastName)
+                                .ToList();
+                        else
+                            rawData = rawData.OrderBy(x => x.Prefix)
+                                .ThenBy(x => x.FirstName)
+                                .ThenBy(x => x.LastName)
+                                .ToList();
+                        break;
+                    case "CREATEDAT":
+                        if (descending == true)
+                            rawData = rawData.OrderByDescending(x => x.CreatedAt).ToList();
+                        else
+                            rawData = rawData.OrderBy(x => x.CreatedAt).ToList();
+                        break;
+                    case "CHECKDATE":
+                        if (descending == true)
+                            rawData = rawData.OrderByDescending(x => x.CheckDate).ToList();
+                        else
+                            rawData = rawData.OrderBy(x => x.CheckDate).ToList();
+                        break;
+                    // case "STARTTIMEMORNING":
+                    //     if (descending == true)
+                    //         rawData = rawData.OrderByDescending(x => x.StartTimeMorning).ToList();
+                    //     else
+                    //         result = result.OrderBy(x => x.StartTimeMorning).ToList();
+                    //     break;
+                    // case "STARTTIMEAFTERNOON":
+                    //     if (descending == true)
+                    //         result = result.OrderByDescending(x => x.StartTimeAfternoon).ToList();
+                    //     else
+                    //         result = result.OrderBy(x => x.StartTimeAfternoon).ToList();
+                    //     break;
+                    case "DESCRIPTION":
+                        if (descending == true)
+                            rawData = rawData.OrderByDescending(x => x.Description).ToList();
+                        else
+                            rawData = rawData.OrderBy(x => x.Description).ToList();
+                        break;
+                    default:
+                        rawData = rawData.OrderBy(x => 
+                                    x.Status.Trim().ToLower() == "pending" ? 1 :
+                                    x.Status.Trim().ToLower() == "approve" ? 2 : 3).ToList();
+                        break;
+                }
+            }
+
+            var rawDataPaged = rawData.Skip((page - 1) * pageSize).Take(pageSize)
+                                .ToList();
+
+            foreach (var data in rawDataPaged)
+            {
+                var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(data.KeycloakUserId, AccessToken);
+                UserDutyTime? effectiveDate = null;
+                if (profile != null)
+                {
+                    effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(profile.Id);
+                    //return Error($"{data.Id} PF{data.FirstName} {data.LastName} : {GlobalMessages.DataNotFound}", StatusCodes.Status404NotFound);
                 }
                 //var userRound = await _dutyTimeRepository.GetByIdAsync(profile.DutyTimeId ?? Guid.Empty);
-
-                var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(profile.Id);
                 var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
                 var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
-
                 var checkInData = await _userTimeStampRepository.GetTimestampByDateAsync(data.KeycloakUserId, data.CheckDate);
 
                 var duty = userRound ?? getDefaultRound;
@@ -2614,69 +3429,69 @@ namespace BMA.EHR.Leave.Service.Controllers
                 result.Add(resObj);
             }
 
-            if (keyword != "")
-            {
-                result = result.Where(x => x.FullName.Contains(keyword)).ToList();
-            }
-            if (string.IsNullOrWhiteSpace(sortBy))
-            {
-                sortBy = "default";
-            }
-            if (!string.IsNullOrWhiteSpace(sortBy))
-            {
-                switch (sortBy.ToUpper())
-                {
-                    case "FULLNAME":
-                        if (descending == true)
-                            result = result.OrderByDescending(x => x.Prefix)
-                                .ThenByDescending(x => x.FirstName)
-                                .ThenByDescending(x => x.LastName)
-                                .ToList();
-                        else
-                            result = result.OrderBy(x => x.Prefix)
-                                .ThenBy(x => x.FirstName)
-                                .ThenBy(x => x.LastName)
-                                .ToList();
-                        break;
-                    case "CREATEDAT":
-                        if (descending == true)
-                            result = result.OrderByDescending(x => x.CreatedAt).ToList();
-                        else
-                            result = result.OrderBy(x => x.CreatedAt).ToList();
-                        break;
-                    case "CHECKDATE":
-                        if (descending == true)
-                            result = result.OrderByDescending(x => x.CheckDate).ToList();
-                        else
-                            result = result.OrderBy(x => x.CheckDate).ToList();
-                        break;
-                    case "STARTTIMEMORNING":
-                        if (descending == true)
-                            result = result.OrderByDescending(x => x.StartTimeMorning).ToList();
-                        else
-                            result = result.OrderBy(x => x.StartTimeMorning).ToList();
-                        break;
-                    case "STARTTIMEAFTERNOON":
-                        if (descending == true)
-                            result = result.OrderByDescending(x => x.StartTimeAfternoon).ToList();
-                        else
-                            result = result.OrderBy(x => x.StartTimeAfternoon).ToList();
-                        break;
-                    case "DESCRIPTION":
-                        if (descending == true)
-                            result = result.OrderByDescending(x => x.Description).ToList();
-                        else
-                            result = result.OrderBy(x => x.Description).ToList();
-                        break;
-                    default:
-                        result = result.OrderBy(x => x.StatusSort).ToList();
-                        break;
-                }
-            }
-            var pageResult = result.Skip((page - 1) * pageSize).Take(pageSize)
-                                .ToList();
+            // if (keyword != "")
+            // {
+            //     result = result.Where(x => x.FullName.Contains(keyword)).ToList();
+            // }
+            // if (string.IsNullOrWhiteSpace(sortBy))
+            // {
+            //     sortBy = "default";
+            // }
+            // if (!string.IsNullOrWhiteSpace(sortBy))
+            // {
+            //     switch (sortBy.ToUpper())
+            //     {
+            //         case "FULLNAME":
+            //             if (descending == true)
+            //                 result = result.OrderByDescending(x => x.Prefix)
+            //                     .ThenByDescending(x => x.FirstName)
+            //                     .ThenByDescending(x => x.LastName)
+            //                     .ToList();
+            //             else
+            //                 result = result.OrderBy(x => x.Prefix)
+            //                     .ThenBy(x => x.FirstName)
+            //                     .ThenBy(x => x.LastName)
+            //                     .ToList();
+            //             break;
+            //         case "CREATEDAT":
+            //             if (descending == true)
+            //                 result = result.OrderByDescending(x => x.CreatedAt).ToList();
+            //             else
+            //                 result = result.OrderBy(x => x.CreatedAt).ToList();
+            //             break;
+            //         case "CHECKDATE":
+            //             if (descending == true)
+            //                 result = result.OrderByDescending(x => x.CheckDate).ToList();
+            //             else
+            //                 result = result.OrderBy(x => x.CheckDate).ToList();
+            //             break;
+            //         case "STARTTIMEMORNING":
+            //             if (descending == true)
+            //                 result = result.OrderByDescending(x => x.StartTimeMorning).ToList();
+            //             else
+            //                 result = result.OrderBy(x => x.StartTimeMorning).ToList();
+            //             break;
+            //         case "STARTTIMEAFTERNOON":
+            //             if (descending == true)
+            //                 result = result.OrderByDescending(x => x.StartTimeAfternoon).ToList();
+            //             else
+            //                 result = result.OrderBy(x => x.StartTimeAfternoon).ToList();
+            //             break;
+            //         case "DESCRIPTION":
+            //             if (descending == true)
+            //                 result = result.OrderByDescending(x => x.Description).ToList();
+            //             else
+            //                 result = result.OrderBy(x => x.Description).ToList();
+            //             break;
+            //         default:
+            //             result = result.OrderBy(x => x.StatusSort).ToList();
+            //             break;
+            //     }
+            // }
+            // var pageResult = result.Skip((page - 1) * pageSize).Take(pageSize)
+            //                     .ToList();
 
-            return Success(new { data = pageResult, total = result.Count });
+            return Success(new { data = result, total = total });
         }
 
         /// <summary>
@@ -2717,7 +3532,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             // change user timestamp
             var processTimeStamp = await _processUserTimeStampRepository.GetTimestampByDateAsync(requestData.KeycloakUserId, requestData.CheckDate.Date);
 
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(requestData.KeycloakUserId, AccessToken);
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(requestData.KeycloakUserId, AccessToken);
 
             if (processTimeStamp == null)
             {
@@ -2871,7 +3686,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             requestData.Comment = req.Reason;
             await _additionalCheckRequestRepository.UpdateAsync(requestData);
 
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(requestData.KeycloakUserId, AccessToken);
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(requestData.KeycloakUserId, AccessToken);
 
             var recvId = new List<Guid> { profile.Id };
             await _notificationRepository.PushNotificationsAsync(recvId.ToArray(), "ลงเวลากรณีพิเศษ", "การขอลงเวลากรณีพิเศษของคุณไม่ได้รับการอนุมัติ", "", "", true, false);
@@ -2915,7 +3730,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             }
             else
             {
-                var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(d.KeycloakUserId, AccessToken);
+                var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(d.KeycloakUserId, AccessToken);
                 if (profile == null)
                 {
                     return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
@@ -2945,7 +3760,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                     CheckInPOI = d.CheckInPOI,
                     CheckInLat = d.CheckInLat,
                     CheckInLon = d.CheckInLon,
-                    CheckInImg = $"{imgUrl}/{d.CheckInImageUrl}",
+                    // CheckInImg = $"{imgUrl}/{d.CheckInImageUrl}",
+                    CheckInImg = await _minIOService.ImagesPathByName(d.CheckInImageUrl),
                     CheckInStatus = DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) >
                                     DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ?
 
@@ -2962,7 +3778,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     CheckOutPOI = d.CheckOut == null ? "" : d.CheckOutPOI,
                     CheckOutLat = d.CheckOut == null ? null : d.CheckOutLat,
                     CheckOutLon = d.CheckOut == null ? null : d.CheckOutLon,
-                    CheckOutImg = d.CheckOut == null ? "" : $"{imgUrl}/{d.CheckOutImageUrl}",
+                    CheckOutImg = d.CheckOut == null ? "" : await _minIOService.ImagesPathByName(d.CheckOutImageUrl),
 
                     CheckOutStatus = d.CheckOut == null ? null :
                                      DateTime.Parse(d.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) <
@@ -3008,7 +3824,7 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             foreach (var data in rawData)
             {
-                var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+                var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(data.KeycloakUserId, AccessToken);
                 if (profile == null)
                 {
                     return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
@@ -3106,10 +3922,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 result.Add(resObj);
             }
 
-            if (keyword != "")
-            {
-                result = result.Where(x => x.EditReason!.Contains(keyword) || x.CheckInLocation!.Contains(keyword) || x.CheckOutLocation!.Contains(keyword)).ToList();
-            }
+            
 
             var pageResult = result.Skip((page - 1) * pageSize).Take(pageSize)
                                 .ToList();
@@ -3296,7 +4109,54 @@ namespace BMA.EHR.Leave.Service.Controllers
             var data = await _processUserTimeStampRepository.GetByIdAsync(id);
             if (data == null)
                 return Error(GlobalMessages.DataNotFound);
+            
+             //if (data.CheckInStatus == "NORMAL" || data.CheckOutStatus == "NORMAL")
+            
+            //var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+            // แก้เป็นมาใช้งาน KeycloakUserId แทน
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(data.KeycloakUserId, AccessToken);
+            var defaultRound = await _dutyTimeRepository.GetDefaultAsync();
+            if (defaultRound == null)
+            {
+                return Error("ไม่พบรอบการลงเวลา Default", StatusCodes.Status404NotFound);
+            }
+            var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(profile!.Id);
+            var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
+            var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
 
+            var duty = userRound ?? defaultRound;
+            if (req.CheckInStatus == "NORMAL")
+            {
+                if(data.CheckInLocationName == "ไปประชุม / อบรม / สัมมนา")
+                {
+                    data.CheckIn = DateTime.Parse($"{data.CheckIn.Date.ToString("yyyy-MM-dd")} 10:30");
+                }
+                else
+                {
+                    data.CheckIn = DateTime.Parse($"{data.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}");
+                }
+                
+            }
+            if (req.CheckOutStatus == "NORMAL" )
+            {
+                var checkOutTime = data.CheckOut != null ? data.CheckOut.Value : data.CheckIn;
+                var oldCheckOutTime = data.CheckOut != null ? data.CheckOut.Value : DateTime.Now;
+                var roundCheckOutTime = DateTime.Now;
+                if(data.CheckOutLocationName == "ไปประชุม / อบรม / สัมมนา")
+                {
+                    roundCheckOutTime = DateTime.Parse($"{checkOutTime.Date.ToString("yyyy-MM-dd")} 14:30");
+                }
+                else
+                {
+                    roundCheckOutTime = DateTime.Parse($"{checkOutTime.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}");
+                }
+                
+                if (oldCheckOutTime < roundCheckOutTime)
+                {
+                    data.CheckOut = roundCheckOutTime;
+                }
+            }
+            
             data.CheckInStatus = req.CheckInStatus;
             data.CheckOutStatus = req.CheckOutStatus;
             data.EditReason = req.Reason;
@@ -3324,7 +4184,7 @@ namespace BMA.EHR.Leave.Service.Controllers
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
         public async Task<ActionResult<ResponseObject>> GetLeaveSummaryByProfileAsync(Guid id, [FromBody] GetLeaveSummaryDto req)
         {
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(id, AccessToken);
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(id, AccessToken);
 
             var thisYear = DateTime.Now.Year;
             var startDate = req.StartDate;
@@ -3373,6 +4233,182 @@ namespace BMA.EHR.Leave.Service.Controllers
             });
         }
 
+        #endregion
+
+        #region " Process - Leave and Absence "
+
+
+        /// <summary>
+        /// สร้าง Task สำหรับ Process ข้อมูลวันลาและขาดราชการ (ADMIN)
+        /// </summary>
+        /// <returns>
+        /// </returns>
+        /// <response code="200">เมื่อทำรายการสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("admin/leave-task/process")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> CreateProcessTaskAsync([FromBody] CreateLeaveProcessJobDto req)
+        {
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
+            if (profile == null)
+            {
+                return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            }
+
+            var task = new LeaveProcessJobStatus
+            {
+                RootDnaId = profile.RootDnaId ?? Guid.Empty,
+                CreatedUserId = profile.Keycloak?.ToString("D") ?? "",
+                CreatedFullName = profile.FirstName + " " + profile.LastName,
+                CreatedAt = DateTime.Now,
+                Status = "PENDING",
+                StartDate = req.StartDate,
+                EndDate = req.EndDate
+            };
+
+            await _leaveProcessJobStatusRepository.AddAsync(task);
+
+            return Success();
+        }
+
+        /// <summary>
+        /// แสดงรายการ Task สำหรับ Process ข้อมูลวันลาและขาดราชการ (ADMIN)
+        /// </summary>
+        /// <returns>
+        /// </returns>
+        /// <response code="200">เมื่อทำรายการสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpGet("admin/leave-task/process")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> GetProcessTaskAsync()
+        {
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+
+            var tasks = await _leaveProcessJobStatusRepository.GetByUserIdAsync(userId);
+
+            var result = tasks.Select(t => new
+            {
+                t.Id,
+                t.CreatedFullName,
+                t.CreatedAt,
+                t.Status,
+                t.StartDate,
+                t.EndDate,
+                t.ProcessingDate,
+                t.CompletedDate,
+                t.ErrorMessage
+            });
+
+            return Success(result);
+         }
+
+
+        /// <summary>
+        /// แสดงรายการ Task สำหรับ Process ข้อมูลวันลาและขาดราชการ (ADMIN)
+        /// </summary>
+        /// <returns>
+        /// </returns>
+        /// <response code="200">เมื่อทำรายการสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpGet("admin/leave-task/process/{id:guid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> GetProcessTaskByIdAsync(Guid id)
+        {
+            var task = await _leaveProcessJobStatusRepository.GetByTaskIdAsync(id);
+
+            if (task == null)
+            {
+                return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            }
+
+            var result = new
+            {
+                task.Id,
+                task.CreatedFullName,
+                task.CreatedAt,
+                task.Status,
+                task.StartDate,
+                task.EndDate,
+                task.ProcessingDate,
+                task.CompletedDate,
+                task.ErrorMessage
+            };
+
+            return Success(result);
+         }
+
+        /// <summary>
+        /// ลบ Task สำหรับ Process ข้อมูลวันลาและขาดราชการ (ADMIN)
+        /// </summary>
+        /// <returns>
+        /// </returns>
+        /// <response code="200">เมื่อทำรายการสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpDelete("admin/leave-task/process/{id:guid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> DeleteProcessTaskByIdAsync(Guid id)
+        {
+            var task = await _leaveProcessJobStatusRepository.GetByTaskIdAsync(id);
+
+            if (task == null)
+            {
+                return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            }
+
+            await _leaveProcessJobStatusRepository.DeleteAsync(task);
+
+            return Success();
+        }
+
+        /// <summary>
+        /// อัปเดต Task สำหรับ Process ข้อมูลวันลาและขาดราชการ (ADMIN)
+        /// </summary>
+        /// <returns>
+        /// </returns>
+        /// <response code="200">เมื่อทำรายการสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("admin/leave-task/process/{id:guid}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> UpdateProcessTaskByIdAsync(Guid id,[FromBody] CreateLeaveProcessJobDto req)
+        {
+            var task = await _leaveProcessJobStatusRepository.GetByTaskIdAsync(id);
+
+            if (task == null)
+            {
+                return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            }
+
+            if(task.Status != "PENDING")
+            {
+                return Error("ไม่สามารถแก้ไขได้เนื่องจาก Task อยู่ในสถานะกำลังดำเนินการหรือดำเนินการเสร็จสิ้นแล้ว");
+            }
+
+            task.StartDate = req.StartDate;
+            task.EndDate = req.EndDate;
+            
+            await _leaveProcessJobStatusRepository.UpdateAsync(task);
+
+            return Success();
+        }
+
+
         #endregion
 
         #endregion
diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index 2c001072..7e4b7b56 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -7,6 +7,7 @@ using BMA.EHR.Application.Responses.Profiles;
 using BMA.EHR.Domain.Common;
 using BMA.EHR.Domain.Extensions;
 using BMA.EHR.Domain.Models.Leave.Requests;
+using BMA.EHR.Domain.Models.Leave.TimeAttendants;
 using BMA.EHR.Domain.Shared;
 using BMA.EHR.Leave.Service.DTOs.Reports;
 using Microsoft.AspNetCore.Authorization;
@@ -137,22 +138,43 @@ namespace BMA.EHR.Leave.Service.Controllers
 
         private async Task<dynamic> GetReport01(LeaveRequest data)
         {
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //if (profile == null)
+            //{
+            //    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            //}
+            var profile = await _userProfileRepository.GetProfileLeaveReportByKeycloakIdAsync(data.KeycloakUserId, AccessToken, "leave9");
             if (profile == null)
             {
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
             }
 
             var fullName = $"{profile!.Prefix}{profile!.FirstName} {profile!.LastName}";
+            
 
             var lastLeaveRequest =
-                await _leaveRequestRepository.GetLastLeaveRequestByTypeForUserAsync(data.KeycloakUserId,
-                    data.Type.Id, data.LeaveStartDate.Date);
+                await _leaveRequestRepository.GetLastLeaveRequestByTypeForUserAsync2(data.KeycloakUserId,
+                    data.Type.Id, data.CreatedAt);
 
             var startFiscalYear = new DateTime(data.LeaveStartDate.Year - 1, 10, 1);
-            var endFiscalYear = data.LeaveStartDate.Date.AddDays(-1); // นับจากวันที่ยื่นลา
-            var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);
+            var endFiscalYear = data.CreatedAt; 
+
+            var thisYear = data.LeaveStartDate.Year;
+            var toDay = data.LeaveStartDate.Date;
+            if (toDay >= new DateTime(toDay.Year, 10, 1) && toDay <= new DateTime(toDay.Year, 12, 31))
+                thisYear = thisYear + 1;
+            var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUser2Async(thisYear, data.Type.Id, data.KeycloakUserId);
+            var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser2(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);
+            if (leaveData != null)
+            {
+                sumLeave += leaveData.BeginningLeaveDays;
+            }
+
+            var Oc = profile.isCommission == false 
+                ? profile.Oc.ToThaiNumber() 
+                : profile.Oc.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.").ToThaiNumber();
             var approveResult = await GetApproverData(data.Approvers);
+
             return new
             {
                 template = "leave9",
@@ -165,9 +187,28 @@ namespace BMA.EHR.Leave.Service.Controllers
                     leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
                     fullname = fullName,
-                    positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
+                    position = string.IsNullOrEmpty(profile.Position) ? "-" : profile.Position,
+                    positionName = (!string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? string.IsNullOrEmpty(profile.Position)
+                                    ? "-"
+                                    : profile.Position
+                                : profile.PosExecutiveName
+                            : string.IsNullOrEmpty(profile.Position)
+                                ? "-"
+                                : string.IsNullOrEmpty(profile.PositionLeaveName)
+                                    ? profile.Position
+                                    : $"{profile.Position}{profile.PositionLeaveName}").ToThaiNumber(),
                     positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
+                    posExecutiveName = profile.PosExecutiveName,
                     organizationName = profile!.Oc!.ToThaiNumber(),
+                    posExOrg = !string.IsNullOrEmpty(profile.PositionLeaveName) && 
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? new[] { Oc }
+                            : !string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? new[] { profile.PosExecutiveName.ToThaiNumber(), Oc }
+                                : new[] { Oc },
                     leaveDetail = data.LeaveDetail.ToThaiNumber(),
                     leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
                     leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
@@ -208,13 +249,21 @@ namespace BMA.EHR.Leave.Service.Controllers
 
         private async Task<dynamic> GetReport02(LeaveRequest data)
         {
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //if (profile == null)
+            //{
+            //    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            //}
+            var profile = await _userProfileRepository.GetProfileLeaveReportByKeycloakIdAsync(data.KeycloakUserId, AccessToken, "leave10");
             if (profile == null)
             {
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
             }
 
             var fullName = $"{profile!.Prefix}{profile!.FirstName} {profile!.LastName}";
+            var Oc = profile.isCommission == false
+                ? profile.Oc.ToThaiNumber()
+                : profile.Oc.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.").ToThaiNumber();
             var approveResult = await GetApproverData(data.Approvers);
             return new
             {
@@ -228,9 +277,28 @@ namespace BMA.EHR.Leave.Service.Controllers
                     leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
                     fullname = fullName,
-                    positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
+                    position = string.IsNullOrEmpty(profile.Position) ? "-" : profile.Position,
+                    positionName = (!string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? string.IsNullOrEmpty(profile.Position)
+                                    ? "-"
+                                    : profile.Position
+                                : profile.PosExecutiveName
+                            : string.IsNullOrEmpty(profile.Position)
+                                ? "-"
+                                : string.IsNullOrEmpty(profile.PositionLeaveName)
+                                    ? profile.Position
+                                    : $"{profile.Position}{profile.PositionLeaveName}").ToThaiNumber(),
                     positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
-                    organizationName = profile!.Oc!.ToThaiNumber() ?? "",
+                    posExecutiveName = profile.PosExecutiveName,
+                    organizationName = profile!.Oc!.ToThaiNumber(),
+                    posExOrg = !string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? new[] { Oc }
+                            : !string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? new[] { profile.PosExecutiveName.ToThaiNumber(), Oc }
+                                : new[] { Oc },
                     wifeDayName = data.WifeDayName ?? "",
                     wifeDayDateBorn = data.WifeDayDateBorn == null || data.WifeDayDateBorn == "" ? "" : DateTime.Parse(data.WifeDayDateBorn).ToThaiShortDate().ToThaiNumber(),
                     leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
@@ -238,7 +306,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     LeaveTotal = data.LeaveTotal.ToString().ToThaiNumber(), //data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
                     leaveAddress = data.LeaveAddress.ToThaiNumber(),
                     leaveNumber = data.LeaveNumber.ToThaiNumber(),
-                    
+
                     approve = approveResult,
                     leaveStatus = data.LeaveStatus != null && data.LeaveStatus!.ToUpper() == "APPROVE"
                         ? "🗹 อนุญาต  ☐ ไม่อนุญาต"
@@ -251,7 +319,12 @@ namespace BMA.EHR.Leave.Service.Controllers
 
         private async Task<dynamic> GetReport03(LeaveRequest data)
         {
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //if (profile == null)
+            //{
+            //    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            //}
+            var profile = await _userProfileRepository.GetProfileLeaveReportByKeycloakIdAsync(data.KeycloakUserId, AccessToken, "leave11");
             if (profile == null)
             {
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
@@ -259,7 +332,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             var fullName = $"{profile!.Prefix}{profile!.FirstName} {profile!.LastName}";
 
             var startFiscalYear = new DateTime(data.LeaveStartDate.Year - 1, 10, 1);
-            var endFiscalYear = data.LeaveStartDate.Date.AddDays(-1); // นับจากวันที่ยื่นลา
+            var endFiscalYear = data.CreatedAt; 
 
             var thisYear = data.LeaveStartDate.Year;
             var toDay = data.LeaveStartDate.Date;
@@ -272,10 +345,19 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             //var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);
 
-            var sumLeave = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed;
+            
+            var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser2(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);
+            if (leaveData != null)
+            {
+                sumLeave += leaveData.BeginningLeaveDays;
+            }
+
+            //var sumLeave = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed;
             var leaveLimit = leaveData == null ? 0.0 : leaveData.LeaveDays;
             var extendLeave = leaveLimit - 10;
-
+            var Oc = profile.isCommission == false 
+                ? profile.Oc.ToThaiNumber() 
+                : profile.Oc.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.").ToThaiNumber();
             var approveResult = await GetApproverData(data.Approvers);
             return new
             {
@@ -289,9 +371,28 @@ namespace BMA.EHR.Leave.Service.Controllers
                     leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
                     fullname = fullName,
-                    positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
+                    position = string.IsNullOrEmpty(profile.Position) ? "-" : profile.Position,
+                    positionName = (!string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? string.IsNullOrEmpty(profile.Position)
+                                    ? "-"
+                                    : profile.Position
+                                : profile.PosExecutiveName
+                            : string.IsNullOrEmpty(profile.Position)
+                                ? "-"
+                                : string.IsNullOrEmpty(profile.PositionLeaveName)
+                                    ? profile.Position
+                                    : $"{profile.Position}{profile.PositionLeaveName}").ToThaiNumber(),
                     positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
-                    organizationName = profile!.Oc!.ToThaiNumber() ?? "",
+                    posExecutiveName = profile.PosExecutiveName,
+                    organizationName = profile!.Oc!.ToThaiNumber(),
+                    posExOrg = !string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? new[] { Oc }
+                            : !string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? new[] { profile.PosExecutiveName.ToThaiNumber(), Oc }
+                                : new[] { Oc },
 
                     restDayOldTotal = extendLeave.ToString().ToThaiNumber(),
                     restDayCurrentTotal = (10).ToString().ToThaiNumber(),
@@ -322,7 +423,12 @@ namespace BMA.EHR.Leave.Service.Controllers
 
         private async Task<dynamic> GetReport04(LeaveRequest data, bool isHajj = false)
         {
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //if (profile == null)
+            //{
+            //    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            //}
+            var profile = await _userProfileRepository.GetProfileLeaveReportByKeycloakIdAsync(data.KeycloakUserId, AccessToken, isHajj ? "leave13": "leave12");
             if (profile == null)
             {
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
@@ -342,6 +448,9 @@ namespace BMA.EHR.Leave.Service.Controllers
             {
                 isHajj = true;
             }
+            var Oc = profile.isCommission == false
+               ? profile.Oc.ToThaiNumber()
+               : profile.Oc.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.").ToThaiNumber();
             var approveResult = await GetApproverData(data.Approvers);
             if (isHajj == true)
             {
@@ -357,10 +466,28 @@ namespace BMA.EHR.Leave.Service.Controllers
                         leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                         dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
                         fullname = fullName,
-                        positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
+                        position = string.IsNullOrEmpty(profile.Position) ? "-" : profile.Position,
+                        positionName = (!string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? string.IsNullOrEmpty(profile.Position)
+                                    ? "-"
+                                    : profile.Position
+                                : profile.PosExecutiveName
+                            : string.IsNullOrEmpty(profile.Position)
+                                ? "-"
+                                : string.IsNullOrEmpty(profile.PositionLeaveName)
+                                    ? profile.Position
+                                    : $"{profile.Position}{profile.PositionLeaveName}").ToThaiNumber(),
                         positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
-                        organizationName = profile!.Oc!.ToThaiNumber() ?? "",
-
+                        posExecutiveName = profile.PosExecutiveName,
+                        organizationName = profile!.Oc!.ToThaiNumber(),
+                        posExOrg = !string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? new[] { Oc }
+                            : !string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? new[] { profile.PosExecutiveName.ToThaiNumber(), Oc }
+                                : new[] { Oc },
 
                         leavegovernmentDate = data.LeaveGovernmentDate == null ? "" : data.LeaveGovernmentDate.Value.Date.ToThaiShortDate().ToThaiNumber(),
                         hajjDayStatus = data.HajjDayStatus,
@@ -393,9 +520,28 @@ namespace BMA.EHR.Leave.Service.Controllers
                         leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                         dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
                         fullname = fullName,
-                        positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
+                        position = string.IsNullOrEmpty(profile.Position) ? "-" : profile.Position,
+                        positionName = (!string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? string.IsNullOrEmpty(profile.Position)
+                                    ? "-"
+                                    : profile.Position
+                                : profile.PosExecutiveName
+                            : string.IsNullOrEmpty(profile.Position)
+                                ? "-"
+                                : string.IsNullOrEmpty(profile.PositionLeaveName)
+                                    ? profile.Position
+                                    : $"{profile.Position}{profile.PositionLeaveName}").ToThaiNumber(),
                         positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
-                        organizationName = profile!.Oc!.ToThaiNumber() ?? "",
+                        posExecutiveName = profile.PosExecutiveName,
+                        organizationName = profile!.Oc!.ToThaiNumber(),
+                        posExOrg = !string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? new[] { Oc }
+                            : !string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? new[] { profile.PosExecutiveName.ToThaiNumber(), Oc }
+                                : new[] { Oc },
 
                         leavebirthDate = data.LeaveBirthDate == null ? "" : data.LeaveBirthDate.Value.Date.ToThaiShortDate().ToThaiNumber(),
                         leavegovernmentDate = data.LeaveGovernmentDate == null ? "" : data.LeaveGovernmentDate.Value.Date.ToThaiShortDate().ToThaiNumber(),
@@ -425,12 +571,16 @@ namespace BMA.EHR.Leave.Service.Controllers
 
         private async Task<dynamic> GetReport05(LeaveRequest data)
         {
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //if (profile == null)
+            //{
+            //    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            //}
+            var profile = await _userProfileRepository.GetProfileLeaveReportByKeycloakIdAsync(data.KeycloakUserId, AccessToken, "leave14");
             if (profile == null)
             {
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
             }
-
             var fullName = $"{profile!.Prefix}{profile!.FirstName} {profile!.LastName}";
 
             //var rootOc = _userProfileRepository.GetRootOcId(profile.OcId ?? Guid.Empty, AccessToken);
@@ -441,6 +591,9 @@ namespace BMA.EHR.Leave.Service.Controllers
             //    if (list.Count > 0)
             //        approver = list.First().Name;
             //}
+            var Oc = profile.isCommission == false
+                ? profile.Oc.ToThaiNumber()
+                : profile.Oc.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.").ToThaiNumber();
             var approveResult = await GetApproverData(data.Approvers);
             return new
             {
@@ -454,9 +607,28 @@ namespace BMA.EHR.Leave.Service.Controllers
                     leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
                     fullname = fullName,
-                    positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
+                    position = string.IsNullOrEmpty(profile.Position) ? "-" : profile.Position,
+                    positionName = (!string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? string.IsNullOrEmpty(profile.Position)
+                                    ? "-"
+                                    : profile.Position
+                                : profile.PosExecutiveName
+                            : string.IsNullOrEmpty(profile.Position)
+                                ? "-"
+                                : string.IsNullOrEmpty(profile.PositionLeaveName)
+                                    ? profile.Position
+                                    : $"{profile.Position}{profile.PositionLeaveName}").ToThaiNumber(),
                     positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
-                    organizationName = profile!.Oc!.ToThaiNumber() ?? "",
+                    posExecutiveName = profile.PosExecutiveName,
+                    organizationName = profile!.Oc!.ToThaiNumber(),
+                    posExOrg = !string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? new[] { Oc }
+                            : !string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? new[] { profile.PosExecutiveName.ToThaiNumber(), Oc }
+                                : new[] { Oc },
 
                     absentDaySummon = data.AbsentDaySummon.ToThaiNumber(),
                     absentDayLocation = data.AbsentDayLocation.ToThaiNumber(),
@@ -480,12 +652,16 @@ namespace BMA.EHR.Leave.Service.Controllers
 
         private async Task<dynamic> GetReport06(LeaveRequest data)
         {
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //if (profile == null)
+            //{
+            //    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            //}
+            var profile = await _userProfileRepository.GetProfileLeaveReportByKeycloakIdAsync(data.KeycloakUserId, AccessToken, "leave15");
             if (profile == null)
             {
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
             }
-
             var fullName = $"{profile!.Prefix}{profile!.FirstName} {profile!.LastName}";
 
             //var rootOc = _userProfileRepository.GetRootOcId(profile.OcId ?? Guid.Empty, AccessToken);
@@ -496,6 +672,9 @@ namespace BMA.EHR.Leave.Service.Controllers
             //    if (list.Count > 0)
             //        approver = list.First().Name;
             //}
+            var Oc = profile.isCommission == false
+                ? profile.Oc.ToThaiNumber()
+                : profile.Oc.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.").ToThaiNumber();
             var approveResult = await GetApproverData(data.Approvers);
             return new
             {
@@ -509,9 +688,28 @@ namespace BMA.EHR.Leave.Service.Controllers
                     leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
                     fullname = fullName,
-                    positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
+                    position = string.IsNullOrEmpty(profile.Position) ? "-" : profile.Position,
+                    positionName = (!string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? string.IsNullOrEmpty(profile.Position)
+                                    ? "-"
+                                    : profile.Position
+                                : profile.PosExecutiveName
+                            : string.IsNullOrEmpty(profile.Position)
+                                ? "-"
+                                : string.IsNullOrEmpty(profile.PositionLeaveName)
+                                    ? profile.Position
+                                    : $"{profile.Position}{profile.PositionLeaveName}").ToThaiNumber(),
                     positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
-                    organizationName = profile!.Oc!.ToThaiNumber() ?? "",
+                    posExecutiveName = profile.PosExecutiveName,
+                    organizationName = profile!.Oc!.ToThaiNumber(),
+                    posExOrg = !string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? new[] { Oc }
+                            : !string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? new[] { profile.PosExecutiveName.ToThaiNumber(), Oc }
+                                : new[] { Oc },
 
                     leavebirthDate = data.LeaveBirthDate == null ? "" : data.LeaveBirthDate.Value.Date.ToThaiShortDate().ToThaiNumber(),
                     leavegovernmentDate = data.LeaveGovernmentDate == null ? "" : data.LeaveGovernmentDate.Value.Date.ToThaiShortDate().ToThaiNumber(),
@@ -551,18 +749,22 @@ namespace BMA.EHR.Leave.Service.Controllers
 
         private async Task<dynamic> GetReport07(LeaveRequest data)
         {
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //if (profile == null)
+            //{
+            //    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            //}
+
+            //var profileLeave = await _userProfileRepository.GetProfileLeaveByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //if (profileLeave == null)
+            //{
+            //    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            //}
+            var profile = await _userProfileRepository.GetProfileLeaveReportByKeycloakIdAsync(data.KeycloakUserId, AccessToken, "leave16");
             if (profile == null)
             {
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
             }
-
-            var profileLeave = await _userProfileRepository.GetProfileLeaveByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
-            if (profileLeave == null)
-            {
-                return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
-            }
-
             var fullName = $"{profile!.Prefix}{profile!.FirstName} {profile!.LastName}";
 
             //var rootOc = _userProfileRepository.GetRootOcId(profile.OcId ?? Guid.Empty, AccessToken);
@@ -573,6 +775,9 @@ namespace BMA.EHR.Leave.Service.Controllers
             //    if (list.Count > 0)
             //        approver = list.First().Name;
             //}
+            var Oc = profile.isCommission == false
+                ? profile.Oc.ToThaiNumber()
+                : profile.Oc.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.").ToThaiNumber();
             var approveResult = await GetApproverData(data.Approvers);
             return new
             {
@@ -587,35 +792,54 @@ namespace BMA.EHR.Leave.Service.Controllers
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
                     fullname = fullName,
                     fullnameEng = "",
-                    positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
+                    position = string.IsNullOrEmpty(profile.Position) ? "-" : profile.Position,
+                    positionName = (!string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? string.IsNullOrEmpty(profile.Position)
+                                    ? "-"
+                                    : profile.Position
+                                : profile.PosExecutiveName
+                            : string.IsNullOrEmpty(profile.Position)
+                                ? "-"
+                                : string.IsNullOrEmpty(profile.PositionLeaveName)
+                                    ? profile.Position
+                                    : $"{profile.Position}{profile.PositionLeaveName}").ToThaiNumber(),
                     positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
-                    organizationName = profile!.Oc!.ToThaiNumber() ?? "",
+                    posExecutiveName = profile.PosExecutiveName,
+                    organizationName = profile!.Oc!.ToThaiNumber(),
+                    posExOrg = !string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? new[] { Oc }
+                            : !string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? new[] { profile.PosExecutiveName.ToThaiNumber(), Oc }
+                                : new[] { Oc },
 
                     leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
                     leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
 
                     profileType = profile.ProfileType,
 
-                    birthDate = profileLeave.BirthDate.ToThaiShortDate().ToThaiNumber(),
-                    retireDate = profileLeave.RetireDate.ToThaiShortDate().ToThaiNumber(),
-                    govAge = profileLeave.GovAge.ToThaiNumber(),
-                    age = profileLeave.Age.ToThaiNumber(),
-                    dateAppoint = profileLeave.DateAppoint.ToThaiShortDate().ToThaiNumber(),
-                    dateCurrent = profileLeave.DateCurrent.ToThaiShortDate().ToThaiNumber(),
-                    amount = ((double)profileLeave.Amount).ToNumericText().ToThaiNumber(),
-                    telephoneNumber = profileLeave.TelephoneNumber == null ? "" : profileLeave.TelephoneNumber.ToThaiNumber(),
+                    birthDate = profile.BirthDate.ToThaiShortDate().ToThaiNumber(),
+                    retireDate = profile.RetireDate.ToThaiShortDate().ToThaiNumber(),
+                    govAge = profile.GovAge.ToThaiNumber(),
+                    age = profile.Age.ToThaiNumber(),
+                    dateAppoint = profile.DateAppoint.ToThaiShortDate().ToThaiNumber(),
+                    dateCurrent = profile.DateCurrent.ToThaiShortDate().ToThaiNumber(),
+                    amount = ((double)profile.Amount).ToNumericText().ToThaiNumber(),
+                    telephoneNumber = profile.TelephoneNumber == null ? "" : profile.TelephoneNumber.ToThaiNumber(),
 
-                    posLevel = profileLeave.PosLevel.ToThaiNumber(),
-                    posType = profileLeave.PosType.ToThaiNumber(),
-                    currentAddress = profileLeave.CurrentAddress.ToThaiNumber(),
-                    oc = profileLeave.Oc.ToThaiNumber(),
-                    root = profileLeave.Root.ToThaiNumber(),
-                    child1 = profileLeave.Child1 == null ? "" : profileLeave.Child1!.ToThaiNumber(),
-                    child2 = profileLeave.Child2 == null ? "" : profileLeave.Child2!.ToThaiNumber(),
-                    child3 = profileLeave.Child3 == null ? "" : profileLeave.Child3!.ToThaiNumber(),
-                    child4 = profileLeave.Child4 == null ? "" : profileLeave.Child4!.ToThaiNumber(),
+                    posLevel = profile.PosLevel.ToThaiNumber(),
+                    posType = profile.PosType.ToThaiNumber(),
+                    currentAddress = profile.CurrentAddress.ToThaiNumber(),
+                    oc = profile.Oc.ToThaiNumber(),
+                    root = profile.Root.ToThaiNumber(),
+                    child1 = profile.Child1 == null ? "" : profile.Child1!.ToThaiNumber(),
+                    child2 = profile.Child2 == null ? "" : profile.Child2!.ToThaiNumber(),
+                    child3 = profile.Child3 == null ? "" : profile.Child3!.ToThaiNumber(),
+                    child4 = profile.Child4 == null ? "" : profile.Child4!.ToThaiNumber(),
 
-                    positions = profileLeave.Positions.Select(x => new
+                    positions = profile.Positions.Select(x => new
                     {
                         positionName = x.PositionName == null ? "" : x.PositionName.ToThaiNumber(),
                         dateStart = x.DateStart.ToThaiShortDate().ToThaiNumber(),
@@ -628,7 +852,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                         orgChild3 = x.OrgChild3 == null ? "" : x.OrgChild3.ToThaiNumber(),
                         orgChild4 = x.OrgChild4 == null ? "" : x.OrgChild4.ToThaiNumber(),
                     }).ToList(),
-                    educations = profileLeave.Educations.Select(x => new
+                    educations = profile.Educations.Select(x => new
                     {
                         educationLevel = x.EducationLevel == null ? "" : x.EducationLevel.ToThaiNumber(),
                         institute = x.Institute == null ? "" : x.Institute.ToThaiNumber(),
@@ -650,12 +874,16 @@ namespace BMA.EHR.Leave.Service.Controllers
 
         private async Task<dynamic> GetReport08(LeaveRequest data)
         {
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //if (profile == null)
+            //{
+            //    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            //}
+            var profile = await _userProfileRepository.GetProfileLeaveReportByKeycloakIdAsync(data.KeycloakUserId, AccessToken, "leave17");
             if (profile == null)
             {
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
             }
-
             var fullName = $"{profile!.Prefix}{profile!.FirstName} {profile!.LastName}";
 
             //var rootOc = _userProfileRepository.GetRootOcId(profile.OcId ?? Guid.Empty, AccessToken);
@@ -666,6 +894,9 @@ namespace BMA.EHR.Leave.Service.Controllers
             //    if (list.Count > 0)
             //        approver = list.First().Name;
             //}
+            var Oc = profile.isCommission == false
+                ? profile.Oc.ToThaiNumber()
+                : profile.Oc.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.").ToThaiNumber();
             var approveResult = await GetApproverData(data.Approvers);
             return new
             {
@@ -679,9 +910,28 @@ namespace BMA.EHR.Leave.Service.Controllers
                     leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
                     fullname = fullName,
-                    positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
+                    position = string.IsNullOrEmpty(profile.Position) ? "-" : profile.Position,
+                    positionName = (!string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? string.IsNullOrEmpty(profile.Position)
+                                    ? "-"
+                                    : profile.Position
+                                : profile.PosExecutiveName
+                            : string.IsNullOrEmpty(profile.Position)
+                                ? "-"
+                                : string.IsNullOrEmpty(profile.PositionLeaveName)
+                                    ? profile.Position
+                                    : $"{profile.Position}{profile.PositionLeaveName}").ToThaiNumber(),
                     positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
-                    organizationName = profile!.Oc!.ToThaiNumber() ?? "",
+                    posExecutiveName = profile.PosExecutiveName,
+                    organizationName = profile!.Oc!.ToThaiNumber(),
+                    posExOrg = !string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? new[] { Oc }
+                            : !string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? new[] { profile.PosExecutiveName.ToThaiNumber(), Oc }
+                                : new[] { Oc },
 
                     leaveSalary = data.LeaveSalary == null ? "" : data.LeaveSalary.Value.ToNumericText().ToThaiNumber(),
                     leaveSalaryText = data.LeaveSalaryText.ToThaiNumber(),
@@ -713,14 +963,19 @@ namespace BMA.EHR.Leave.Service.Controllers
 
         private async Task<dynamic> GetReport09(LeaveRequest data)
         {
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
-            if (profile == null)
-            {
-                return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
-            }
+            //var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //if (profile == null)
+            //{
+            //    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            //}
 
-            var profileLeave = await _userProfileRepository.GetProfileLeaveByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
-            if (profileLeave == null)
+            //var profileLeave = await _userProfileRepository.GetProfileLeaveByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+            //if (profileLeave == null)
+            //{
+            //    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            //}
+            var profile = await _userProfileRepository.GetProfileLeaveReportByKeycloakIdAsync(data.KeycloakUserId, AccessToken, "leave18");
+            if (profile == null)
             {
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
             }
@@ -735,6 +990,9 @@ namespace BMA.EHR.Leave.Service.Controllers
             //    if (list.Count > 0)
             //        approver = list.First().Name;
             //}
+            var Oc = profile.isCommission == false
+                ? profile.Oc.ToThaiNumber()
+                : profile.Oc.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.").ToThaiNumber();
             var approveResult = await GetApproverData(data.Approvers);
             return new
             {
@@ -748,35 +1006,54 @@ namespace BMA.EHR.Leave.Service.Controllers
                     leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
                     fullname = fullName,
-                    positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
+                    position = string.IsNullOrEmpty(profile.Position) ? "-" : profile.Position,
+                    positionName = (!string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? string.IsNullOrEmpty(profile.Position)
+                                    ? "-"
+                                    : profile.Position
+                                : profile.PosExecutiveName
+                            : string.IsNullOrEmpty(profile.Position)
+                                ? "-"
+                                : string.IsNullOrEmpty(profile.PositionLeaveName)
+                                    ? profile.Position
+                                    : $"{profile.Position}{profile.PositionLeaveName}").ToThaiNumber(),
                     positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
-                    organizationName = profile!.Oc!.ToThaiNumber() ?? "",
+                    posExecutiveName = profile.PosExecutiveName,
+                    organizationName = profile!.Oc!.ToThaiNumber(),
+                    posExOrg = !string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? new[] { Oc }
+                            : !string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? new[] { profile.PosExecutiveName.ToThaiNumber(), Oc }
+                                : new[] { Oc },
 
                     leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
                     leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
 
                     profileType = profile.ProfileType,
 
-                    birthDate = profileLeave.BirthDate.ToThaiShortDate().ToThaiNumber(),
-                    retireDate = profileLeave.RetireDate.ToThaiShortDate().ToThaiNumber(),
-                    govAge = profileLeave.GovAge.ToThaiNumber(),
-                    age = profileLeave.Age.ToThaiNumber(),
-                    dateAppoint = profileLeave.DateAppoint.ToThaiShortDate().ToThaiNumber(),
-                    dateCurrent = profileLeave.DateCurrent.ToThaiShortDate().ToThaiNumber(),
-                    amount = ((double)profileLeave.Amount).ToNumericText().ToThaiNumber(),
-                    telephoneNumber = profileLeave.TelephoneNumber == null ? "" : profileLeave.TelephoneNumber.ToThaiNumber(),
+                    birthDate = profile.BirthDate.ToThaiShortDate().ToThaiNumber(),
+                    retireDate = profile.RetireDate.ToThaiShortDate().ToThaiNumber(),
+                    govAge = profile.GovAge.ToThaiNumber(),
+                    age = profile.Age.ToThaiNumber(),
+                    dateAppoint = profile.DateAppoint.ToThaiShortDate().ToThaiNumber(),
+                    dateCurrent = profile.DateCurrent.ToThaiShortDate().ToThaiNumber(),
+                    amount = ((double)profile.Amount).ToNumericText().ToThaiNumber(),
+                    telephoneNumber = profile.TelephoneNumber == null ? "" : profile.TelephoneNumber.ToThaiNumber(),
 
-                    posLevel = profileLeave.PosLevel.ToThaiNumber(),
-                    posType = profileLeave.PosType.ToThaiNumber(),
-                    currentAddress = profileLeave.CurrentAddress.ToThaiNumber(),
-                    oc = profileLeave.Oc.ToThaiNumber(),
-                    root = profileLeave.Root.ToThaiNumber(),
-                    child1 = profileLeave.Child1 == null ? "" : profileLeave.Child1!.ToThaiNumber(),
-                    child2 = profileLeave.Child2 == null ? "" : profileLeave.Child2!.ToThaiNumber(),
-                    child3 = profileLeave.Child3 == null ? "" : profileLeave.Child3!.ToThaiNumber(),
-                    child4 = profileLeave.Child4 == null ? "" : profileLeave.Child4!.ToThaiNumber(),
+                    posLevel = profile.PosLevel.ToThaiNumber(),
+                    posType = profile.PosType.ToThaiNumber(),
+                    currentAddress = profile.CurrentAddress.ToThaiNumber(),
+                    oc = profile.Oc.ToThaiNumber(),
+                    root = profile.Root.ToThaiNumber(),
+                    child1 = profile.Child1 == null ? "" : profile.Child1!.ToThaiNumber(),
+                    child2 = profile.Child2 == null ? "" : profile.Child2!.ToThaiNumber(),
+                    child3 = profile.Child3 == null ? "" : profile.Child3!.ToThaiNumber(),
+                    child4 = profile.Child4 == null ? "" : profile.Child4!.ToThaiNumber(),
 
-                    positions = profileLeave.Positions.Select(x => new
+                    positions = profile.Positions.Select(x => new
                     {
                         positionName = x.PositionName == null ? "" : x.PositionName.ToThaiNumber(),
                         dateStart = x.DateStart.ToThaiShortDate().ToThaiNumber(),
@@ -790,7 +1067,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                         orgChild4 = x.OrgChild4 == null ? "" : x.OrgChild4.ToThaiNumber(),
                     }).ToList(),
 
-                    educations = profileLeave.Educations.Select(x => new
+                    educations = profile.Educations.Select(x => new
                     {
                         educationLevel = x.EducationLevel == null ? "" : x.EducationLevel.ToThaiNumber(),
                         institute = x.Institute == null ? "" : x.Institute.ToThaiNumber(),
@@ -919,12 +1196,16 @@ namespace BMA.EHR.Leave.Service.Controllers
                     return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
                 }
 
-                var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+                //var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(data.KeycloakUserId, AccessToken);
+                //if (profile == null)
+                //{
+                //    return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+                //}
+                var profile = await _userProfileRepository.GetProfileLeaveReportByKeycloakIdAsync(data.KeycloakUserId, AccessToken, "leave9");
                 if (profile == null)
                 {
                     return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
                 }
-
                 var fullName = $"{profile!.Prefix}{profile!.FirstName} {profile!.LastName}";
 
                 //var rootOc = _userProfileRepository.GetRootOcId(profile.OcId ?? Guid.Empty, AccessToken);
@@ -935,7 +1216,10 @@ namespace BMA.EHR.Leave.Service.Controllers
                 //    if (list.Count > 0)
                 //        approver = list.First().Name;
                 //}
-
+                var Oc = profile.isCommission == false
+                    ? profile.Oc.ToThaiNumber()
+                    : profile.Oc.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.").ToThaiNumber();
+                var approveResult = await GetApproverData(data.Approvers);
                 var result = new
                 {
                     template = "แบบใบขอยกเลิกวันลา",
@@ -946,9 +1230,28 @@ namespace BMA.EHR.Leave.Service.Controllers
                         dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
                         leaveTypeName = data.Type.Name,
                         fullname = fullName,
-                        positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
+                        position = string.IsNullOrEmpty(profile.Position) ? "-" : profile.Position,
+                        positionName = (!string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? string.IsNullOrEmpty(profile.Position)
+                                    ? "-"
+                                    : profile.Position
+                                : profile.PosExecutiveName
+                            : string.IsNullOrEmpty(profile.Position)
+                                ? "-"
+                                : string.IsNullOrEmpty(profile.PositionLeaveName)
+                                    ? profile.Position
+                                    : $"{profile.Position}{profile.PositionLeaveName}").ToThaiNumber(),
                         positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
-                        organizationName = profile!.Oc ?? "",
+                        posExecutiveName = profile.PosExecutiveName,
+                        organizationName = profile!.Oc!.ToThaiNumber(),
+                        posExOrg = !string.IsNullOrEmpty(profile.PositionLeaveName) &&
+                        (profile.PositionLeaveName.Contains("อำนวยการ") || profile.PositionLeaveName.Contains("บริหาร"))
+                            ? new[] { Oc }
+                            : !string.IsNullOrEmpty(profile.PosExecutiveName)
+                                ? new[] { profile.PosExecutiveName.ToThaiNumber(), Oc }
+                                : new[] { Oc },
                         leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
                         leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
                         dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
@@ -956,6 +1259,22 @@ namespace BMA.EHR.Leave.Service.Controllers
                         profileType = data.ProfileType,
                         leaveReasonDelete = data.LeaveCancelComment == null ? "" : data.LeaveCancelComment!.ToThaiNumber(),
                         leaveDetail = data.LeaveDetail.ToThaiNumber(),
+
+                        Type1 = profile.ProfileType == "OFFICER" ? "🗹" : "☐",
+                        Type2 = profile.ProfileType != "OFFICER" ? "🗹" : "☐",
+                        Type3 = "☐",
+                        approve = approveResult,
+                        approverComment = !string.IsNullOrEmpty(data.LeaveDirectorComment)
+                                        ? data.LeaveDirectorComment.Replace("\r", "").Replace("\n", "").Trim().ToThaiNumber()
+                                        : "......................",
+                        approverUpdatedAt = data.LastUpdatedAt.HasValue
+                                        ? data.LastUpdatedAt.Value.ToThaiShortDate().ToThaiNumber()
+                                        : "...... /...... /......",
+                        leaveStatus = data.LeaveCancelStatus != null && data.LeaveCancelStatus!.ToUpper() == "APPROVE"
+                                        ? "🗹 อนุญาต  ☐ ไม่อนุญาต"
+                                        : data.LeaveCancelStatus != null && data.LeaveCancelStatus!.ToUpper() == "REJECT"
+                                            ? "☐ อนุญาต  🗹 ไม่อนุญาต"
+                                            : "☐ อนุญาต  ☐ ไม่อนุญาต"
                     }
                 };
 
@@ -1022,18 +1341,18 @@ namespace BMA.EHR.Leave.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
                 }
-                else if (role == "ROOT" || role == "PARENT")
+                else if (role == "ROOT" /*|| role == "PARENT"*/)
                 {
                     nodeId = profileAdmin?.RootDnaId;
                 }
 
                 if (type.Trim().ToUpper() == "OFFICER")
                 {
-                    profile = await _userProfileRepository.GetProfileByAdminRole(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId);
+                    profile = await _userProfileRepository.GetProfileByAdminRolev4(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId, req.StartDate.Date, req.EndDate.Date);
                 }
                 else
                 {
-                    profile = await _userProfileRepository.GetEmployeeByAdminRole(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId);
+                    profile = await _userProfileRepository.GetEmployeeByAdminRole(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId, req.StartDate.Date, req.EndDate.Date);
                 }
                 // get leave day
                 var leaveDays = await _leaveRequestRepository.GetSumApproveLeaveByTypeAndRange(req.StartDate, req.EndDate);
@@ -1058,6 +1377,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     FirstName = x.FirstName ?? "",
                     LastName = x.LastName ?? "",
                     DateStart = x.DateStart ?? x.DateAppoint,
+                    DateAppoint = x.DateAppoint,
                 }).Distinct().ToList();
 
                 var beginningData = await _leaveBeginningRepository.GetAllByYearAsync(year);
@@ -1086,57 +1406,57 @@ namespace BMA.EHR.Leave.Service.Controllers
                         var sickDaySum = beginningData.FirstOrDefault(x => x.ProfileId == p.Id && x.LeaveType.Code == "LV-001");
                         var sickDay = leaveDays.FirstOrDefault(x => x.KeycloakUserId == keycloakUserId && x.LeaveTypeCode == "LV-001");
                         var sickDayCount = sickDaySum != null ? sickDaySum.LeaveDaysUsed : 0;
-                        var sickCount = sickDay != null ? sickDay.CountLeaveDay : 0;
+                        var sickCount = sickDaySum != null ? sickDaySum.LeaveCount : 0;
 
                         var personalDaySum = beginningData.FirstOrDefault(x => x.ProfileId == p.Id && x.LeaveType.Code == "LV-002");
                         var personalDay = leaveDays.FirstOrDefault(x => x.KeycloakUserId == keycloakUserId && x.LeaveTypeCode == "LV-002");
                         var personalDayCount = personalDaySum != null ? personalDaySum.LeaveDaysUsed : 0;
-                        var personalCount = personalDay != null ? personalDay.CountLeaveDay : 0;
+                        var personalCount = personalDaySum != null ? personalDaySum.LeaveCount : 0;
 
                         var maternityDaySum = beginningData.FirstOrDefault(x => x.ProfileId == p.Id && x.LeaveType.Code == "LV-003");
                         var maternityDay = leaveDays.FirstOrDefault(x => x.KeycloakUserId == keycloakUserId && x.LeaveTypeCode == "LV-003");
                         var maternityDayCount = maternityDaySum != null ? maternityDaySum.LeaveDaysUsed : 0;
-                        var maternityCount = maternityDay != null ? maternityDay.CountLeaveDay : 0;
+                        var maternityCount = maternityDaySum != null ? maternityDaySum.LeaveCount : 0;
 
                         var wifeDaySum = beginningData.FirstOrDefault(x => x.ProfileId == p.Id && x.LeaveType.Code == "LV-004");
                         var wifeDay = leaveDays.FirstOrDefault(x => x.KeycloakUserId == keycloakUserId && x.LeaveTypeCode == "LV-004");
                         var wifeDayCount = wifeDaySum != null ? wifeDaySum.LeaveDaysUsed : 0;
-                        var wifeCount = wifeDay != null ? wifeDay.CountLeaveDay : 0;
+                        var wifeCount = wifeDaySum != null ? wifeDaySum.LeaveCount : 0;
 
                         var restDaySum = beginningData.FirstOrDefault(x => x.ProfileId == p.Id && x.LeaveType.Code == "LV-005");
                         var restDay = leaveDays.FirstOrDefault(x => x.KeycloakUserId == keycloakUserId && x.LeaveTypeCode == "LV-005");
                         var restDayCount = restDaySum != null ? restDaySum.LeaveDaysUsed : 0;
-                        var restCount = restDay != null ? restDay.CountLeaveDay : 0;
+                        var restCount = restDaySum != null ? restDaySum.LeaveCount : 0;
 
                         var ordainDaySum = beginningData.FirstOrDefault(x => x.ProfileId == p.Id && x.LeaveType.Code == "LV-006");
                         var ordainDay = leaveDays.FirstOrDefault(x => x.KeycloakUserId == keycloakUserId && x.LeaveTypeCode == "LV-006");
                         var ordainDayCount = ordainDaySum != null ? ordainDaySum.LeaveDaysUsed : 0;
-                        var ordainCount = ordainDay != null ? ordainDay.CountLeaveDay : 0;
+                        var ordainCount = ordainDaySum != null ? ordainDaySum.LeaveCount : 0;
 
                         var absentDaySum = beginningData.FirstOrDefault(x => x.ProfileId == p.Id && x.LeaveType.Code == "LV-007");
                         var absentDay = leaveDays.FirstOrDefault(x => x.KeycloakUserId == keycloakUserId && x.LeaveTypeCode == "LV-007");
                         var absentDayCount = absentDaySum != null ? absentDaySum.LeaveDaysUsed : 0;
-                        var absentCount = absentDay != null ? absentDay.CountLeaveDay : 0;
+                        var absentCount = absentDaySum != null ? absentDaySum.LeaveCount : 0;
 
                         var studyDaySum = beginningData.FirstOrDefault(x => x.ProfileId == p.Id && x.LeaveType.Code == "LV-008");
                         var studyDay = leaveDays.FirstOrDefault(x => x.KeycloakUserId == keycloakUserId && x.LeaveTypeCode == "LV-008");
                         var studyDayCount = studyDaySum != null ? studyDaySum.LeaveDaysUsed : 0;
-                        var studyCount = studyDay != null ? studyDay.CountLeaveDay : 0;
+                        var studyCount = studyDaySum != null ? studyDaySum.LeaveCount : 0;
 
                         var agencyDaySum = beginningData.FirstOrDefault(x => x.ProfileId == p.Id && x.LeaveType.Code == "LV-009");
                         var agencyDay = leaveDays.FirstOrDefault(x => x.KeycloakUserId == keycloakUserId && x.LeaveTypeCode == "LV-009");
                         var agencyDayCount = agencyDaySum != null ? agencyDaySum.LeaveDaysUsed : 0;
-                        var agencyCount = agencyDay != null ? agencyDay.CountLeaveDay : 0;
+                        var agencyCount = agencyDaySum != null ? agencyDaySum.LeaveCount : 0;
 
                         var coupleDaySum = beginningData.FirstOrDefault(x => x.ProfileId == p.Id && x.LeaveType.Code == "LV-010");
                         var coupleDay = leaveDays.FirstOrDefault(x => x.KeycloakUserId == keycloakUserId && x.LeaveTypeCode == "LV-010");
                         var coupleDayCount = coupleDaySum != null ? coupleDaySum.LeaveDaysUsed : 0;
-                        var coupleCount = coupleDay != null ? coupleDay.CountLeaveDay : 0;
+                        var coupleCount = coupleDaySum != null ? coupleDaySum.LeaveCount : 0;
 
                         var therapyDaySum = beginningData.FirstOrDefault(x => x.ProfileId == p.Id && x.LeaveType.Code == "LV-011");
                         var therapyDay = leaveDays.FirstOrDefault(x => x.KeycloakUserId == keycloakUserId && x.LeaveTypeCode == "LV-011");
                         var therapyDayCount = therapyDaySum != null ? therapyDaySum.LeaveDaysUsed : 0;
-                        var therapyCount = therapyDay != null ? therapyDay.CountLeaveDay : 0;
+                        var therapyCount = therapyDaySum != null ? therapyDaySum.LeaveCount : 0;
 
                         var timeStamps = await _processUserTimeStampRepository.GetTimeStampHistoryByRangeForUserAsync(p.Keycloak ?? Guid.Empty, req.StartDate, req.EndDate);
 
@@ -1651,18 +1971,18 @@ namespace BMA.EHR.Leave.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
                 }
-                else if (role == "ROOT" || role == "PARENT")
+                else if (role == "ROOT" /*|| role == "PARENT"*/)
                 {
                     nodeId = profileAdmin?.RootDnaId;
                 }
 
                 if (type.Trim().ToUpper() == "OFFICER")
                 {
-                    profile = await _userProfileRepository.GetProfileByAdminRole(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId);
+                    profile = await _userProfileRepository.GetProfileByAdminRolev4(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId, req.StartDate.Date, req.EndDate.Date);
                 }
                 else
                 {
-                    profile = await _userProfileRepository.GetEmployeeByAdminRole(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId);
+                    profile = await _userProfileRepository.GetEmployeeByAdminRole(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId, req.StartDate.Date, req.EndDate.Date);
                 }
                 var date = req.StartDate.Date;
 
@@ -1752,7 +2072,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                         //    return Error("ไม่พบรอบการลงเวลา Default", StatusCodes.Status404NotFound);
                         //}
 
-                        var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(p.Id);
+                        // ให้ใช้วันที่จาก loop date แทน
+                        var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(p.Id, dd.date);
                         var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
                         var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
 
@@ -1771,20 +2092,68 @@ namespace BMA.EHR.Leave.Service.Controllers
                                 case "LV-005":
                                     remarkStr += leaveReq.Type.Name;
                                     var leaveRange = leaveReq.LeaveRange == null ? "" : leaveReq.LeaveRange.ToUpper();
-                                    if (leaveRange == "MORNING")
-                                        remarkStr += "ครึ่งวันเช้า";
-                                    else if (leaveRange == "AFTERNOON")
-                                        remarkStr += "ครึ่งวันบ่าย";
 
-
-                                    var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
-                                    if(leaveRange != leaveRangeEnd)
+                                    if(leaveReq.LeaveStartDate.Date == leaveReq.LeaveEndDate.Date)
                                     {
-                                        if (leaveRangeEnd == "MORNING")
-                                            remarkStr += " - ครึ่งวันเช้า";
-                                        else if (leaveRangeEnd == "AFTERNOON")
-                                            remarkStr += " - ครึ่งวันบ่าย";
-                                    }                               
+                                        if (leaveRange == "MORNING")
+                                            remarkStr += "ครึ่งวันเช้า";
+                                        else if (leaveRange == "AFTERNOON")
+                                            remarkStr += "ครึ่งวันบ่าย";
+
+
+                                        // var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                                        // if (leaveRangeEnd == "MORNING")
+                                        //     remarkStr += "ครึ่งวันเช้า";
+                                        // else if (leaveRangeEnd == "AFTERNOON")
+                                        //     remarkStr += "ครึ่งวันบ่าย";
+
+                                        var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                                        if (leaveRange != leaveRangeEnd)
+                                        {
+                                            if (leaveRangeEnd == "MORNING")
+                                                remarkStr += " - ครึ่งวันเช้า";
+                                            else if (leaveRangeEnd == "AFTERNOON")
+                                                remarkStr += " - ครึ่งวันบ่าย";
+                                        }
+                                    }
+                                    else
+                                    {
+                                        if(dd.date == leaveReq.LeaveStartDate.Date)
+                                        {
+                                            if (leaveRange == "MORNING")
+                                                remarkStr += "ครึ่งวันเช้า";
+                                            else if (leaveRange == "AFTERNOON")
+                                                remarkStr += "ครึ่งวันบ่าย";
+                                        }
+                                        else if(dd.date == leaveReq.LeaveEndDate.Date)
+                                        {
+                                            var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                                            if (leaveRangeEnd == "MORNING")
+                                                remarkStr += "ครึ่งวันเช้า";
+                                            else if (leaveRangeEnd == "AFTERNOON")
+                                                remarkStr += "ครึ่งวันบ่าย";
+                                        }
+                                        else
+                                        {
+                                            remarkStr += "เต็มวัน";
+                                        }
+                                    }                            
+                                
+
+                                    // if (leaveRange == "MORNING")
+                                    //     remarkStr += "ครึ่งวันเช้า";
+                                    // else if (leaveRange == "AFTERNOON")
+                                    //     remarkStr += "ครึ่งวันบ่าย";
+
+
+                                    // var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                                    // if (leaveRange != leaveRangeEnd)
+                                    // {
+                                    //     if (leaveRangeEnd == "MORNING")
+                                    //         remarkStr += " - ครึ่งวันเช้า";
+                                    //     else if (leaveRangeEnd == "AFTERNOON")
+                                    //         remarkStr += " - ครึ่งวันบ่าย";
+                                    // }
                                     break;
                                 default:
                                     remarkStr += leaveReq.Type.Name;
@@ -1992,18 +2361,18 @@ namespace BMA.EHR.Leave.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
                 }
-                else if (role == "ROOT" || role == "PARENT")
+                else if (role == "ROOT" /*|| role == "PARENT"*/)
                 {
                     nodeId = profileAdmin?.RootDnaId;
                 }
 
                 if (type.Trim().ToUpper() == "OFFICER")
                 {
-                    profile = await _userProfileRepository.GetProfileByAdminRole(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId);
+                    profile = await _userProfileRepository.GetProfileByAdminRolev4(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId, req.StartDate.Date, req.EndDate.Date);
                 }
                 else
                 {
-                    profile = await _userProfileRepository.GetEmployeeByAdminRole(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId);
+                    profile = await _userProfileRepository.GetEmployeeByAdminRole(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId, req.StartDate.Date, req.EndDate.Date);
                 }
                 // Child กรองตามที่ fe ส่งมาอีกชั้น
                 if ((role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "PARENT" || role == "BROTHER") /*&& req.node > profileAdmin?.Node*/)
@@ -2082,7 +2451,7 @@ namespace BMA.EHR.Leave.Service.Controllers
 
                         var fullName = $"{p.Prefix}{p.FirstName} {p.LastName}";
 
-                        var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(p.Id);
+                        var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(p.Id, dd.date);
                         var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
                         var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
 
@@ -2101,26 +2470,72 @@ namespace BMA.EHR.Leave.Service.Controllers
                                 case "LV-005":
                                     remarkStr += leaveReq.Type.Name;
                                     var leaveRange = leaveReq.LeaveRange == null ? "" : leaveReq.LeaveRange.ToUpper();
-                                    if (leaveRange == "MORNING")
-                                        remarkStr += "ครึ่งวันเช้า";
-                                    else if (leaveRange == "AFTERNOON")
-                                        remarkStr += "ครึ่งวันบ่าย";
+                                    if(leaveReq.LeaveStartDate.Date == leaveReq.LeaveEndDate.Date)
+                                    {
+                                        if (leaveRange == "MORNING")
+                                            remarkStr += "ครึ่งวันเช้า";
+                                        else if (leaveRange == "AFTERNOON")
+                                            remarkStr += "ครึ่งวันบ่าย";
 
 
-                                    // var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
-                                    // if (leaveRangeEnd == "MORNING")
+                                        // var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                                        // if (leaveRangeEnd == "MORNING")
+                                        //     remarkStr += "ครึ่งวันเช้า";
+                                        // else if (leaveRangeEnd == "AFTERNOON")
+                                        //     remarkStr += "ครึ่งวันบ่าย";
+
+                                        var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                                        if (leaveRange != leaveRangeEnd)
+                                        {
+                                            if (leaveRangeEnd == "MORNING")
+                                                remarkStr += " - ครึ่งวันเช้า";
+                                            else if (leaveRangeEnd == "AFTERNOON")
+                                                remarkStr += " - ครึ่งวันบ่าย";
+                                        }
+                                    }
+                                    else
+                                    {
+                                        if(dd.date == leaveReq.LeaveStartDate.Date)
+                                        {
+                                            if (leaveRange == "MORNING")
+                                                remarkStr += "ครึ่งวันเช้า";
+                                            else if (leaveRange == "AFTERNOON")
+                                                remarkStr += "ครึ่งวันบ่าย";
+                                        }
+                                        else if(dd.date == leaveReq.LeaveEndDate.Date)
+                                        {
+                                            var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                                            if (leaveRangeEnd == "MORNING")
+                                                remarkStr += "ครึ่งวันเช้า";
+                                            else if (leaveRangeEnd == "AFTERNOON")
+                                                remarkStr += "ครึ่งวันบ่าย";
+                                        }
+                                        else
+                                        {
+                                            remarkStr += "เต็มวัน";
+                                        }
+                                    }                            
+                                
+                                    // if (leaveRange == "MORNING")
                                     //     remarkStr += "ครึ่งวันเช้า";
-                                    // else if (leaveRangeEnd == "AFTERNOON")
+                                    // else if (leaveRange == "AFTERNOON")
                                     //     remarkStr += "ครึ่งวันบ่าย";
 
-                                    var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
-                                    if(leaveRange != leaveRangeEnd)
-                                    {
-                                        if (leaveRangeEnd == "MORNING")
-                                            remarkStr += " - ครึ่งวันเช้า";
-                                        else if (leaveRangeEnd == "AFTERNOON")
-                                            remarkStr += " - ครึ่งวันบ่าย";
-                                    } 
+
+                                    // // var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                                    // // if (leaveRangeEnd == "MORNING")
+                                    // //     remarkStr += "ครึ่งวันเช้า";
+                                    // // else if (leaveRangeEnd == "AFTERNOON")
+                                    // //     remarkStr += "ครึ่งวันบ่าย";
+
+                                    // var leaveRangeEnd = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                                    // if (leaveRange != leaveRangeEnd)
+                                    // {
+                                    //     if (leaveRangeEnd == "MORNING")
+                                    //         remarkStr += " - ครึ่งวันเช้า";
+                                    //     else if (leaveRangeEnd == "AFTERNOON")
+                                    //         remarkStr += " - ครึ่งวันบ่าย";
+                                    // }
                                     break;
                                 default:
                                     remarkStr += leaveReq.Type.Name;
@@ -2233,7 +2648,12 @@ namespace BMA.EHR.Leave.Service.Controllers
                     }
                 }
                 //employees = employees.OrderBy(x => x.checkInDate).ThenBy(x => x.checkInTimeRaw ?? DateTime.MaxValue).ThenBy(x => x.checkOutTimeRaw ?? DateTime.MaxValue).ToList();
-                employees = employees.OrderBy(x => x.checkInTimeRaw ?? DateTime.MaxValue).ThenBy(x => x.checkOutTimeRaw ?? DateTime.MaxValue).ToList();
+                employees = employees
+                                .OrderBy(x => x.checkInTime.Trim() != "" ? 0 : 1) // เรียงตามวันที่ลงเวลา                             
+                                .ThenBy(x => x.remark.Trim() == "" ? 0 : 1) // ข้อมูลที่ไม่มี remark ให้ขึ้นก่อน                           
+                                .ThenBy(x => x.checkInTimeRaw ?? DateTime.MaxValue).ThenBy(x => x.checkOutTimeRaw ?? DateTime.MaxValue)
+                                .ThenBy(x => x.remark) // จากนั้นจัดเรียงตาม remark
+                                .ToList();
                 for (int i = 0; i < employees.Count; i++)
                 {
                     employees[i].no = i + 1;
@@ -2241,7 +2661,7 @@ namespace BMA.EHR.Leave.Service.Controllers
 
                 var enddate = req.EndDate.Date == req.StartDate.Date ? "" : $" - {req.EndDate.Date.ToThaiShortDate()}";
                 var org = _userProfileRepository.GetOc(Guid.Parse(req.nodeId), req.node, AccessToken);
-                var organizationName = $"{(!string.IsNullOrEmpty(org.Child4) ? org.Child4 + "/" : "")}{(!string.IsNullOrEmpty(org.Child3) ? org.Child3 + "/" : "")}{(!string.IsNullOrEmpty(org.Child2) ? org.Child2 + "/" : "")}{(!string.IsNullOrEmpty(org.Child1) ? org.Child1 + "/" : "")}{org.Root ?? ""}";
+                var organizationName = org == null ? "" : $"{(!string.IsNullOrEmpty(org.Child4) ? org.Child4 + "/" : "")}{(!string.IsNullOrEmpty(org.Child3) ? org.Child3 + "/" : "")}{(!string.IsNullOrEmpty(org.Child2) ? org.Child2 + "/" : "")}{(!string.IsNullOrEmpty(org.Child1) ? org.Child1 + "/" : "")}{org.Root ?? ""}";
                 var dateTimeStamp = $"ประจำ ณ วัน{req.StartDate.Date.GetThaiDayOfWeek()} ที่ {req.StartDate.Date.ToThaiShortDate()}{enddate}";
 
                 var templatePath = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", "TimeStampRecords.xlsx");
@@ -2432,29 +2852,45 @@ namespace BMA.EHR.Leave.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
                 }
-                else if (role == "ROOT" || role == "PARENT")
+                else if (role == "ROOT" /*|| role == "PARENT"*/)
                 {
                     nodeId = profileAdmin?.RootDnaId;
                 }
+                var getDefaultRound = await _dutyTimeRepository.GetDefaultAsync();
+                if (getDefaultRound == null)
+                {
+                    return Error("ไม่พบรอบลงเวลา Default", StatusCodes.Status404NotFound);
+                }
 
                 var userTimeStamps = await _processUserTimeStampRepository.GetTimestampByDateLateAsync(type.Trim().ToUpper(), role, nodeId, profileAdmin.Node, req.nodeId, req.node, req.StartDate, req.EndDate);
                 foreach (var p in userTimeStamps)
                 {
                     var fullName = $"{p.Prefix}{p.FirstName} {p.LastName}";
 
-                    var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(p.Id);
+                    UserDutyTime? effectiveDate = null;
+               
+                    effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(p.ProfileId ?? Guid.Empty);
+                    //return Error($"{data.Id} PF{data.FirstName} {data.LastName} : {GlobalMessages.DataNotFound}", StatusCodes.Status404NotFound);
+                
+                    //var userRound = await _dutyTimeRepository.GetByIdAsync(profile.DutyTimeId ?? Guid.Empty);
                     var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
                     var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
 
-                    var duty = userRound;
-                    if (duty == null)
-                    {
-                        duty = await _dutyTimeRepository.GetDefaultAsync();
-                        if (duty == null)
-                        {
-                            return Error("ไม่พบรอบการลงเวลา Default", StatusCodes.Status404NotFound);
-                        }
-                    }
+                    var duty = userRound ?? getDefaultRound;
+
+                    // var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(p.Id);
+                    // var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
+                    // var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
+
+                    // var duty = userRound;
+                    // if (duty == null)
+                    // {
+                    //     duty = await _dutyTimeRepository.GetDefaultAsync();
+                    //     if (duty == null)
+                    //     {
+                    //         return Error("ไม่พบรอบการลงเวลา Default", StatusCodes.Status404NotFound);
+                    //     }
+                    // }
                     DateTime? checkIn = p.CheckIn;
                     DateTime? checkOut = p.CheckOut ?? null;
                     var emp = new
@@ -2553,13 +2989,21 @@ namespace BMA.EHR.Leave.Service.Controllers
                                         ? profileAdmin?.RootDnaId
                                         : "";
                 }
-                else if (role == "ROOT" || role == "PARENT")
+                else if (role == "ROOT" /*|| role == "PARENT"*/)
                 {
                     nodeId = profileAdmin?.RootDnaId;
                 }
 
                 var leaveDays = await _leaveRequestRepository.GetSumApproveLeaveByRootAndRange(req.StartDate, req.EndDate, type, jsonData["result"]?.ToString(), nodeId, profileAdmin?.Node, req.nodeId, req.node);
                 var enddate = req.EndDate.Date == req.StartDate.Date ? "" : $" - {req.EndDate.Date.ToThaiShortDate().ToThaiNumber()}";
+                
+                // var thisYear = req.StartDate.Year;
+                // var toDay = req.StartDate.Date;
+                // if (toDay >= new DateTime(toDay.Year, 10, 1) && toDay <= new DateTime(toDay.Year, 12, 31))
+                //     thisYear = thisYear + 1;
+
+                // var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUser2Async(thisYear, type, data.KeycloakUserId);
+                
                 var result = new
                 {
                     template = "leave2",
@@ -2584,11 +3028,12 @@ namespace BMA.EHR.Leave.Service.Controllers
         {
             var _default = new
             {
-                fullName = "......................",
-                positionName = "......................",
-                positionSign = "......................",
-                updatedAt = "...... /...... /......",
-                comment = "......................",
+                fullName = "............................................",
+                positionName = "............................................",
+                posExOrg = Array.Empty<string>(),
+                positionSign = "............................................",
+                updatedAt = "............/............/............",
+                comment = "......................................................................................................................................................................",
                 approveType = ""
             };
 
@@ -2596,38 +3041,61 @@ namespace BMA.EHR.Leave.Service.Controllers
                 .Select(x => new
                 {
                     fullName = $"{(x.Prefix ?? "")}{(x.FirstName ?? "")} {(x.LastName ?? "")}".Trim(),
-                    positionName = x.PositionName ?? "......................",
-                    positionSign = x.PositionSign ?? "......................",
+                    positionName = (!string.IsNullOrEmpty(x.PositionLevelName) &&
+                           (x.PositionLevelName.Contains("อำนวยการ") || x.PositionLevelName.Contains("บริหาร"))
+                               ? string.IsNullOrEmpty(x.PosExecutiveName)
+                                   ? string.IsNullOrEmpty(x.PositionName)
+                                       ? "............................................"
+                                       : x.PositionName
+                                   : x.PosExecutiveName
+                               : string.IsNullOrEmpty(x.PositionName)
+                                   ? "............................................"
+                                   : string.IsNullOrEmpty(x.PositionLevelName)
+                                       ? x.PositionName
+                                       : $"{x.PositionName}{x.PositionLevelName}").ToThaiNumber(),
+                    posExOrg = !string.IsNullOrEmpty(x.PositionLevelName) &&
+                            (x.PositionLevelName.Contains("อำนวยการ") || x.PositionLevelName.Contains("บริหาร"))
+                               ? new[] { (x!.OrganizationName.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.")).ToThaiNumber() }
+                               : !string.IsNullOrEmpty(x.PosExecutiveName)
+                                   ? new[] { x.PosExecutiveName.ToThaiNumber(), x!.OrganizationName.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.").ToThaiNumber() }
+                                   : new[] { x!.OrganizationName.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.").ToThaiNumber() },
+                    positionSign = !string.IsNullOrEmpty(x.PositionSign)
+                        ? x.PositionSign.Replace("\r", "").Replace("\n", " ").ToThaiNumber()
+                        : "............................................",
                     updatedAt = x.LastUpdatedAt.HasValue
                         ? x.LastUpdatedAt.Value.Date.ToThaiShortDate().ToThaiNumber()
-                        : "...... /...... /......",
-                    comment = (x.Comment ?? "")
-                        .Replace("\r", "")
-                        .Replace("\n", "")
-                        .Trim(),
+                        : "............/............/............",
+                    comment = !string.IsNullOrEmpty(x.Comment)
+                        ? (x.Comment.Replace("\r", "").Replace("\n", " ").Trim()).ToThaiNumber()
+                        : "......................................................................................................................................................................",
                     approveType = (x.ApproveType ?? "").Trim().ToUpper()
                 })
                 .ToList();
 
+            // การเจ้าหน้าที่
             var sender = approvers
                 .FirstOrDefault(x => x.approveType == "SENDER")
                 ?? _default;
 
-            var approver = approvers
-                .FirstOrDefault(x => x.approveType == "APPROVER")
-                ?? _default;
-
+            // ผู้บังคับบัญชา (มีได้มากกว่า 1 คน)
             var commanders = approvers
                 .Where(x => x.approveType == "COMMANDER")
                 .DefaultIfEmpty(_default)
                 .ToList();
 
+            // ผู้มีอำนาจ
+            var approver = approvers
+                .FirstOrDefault(x => x.approveType == "APPROVER")
+                ?? _default;
+
             return new
             {
+                sign = "............................................",
                 sender = sender,
                 approver = approver,
                 commanders = commanders
             };
+
         }
 
     }
diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
index 09addc23..5720bccc 100644
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@@ -17,6 +17,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using NodaTime;
 using Org.BouncyCastle.Asn1.Pkcs;
 using Sentry;
 using Swashbuckle.AspNetCore.Annotations;
@@ -160,10 +161,20 @@ namespace BMA.EHR.Leave.Service.Controllers
                         LastName = r.LastName,
                         PositionName = r.PositionName,
                         PositionSign = r.PositionSign,
+                        PosExecutiveName = r.PosExecutiveName,
+                        PositionLevelName = r.PositionLeaveName,
+                        OrganizationName = r.OrganizationName,
                         ProfileId = r.ProfileId,
                         KeycloakId = r.KeycloakId,
                         ApproveStatus = "PENDING",
-                        ApproveType = type.Trim().ToUpper()
+                        ApproveType = type.Trim().ToUpper(),
+
+                        CreatedFullName = FullName ?? "",
+                        CreatedUserId = UserId!,
+                        CreatedAt = DateTime.Now,
+                        LastUpdateFullName = FullName ?? "",
+                        LastUpdateUserId = UserId!,
+                        LastUpdatedAt = DateTime.Now,
                     });
                 }
 
@@ -202,7 +213,8 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             var thisYear = DateTime.Now.Year;
 
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
 
             if (profile == null)
             {
@@ -367,11 +379,15 @@ namespace BMA.EHR.Leave.Service.Controllers
                     break;
                 case "LV-008":
                     {
-                        var lastSalary = profile.ProfileSalary;
-                        var lastSalaryAmount = lastSalary == null ? 0 : lastSalary.Amount == null ? 0 : lastSalary.Amount;
-                        var lastSalaryAmountText = lastSalary == null ? "" : lastSalary.Amount == null ? "" : ((int)lastSalary.Amount).ToThaiBahtText(false);
-                        leaveRequest.LeaveSalary = (int)lastSalaryAmount;
-                        leaveRequest.LeaveSalaryText = lastSalaryAmountText;
+                        // var lastSalary = profile.ProfileSalary;
+                        // var lastSalaryAmount = lastSalary == null ? 0 : lastSalary.Amount == null ? 0 : lastSalary.Amount;
+                        // var lastSalaryAmountText = lastSalary == null ? "" : lastSalary.Amount == null ? "" : ((int)lastSalary.Amount).ToThaiBahtText(false);
+                        // leaveRequest.LeaveSalary = (int)lastSalaryAmount;
+                        // leaveRequest.LeaveSalaryText = lastSalaryAmountText;
+                        leaveRequest.LeaveSalary = profile.Amount.HasValue && profile.Amount > 0 
+                            ? (int)profile.Amount : 0;
+                        leaveRequest.LeaveSalaryText = profile.Amount.HasValue && profile.Amount > 0 
+                            ? ((int)profile.Amount).ToThaiBahtText(false) : "";
                         //leaveRequest.LeaveSalary = lastSalary == null ? 0 : (int)lastSalary.Amount.Value;
                         //leaveRequest.LeaveSalaryText =
                         //    lastSalary == null ? "" : ((int)lastSalary.Amount.Value).ToThaiBahtText(false);
@@ -391,11 +407,15 @@ namespace BMA.EHR.Leave.Service.Controllers
                     break;
                 case "LV-010":
                     {
-                        var lastSalary = profile.ProfileSalary;
-                        var lastSalaryAmount = lastSalary == null ? 0 : lastSalary.Amount == null ? 0 : lastSalary.Amount;
-                        var lastSalaryAmountText = lastSalary == null ? "" : lastSalary.Amount == null ? "" : ((int)lastSalary.Amount).ToThaiBahtText(false);
-                        leaveRequest.LeaveSalary = (int)lastSalaryAmount;
-                        leaveRequest.LeaveSalaryText = lastSalaryAmountText;
+                        // var lastSalary = profile.ProfileSalary;
+                        // var lastSalaryAmount = lastSalary == null ? 0 : lastSalary.Amount == null ? 0 : lastSalary.Amount;
+                        // var lastSalaryAmountText = lastSalary == null ? "" : lastSalary.Amount == null ? "" : ((int)lastSalary.Amount).ToThaiBahtText(false);
+                        // leaveRequest.LeaveSalary = (int)lastSalaryAmount;
+                        // leaveRequest.LeaveSalaryText = lastSalaryAmountText;
+                        leaveRequest.LeaveSalary = profile.Amount.HasValue && profile.Amount > 0 
+                            ? (int)profile.Amount : 0;
+                        leaveRequest.LeaveSalaryText = profile.Amount.HasValue && profile.Amount > 0 
+                            ? ((int)profile.Amount).ToThaiBahtText(false) : "";
                         //leaveRequest.LeaveSalary = lastSalary == null ? 0 : (int)lastSalary.Amount.Value;
                         //leaveRequest.LeaveSalaryText =
                         //    lastSalary == null ? "" : ((int)lastSalary.Amount.Value).ToThaiBahtText(false);
@@ -481,7 +501,8 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             foreach (var leave in leaves)
             {
-                var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(leave.KeycloakUserId, AccessToken);
+                // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(leave.KeycloakUserId, AccessToken);
+                var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(leave.KeycloakUserId, AccessToken);
                 if (profile != null)
                 {
                     leave.Prefix = profile.Prefix;
@@ -541,7 +562,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                 //     return Error("ไม่สามารถขอลาในช่วงเวลาเดียวกันได้");
                 // }
 
-                var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+                // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+                var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
 
                 if (profile == null)
                 {
@@ -666,11 +688,15 @@ namespace BMA.EHR.Leave.Service.Controllers
                         break;
                     case "LV-008":
                         {
-                            var lastSalary = profile.ProfileSalary;
+                            // var lastSalary = profile.ProfileSalary;
 
-                            oldData.LeaveSalary = lastSalary == null ? 0 : (int)lastSalary.Amount.Value;
-                            oldData.LeaveSalaryText =
-                                lastSalary == null ? "" : ((int)lastSalary.Amount.Value).ToThaiBahtText(false);
+                            // oldData.LeaveSalary = lastSalary == null ? 0 : (int)lastSalary.Amount.Value;
+                            // oldData.LeaveSalaryText =
+                            //     lastSalary == null ? "" : ((int)lastSalary.Amount.Value).ToThaiBahtText(false);
+                            oldData.LeaveSalary = profile.Amount.HasValue && profile.Amount > 0 
+                                ? (int)profile.Amount : 0;
+                            oldData.LeaveSalaryText = profile.Amount.HasValue && profile.Amount > 0 
+                                ? ((int)profile.Amount).ToThaiBahtText(false) : "";
                             oldData.LeaveBirthDate = profile.BirthDate;
                             oldData.LeaveGovernmentDate = profile.DateStart;
 
@@ -686,12 +712,15 @@ namespace BMA.EHR.Leave.Service.Controllers
                         break;
                     case "LV-010":
                         {
-                            var lastSalary = profile.ProfileSalary;
-
-                            oldData.LeaveSalary = lastSalary == null ? 0 : (int)lastSalary.Amount.Value;
-                            oldData.LeaveSalaryText =
-                                lastSalary == null ? "" : ((int)lastSalary.Amount.Value).ToThaiBahtText(false);
+                            // var lastSalary = profile.ProfileSalary;
 
+                            // oldData.LeaveSalary = lastSalary == null ? 0 : (int)lastSalary.Amount.Value;
+                            // oldData.LeaveSalaryText =
+                            //     lastSalary == null ? "" : ((int)lastSalary.Amount.Value).ToThaiBahtText(false);
+                            oldData.LeaveSalary = profile.Amount.HasValue && profile.Amount > 0 
+                                ? (int)profile.Amount : 0;
+                            oldData.LeaveSalaryText = profile.Amount.HasValue && profile.Amount > 0 
+                                ? ((int)profile.Amount).ToThaiBahtText(false) : "";
                             oldData.CoupleDayName = req.CoupleDayName ?? "";
                             oldData.CoupleDayPosition = req.CoupleDayPosition ?? "";
                             oldData.CoupleDayLevel = req.CoupleDayLevel ?? "";
@@ -834,7 +863,8 @@ namespace BMA.EHR.Leave.Service.Controllers
             if (toDay >= startFiscalDate && toDay <= endFiscalDate)
                 thisYear = thisYear + 1;
 
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
             if (profile == null)
             {
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
@@ -868,16 +898,30 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             if (leaveType.Code.Trim().ToUpper() == "LV-005")
             {
-                leaveLimit = leaveData == null ? 0 : leaveData.LeaveDays;
+                // if (profile.IsProbation! == true)
+                //     leaveLimit = 0;
+                // else
+                {
+                    leaveLimit = leaveData == null ? 
+                    10
+                    : leaveData.LeaveDays;
+                }
             }
             else
                 leaveLimit = leaveType.Limit;
 
             var restOldDay = leaveData == null ? 0 : leaveData.LeaveDays - 10;
             var restCurrentDay = 10.0;
+            // if (profile.IsProbation! == true)
+            // {
+            //     restOldDay = 0;
+            //     restCurrentDay = 0;
+            // }
+            if(restOldDay < 0)
+                restOldDay = 0;
             var sumLeave = leaveData == null ? 0 : leaveData.LeaveDaysUsed;
 
-            var lastSalary = profile.ProfileSalary;
+            // var lastSalary = profile.ProfileSalary;
 
             var leaveLast = await _leaveRequestRepository.GetLeaveLastByTypeForUserAsync(userId, req.Type);
 
@@ -902,8 +946,12 @@ namespace BMA.EHR.Leave.Service.Controllers
                 RestDayTotalCurrent = restCurrentDay,// 10 วันเสมอ (LV-005)
                 BirthDate = profile.BirthDate.Date,
                 DateAppoint = profile.DateAppoint == null ? null : profile.DateAppoint.Value.Date,
-                Salary = lastSalary == null ? 0 : lastSalary.Amount == null ? 0 : (int)lastSalary.Amount.Value,
-                SalaryText = lastSalary == null ? "" : lastSalary.Amount == null ? "" : ((int)lastSalary.Amount.Value).ToThaiBahtText(false),
+                // Salary = lastSalary == null ? 0 : lastSalary.Amount == null ? 0 : (int)lastSalary.Amount.Value,
+                // SalaryText = lastSalary == null ? "" : lastSalary.Amount == null ? "" : ((int)lastSalary.Amount.Value).ToThaiBahtText(false),
+                Salary = profile.Amount.HasValue && profile.Amount > 0 
+                    ? (int)profile.Amount : 0,
+                SalaryText = profile.Amount.HasValue && profile.Amount > 0 
+                    ? ((int)profile.Amount).ToThaiBahtText(false) : "",
                 LeaveLast = leaveLast == null ? null : leaveLast,
 
                 TelephoneNumber = profile.TelephoneNumber ?? "",
@@ -912,11 +960,53 @@ namespace BMA.EHR.Leave.Service.Controllers
                 CurrentDistrict = profile.CurrentDistrict ?? "",
                 CurrentProvince = profile.CurrentProvince ?? "",
                 CurrentZipCode = profile.CurrentZipCode ?? "",
+                GovAge = govAge
             };
 
             return Success(result);
         }
 
+        [HttpGet("time-check")]
+        [AllowAnonymous]
+        public async Task<ActionResult<ResponseObject>> TimeCheckAsync()
+        {
+            var startDate = new DateTime(2017, 1, 6);
+            var govAge = (startDate).DiffDay(DateTime.Now.Date);
+            var date1Raw = startDate;
+            var date1 = new LocalDate(date1Raw.Year, date1Raw.Month, date1Raw.Day);
+            var date2 = new LocalDate(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+
+            
+            var (govAgeYear, govAgeMonth, govAgeDay) = startDate.GetDifference(DateTime.Now.Date);
+
+            var isLeave = false;
+            var message = string.Empty;
+
+            if (govAgeYear >= 1 || (govAgeYear == 0 && govAgeMonth >= 6))
+            {
+                isLeave = true;
+                if (!isLeave) message = "จำนวนวันลาเกินที่กำหนด";
+            }
+            else
+            {
+                isLeave = false;
+                if (!isLeave) message = "อายุราชการน้อยกว่า 6 เดือนหรือ 180 วัน";
+            }
+
+            return Success(new
+            {
+                GovAge = govAge,
+                GovAgeDay = govAgeDay,
+                GovAgeMonth = govAgeMonth,
+                GovAgeYear = govAgeYear,
+                IsLeave = isLeave,
+                Message = message
+                
+
+                
+            });
+        }
+
         /// <summary>
         /// LV2_003 - เช็คการยืนขอลา (USER)
         /// </summary>
@@ -935,8 +1025,19 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
 
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
             var govAge = (profile?.DateStart?.Date ?? DateTime.Now.Date).DiffDay(DateTime.Now.Date);
+            var startDate = profile?.DateStart?.Date ?? DateTime.Now.Date;
+            // var date1Raw = profile?.DateStart?.Date ?? DateTime.Now.Date;
+            // var date1 = new LocalDate(date1Raw.Year, date1Raw.Month, date1Raw.Day);
+            // var date2 = new LocalDate(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+            // Period period = Period.Between(date1, date2);
+            // var govAgeMonth = period.Months;
+            // var govAgeYear = period.Years;
+
+            var (govAgeYear, govAgeMonth, govAgeDay) = startDate.GetDifference(DateTime.Now.Date);
+
             var thisYear = DateTime.Now.Year;
 
             var message = string.Empty;
@@ -969,26 +1070,38 @@ namespace BMA.EHR.Leave.Service.Controllers
                 fiscalYear = req.StartLeaveDate.Year + 1;
 
             var sumLeaveDay = await _leaveBeginningRepository.GetByYearAndTypeIdForUserAsync(fiscalYear, req.Type, userId);
-
-
-            var minLeave = (await _context.Set<LeaveRequest>().Where(x => x.Type.Id == req.Type &&
-                                                                          (x.LeaveStatus == "PENDING" || x.LeaveStatus == "APPROVE") &&
-                                                                          x.KeycloakUserId == userId)
-                                                                 .OrderBy(x => x.LeaveStartDate)
-                                                                 .FirstOrDefaultAsync());
-
-            var maxLeave = (await _context.Set<LeaveRequest>().Where(x => x.Type.Id == req.Type &&
-                                                                          (x.LeaveStatus == "PENDING" || x.LeaveStatus == "APPROVE") &&
-                                                                          x.KeycloakUserId == userId)
-                                                                 .OrderByDescending(x => x.LeaveEndDate)
-                                                                 .FirstOrDefaultAsync());
-
             var isBetween = false;
-            if (minLeave != null && maxLeave != null)
-            {
-                isBetween = (req.StartLeaveDate.Date >= minLeave.LeaveStartDate.Date && req.StartLeaveDate.Date <= maxLeave.LeaveEndDate.Date) ||
-                            (req.EndLeaveDate.Date >= minLeave.LeaveStartDate.Date && req.EndLeaveDate.Date <= maxLeave.LeaveEndDate.Date);
-            }
+            var existingLeaves = await _context.Set<LeaveRequest>()
+                .Where(x => x.Type.Id == req.Type &&
+                            (x.LeaveStatus == "PENDING" || x.LeaveStatus == "APPROVE") &&
+                            x.KeycloakUserId == userId)
+                .ToListAsync();
+
+            isBetween = existingLeaves.Any(leave => 
+                            req.StartLeaveDate.Date <= leave.LeaveEndDate.Date && 
+                            req.EndLeaveDate.Date >= leave.LeaveStartDate.Date);
+
+            // var minLeave = (await _context.Set<LeaveRequest>().Where(x => x.Type.Id == req.Type &&
+            //                                                               (x.LeaveStatus == "PENDING" || x.LeaveStatus == "APPROVE") &&
+            //                                                               x.KeycloakUserId == userId)
+            //                                                      .OrderBy(x => x.LeaveStartDate)
+            //                                                      .FirstOrDefaultAsync());
+
+            // var maxLeave = (await _context.Set<LeaveRequest>().Where(x => x.Type.Id == req.Type &&
+            //                                                               (x.LeaveStatus == "PENDING" || x.LeaveStatus == "APPROVE") &&
+            //                                                               x.KeycloakUserId == userId)
+            //                                                      .OrderByDescending(x => x.LeaveEndDate)
+            //                                                      .FirstOrDefaultAsync());
+
+            // var isBetween = false;
+            // if (minLeave != null && maxLeave != null)
+            // {
+            //     // isBetween = (req.StartLeaveDate.Date >= minLeave.LeaveStartDate.Date && req.StartLeaveDate.Date <= maxLeave.LeaveEndDate.Date) ||
+            //     //             (req.EndLeaveDate.Date >= minLeave.LeaveStartDate.Date && req.EndLeaveDate.Date <= maxLeave.LeaveEndDate.Date);
+            //     isBetween = req.StartLeaveDate.Date <= maxLeave.LeaveEndDate.Date && 
+            //                 req.EndLeaveDate.Date >= minLeave.LeaveStartDate.Date;
+
+            // }
 
             var isLeave = false;
             var approveDay = sumLeaveDay == null ? 0.0 : sumLeaveDay.LeaveDaysUsed;
@@ -1006,12 +1119,11 @@ namespace BMA.EHR.Leave.Service.Controllers
                 case "LV-002":
                     // fix issue : ระบบลา (ขรก.) >> ลากิจส่วนตัว (กรณียื่นขอลาเกิน 45 วัน/ปี) #829
                     // fix issue : ระบบลา (ขรก.) >> ลากิจส่วนตัว (กรณีผู้เข้ารับราชการไม่เกิน 1 ปี ยื่นขอลาเกิน 15 วัน/ปี) #831
-                    if (govAge <= 365)
+                    if (govAgeYear <= 1)
                     {
                         isLeave = (totalDay - (sumWorkDay + sumWeekend) + approveDay) <= 15;
                         if (!isLeave) message = "จำนวนวันลาเกินที่กำหนด";
                     }
-
                     else
                     {
                         isLeave = (totalDay - (sumWorkDay + sumWeekend) + approveDay) <= 45;
@@ -1033,32 +1145,11 @@ namespace BMA.EHR.Leave.Service.Controllers
                     break;
                 case "LV-005":
                     // fix issue : ระบบลา (ขรก.) >> ลาพักผ่อน (กรณีรับราชการไม่ถึง 6 เดือน) #838
-                    //var leavePrevYear = (await _leaveRequestRepository.GetSumApproveLeaveAsync(fiscalYear - 1)).Where(x => x.LeaveTypeCode == "LV-005" && x.KeycloakUserId == userId).FirstOrDefault();
-                    //var leavePrevYearRemain = 10 - (leavePrevYear == null ? 0 : leavePrevYear.SumLeaveDay); // หายอดวันลาที่เหลือของปีก่อน
-
-                    if (govAge >= 180)
+                    if (govAgeYear >= 1 || (govAgeYear == 0 && govAgeMonth >= 6))
                     {
                         isLeave = (totalDay - (sumWorkDay + sumWeekend) + approveDay) <= (limitDay);
                         if (!isLeave) message = "จำนวนวันลาเกินที่กำหนด";
                     }
-                    // else if (govAge >= 3650)
-                    // {
-                    //    // ถ้าอายุราชการเกิน 10 ปี ได้บวกเพิ่มอีก 10 วัน
-                    //    var leavePrevYearRemain = 30 - (leavePrevYear == null ? 0 : leavePrevYear.SumLeaveDay); // หายอดวันลาที่เหลือของปีก่อน
-                    //    if (leavePrevYearRemain >= 20) leavePrevYearRemain = 20;
-
-                    //    isLeave = (totalDay - (sumWorkDay + sumWeekend) + approveDay) <= (limitDay);
-                    //    if (!isLeave) message = "จำนวนวันลาเกินที่กำหนด";
-                    // }
-                    // else if
-                    // {
-                    //    //var leavePrevYearRemain = 20 - (leavePrevYear == null ? 0 : leavePrevYear.SumLeaveDay); // หายอดวันลาที่เหลือของปีก่อน
-                    //    //if (leavePrevYearRemain >= 10) leavePrevYearRemain = 10;
-
-                    //    isLeave = (totalDay - (sumWorkDay + sumWeekend) + sumApproveLeave) <= (10 + leavePrevYearRemain);
-                    //    if (!isLeave) message = "จำนวนวันลาเกินที่กำหนด";
-                    // }
-
                     else
                     {
                         isLeave = false;
@@ -1068,7 +1159,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     break;
                 case "LV-006":
                     // fix issue : ระบบลา(ขรก.) >> ลาอุปสมบทหรือการลาประกอบพิธีฮัจย์ฯ(กรณีรับราชการน้อยกว่า 1 ปี) #840
-                    if (govAge < 365)
+                    if (govAgeYear < 1)
                     {
                         isLeave = false;
                         if (!isLeave) message = "อายุราชการน้อยกว่า 1 ปีหรือ 365 วัน";
@@ -1094,7 +1185,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     break;
                 case "LV-008":
                 case "LV-009":
-                    isLeave = govAge >= 365;
+                    isLeave = govAgeYear >= 1;
                     if (!isLeave) message = "อายุราชการน้อยกว่า 1 ปีหรือ 365 วัน";
                     break;
                 case "LV-010":
@@ -1261,14 +1352,14 @@ namespace BMA.EHR.Leave.Service.Controllers
         public async Task<ActionResult<ResponseObject>> GetLeaveRequestCalendarAdminAsync(
             [FromBody] GetLeaveRequestCalendarDto req)
         {
-            var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_LEAVE_LIST");
-            var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
-            if (jsonData["status"]?.ToString() != "200")
+            var jsonData = await _permission.GetPermissionWithActingAPIAsync("LIST", "SYS_LEAVE_LIST");
+            //var jsonData = JsonConvert.DeserializeObject<GetPermissionWithActingResultDto>(getPermission);
+            if (jsonData!.status != 200)
             {
-                return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
+                return Error(jsonData.message, StatusCodes.Status403Forbidden);
             }
-
-            string role = jsonData["result"]?.ToString();
+            //string role = jsonData["result"]?.ToString();
+            string role = jsonData.result.privilege;
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
@@ -1298,12 +1389,91 @@ namespace BMA.EHR.Leave.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
             var data = await _leaveRequestRepository.GetLeaveRequestByYearForAdminAsync(req.Year, role, nodeId, profileAdmin.Node);
 
+
+            // ถ้ามีการรักษาการ
+            if (jsonData.result.isAct)
+            {
+                var posActs = jsonData.result.posMasterActs;
+                foreach(var act in posActs)
+                {
+                    var actRole = act.privilege;
+                    string actNodeId = string.Empty;
+                    int? actNode = null;
+
+                    if (role == "NORMAL" || role == "CHILD")
+                    {
+                        actNodeId = act.child4DnaId != null ?
+                                    act.child4DnaId.Value.ToString("D") :
+                                    act.child3DnaId != null ?
+                                    act.child3DnaId.Value.ToString("D") :
+                                    act.child2DnaId != null ?
+                                    act.child2DnaId.Value.ToString("D") :
+                                    act.child1DnaId != null ?
+                                    act.child1DnaId.Value.ToString("D") :
+                                    act.rootDnaId != null ? 
+                                    act.rootDnaId.Value.ToString("D") :
+                                    "";
+                        actNode =   act.child4DnaId != null ?
+                                    4 :
+                                    act.child3DnaId != null ?
+                                    3 :
+                                    act.child2DnaId != null ?
+                                    2 :
+                                    act.child1DnaId != null ?
+                                    1 :
+                                    act.rootDnaId != null ? 
+                                    0 :
+                                    null;
+                    }
+                    else if (role == "BROTHER")
+                    {
+                        actNodeId = act.child3DnaId != null ?
+                                    act.child3DnaId.Value.ToString("D") :
+                                    act.child2DnaId != null ?
+                                    act.child2DnaId.Value.ToString("D") :
+                                    act.child1DnaId != null ?
+                                    act.rootDnaId!.Value.ToString("D") :
+                                    act.rootDnaId != null ? 
+                                    act.rootDnaId.Value.ToString("D") :
+                                    "";
+                        actNode =   act.child4DnaId != null ?
+                                    4 :
+                                    act.child3DnaId != null ?
+                                    4 :
+                                    act.child2DnaId != null ?
+                                    3 :
+                                    act.child1DnaId != null ?
+                                    2 :
+                                    act.rootDnaId != null ? 
+                                    0 :
+                                    null;
+                    }
+                    else if (role == "ROOT" /*|| role == "PARENT"*/)
+                    {
+                        actNodeId = act.rootDnaId!.Value.ToString("D");
+                        actNode = 0;
+                    }
+
+                    var rawDataAct = await _leaveRequestRepository.GetLeaveRequestByYearForAdminAsync(req.Year, actRole, actNodeId, actNode);
+                    if (rawDataAct != null)
+                    {
+                        if (data != null)
+                            data = data.Union(rawDataAct).ToList();
+                        else
+                            data = rawDataAct;
+                    }
+                }
+            }
+            
+
+
+
             var resultData = (from d in data
                                   //join p in profileList on d.KeycloakUserId equals p.Keycloak
                               select new GetLeaveRequestCalendarResultDto
@@ -1316,7 +1486,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                                   FullName = $"{d.Prefix}{d.FirstName} {d.LastName}",
                                   LeaveEndDate = d.LeaveEndDate,
                                   LeaveStartDate = d.LeaveStartDate,
-                                  KeycloakId = d.KeycloakUserId
+                                  KeycloakId = d.KeycloakUserId,
+                                  LeaveTotal = d.LeaveTotal
 
                               })
                          .ToList();
@@ -1484,7 +1655,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
             }
 
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(rawData.KeycloakUserId, AccessToken);
+            // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(rawData.KeycloakUserId, AccessToken);
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(rawData.KeycloakUserId, AccessToken);
 
             if (profile == null)
             {
@@ -1496,8 +1668,8 @@ namespace BMA.EHR.Leave.Service.Controllers
             var userCalendar = await _userCalendarRepository.GetExist(profile.Id);
             var category = userCalendar == null ? "NORMAL" : userCalendar.Calendar;
 
-            var lastSalary = profile.ProfileSalary;
-            var lastSalaryAmount = lastSalary == null ? 0 : lastSalary.Amount ?? 0;
+            // var lastSalary = profile.ProfileSalary;
+            // var lastSalaryAmount = lastSalary == null ? 0 : lastSalary.Amount ?? 0;
 
             var lastLeaveRequest =
                 await _leaveRequestRepository.GetLastLeaveRequestByTypeForUserAsync(rawData.KeycloakUserId,
@@ -1523,7 +1695,8 @@ namespace BMA.EHR.Leave.Service.Controllers
 
 
             var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUserAsync(thisYear, rawData.Type.Id, rawData.KeycloakUserId);
-            var restDayOld = govAge < 180 ? 0 : leaveData == null ? 0 : leaveData.LeaveDays - 10;
+            var restDayOld = govAge < 180 ? 0 : leaveData == null ? 0 : (leaveData.LeaveDays + leaveData.BeginningLeaveDays - 10);
+            if (restDayOld < 0) restDayOld = 0;    
             var restDayCurrent = govAge < 180 ? 0 : 10;
 
 
@@ -1562,8 +1735,12 @@ namespace BMA.EHR.Leave.Service.Controllers
                 LeaveBirthDate = profile.BirthDate,
                 LeaveGovernmentDate = profile.DateAppoint == null ? null : profile.DateAppoint.Value,
 
-                LeaveSalary = lastSalary == null ? 0 : lastSalaryAmount,
-                LeaveSalaryText = lastSalary == null ? "" : ((int)lastSalaryAmount).ToThaiBahtText(false),
+                // LeaveSalary = lastSalary == null ? 0 : lastSalaryAmount,
+                // LeaveSalaryText = lastSalary == null ? "" : ((int)lastSalaryAmount).ToThaiBahtText(false),
+                LeaveSalary = profile.Amount.HasValue && profile.Amount > 0 
+                    ? (int)profile.Amount : 0,
+                LeaveSalaryText = profile.Amount.HasValue && profile.Amount > 0 
+                    ? ((int)profile.Amount).ToThaiBahtText(false) : "",
 
                 WifeDayName = rawData.WifeDayName,
                 WifeDayDateBorn = rawData.WifeDayDateBorn,
@@ -1652,14 +1829,14 @@ namespace BMA.EHR.Leave.Service.Controllers
         public async Task<ActionResult<ResponseObject>> GetLeaveRequestForAdminAsync(
             [FromBody] GetLeaveRequestForAdminDto req)
         {
-            var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_LEAVE_LIST");
-            var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
-            if (jsonData["status"]?.ToString() != "200")
+            var jsonData = await _permission.GetPermissionWithActingAPIAsync("LIST", "SYS_LEAVE_LIST");
+            //var jsonData = JsonConvert.DeserializeObject<GetPermissionWithActingResultDto>(getPermission);
+            if (jsonData!.status != 200)
             {
-                return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
+                return Error(jsonData.message, StatusCodes.Status403Forbidden);
             }
-
-            string role = jsonData["result"]?.ToString();
+            //string role = jsonData["result"]?.ToString();
+            string role = jsonData.result.privilege;
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
@@ -1689,13 +1866,90 @@ namespace BMA.EHR.Leave.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
 
             var rawData = await _leaveRequestRepository.GetListLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, req.StartDate, req.EndDate, role, nodeId, profileAdmin?.Node);
 
+
+            // ถ้ามีการรักษาการ
+            if (jsonData.result.isAct)
+            {
+                var posActs = jsonData.result.posMasterActs;
+                foreach(var act in posActs)
+                {
+                    var actRole = act.privilege;
+                    string actNodeId = string.Empty;
+                    int? actNode = null;
+
+                    if (role == "NORMAL" || role == "CHILD")
+                    {
+                        actNodeId = act.child4DnaId != null ?
+                                    act.child4DnaId.Value.ToString("D") :
+                                    act.child3DnaId != null ?
+                                    act.child3DnaId.Value.ToString("D") :
+                                    act.child2DnaId != null ?
+                                    act.child2DnaId.Value.ToString("D") :
+                                    act.child1DnaId != null ?
+                                    act.child1DnaId.Value.ToString("D") :
+                                    act.rootDnaId != null ? 
+                                    act.rootDnaId.Value.ToString("D") :
+                                    "";
+                        actNode =   act.child4DnaId != null ?
+                                    4 :
+                                    act.child3DnaId != null ?
+                                    3 :
+                                    act.child2DnaId != null ?
+                                    2 :
+                                    act.child1DnaId != null ?
+                                    1 :
+                                    act.rootDnaId != null ? 
+                                    0 :
+                                    null;
+                    }
+                    else if (role == "BROTHER")
+                    {
+                        actNodeId = act.child3DnaId != null ?
+                                    act.child3DnaId.Value.ToString("D") :
+                                    act.child2DnaId != null ?
+                                    act.child2DnaId.Value.ToString("D") :
+                                    act.child1DnaId != null ?
+                                    act.rootDnaId!.Value.ToString("D") :
+                                    act.rootDnaId != null ? 
+                                    act.rootDnaId.Value.ToString("D") :
+                                    "";
+                        actNode =   act.child4DnaId != null ?
+                                    4 :
+                                    act.child3DnaId != null ?
+                                    4 :
+                                    act.child2DnaId != null ?
+                                    3 :
+                                    act.child1DnaId != null ?
+                                    2 :
+                                    act.rootDnaId != null ? 
+                                    0 :
+                                    null;
+                    }
+                    else if (role == "ROOT" /*|| role == "PARENT"*/)
+                    {
+                        actNodeId = act.rootDnaId!.Value.ToString("D");
+                        actNode = 0;
+                    }
+
+                    var rawDataAct = await _leaveRequestRepository.GetListLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, req.StartDate, req.EndDate, actRole, actNodeId, actNode);
+                    if (rawDataAct != null)
+                    {
+                        if (rawData != null)
+                            rawData = rawData.Union(rawDataAct).ToList();
+                        else
+                            rawData = rawDataAct;
+                    }
+                }
+            }
+            
+
             var result = new List<GetLeaveRequestForAdminResultDto>();
 
             foreach (var item in rawData)
@@ -1740,6 +1994,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     LeaveRange = item.LeaveRange ?? "ALL",
                     LeaveRangeEnd = item.LeaveRangeEnd ?? "ALL",
                     HajjDayStatus = item.HajjDayStatus,
+                    LeaveTotal = item.LeaveTotal
                 };
 
                 result.Add(res);
@@ -1777,6 +2032,12 @@ namespace BMA.EHR.Leave.Service.Controllers
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
             }
 
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(data.KeycloakUserId, AccessToken);
+            if (profile == null)
+            {
+                return Error(GlobalMessages.ProfileNotFound, StatusCodes.Status404NotFound);
+            }
+
             // change status to delete
             // แก้จาก DELETE เป็น DELETING ไว้ก่อน รอ approve ค่อยเปลี่ยนเป็น DELETE
             // data.LeaveStatus = "DELETE"; 
@@ -1813,7 +2074,7 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             // TODO: Send notification to all users who need to approve the cancel leave request
             var approvers = data.Approvers
-                            .Where(x => x.ApproveStatus!.ToUpper() == "PENDING")
+                            //.Where(x => x.ApproveStatus!.ToUpper() == "PENDING")
                             .OrderBy(x => x.Seq)
                             .ToList();
 
@@ -1825,11 +2086,33 @@ namespace BMA.EHR.Leave.Service.Controllers
                     Body = $"คำร้องขอยกเลิกการลาของคุณ {data.FirstName} {data.LastName} รอรับการอนุมัติจากคุณ",
                     ReceiverUserId = approver!.ProfileId,
                     Type = "",
-                    Payload = $"{URL}/leave/detail/{id}",
+                    Payload = $"{URL}/leave-reject/detail/{id}",
                 };
                 _appDbContext.Set<Notification>().Add(noti1);
             }
 
+            // Get Officer List
+            var officers = await _userProfileRepository.GetOCStaffAsync(profile.Id, AccessToken);
+            var approverProfileIdList = approvers.Select(x => x.ProfileId).ToList();
+            
+            if(officers != null && officers.Count > 0)
+            {
+                officers = officers.Where(x => !approverProfileIdList.Contains(x.ProfileId)).ToList();
+                foreach (var officer in officers)
+                {
+                    // Send Notification
+                    var noti = new Notification
+                    {
+                        Body = $"คำร้องขอยกเลิกการลาของคุณ {data.FirstName} {data.LastName} รอรับการอนุมัติจากคุณ",
+                        ReceiverUserId = officer.ProfileId,
+                        Type = "",
+                        Payload = $"{URL}/leave-reject/detail/{id}",
+                    };
+                    _appDbContext.Set<Notification>().Add(noti);
+                }
+                await _appDbContext.SaveChangesAsync();
+            }
+
 
             return Success();
         }
@@ -1849,14 +2132,14 @@ namespace BMA.EHR.Leave.Service.Controllers
         public async Task<ActionResult<ResponseObject>> GetCancelLeaveRequestForAdminAsync(
             [FromBody] GetLeaveRequestForAdminDto req)
         {
-            var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_LEAVE_LIST");
-            var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
-            if (jsonData["status"]?.ToString() != "200")
+            var jsonData = await _permission.GetPermissionWithActingAPIAsync("LIST", "SYS_LEAVE_LIST");
+            //var jsonData = JsonConvert.DeserializeObject<GetPermissionWithActingResultDto>(getPermission);
+            if (jsonData!.status != 200)
             {
-                return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
+                return Error(jsonData.message, StatusCodes.Status403Forbidden);
             }
-
-            string role = jsonData["result"]?.ToString();
+            //string role = jsonData["result"]?.ToString();
+            string role = jsonData.result.privilege;
             var nodeId = string.Empty;
             var profileAdmin = new GetUserOCAllDto();
             profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
@@ -1886,7 +2169,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -1894,11 +2177,96 @@ namespace BMA.EHR.Leave.Service.Controllers
             var rawData =
                 await _leaveRequestRepository.GetCancelLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, role, nodeId, profileAdmin?.Node);
 
+            // ถ้ามีการรักษาการ
+            if (jsonData.result.isAct)
+            {
+                var posActs = jsonData.result.posMasterActs;
+                foreach(var act in posActs)
+                {
+                    var actRole = act.privilege;
+                    string actNodeId = string.Empty;
+                    int? actNode = null;
+
+                    if (role == "NORMAL" || role == "CHILD")
+                    {
+                        actNodeId = act.child4DnaId != null ?
+                                    act.child4DnaId.Value.ToString("D") :
+                                    act.child3DnaId != null ?
+                                    act.child3DnaId.Value.ToString("D") :
+                                    act.child2DnaId != null ?
+                                    act.child2DnaId.Value.ToString("D") :
+                                    act.child1DnaId != null ?
+                                    act.child1DnaId.Value.ToString("D") :
+                                    act.rootDnaId != null ? 
+                                    act.rootDnaId.Value.ToString("D") :
+                                    "";
+                        actNode =   act.child4DnaId != null ?
+                                    4 :
+                                    act.child3DnaId != null ?
+                                    3 :
+                                    act.child2DnaId != null ?
+                                    2 :
+                                    act.child1DnaId != null ?
+                                    1 :
+                                    act.rootDnaId != null ? 
+                                    0 :
+                                    null;
+                    }
+                    else if (role == "BROTHER")
+                    {
+                        actNodeId = act.child3DnaId != null ?
+                                    act.child3DnaId.Value.ToString("D") :
+                                    act.child2DnaId != null ?
+                                    act.child2DnaId.Value.ToString("D") :
+                                    act.child1DnaId != null ?
+                                    act.rootDnaId!.Value.ToString("D") :
+                                    act.rootDnaId != null ? 
+                                    act.rootDnaId.Value.ToString("D") :
+                                    "";
+                        actNode =   act.child4DnaId != null ?
+                                    4 :
+                                    act.child3DnaId != null ?
+                                    4 :
+                                    act.child2DnaId != null ?
+                                    3 :
+                                    act.child1DnaId != null ?
+                                    2 :
+                                    act.rootDnaId != null ? 
+                                    0 :
+                                    null;
+                    }
+                    else if (role == "ROOT" /*|| role == "PARENT"*/)
+                    {
+                        actNodeId = act.rootDnaId!.Value.ToString("D");
+                        actNode = 0;
+                    }
+
+                    var rawDataAct = await _leaveRequestRepository.GetCancelLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, actRole, actNodeId, actNode);
+                    if (rawDataAct != null)
+                    {
+                        if (rawData != null)
+                            rawData = rawData.Union(rawDataAct).ToList();
+                        else
+                            rawData = rawDataAct;
+                    }
+                }
+            }
+            
+
+            var recCount = rawData.Count;
+
+            if (req.Keyword != "")
+                rawData = rawData.Where(x => ($"{x.Prefix}{x.FirstName} {x.LastName}").Contains(req.Keyword)).ToList();
+            if (!string.IsNullOrEmpty(req.ProfileType) && req.ProfileType.ToUpper() != "ALL")
+                rawData = rawData.Where(x => x.ProfileType.ToUpper().Contains(req.ProfileType.ToUpper())).ToList();
+            
+            rawData = rawData.Skip((req.Page - 1) * req.PageSize).Take(req.PageSize).ToList();
+
             var result = new List<GetLeaveCancelRequestResultDto>();
 
             foreach (var item in rawData)
             {
-                var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(item.KeycloakUserId, AccessToken);
+                //var profile = await _userProfileRepository.GetProfileByKeycloakIdNewAsync(item.KeycloakUserId, AccessToken);
                 var res = new GetLeaveCancelRequestResultDto
                 {
                     Id = item.Id,
@@ -1913,13 +2281,13 @@ namespace BMA.EHR.Leave.Service.Controllers
                 result.Add(res);
             }
 
-            if (req.Keyword != "")
-                result = result.Where(x => x.FullName.Contains(req.Keyword)).ToList();
-            if (!string.IsNullOrEmpty(req.ProfileType) && req.ProfileType.ToUpper() != "ALL")
-                result = result.Where(x => x.ProfileType.ToUpper().Contains(req.ProfileType.ToUpper())).ToList();
-            var pageResult = result.Skip((req.Page - 1) * req.PageSize).Take(req.PageSize).ToList();
+            // if (req.Keyword != "")
+            //     result = result.Where(x => x.FullName.Contains(req.Keyword)).ToList();
+            // if (!string.IsNullOrEmpty(req.ProfileType) && req.ProfileType.ToUpper() != "ALL")
+            //     result = result.Where(x => x.ProfileType.ToUpper().Contains(req.ProfileType.ToUpper())).ToList();
+            // var pageResult = result.Skip((req.Page - 1) * req.PageSize).Take(req.PageSize).ToList();
 
-            return Success(new { data = pageResult, total = result.Count });
+            return Success(new { data = result, total = recCount });
         }
 
 
@@ -1946,12 +2314,12 @@ namespace BMA.EHR.Leave.Service.Controllers
                 return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
             }
 
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(rawData.KeycloakUserId, AccessToken);
+            // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(rawData.KeycloakUserId, AccessToken);
 
-            if (profile == null)
-            {
-                return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
-            }
+            // if (profile == null)
+            // {
+            //     return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
+            // }
 
             var result = new GetCancelLeaveRequestByIdDto
             {
@@ -2003,7 +2371,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
 
-            var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(Guid.Parse(UserId!), AccessToken);
+            // var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(Guid.Parse(UserId!), AccessToken);
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(Guid.Parse(UserId!), AccessToken);
 
             if (profile == null)
             {
@@ -2027,13 +2396,16 @@ namespace BMA.EHR.Leave.Service.Controllers
                 {
                     new LeaveRequestApprover
                     {
-                        Prefix = profile.Prefix,
-                        FirstName = profile.FirstName,
-                        LastName = profile.LastName,
-                        PositionName = profile.Position,
+                        Prefix = profile.Prefix ?? "",
+                        FirstName = profile.FirstName  ?? "",
+                        LastName = profile.LastName ?? "",
+                        PositionName = $"{profile.Position ?? ""}",
                         ProfileId = profile.Id,
                         KeycloakId = Guid.Parse(UserId!),
                         ApproveType = "SENDER",
+                        PositionLevelName = profile.PositionLeaveName ?? "",
+                        PosExecutiveName = profile.PosExecutiveName ?? "",
+                        OrganizationName = profile.Oc ?? "",
 
                         CreatedFullName = FullName ?? "",
                         CreatedUserId = UserId!,
@@ -2247,46 +2619,66 @@ namespace BMA.EHR.Leave.Service.Controllers
             {
                 await _leaveRequestRepository.SendToOfficerAsync(id);
 
+                // Remove Workflow Integration
                 var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
                 var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
                 if (profile == null)
                 {
                     return Error(GlobalMessages.DataNotFound, StatusCodes.Status404NotFound);
                 }
-                var baseAPIOrg = _configuration["API"];
-                var apiUrlOrg = $"{baseAPIOrg}/org/workflow/add-workflow";
-                if (profile.ProfileType == "OFFICER")
+
+                // Get Officer List
+                var officers = await _userProfileRepository.GetOCStaffAsync(profile.Id, AccessToken);
+                if(officers != null && officers.Count > 0)
                 {
-                    using (var client = new HttpClient())
+                    foreach (var officer in officers)
                     {
-                        client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
-                        var _res = await client.PostAsJsonAsync(apiUrlOrg, new
+                        // Send Notification
+                        var noti = new Notification
                         {
-                            refId = id,
-                            sysName = "SYS_LEAVE_LIST",
-                            posLevelName = profile.PosLevel ?? "",
-                            posTypeName = profile.PosType ?? "",
-                            fullName = $"{profile.Prefix}{profile.FirstName} {profile.LastName}"
-                        });
-                    }
-                }
-                else
-                {
-                    using (var client = new HttpClient())
-                    {
-                        client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
-                        var _res = await client.PostAsJsonAsync(apiUrlOrg, new
-                        {
-                            refId = id,
-                            sysName = "SYS_LEAVE_LIST_EMP",
-                            posLevelName = profile.PosLevel ?? "",
-                            posTypeName = profile.PosType ?? "",
-                            fullName = $"{profile.Prefix}{profile.FirstName} {profile.LastName}"
-                        });
+                            Body = $"มีคำร้องขอลาจาก {profile.Prefix}{profile.FirstName} {profile.LastName} รอรับการอนุมัติจากคุณ",
+                            ReceiverUserId = officer.ProfileId,
+                            Type = "",
+                            Payload = $"{URL}/leave/detail/{id}",
+                        };
+                        _appDbContext.Set<Notification>().Add(noti);
                     }
+                    await _appDbContext.SaveChangesAsync();
                 }
+                // var baseAPIOrg = _configuration["API"];
+                // var apiUrlOrg = $"{baseAPIOrg}/org/workflow/add-workflow";
+                // if (profile.ProfileType == "OFFICER")
+                // {
+                //     using (var client = new HttpClient())
+                //     {
+                //         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
+                //         client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
+                //         var _res = await client.PostAsJsonAsync(apiUrlOrg, new
+                //         {
+                //             refId = id,
+                //             sysName = "SYS_LEAVE_LIST",
+                //             posLevelName = profile.PosLevel ?? "",
+                //             posTypeName = profile.PosType ?? "",
+                //             fullName = $"{profile.Prefix}{profile.FirstName} {profile.LastName}"
+                //         });
+                //     }
+                // }
+                // else
+                // {
+                //     using (var client = new HttpClient())
+                //     {
+                //         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
+                //         client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
+                //         var _res = await client.PostAsJsonAsync(apiUrlOrg, new
+                //         {
+                //             refId = id,
+                //             sysName = "SYS_LEAVE_LIST_EMP",
+                //             posLevelName = profile.PosLevel ?? "",
+                //             posTypeName = profile.PosType ?? "",
+                //             fullName = $"{profile.Prefix}{profile.FirstName} {profile.LastName}"
+                //         });
+                //     }
+                // }
 
                 return Success();
             }
@@ -2374,8 +2766,10 @@ namespace BMA.EHR.Leave.Service.Controllers
                     }
                 }
             }
-            var thisYear = DateTime.Now.Year;
-            var toDay = DateTime.Now.Date;
+            var thisYear = rawData.LeaveStartDate.Year;
+            var toDay = rawData.LeaveStartDate.Date;
+            // var thisYear = DateTime.Now.Year;
+            // var toDay = DateTime.Now.Date;
             if (toDay >= new DateTime(toDay.Year, 10, 1) && toDay <= new DateTime(toDay.Year, 12, 31))
                 thisYear = thisYear + 1;
 
@@ -2393,8 +2787,8 @@ namespace BMA.EHR.Leave.Service.Controllers
             //var lastSalaryAmount = lastSalary == null ? 0 : lastSalary.Amount ?? 0;
 
             var lastLeaveRequest =
-                await _leaveRequestRepository.GetLastLeaveRequestByTypeForUserAsync(rawData.KeycloakUserId,
-                    rawData.Type.Id, rawData.LeaveStartDate.Date);
+                await _leaveRequestRepository.GetLastLeaveRequestByTypeForUserAsync2(rawData.KeycloakUserId,
+                    rawData.Type.Id, rawData.CreatedAt);
 
             //var rootOc = _userProfileRepository.GetRootOcId(profile.OcId ?? Guid.Empty, AccessToken);
             //var approver = string.Empty;
@@ -2427,7 +2821,13 @@ namespace BMA.EHR.Leave.Service.Controllers
                 orgName += $" {rawData.Root}";
 
             var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUser2Async(thisYear, rawData.Type.Id, rawData.KeycloakUserId);
-            var leaveSummary = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed;
+
+            var startFiscalYear = new DateTime(rawData.LeaveStartDate.Year - 1, 10, 1);
+            var endFiscalYear = rawData.CreatedAt;
+            var leaveSummary = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser2(rawData.KeycloakUserId, rawData.Type.Id, startFiscalYear, endFiscalYear);
+            //var leaveSummary = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed;
+            if (leaveData != null)
+                leaveSummary += leaveData.BeginningLeaveDays;
 
             var extendLeave = 0.0;
             var leaveLimit = (double)rawData.Type.Limit;
@@ -2435,7 +2835,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             if (rawData.Type.Code == "LV-005")
             {
                 leaveLimit = leaveData == null ? 0.0 : leaveData.LeaveDays;
-                extendLeave = leaveLimit - 10;
+                extendLeave = leaveLimit <= 0 ? 0 : leaveLimit - 10;
             }
 
             var result = new GetLeaveRequestForAdminByIdDto
@@ -2534,8 +2934,6 @@ namespace BMA.EHR.Leave.Service.Controllers
                 //OrganizationName = rawData.OrganizationName ?? "",
                 // fix SIT ระบบบันทึกการลา>>รายการลา (ข้อมูลผู้สังกัดและเรียนไม่แสดง) #971
 
-
-
                 ApproveStep = rawData.ApproveStep ?? "-",
 
                 LeaveLimit = rawData.Type.Limit + extendLeave,
@@ -2618,7 +3016,8 @@ namespace BMA.EHR.Leave.Service.Controllers
             var sendList = await _leaveRequestRepository.GetSumSendLeaveAsync(thisYear);
             var rejectList = await _leaveRequestRepository.GetSumRejectLeaveAsync(thisYear);
             var deleteList = await _leaveRequestRepository.GetSumDeleteLeaveAsync(thisYear);
-            var pf = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            // var pf = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var pf = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
 
             if (pf == null)
             {
@@ -2660,7 +3059,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 if (leaveType.Code == "LV-005")
                 {
                     leaveLimit = leaveData?.LeaveDays ?? 0.0;
-                    extendLeave = leaveLimit - 10;
+                    extendLeave = leaveLimit <= 0 ? 0 : leaveLimit - 10;
                 }
 
                 var data = new
diff --git a/BMA.EHR.Leave/DTOs/ChangeRound/CreateChangeRoundDto.cs b/BMA.EHR.Leave/DTOs/ChangeRound/CreateChangeRoundDto.cs
index 6ad96fcd..5379abda 100644
--- a/BMA.EHR.Leave/DTOs/ChangeRound/CreateChangeRoundDto.cs
+++ b/BMA.EHR.Leave/DTOs/ChangeRound/CreateChangeRoundDto.cs
@@ -12,4 +12,25 @@ namespace BMA.EHR.Leave.Service.DTOs.ChangeRound
 
         public string Remark { get; set; }
     }
+
+    public class CreateChangeRoundMultipleDto
+    {
+        public Guid ProfileId { get; set; }
+
+        public Guid RoundId { get; set; }
+
+        public DateTime EffectiveDate { get; set; }
+
+        public string Remark { get; set; }
+
+        public Guid? RootDnaId { get; set; }
+        public Guid? Child1DnaId { get; set; }
+        public Guid? Child2DnaId { get; set; }
+        public Guid? Child3DnaId { get; set; }
+        public Guid? Child4DnaId { get; set; }
+
+        public string? Prefix { get; set; }
+        public string? FirstName { get; set; }
+        public string? LastName { get; set; }
+    }
 }
diff --git a/BMA.EHR.Leave/DTOs/ChangeRound/SearchProfileDto.cs b/BMA.EHR.Leave/DTOs/ChangeRound/SearchProfileDto.cs
index 3b05ad29..69f5cbba 100644
--- a/BMA.EHR.Leave/DTOs/ChangeRound/SearchProfileDto.cs
+++ b/BMA.EHR.Leave/DTOs/ChangeRound/SearchProfileDto.cs
@@ -17,5 +17,9 @@
         public string? sortBy { get; set; }
 
         public bool? descending { get; set; }
+
+        public Guid? SelectedNodeId { get; set; }
+
+        public int? SelectedNode { get; set; }
     }
 }
diff --git a/BMA.EHR.Leave/DTOs/ChangeRound/SearchProfileResultDto.cs b/BMA.EHR.Leave/DTOs/ChangeRound/SearchProfileResultDto.cs
index 83b4d7b9..00df91a9 100644
--- a/BMA.EHR.Leave/DTOs/ChangeRound/SearchProfileResultDto.cs
+++ b/BMA.EHR.Leave/DTOs/ChangeRound/SearchProfileResultDto.cs
@@ -17,5 +17,11 @@
         public string LeaveTimeAfterNoon { get;set; }
 
         public DateTime? EffectiveDate { get; set; }
+
+        public string? RootDnaId { get; set; }
+        public string? Child1DnaId { get; set; }
+        public string? Child2DnaId { get; set; }
+        public string? Child3DnaId { get; set; }
+        public string? Child4DnaId { get; set; }
     }
 }
diff --git a/BMA.EHR.Leave/DTOs/CheckIn/CheckTimeDto.cs b/BMA.EHR.Leave/DTOs/CheckIn/CheckTimeDto.cs
index 3a738170..0d49c24f 100644
--- a/BMA.EHR.Leave/DTOs/CheckIn/CheckTimeDto.cs
+++ b/BMA.EHR.Leave/DTOs/CheckIn/CheckTimeDto.cs
@@ -54,6 +54,7 @@ namespace BMA.EHR.Leave.Service.DTOs.CheckIn
 
         public Guid? CheckInId { get; set; }
 
+        public Guid? TaskId { get; set; }
 
         public double Lat { get; set; } = 0;
 
diff --git a/BMA.EHR.Leave/DTOs/LeaveBeginnings/CreateLeaveBeginningDto.cs b/BMA.EHR.Leave/DTOs/LeaveBeginnings/CreateLeaveBeginningDto.cs
index 79d33052..423385ed 100644
--- a/BMA.EHR.Leave/DTOs/LeaveBeginnings/CreateLeaveBeginningDto.cs
+++ b/BMA.EHR.Leave/DTOs/LeaveBeginnings/CreateLeaveBeginningDto.cs
@@ -14,10 +14,19 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveBeginnings
         [Required, Comment("ปีงบประมาณ")]
         public int LeaveYear { get; set; } = 0;
 
-        [Required, Comment("จำนวนวันลายกมา")]
+        [Required, Comment("จำนวนวันลาที่ได้รับ")]
         public double LeaveDays { get; set; } = 0.0;
 
         [Required, Comment("จำนวนวันลาที่ใช้ไป")]
         public double LeaveDaysUsed { get; set; } = 0.0;
+
+        [Required, Comment("จำนวนครั้งที่ลาสะสม")]
+        public int LeaveCount { get; set; } = 0;
+
+        [Required, Comment("จำนวนวันลายกมา")]
+        public double BeginningLeaveDays { get; set; } = 0.0;
+
+        [Comment("จำนวนครั้งที่ลายกมา")]
+        public int BeginningLeaveCount { get; set; } = 0;
     }
 }
diff --git a/BMA.EHR.Leave/DTOs/LeaveBeginnings/EditLeaveBeginningDto.cs b/BMA.EHR.Leave/DTOs/LeaveBeginnings/EditLeaveBeginningDto.cs
index 6ecfe1f4..524072ec 100644
--- a/BMA.EHR.Leave/DTOs/LeaveBeginnings/EditLeaveBeginningDto.cs
+++ b/BMA.EHR.Leave/DTOs/LeaveBeginnings/EditLeaveBeginningDto.cs
@@ -19,5 +19,45 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveBeginnings
 
         [Required, Comment("จำนวนวันลาที่ใช้ไป")]
         public double LeaveDaysUsed { get; set; } = 0.0;
+
+        [Required, Comment("จำนวนครั้งที่ลาสะสม")]
+        public int LeaveCount { get; set; } = 0;
+
+        [Required, Comment("จำนวนวันลายกมา")]
+        public double BeginningLeaveDays { get; set; } = 0.0;
+
+        [Comment("จำนวนครั้งที่ลายกมา")]
+        public int BeginningLeaveCount { get; set; } = 0;
+    }
+
+
+    public class ScheduleEditLeaveBeginningDto
+    {
+        [Required]
+        public Guid ProfileId { get; set; } = Guid.Empty;
+
+        [Required]
+        public Guid LeaveTypeId { get; set; } = Guid.Empty;
+
+        [Required, Comment("ปีงบประมาณ")]
+        public int LeaveYear { get; set; } = 0;
+
+        [Required, Comment("จำนวนวันลายกมา")]
+        public double LeaveDays { get; set; } = 0.0;
+    }
+
+    public class ScheduleUpdateDnaDto
+    {
+        [Required]
+        public Guid ProfileId { get; set; } = Guid.Empty;
+
+        // [Required, Comment("ปีงบประมาณ")]
+        // public int LeaveYear { get; set; } = 0;
+
+        public Guid? RootDnaId { get; set; }
+        public Guid? Child1DnaId { get; set; }
+        public Guid? Child2DnaId { get; set; }
+        public Guid? Child3DnaId { get; set; }
+        public Guid? Child4DnaId { get; set; }
     }
 }
diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveProcessJobDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveProcessJobDto.cs
new file mode 100644
index 00000000..ae4aacc4
--- /dev/null
+++ b/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveProcessJobDto.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
+{
+    /// <summary>
+    ///  ข้อมูลสำหรับสร้าง Job ประมวลผลวันลา โดยมีช่วงวันที่เริ่มต้นและสิ้นสุดของการประมวลผลวันลา
+    /// </summary>
+    public class CreateLeaveProcessJobDto
+    {
+        /// <summary>
+        /// วันที่เริ่มต้นของการประมวลผลวันลา
+        /// </summary>
+        public DateTime StartDate { get; set; }
+
+        /// <summary>
+        /// วันที่สิ้นสุดของการประมวลผลวันลา
+        /// </summary>
+        public DateTime EndDate { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestCalendarResultDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestCalendarResultDto.cs
index ef895786..be03ec4c 100644
--- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestCalendarResultDto.cs
+++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestCalendarResultDto.cs
@@ -19,5 +19,7 @@
         public DateTime LeaveEndDate { get; set; }
 
         public Guid KeycloakId { get; set; }
+
+        public double LeaveTotal { get; set; }
     }
 }
diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs
index 42a508ff..d723bd66 100644
--- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs
+++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminResultDto.cs
@@ -37,5 +37,7 @@
         public bool? HajjDayStatus { get; set; }
 
         public string? ProfileType { get; set; }
+
+        public double LeaveTotal { get; set; }
     }
 }
diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetUserLeaveProfileResultDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetUserLeaveProfileResultDto.cs
index 6ddc93cb..e64b5ac3 100644
--- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetUserLeaveProfileResultDto.cs
+++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetUserLeaveProfileResultDto.cs
@@ -51,5 +51,7 @@
         public string? CurrentProvince { get; set; }
 
         public string? CurrentZipCode { get; set; }
+
+        public int GovAge { get; set; } = 0;
     }
 }
diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/LeaveRequestApproverDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/LeaveRequestApproverDto.cs
index 21c2a216..b5ff27a5 100644
--- a/BMA.EHR.Leave/DTOs/LeaveRequest/LeaveRequestApproverDto.cs
+++ b/BMA.EHR.Leave/DTOs/LeaveRequest/LeaveRequestApproverDto.cs
@@ -27,5 +27,15 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
 
         [JsonProperty("keycloakId")]
         public Guid KeycloakId { get; set; } = Guid.Empty;
+
+        [JsonProperty("positionLeaveName")]
+        public string PositionLeaveName { get; set; } = string.Empty;
+
+        [JsonProperty("posExecutiveName")]
+        public string PosExecutiveName { get; set; } = string.Empty;
+
+        [JsonProperty("organizationName")]
+        public string OrganizationName { get; set; } = string.Empty;
+
     }
 }
diff --git a/BMA.EHR.Leave/Program.cs b/BMA.EHR.Leave/Program.cs
index 7ff93507..c4774831 100644
--- a/BMA.EHR.Leave/Program.cs
+++ b/BMA.EHR.Leave/Program.cs
@@ -96,7 +96,14 @@ builder.Services.AddPersistence(builder.Configuration);
 builder.Services.AddLeavePersistence(builder.Configuration);
 builder.Services.AddTransient<HolidayService>();
 
+// Configure HttpClient with increased timeout for long-running operations (e.g., RabbitMQ Management API)
 builder.Services.AddHttpClient();
+builder.Services.AddTransient(sp =>
+{
+    var httpClient = sp.GetRequiredService<IHttpClientFactory>().CreateClient();
+    httpClient.Timeout = TimeSpan.FromMinutes(10); // Set timeout to 10 minutes
+    return httpClient;
+});
 
 builder.Services.AddControllers(options =>
 {
@@ -112,7 +119,7 @@ builder.Services.AddHealthChecks();
 builder.Services.AddRabbitMqConnectionPooling(builder.Configuration);
 
 // Add Hangfire services.
-var defaultConnection = builder.Configuration.GetConnectionString("DefaultConnection");
+var hangfireConnection = builder.Configuration.GetConnectionString("defaultConnection");
 
 builder.Services.AddHangfire(configuration => configuration
     .SetDataCompatibilityLevel(CompatibilityLevel.Version_170)
@@ -120,19 +127,24 @@ builder.Services.AddHangfire(configuration => configuration
     .UseRecommendedSerializerSettings()
     .UseStorage(
         new MySqlStorage(
-            defaultConnection,
+            hangfireConnection,
             new MySqlStorageOptions
             {
-                TransactionIsolationLevel = IsolationLevel.ReadCommitted,
                 QueuePollInterval = TimeSpan.FromSeconds(15),
                 JobExpirationCheckInterval = TimeSpan.FromHours(1),
                 CountersAggregateInterval = TimeSpan.FromMinutes(5),
                 PrepareSchemaIfNecessary = true,
                 DashboardJobListLimit = 50000,
                 TransactionTimeout = TimeSpan.FromMinutes(1),
-                TablesPrefix = "Hangfire"
+                InvisibilityTimeout = TimeSpan.FromHours(3),
+                TablesPrefix = "Hangfire_Leave"
             })));
-builder.Services.AddHangfireServer();
+builder.Services.AddHangfireServer(options =>
+    {
+        options.ServerName = "Leave-Server";  // ← ระบุชื่อ server
+        options.WorkerCount = 5;  // ← 
+        options.Queues = new[] { "leave","default" };  // ← worker จะรันเฉพาะ queue "leave"
+    });
 
 
 var app = builder.Build();
@@ -181,6 +193,15 @@ var manager = new RecurringJobManager();
 if (manager != null)
 {
     manager.AddOrUpdate("ปรับปรุงรอบการลงเวลาทำงาน", Job.FromExpression<UserDutyTimeRepository>(x => x.UpdateUserDutyTime()), "0 1 * * *", bangkokTimeZone);
+    // ทำความสะอาดข้อมูล CheckIn Job Status ที่เก่ากว่า 30 วัน - รันทุกวันเวลา 02:00 น.
+    manager.AddOrUpdate("ทำความสะอาดข้อมูล CheckIn Job Status", Job.FromExpression<CheckInJobStatusRepository>(x => x.CleanupOldJobsAsync(30)), "0 2 * * *", bangkokTimeZone);
+
+    manager.AddOrUpdate("ประมวลผลงานที่ค้างอยู่ในสถานะ Pending หรือ Processing", Job.FromExpression<LeaveProcessJobStatusRepository>(x => x.ProcessPendingJobsAsync()), "0 3 * * *", 
+    new RecurringJobOptions
+        {
+            TimeZone = bangkokTimeZone,
+            QueueName = "leave"  // ← กำหนด queue
+        });
 }
 
 // apply migrations
diff --git a/BMA.EHR.Leave/appsettings.json b/BMA.EHR.Leave/appsettings.json
index e1bb5d10..ee356491 100644
--- a/BMA.EHR.Leave/appsettings.json
+++ b/BMA.EHR.Leave/appsettings.json
@@ -9,8 +9,8 @@
     }
   },
   "ElasticConfiguration": {
-    "Uri": "http://192.168.1.40:9200",
-    "IndexFormat": "bma-ehr-log-index",
+    "Uri": "http://192.168.1.63:9200",
+    "IndexFormat": "hrms-log-index",
     "SystemName": "leave"
   },
   "AllowedHosts": "*",
@@ -19,20 +19,19 @@
     // "ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=hrms_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
     // "LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=hrms_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
 
-    "DefaultConnection": "server=192.168.1.63;user=root;password=12345678;port=3306;database=hrms;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
-    "ExamConnection": "server=192.168.1.63;user=root;password=12345678;port=3306;database=hrms_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
-    "LeaveConnection": "server=192.168.1.63;user=root;password=12345678;port=3306;database=hrms_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
+    "DefaultConnection": "Server=192.168.1.63;User ID=root;Password=12345678;Port=3306;Database=hrms;Allow User Variables=True;Convert Zero Datetime=True;Pooling=True;",
+    "ExamConnection": "Server=192.168.1.63;User ID=root;Password=12345678;Port=3306;Database=hrms_exam;Allow User Variables=True;Convert Zero Datetime=True;Pooling=True;",
+    "LeaveConnection": "Server=192.168.1.63;User ID=root;Password=12345678;Port=3306;Database=hrms_leave;Allow User Variables=True;Convert Zero Datetime=True;Pooling=True;"
 
-    //"DefaultConnection": "server=172.27.17.68;user=user;password=cDldaqkwESWvuZ37Gr0n;port=3306;database=hrms;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
-    //"ExamConnection": "server=172.27.17.68;user=user;password=cDldaqkwESWvuZ37Gr0n;port=3306;database=hrms_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
-    //"LeaveConnection": "server=172.27.17.68;user=user;password=cDldaqkwESWvuZ37Gr0n;port=3306;database=hrms_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
+    // "DefaultConnection": "server=172.27.17.68;user=root;password=ey2qVVyyqGYw8CyA7h8X72559r2Ad84K;port=3306;database=hrms;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;Connection Timeout=180;",
+    // "ExamConnection": "server=172.27.17.68;user=root;password=ey2qVVyyqGYw8CyA7h8X72559r2Ad84K;port=3306;database=hrms_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;Connection Timeout=180;",
+    // "LeaveConnection": "server=172.27.17.68;user=root;password=ey2qVVyyqGYw8CyA7h8X72559r2Ad84K;port=3306;database=hrms_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;Connection Timeout=180;"
   },
   "Jwt": {
-    //"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
     "Key": "j7C9RO_p4nRtuwCH4z9Db_A_6We42tkD_p4lZtDrezc",
     "Issuer": "https://hrmsbkk-id.case-collection.com/realms/hrms"
-    //"Key": "xY2VR-EFvvNPsMs39u8ooVBWQL6mPwrNJOh3koJFTgU",
-    //"Issuer": "https://hrms-id.bangkok.go.th/realms/hrms"
+    // "Key": "xY2VR-EFvvNPsMs39u8ooVBWQL6mPwrNJOh3koJFTgU",
+    // "Issuer": "https://hrms-id.bangkok.go.th/realms/hrms"
   },
   "EPPlus": {
     "ExcelPackage": {
@@ -53,8 +52,13 @@
     "Host": "192.168.1.63",
     "User": "admin",
     "Password": "12345678",
-    "Queue": "hrms-checkin-queue",
+    "Queue": "hrms-checkin-queue-dev",
     "URL": "http://192.168.1.63:9122/api/queues/%2F/"
+    // "Host": "172.27.17.68",
+    // "User": "admin",
+    // "Password": "admin123456",
+    // "Queue": "hrms-checkin-queue",
+    // "URL": "http://172.27.17.68:9122/api/queues/%2F/"
   },
   "Mail": {
     "Server": "mail.bangkok.go.th",
@@ -68,7 +72,10 @@
   "API": "https://hrmsbkk.case-collection.com/api/v1",
   "APIV2": "https://hrmsbkk.case-collection.com/api/v2",
   "VITE_URL_MGT": "https://hrmsbkk-mgt.case-collection.com",
-  //"API": "https://bma-ehr.frappet.synology.me/api/v1",
-  //"API": "https://bma-hrms.bangkok.go.th/api/v1",
+  // "Domain": "https://hrms-exam.bangkok.go.th",
+  // "APIPROBATION": "https://hrms.bangkok.go.th/api/v1/probation",
+  // "API": "https://hrms.bangkok.go.th/api/v1",
+  // "APIV2": "https://hrms.bangkok.go.th/api/v2",
+  // "VITE_URL_MGT": "https://hrms-mgt.bangkok.go.th",
   "API_KEY": "fKRL16yyEgbyTEJdsMw2h64tGSCmkW685PRtM3CygzX1JOSdptT9UJtpgWwKM8FybRTJups3GTFwj27ZRvlPdIkv3XgCoVJaD5LmR06ozuEPvCCRSdp2WFthg08V5xHc56fTPfZLpr1VmXrhd6dvYhHIqKkQUJR02Rlkss11cLRWEQOssEFVA4xdu2J5DIRO1EM5m7wRRvEwcDB4mYRXD9HH52SMq6iYqUWEWsMwLdbk7QW9yYESUEuzMW5gWrb6vIeWZxJV5bTz1PcWUyR7eO9Fyw1F5DiQYc9JgzTC1mW7cv31fEtTtrfbJYKIb5EbWilqIEUKC6A0UKBDDek35ML0006cqRVm0pvdOH6jeq7VQyYrhdXe59dBEyhYGUIfozoVBvW7Up4QBuOMjyPjSqJPlMBKwaseptfrblxQV1AOOivSBpf1ZcQyOZ8JktRtKUDSuXsmG0lsXwFlI3JCeSHdpVdgZWFYcJPegqfrB6KotR02t9AVkpLs1ZWrixwz"
 }
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
index a98abb74..ff010a2a 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
@@ -112,7 +112,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -239,11 +239,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                 placementAppointments = placementAppointments
                     .Where(x => x.rootDnaId == nodeId).ToList();
             }
-            else if (role == "PARENT")
-            {
-                placementAppointments = placementAppointments
-                    .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     placementAppointments = placementAppointments
+            //         .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 placementAppointments = placementAppointments.Where(x =>
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
index ae8e40ac..971cd526 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
@@ -110,7 +110,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -232,11 +232,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                 placementAppointments = placementAppointments
                     .Where(x => x.rootDnaId == nodeId).ToList();
             }
-            else if (role == "PARENT")
-            {
-                placementAppointments = placementAppointments
-                    .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     placementAppointments = placementAppointments
+            //         .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 placementAppointments = placementAppointments.Where(x =>
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
index 62b9bbce..fbb6e2de 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
@@ -62,9 +62,9 @@ namespace BMA.EHR.Placement.Service.Controllers
         #region " Properties "
 
         private string? UserId => _httpContextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
-
         private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
         private string? token => _httpContextAccessor.HttpContext.Request.Headers["Authorization"];
+        //private bool isSuperAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("SUPER_ADMIN") ?? false;
 
         #endregion
 
@@ -140,6 +140,7 @@ namespace BMA.EHR.Placement.Service.Controllers
         public async Task<ActionResult<ResponseObject>> GetExamByPlacement(Guid examId)
         {
             var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(examId.ToString(), "SYS_PLACEMENT_PASS");
+            var role = string.Empty;
             if (getWorkflow == false)
             {
                 var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_PLACEMENT_PASS");
@@ -148,6 +149,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                 {
                     return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
                 }
+                role = jsonData["result"]?.ToString();
             }
 
             var rootId = "";
@@ -155,6 +157,7 @@ namespace BMA.EHR.Placement.Service.Controllers
             var child2Id = "";
             var child3Id = "";
             var child4Id = "";
+            var rootDnaId = "";
             var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position-act";
             using (var client = new HttpClient())
             {
@@ -166,18 +169,19 @@ namespace BMA.EHR.Placement.Service.Controllers
                 if (_res.IsSuccessStatusCode)
                 {
                     var org = JsonConvert.DeserializeObject<OrgRequestAct>(_result);
-                    if (org.result.isOfficer == false)
+                    if (org.result.isOfficer == false && role?.Trim().ToUpper() != "OWNER")
                     {
                         rootId = org.result.rootId == null ? "" : org.result.rootId;
                         // child1Id = org.result.child1Id == null ? "" : org.result.child1Id;
                         // child2Id = org.result.child2Id == null ? "" : org.result.child2Id;
                         // child3Id = org.result.child3Id == null ? "" : org.result.child3Id;
                         // child4Id = org.result.child4Id == null ? "" : org.result.child4Id;
+                        rootDnaId = org.result.rootDnaId == null ? "" : org.result.rootDnaId;
                         var data1 = await _context.PlacementProfiles
                         .Where(x => x.Placement.Id == examId)
                         .Where(x => x.Draft == true)
                         .Where(x => x.PlacementStatus != "UN-CONTAIN")
-                        .Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id)))))
+                        .Where(x => rootDnaId == "" ? true : (child1Id == "" ? x.rootDnaId == rootDnaId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id)))))
                         .Select(x => new
                         {
                             Id = x.Id,
@@ -300,7 +304,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                         }
                         return Success(result1);
                     }
-                    if (org.result.isOfficer == true)
+                    if (org.result.isOfficer == true || role?.Trim().ToUpper() == "OWNER")
                     {
                         var data = await _context.PlacementProfiles.Where(x => x.Placement.Id == examId).Select(x => new
                         {
@@ -688,12 +692,20 @@ namespace BMA.EHR.Placement.Service.Controllers
         public async Task<ActionResult<ResponseObject>> GetDashboardByPlacement(Guid examId)
         {
 
+            var role = string.Empty;
+            var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_PLACEMENT_PASS");
+            var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
+            if (jsonData["status"]?.ToString() == "200")
+            {
+                role = jsonData["result"]?.ToString();
+            }
 
             var rootId = "";
             var child1Id = "";
             var child2Id = "";
             var child3Id = "";
             var child4Id = "";
+            var rootDnaId = "";
             var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position-act";
             using (var client = new HttpClient())
             {
@@ -706,30 +718,31 @@ namespace BMA.EHR.Placement.Service.Controllers
                 if (_res.IsSuccessStatusCode)
                 {
                     var org = JsonConvert.DeserializeObject<OrgRequestAct>(_result);
-                    if (org.result.isOfficer == false)
+                    if (org.result.isOfficer == false && role?.Trim().ToUpper() != "OWNER")
                     {
                         rootId = org.result.rootId == null ? "" : org.result.rootId;
                         // child1Id = org.result.child1Id == null ? "" : org.result.child1Id;
                         // child2Id = org.result.child2Id == null ? "" : org.result.child2Id;
                         // child3Id = org.result.child3Id == null ? "" : org.result.child3Id;
                         // child4Id = org.result.child4Id == null ? "" : org.result.child4Id;
+                        rootDnaId = org.result.rootDnaId == null ? "" : org.result.rootDnaId;
                         var placement = await _context.Placements
                             .Where(x => x.Id == examId)
                             .Select(x => new
                             {
-                                Total = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Count(),
-                                UnContain = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "UN-CONTAIN").Count(),
-                                PrepareContain = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN").Count(),
-                                Report = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "REPORT").Count(),
-                                Done = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "DONE").Count(),
-                                Disclaim = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "DISCLAIM").Count(),
+                                Total = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootDnaId == "" ? true : (child1Id == "" ? x.rootDnaId == rootDnaId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Count(),
+                                UnContain = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootDnaId == "" ? true : (child1Id == "" ? x.rootDnaId == rootDnaId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "UN-CONTAIN").Count(),
+                                PrepareContain = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootDnaId == "" ? true : (child1Id == "" ? x.rootDnaId == rootDnaId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN").Count(),
+                                Report = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootDnaId == "" ? true : (child1Id == "" ? x.rootDnaId == rootDnaId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "REPORT").Count(),
+                                Done = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootDnaId == "" ? true : (child1Id == "" ? x.rootDnaId == rootDnaId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "DONE").Count(),
+                                Disclaim = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootDnaId == "" ? true : (child1Id == "" ? x.rootDnaId == rootDnaId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "DISCLAIM").Count(),
                             }).FirstOrDefaultAsync();
                         if (placement == null)
                             return Error(GlobalMessages.DataNotFound, 404);
 
                         return Success(placement);
                     }
-                    if (org.result.isOfficer == true)
+                    if (org.result.isOfficer == true || role?.Trim().ToUpper() == "OWNER")
                     {
                         var placement = await _context.Placements
                             .Where(x => x.Id == examId)
@@ -848,6 +861,91 @@ namespace BMA.EHR.Placement.Service.Controllers
             return Success();
         }
 
+        /// <summary>
+        /// API อัพเดทสถานะเป็นบรรจุ
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("pass/update-status")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PersonUpdateStatus([FromBody] PersonUpdateStatusRequest req)
+        {
+            var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_PLACEMENT_PASS");
+            var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
+            if (jsonData["status"]?.ToString() != "200")
+            {
+                return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
+            }
+            string role = jsonData["result"]?.ToString();
+            if (role != "OWNER")
+            {
+                return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
+            }
+
+            var person = await _context.PlacementProfiles
+                            .FirstOrDefaultAsync(x => x.Id == req.PersonalId);
+            if (person == null)
+                return Error(GlobalMessages.DataNotFound, 404);
+
+            person.PlacementStatus = "DONE";
+            person.LastUpdateFullName = FullName ?? "System Administrator";
+            person.LastUpdateUserId = UserId ?? "";
+            person.LastUpdatedAt = DateTime.Now;
+
+            await _context.SaveChangesAsync();
+
+            return Success();
+        }
+
+        /// <summary>
+        /// API สำหรับยกเลิกการส่งตัว
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("update/draft-status")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> PersonUpdateDraftStatus([FromBody] PersonUpdateStatusRequest req)
+        {
+            var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_PLACEMENT_PASS");
+            var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
+            if (jsonData["status"]?.ToString() != "200")
+                return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
+
+            string role = jsonData["result"]?.ToString();
+            if (role != "OWNER")
+                return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
+
+            var person = await _context.PlacementProfiles
+                            .FirstOrDefaultAsync(x => x.Id == req.PersonalId);
+            if (person == null)
+                return Error(GlobalMessages.DataNotFound, 404);
+            
+            if (person.PlacementStatus == "REPORT")
+                return Error("ไม่สามารถยกเลิกการส่งตัวได้ เนื่องจากส่งไปออกคำสั่งแล้ว");
+
+            if (person.PlacementStatus == "DONE")
+                return Error("ไม่สามารถยกเลิกการส่งตัวได้ เนื่องจากบรรจุไปแล้ว");
+
+            person.Draft = false;
+            person.LastUpdateFullName = FullName ?? "System Administrator";
+            person.LastUpdateUserId = UserId ?? "";
+            person.LastUpdatedAt = DateTime.Now;
+            await _context.SaveChangesAsync();
+            return Success();
+        }
+
         [HttpGet("pass/deferment/{personalId:length(36)}")]
         public async Task<ActionResult<ResponseObject>> GetPersonDeferment(Guid personalId)
         {
@@ -1745,7 +1843,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                           isLeave = false,
                                           dateRetire = (DateTime?)null,
                                           dateAppoint = r.commandDateAffect,
-                                          dateStart = r.commandDateAffect,
+                                          dateStart = p.ReportingDate,
                                           govAgeAbsent = 0,
                                           govAgePlus = 0,
                                           birthDate = (p.DateOfBirth == null || p.DateOfBirth == DateTime.MinValue) ? (DateTime?)null : p.DateOfBirth,
@@ -1947,7 +2045,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                             .Where(x => req.refIds.Contains(x.Id.ToString()))
                                             // .Where(x => x.PlacementStatus.ToUpper() == "REPORT")
                                             .ToListAsync();
-            placementProfiles.ForEach(profile => profile.PlacementStatus = "PREPARE-CONTAI");
+            placementProfiles.ForEach(profile => profile.PlacementStatus = "PREPARE-CONTAIN");
             await _context.SaveChangesAsync();
             return Success();
         }
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
index 8638291e..c2033280 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
@@ -111,7 +111,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -193,11 +193,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                 placementOfficers = placementOfficers
                     .Where(x => x.rootDnaOldId == nodeId).ToList();
             }
-            else if (role == "PARENT")
-            {
-                placementOfficers = placementOfficers
-                    .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     placementOfficers = placementOfficers
+            //         .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 placementOfficers = placementOfficers.Where(x =>
@@ -223,7 +223,8 @@ namespace BMA.EHR.Placement.Service.Controllers
         [HttpGet("keycloak")]
         public async Task<ActionResult<ResponseObject>> GetListByKeycloak()
         {
-            var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+            // var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+            var apiUrl = $"{_configuration["API"]}/org/dotnet/get-profileId";
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
index f18e2b32..ab8a508e 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
@@ -112,7 +112,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -231,11 +231,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                 placementReceives = placementReceives
                     .Where(x => (x.rootDnaId == nodeId) || (x.CreatedUserId == UserId)).ToList();
             }
-            else if (role == "PARENT")
-            {
-                placementReceives = placementReceives
-                    .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     placementReceives = placementReceives
+            //         .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 placementReceives = placementReceives.Where(x =>
@@ -553,18 +553,23 @@ namespace BMA.EHR.Placement.Service.Controllers
                     // placementReceive.citizenId = org.result.citizenId;
                     placementReceive.rootOld = org.result.root;
                     placementReceive.rootOldId = org.result.rootId;
+                    placementReceive.rootDnaId = org.result.rootDnaId;
                     placementReceive.rootShortNameOld = org.result.rootShortName;
                     placementReceive.child1Old = org.result.child1;
                     placementReceive.child1OldId = org.result.child1Id;
+                    placementReceive.child1DnaId = org.result.child1DnaId;
                     placementReceive.child1ShortNameOld = org.result.child1ShortName;
                     placementReceive.child2Old = org.result.child2;
                     placementReceive.child2OldId = org.result.child2Id;
+                    placementReceive.child2DnaId = org.result.child2DnaId;
                     placementReceive.child2ShortNameOld = org.result.child2ShortName;
                     placementReceive.child3Old = org.result.child3;
                     placementReceive.child3OldId = org.result.child3Id;
+                    placementReceive.child4DnaId = org.result.child4DnaId;
                     placementReceive.child3ShortNameOld = org.result.child3ShortName;
                     placementReceive.child4Old = org.result.child4;
                     placementReceive.child4OldId = org.result.child4Id;
+                    placementReceive.child4DnaId = org.result.child4DnaId;
                     placementReceive.child4ShortNameOld = org.result.child4ShortName;
                     placementReceive.posMasterNoOld = org.result.posMasterNo;
                     placementReceive.posTypeOldId = org.result.posTypeId;
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
index 45798f6c..5f5668b7 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
@@ -112,7 +112,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -198,11 +198,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                 placementRepatriations = placementRepatriations
                     .Where(x => x.rootDnaOldId == nodeId).ToList();
             }
-            else if (role == "PARENT")
-            {
-                placementRepatriations = placementRepatriations
-                    .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     placementRepatriations = placementRepatriations
+            //         .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 placementRepatriations = placementRepatriations.Where(x =>
diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
index 566b799b..3514e4a5 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
@@ -79,7 +79,8 @@ namespace BMA.EHR.Placement.Service.Controllers
         [HttpGet("user")]
         public async Task<ActionResult<ResponseObject>> GetListByProfile()
         {
-            var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+            // var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+            var apiUrl = $"{_configuration["API"]}/org/dotnet/get-profileId";
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
@@ -204,7 +205,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -284,11 +285,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                 placementTransfers = placementTransfers
                     .Where(x => x.rootDnaOldId == nodeId).ToList();
             }
-            else if (role == "PARENT")
-            {
-                placementTransfers = placementTransfers
-                    .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     placementTransfers = placementTransfers
+            //         .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 placementTransfers = placementTransfers.Where(x =>
@@ -574,6 +575,145 @@ namespace BMA.EHR.Placement.Service.Controllers
                 LastUpdatedAt = DateTime.Now,
             };
             var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+            bool isDeputy = false;
+            using (var client = new HttpClient())
+            {
+                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);
+                var _result = await _res.Content.ReadAsStringAsync();
+
+                var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
+
+                if (org == null || org.result == null)
+                    return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404);
+
+                isDeputy = org.result.isDeputy.HasValue ? org.result.isDeputy.Value : false;
+
+                placementTransfer.profileId = org.result.profileId;
+                placementTransfer.prefix = org.result.prefix;
+                placementTransfer.firstName = org.result.firstName;
+                placementTransfer.lastName = org.result.lastName;
+                placementTransfer.citizenId = org.result.citizenId;
+                placementTransfer.rootOld = org.result.root;
+                placementTransfer.rootOldId = org.result.rootId;
+                placementTransfer.rootDnaOldId = org.result.rootDnaId;
+                placementTransfer.rootShortNameOld = org.result.rootShortName;
+                placementTransfer.child1Old = org.result.child1;
+                placementTransfer.child1OldId = org.result.child1Id;
+                placementTransfer.child1DnaOldId = org.result.child1DnaId;
+                placementTransfer.child1ShortNameOld = org.result.child1ShortName;
+                placementTransfer.child2Old = org.result.child2;
+                placementTransfer.child2OldId = org.result.child2Id;
+                placementTransfer.child2DnaOldId = org.result.child2DnaId;
+                placementTransfer.child2ShortNameOld = org.result.child2ShortName;
+                placementTransfer.child3Old = org.result.child3;
+                placementTransfer.child3OldId = org.result.child3Id;
+                placementTransfer.child3DnaOldId = org.result.child3DnaId;
+                placementTransfer.child3ShortNameOld = org.result.child3ShortName;
+                placementTransfer.child4Old = org.result.child4;
+                placementTransfer.child4OldId = org.result.child4Id;
+                placementTransfer.child4DnaOldId = org.result.child4DnaId;
+                placementTransfer.child4ShortNameOld = org.result.child4ShortName;
+                placementTransfer.posMasterNoOld = org.result.posMasterNo;
+                placementTransfer.posTypeOldId = org.result.posTypeId;
+                placementTransfer.posTypeNameOld = org.result.posTypeName;
+                placementTransfer.posLevelOldId = org.result.posLevelId;
+                placementTransfer.posLevelNameOld = org.result.posLevelName;
+                placementTransfer.AmountOld = org.result.salary;
+                placementTransfer.PositionOld = org.result.position;
+                placementTransfer.PositionExecutiveOld = org.result.posExecutiveName;
+                placementTransfer.positionExecutiveFieldOld = org.result.positionExecutiveField;
+                placementTransfer.positionAreaOld = org.result.positionArea;
+                placementTransfer.PositionLevelOld = org.result.posLevelName;
+                placementTransfer.PositionTypeOld = org.result.posTypeName;
+                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") +
+                                                        (org.result.child1 == null ? "" : org.result.child1 + "\n") +
+                                                        (org.result.root == null ? "" : org.result.root);
+                placementTransfer.OrganizationPositionOld = org.result.position + "\n" +
+                    (placementTransfer.PositionExecutiveOld == null ? "" : (placementTransfer.positionExecutiveField == null ? placementTransfer.PositionExecutiveOld + "\n" : placementTransfer.PositionExecutiveOld + "(" + placementTransfer.positionExecutiveField + ")" + "\n"))
+                    + placementTransfer.OrganizationOld;
+            }
+            await _context.PlacementTransfers.AddAsync(placementTransfer);
+            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 placementTransferDoc = new PlacementTransferDoc
+                        {
+                            PlacementTransfer = placementTransfer,
+                            Document = _doc,
+                            CreatedFullName = FullName ?? "System Administrator",
+                            CreatedUserId = UserId ?? "",
+                            CreatedAt = DateTime.Now,
+                            LastUpdateFullName = FullName ?? "System Administrator",
+                            LastUpdateUserId = UserId ?? "",
+                            LastUpdatedAt = DateTime.Now,
+                        };
+                        await _context.PlacementTransferDocs.AddAsync(placementTransferDoc);
+
+                    }
+                }
+            }
+            
+            var baseAPIOrg = _configuration["API"];
+            var apiUrlOrg = $"{baseAPIOrg}/org/workflow/add-workflow";
+            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 = placementTransfer.Id,
+                    sysName = "SYS_TRANSFER_REQ",
+                    posLevelName = placementTransfer.posLevelNameOld,
+                    posTypeName = placementTransfer.posTypeNameOld,
+                    fullName = $"{placementTransfer.prefix}{placementTransfer.firstName} {placementTransfer.lastName}",
+                    isDeputy = isDeputy
+                });
+            }
+            await _context.SaveChangesAsync();
+
+            return Success(placementTransfer.Id);
+        }
+
+        /// <summary>
+        /// สร้างคำขอโอน โดย admin
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("admin")]
+        public async Task<ActionResult<ResponseObject>> PostAdmin([FromForm] PlacementTransferAdminRequest req)
+        {
+            var placementTransfer = new PlacementTransfer
+            {
+                Organization = req.Organization,
+                Reason = req.Reason,
+                Status = "APPROVE",
+                Date = req.Date,
+                CreatedFullName = FullName ?? "System Administrator",
+                CreatedUserId = UserId ?? "",
+                CreatedAt = DateTime.Now,
+                LastUpdateFullName = FullName ?? "System Administrator",
+                LastUpdateUserId = UserId ?? "",
+                LastUpdatedAt = DateTime.Now,
+            };
+            var apiUrl = $"{_configuration["API"]}/org/profile/profileid/position/{req.ProfileId}";
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
@@ -663,21 +803,22 @@ namespace BMA.EHR.Placement.Service.Controllers
                     }
                 }
             }
-            var baseAPIOrg = _configuration["API"];
-            var apiUrlOrg = $"{baseAPIOrg}/org/workflow/add-workflow";
-            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 = placementTransfer.Id,
-                    sysName = "SYS_TRANSFER_REQ",
-                    posLevelName = placementTransfer.posLevelNameOld,
-                    posTypeName = placementTransfer.posTypeNameOld,
-                    fullName = $"{placementTransfer.prefix}{placementTransfer.firstName} {placementTransfer.lastName}"
-                });
-            }
+
+            //var baseAPIOrg = _configuration["API"];
+            //var apiUrlOrg = $"{baseAPIOrg}/org/workflow/add-workflow";
+            //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 = placementTransfer.Id,
+            //        sysName = "SYS_TRANSFER_REQ",
+            //        posLevelName = placementTransfer.posLevelNameOld,
+            //        posTypeName = placementTransfer.posTypeNameOld,
+            //        fullName = $"{placementTransfer.prefix}{placementTransfer.firstName} {placementTransfer.lastName}"
+            //    });
+            //}
             await _context.SaveChangesAsync();
 
             return Success(placementTransfer.Id);
diff --git a/BMA.EHR.Placement.Service/Requests/OrgRequest.cs b/BMA.EHR.Placement.Service/Requests/OrgRequest.cs
index 817c583f..c943bc53 100644
--- a/BMA.EHR.Placement.Service/Requests/OrgRequest.cs
+++ b/BMA.EHR.Placement.Service/Requests/OrgRequest.cs
@@ -52,6 +52,7 @@ namespace BMA.EHR.Placement.Service.Requests
         public string? education { get; set; }
         public double? Amount { get; set; }
         public string? avatarUrl { get; set; }
+        public bool? isDeputy { get; set; }
 
     }
 }
\ No newline at end of file
diff --git a/BMA.EHR.Placement.Service/Requests/OrgRequestAct.cs b/BMA.EHR.Placement.Service/Requests/OrgRequestAct.cs
index dace91d3..6189eaf4 100644
--- a/BMA.EHR.Placement.Service/Requests/OrgRequestAct.cs
+++ b/BMA.EHR.Placement.Service/Requests/OrgRequestAct.cs
@@ -15,5 +15,6 @@ namespace BMA.EHR.Placement.Service.Requests
         public string? child2Id { get; set; }
         public string? child3Id { get; set; }
         public string? child4Id { get; set; }
+        public string? rootDnaId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/BMA.EHR.Placement.Service/Requests/PersonUpdateStatusRequest.cs b/BMA.EHR.Placement.Service/Requests/PersonUpdateStatusRequest.cs
new file mode 100644
index 00000000..aef70fb5
--- /dev/null
+++ b/BMA.EHR.Placement.Service/Requests/PersonUpdateStatusRequest.cs
@@ -0,0 +1,10 @@
+using BMA.EHR.Domain.Models.MetaData;
+using Microsoft.EntityFrameworkCore;
+
+namespace BMA.EHR.Placement.Service.Requests
+{
+    public class PersonUpdateStatusRequest
+    {
+        public Guid PersonalId { get; set; }
+    }
+}
diff --git a/BMA.EHR.Placement.Service/Requests/PlacementTransferRequest.cs b/BMA.EHR.Placement.Service/Requests/PlacementTransferRequest.cs
index 7f740043..6611f92c 100644
--- a/BMA.EHR.Placement.Service/Requests/PlacementTransferRequest.cs
+++ b/BMA.EHR.Placement.Service/Requests/PlacementTransferRequest.cs
@@ -10,4 +10,13 @@ namespace BMA.EHR.Placement.Service.Requests
         public DateTime? Date { get; set; }
         public List<FormFile>? File { get; set; }
     }
+
+    public class PlacementTransferAdminRequest
+    {
+        public string ProfileId { get; set; }
+        public string Organization { get; set; }
+        public string Reason { get; set; }
+        public DateTime? Date { get; set; }
+        public List<FormFile>? File { get; set; }
+    }
 }
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
index 74f217a2..ad3105ba 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
@@ -1306,12 +1306,20 @@ namespace BMA.EHR.Retirement.Service.Controllers
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
+
+            // แยกดึงข้อมูลเพื่อลดภาระ Database
             var retire = await _context.RetirementPeriods
-                                .Include(x => x.RetirementProfiles)
-                                .Include(x => x.RetirementRawProfiles)
+                                //.Include(x => x.RetirementProfiles)
+                                //.Include(x => x.RetirementRawProfiles)
                                 .FirstOrDefaultAsync(x => x.Id == retireId);
+
             if (retire == null)
                 return Error(GlobalMessages.RetirementNotFound, 404);
+
+            // โหลดข้อมูลลูกแยกกัน
+            var profiles = await _context.RetirementProfiles.Where(x => x.RetirementPeriod.Id == retireId).ToListAsync();
+            var rawProfiles = await _context.RetirementRawProfiles.Where(x => x.RetirementPeriod.Id == retireId).ToListAsync();
+
             if (Request.Form.Files != null && Request.Form.Files.Count != 0)
             {
                 var file = Request.Form.Files[0];
@@ -1366,7 +1374,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 }
 
                 var order = 1;
-                foreach (var profile in retire.RetirementProfiles
+                foreach (var profile in profiles
                             .OrderBy(x => string.IsNullOrEmpty(x.root) ? int.MaxValue : rootOrder.ToObject<List<string>>().IndexOf(x.root))
                              .ThenBy(x => child1Order.ToObject<List<string>>().IndexOf(x.child1 ?? ""))
                              .ThenBy(x => child2Order.ToObject<List<string>>().IndexOf(x.child2 ?? ""))
@@ -1381,7 +1389,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 }
 
                 order = 1;
-                foreach (var profile in retire.RetirementRawProfiles
+                foreach (var profile in rawProfiles
                             .OrderBy(x => string.IsNullOrEmpty(x.root) ? int.MaxValue : rootOrder.ToObject<List<string>>().IndexOf(x.root))
                              .ThenBy(x => child1Order.ToObject<List<string>>().IndexOf(x.child1 ?? ""))
                              .ThenBy(x => child2Order.ToObject<List<string>>().IndexOf(x.child2 ?? ""))
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
index 33808435..cf9f153d 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs
@@ -116,7 +116,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -177,11 +177,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 retirementDeceaseds = retirementDeceaseds
                     .Where(x => x.rootDnaId == nodeId).ToList();
             }
-            else if (role == "PARENT")
-            {
-                retirementDeceaseds = retirementDeceaseds
-                    .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     retirementDeceaseds = retirementDeceaseds
+            //         .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 retirementDeceaseds = retirementDeceaseds.Where(x =>
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
index 4db9f778..04a01f77 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
@@ -112,7 +112,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -227,11 +227,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 retirementOthers = retirementOthers
                     .Where(x => x.rootDnaOldId == nodeId).ToList();
             }
-            else if (role == "PARENT")
-            {
-                retirementOthers = retirementOthers
-                    .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     retirementOthers = retirementOthers
+            //         .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 retirementOthers = retirementOthers.Where(x =>
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
index e996abab..ce8b0452 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
@@ -127,7 +127,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -208,11 +208,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 retirementOuts = retirementOuts
                     .Where(x => x.rootDnaOldId == nodeId).ToList();
             }
-            else if (role == "PARENT")
-            {
-                retirementOuts = retirementOuts
-                    .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     retirementOuts = retirementOuts
+            //         .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 retirementOuts = retirementOuts.Where(x =>
@@ -239,16 +239,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
         [HttpGet("{id:length(36)}")]
         public async Task<ActionResult<ResponseObject>> GetDetailAdmin(Guid id)
         {
-            var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), "SYS_DISMISS");
-            if (getWorkflow == false)
-            {
-                var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_DISMISS");
-                var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
-                if (jsonData["status"]?.ToString() != "200")
-                {
-                    return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
-                }
-            }
             var data = await _context.RetirementOuts.AsQueryable()
                         .Where(x => x.Id == id)
                         .Select(p => new
@@ -294,6 +284,20 @@ namespace BMA.EHR.Retirement.Service.Controllers
                             p.OrganizationOld,
                         })
                        .FirstOrDefaultAsync();
+
+            string _system = data != null && data.profileType?.Trim().ToUpper() == "OFFICER" ? "SYS_DISMISS" : "SYS_DISMISS_EMP";
+
+            var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), _system);
+            if (getWorkflow == false)
+            {
+                var getPermission = await _permission.GetPermissionAPIAsync("GET", _system);
+                var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
+                if (jsonData["status"]?.ToString() != "200")
+                {
+                    return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
+                }
+            }
+            
             if (data == null)
                 return Error(GlobalMessages.DataNotFound, 404);
 
@@ -462,14 +466,18 @@ namespace BMA.EHR.Retirement.Service.Controllers
         [HttpPut("{id:length(36)}")]
         public async Task<ActionResult<ResponseObject>> Put([FromBody] RetirementOutEditRequest req, Guid id)
         {
-            var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_DISMISS");
+            var uppdated = await _context.RetirementOuts
+                            .FirstOrDefaultAsync(x => x.Id == id);
+
+            string _system = uppdated != null && uppdated.profileType?.Trim().ToUpper() == "OFFICER" ? "SYS_DISMISS" : "SYS_DISMISS_EMP";
+
+            var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", _system);
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
             if (jsonData["status"]?.ToString() != "200")
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            var uppdated = await _context.RetirementOuts
-                            .FirstOrDefaultAsync(x => x.Id == id);
+            
             if (uppdated == null)
                 return Error(GlobalMessages.RetirementOutNotFound, 404);
 
@@ -527,14 +535,18 @@ namespace BMA.EHR.Retirement.Service.Controllers
         [HttpDelete("{id:length(36)}")]
         public async Task<ActionResult<ResponseObject>> Delete(Guid id)
         {
-            var getPermission = await _permission.GetPermissionAPIAsync("DELETE", "SYS_DISMISS");
+            var deleted = await _context.RetirementOuts.AsQueryable()
+                            .FirstOrDefaultAsync(x => x.Id == id);
+
+            string _system = deleted != null && deleted.profileType?.Trim().ToUpper() == "OFFICER" ? "SYS_DISMISS" : "SYS_DISMISS_EMP";
+
+            var getPermission = await _permission.GetPermissionAPIAsync("DELETE", _system);
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
             if (jsonData["status"]?.ToString() != "200")
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            var deleted = await _context.RetirementOuts.AsQueryable()
-                            .FirstOrDefaultAsync(x => x.Id == id);
+            
             if (deleted == null)
                 return NotFound();
             _context.RetirementOuts.Remove(deleted);
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
index d33b945b..147f1adb 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -135,7 +135,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
         [HttpGet("user")]
         public async Task<ActionResult<ResponseObject>> GetListByProfile()
         {
-            var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+            // var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+            var apiUrl = $"{_configuration["API"]}/org/dotnet/get-profileId";
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
@@ -164,7 +165,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                 p.ApproveReason,
                                 p.RejectReason,
                                 p.CancelReason,
-                                p.Status,
+                                status = p.RetirementResignCancels.FirstOrDefault() == null ? p.Status : p.RetirementResignCancels.FirstOrDefault().Status,
                                 statusCancel = p.RetirementResignCancels.FirstOrDefault() == null ? null : p.RetirementResignCancels.FirstOrDefault().Status,
                                 p.IsActive,
                             })
@@ -185,7 +186,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
         [HttpGet("user-cancel")]
         public async Task<ActionResult<ResponseObject>> GetListByProfileCancel()
         {
-            var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+            // var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
+            var apiUrl = $"{_configuration["API"]}/org/dotnet/get-profileId";
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
@@ -269,7 +271,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -334,11 +336,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 retirementResigns = retirementResigns
                     .Where(x => x.rootDnaOldId == nodeId).ToList();
             }
-            else if (role == "PARENT")
-            {
-                retirementResigns = retirementResigns
-                    .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     retirementResigns = retirementResigns
+            //         .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 retirementResigns = retirementResigns.Where(x =>
@@ -401,7 +403,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -465,11 +467,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 retirementResigns = retirementResigns
                     .Where(x => x.rootDnaOldId == nodeId).ToList();
             }
-            else if (role == "PARENT")
-            {
-                retirementResigns = retirementResigns
-                    .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     retirementResigns = retirementResigns
+            //         .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 retirementResigns = retirementResigns.Where(x =>
@@ -1343,6 +1345,155 @@ namespace BMA.EHR.Retirement.Service.Controllers
             return Success(retirementResign);
         }
 
+        /// <summary>
+        /// สร้างการลาออก โดย admin
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("admin")]
+        public async Task<ActionResult<ResponseObject>> PostAdmin([FromForm] RetirementResignAdminRequest req)
+        {
+            var Remark = req.Remark;
+            if (req.Reason != null)
+            {
+                switch (req.Reason.Trim().ToUpper())
+                {
+                    case "CAREER": Remark = $"ประกอบอาชีพอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
+                    case "MOVE": Remark = $"รับราชการสังกัดอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
+                    case "FAMILY": Remark = $"ดูแลบิดามารดา" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
+                    case "EDUCATION": Remark = $"ศึกษาต่อ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
+                    case "OTHER": Remark = $"อื่น ๆ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
+                }
+            }
+
+            var retirementResign = new RetirementResign
+            {
+                ApproveStep = "st1",
+                Location = req.Location,
+                SendDate = DateTime.Now,
+                ActiveDate = req.ActiveDate,
+                Reason = req.Reason,
+                ReasonResign = Remark,
+                Remark = req.Remark,
+                Status = "APPROVE",
+                IsActive = true,
+                CreatedFullName = FullName ?? "System Administrator",
+                CreatedUserId = UserId ?? "",
+                CreatedAt = DateTime.Now,
+                LastUpdateFullName = FullName ?? "System Administrator",
+                LastUpdateUserId = UserId ?? "",
+                LastUpdatedAt = DateTime.Now,
+            };
+
+            var apiUrl = $"{_configuration["API"]}/org/profile/profileid/position/{req.ProfileId}";
+            using (var client = new HttpClient())
+            {
+                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);
+                var _result = await _res.Content.ReadAsStringAsync();
+
+                var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
+
+                if (org == null || org.result == null)
+                    return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404);
+
+                retirementResign.profileId = org.result.profileId;
+                retirementResign.prefix = org.result.prefix;
+                retirementResign.firstName = org.result.firstName;
+                retirementResign.lastName = org.result.lastName;
+                retirementResign.citizenId = org.result.citizenId;
+                retirementResign.rootOld = org.result.root;
+                retirementResign.rootOldId = org.result.rootId;
+                retirementResign.rootDnaOldId = org.result.rootDnaId;
+                retirementResign.rootShortNameOld = org.result.rootShortName;
+                retirementResign.child1Old = org.result.child1;
+                retirementResign.child1OldId = org.result.child1Id;
+                retirementResign.child1DnaOldId = org.result.child1DnaId;
+                retirementResign.child1ShortNameOld = org.result.child1ShortName;
+                retirementResign.child2Old = org.result.child2;
+                retirementResign.child2OldId = org.result.child2Id;
+                retirementResign.child2DnaOldId = org.result.child2DnaId;
+                retirementResign.child2ShortNameOld = org.result.child2ShortName;
+                retirementResign.child3Old = org.result.child3;
+                retirementResign.child3OldId = org.result.child3Id;
+                retirementResign.child3DnaOldId = org.result.child3DnaId;
+                retirementResign.child3ShortNameOld = org.result.child3ShortName;
+                retirementResign.child4Old = org.result.child4;
+                retirementResign.child4OldId = org.result.child4Id;
+                retirementResign.child4DnaOldId = org.result.child4DnaId;
+                retirementResign.child4ShortNameOld = org.result.child4ShortName;
+                retirementResign.posMasterNoOld = org.result.posMasterNo;
+                retirementResign.posTypeOldId = org.result.posTypeId;
+                retirementResign.posTypeNameOld = org.result.posTypeName;
+                retirementResign.posLevelOldId = org.result.posLevelId;
+                retirementResign.posLevelNameOld = org.result.posLevelName;
+                retirementResign.AmountOld = org.result.salary;
+                retirementResign.PositionOld = org.result.position;
+                retirementResign.PositionExecutiveOld = org.result.posExecutiveName;
+                retirementResign.positionExecutiveFieldOld = org.result.positionExecutiveField;
+                retirementResign.positionAreaOld = org.result.positionArea;
+                retirementResign.PositionLevelOld = org.result.posLevelName;
+                retirementResign.PositionTypeOld = org.result.posTypeName;
+                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") +
+                                                        (org.result.child1 == null ? "" : org.result.child1 + "\n") +
+                                                        (org.result.root == null ? "" : org.result.root);
+                retirementResign.OrganizationPositionOld = org.result.position + "\n" +
+                    (retirementResign.PositionExecutiveOld == null ? "" : (retirementResign.positionExecutiveField == null ? retirementResign.PositionExecutiveOld + "\n" : retirementResign.PositionExecutiveOld + "(" + retirementResign.positionExecutiveField + ")" + "\n"))
+                    + retirementResign.OrganizationOld;
+
+                if ((retirementResign.posTypeNameOld == "ทั่วไป" && retirementResign.posLevelNameOld == "ชำนาญงาน") || (retirementResign.posTypeNameOld == "ทั่วไป" && retirementResign.posLevelNameOld == "ปฏิบัติงาน") || (retirementResign.posTypeNameOld == "วิชาการ" && retirementResign.posLevelNameOld == "ปฏิบัติการ") || (retirementResign.posTypeNameOld == "วิชาการ" && retirementResign.posLevelNameOld == "ชำนาญการ"))
+                {
+                    retirementResign.Group = "1.1";
+                }
+                else if ((retirementResign.posTypeNameOld == "ทั่วไป" && retirementResign.posLevelNameOld == "อาวุโส") || (retirementResign.posTypeNameOld == "วิชาการ" && retirementResign.posLevelNameOld == "ชำนาญการพิเศษ") || (retirementResign.posTypeNameOld == "อำนวยการ" && retirementResign.posLevelNameOld == "ต้น"))
+                {
+                    retirementResign.Group = "1.2";
+                }
+                else if ((retirementResign.posTypeNameOld == "ทั่วไป" && retirementResign.posLevelNameOld == "ทักษะพิเศษ") || (retirementResign.posTypeNameOld == "วิชาการ" && retirementResign.posLevelNameOld == "เชี่ยวชาญ") || (retirementResign.posTypeNameOld == "วิชาการ" && retirementResign.posLevelNameOld == "ทรงคุณวุฒิ") || (retirementResign.posTypeNameOld == "อำนวยการ" && retirementResign.posLevelNameOld == "สูง") || (retirementResign.posTypeNameOld == "บริหาร" && retirementResign.posLevelNameOld == "ต้น") || (retirementResign.posTypeNameOld == "บริหาร" && retirementResign.posLevelNameOld == "สูง"))
+                {
+                    retirementResign.Group = "2";
+                }
+            }
+            await _context.RetirementResigns.AddAsync(retirementResign);
+            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 retirementResignDoc = new RetirementResignDoc
+                        {
+                            RetirementResign = retirementResign,
+                            Document = _doc,
+                            CreatedFullName = FullName ?? "System Administrator",
+                            CreatedUserId = UserId ?? "",
+                            CreatedAt = DateTime.Now,
+                            LastUpdateFullName = FullName ?? "System Administrator",
+                            LastUpdateUserId = UserId ?? "",
+                            LastUpdatedAt = DateTime.Now,
+                        };
+                        await _context.RetirementResignDocs.AddAsync(retirementResignDoc);
+                    }
+                }
+            }
+            await _context.SaveChangesAsync();
+            return Success(retirementResign);
+        }
+
         /// <summary>
         /// แก้ไขการลาออก
         /// </summary>
@@ -2019,7 +2170,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -2077,11 +2228,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 data = data
                     .Where(x => x.rootDnaId == nodeId).ToList();
             }
-            else if (role == "PARENT")
-            {
-                data = data
-                    .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     data = data
+            //         .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 data = data.Where(x =>
@@ -2953,13 +3104,13 @@ namespace BMA.EHR.Retirement.Service.Controllers
                               }).ToList();
 
             var baseAPIOrg = _configuration["API"];
-            var reportDone = false;
-            if (data.Where(profile => profile.Status == "DONE").Any())
-            {
-                reportDone = true;
-            }
-            if (reportDone == true)
-            {
+            //var reportDone = false;
+            //if (data.Where(profile => profile.Status == "DONE").Any())
+            //{
+            //    reportDone = true;
+            //}
+            //if (reportDone == true)
+            //{
                 var apiUrlOrg = $"{baseAPIOrg}/org/command/excexute/salary-leave";
                 using (var client = new HttpClient())
                 {
@@ -2977,27 +3128,27 @@ namespace BMA.EHR.Retirement.Service.Controllers
                         await _context.SaveChangesAsync();
                     }
                 }
-            }
-            else
-            {
-                var apiUrlOrg = $"{baseAPIOrg}/org/command/cancel-resign";
-                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
-                    {
-                        resignId = resultData.Select(x => x.resignId).ToList(),
-                    });
-                    var _result = await _res.Content.ReadAsStringAsync();
-                    if (_res.IsSuccessStatusCode)
-                    {
-                        data.ForEach(profile => profile.Status = "DONE");
-                        data.ForEach(profile => profile.RetirementResign.Status = "CANCEL");
-                        await _context.SaveChangesAsync();
-                    }
-                }
-            }
+            //}
+            //else
+            //{
+            //    var apiUrlOrg = $"{baseAPIOrg}/org/command/cancel-resign";
+            //    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
+            //        {
+            //            resignId = resultData.Select(x => x.resignId).ToList(),
+            //        });
+            //        var _result = await _res.Content.ReadAsStringAsync();
+            //        if (_res.IsSuccessStatusCode)
+            //        {
+            //            data.ForEach(profile => profile.Status = "DONE");
+            //            data.ForEach(profile => profile.RetirementResign.Status = "CANCEL");
+            //            await _context.SaveChangesAsync();
+            //        }
+            //    }
+            //}
             return Success();
         }
 
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
index bfd8ab9f..5ad00538 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
@@ -102,8 +102,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                 p.Remark,
                                 p.ApproveReason,
                                 p.RejectReason,
-                                p.CancelReason,
-                                p.Status,
+                                p.CancelReason,                           
+                                status = p.RetirementResignEmployeeCancels.FirstOrDefault() == null ? p.Status : p.RetirementResignEmployeeCancels.FirstOrDefault().Status,
                                 statusCancel = p.RetirementResignEmployeeCancels.FirstOrDefault() == null ? null : p.RetirementResignEmployeeCancels.FirstOrDefault().Status,
                                 p.IsActive,
                             })
@@ -208,7 +208,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -273,11 +273,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 retirementResignEmployees = retirementResignEmployees
                     .Where(x => x.rootDnaOldId == nodeId).ToList();
             }
-            else if (role == "PARENT")
-            {
-                retirementResignEmployees = retirementResignEmployees
-                    .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     retirementResignEmployees = retirementResignEmployees
+            //         .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 retirementResignEmployees = retirementResignEmployees.Where(x =>
@@ -340,7 +340,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -403,11 +403,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 retirementResignEmployees = retirementResignEmployees
                     .Where(x => x.rootDnaOldId == nodeId).ToList();
             }
-            else if (role == "PARENT")
-            {
-                retirementResignEmployees = retirementResignEmployees
-                    .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     retirementResignEmployees = retirementResignEmployees
+            //         .Where(x => x.rootDnaOldId == nodeId && x.child1DnaOldId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 retirementResignEmployees = retirementResignEmployees.Where(x =>
@@ -1291,6 +1291,148 @@ namespace BMA.EHR.Retirement.Service.Controllers
             return Success(retirementResignEmployee);
         }
 
+        /// <summary>
+        /// สร้างการลาออก โดย admin
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("admin")]
+        public async Task<ActionResult<ResponseObject>> PostAdmin([FromForm] RetirementResignEmployeeAdminRequest req)
+        {
+            var Remark = req.Remark;
+            if (req.Reason != null)
+            {
+                switch (req.Reason.Trim().ToUpper())
+                {
+                    case "CAREER": Remark = $"ประกอบอาชีพอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
+                    case "MOVE": Remark = $"รับราชการสังกัดอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
+                    case "FAMILY": Remark = $"ดูแลบิดามารดา" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
+                    case "EDUCATION": Remark = $"ศึกษาต่อ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
+                    case "OTHER": Remark = $"อื่น ๆ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break;
+                }
+            }
+            var retirementResignEmployee = new RetirementResignEmployee
+            {
+                ApproveStep = "st1",
+                Location = req.Location,
+                SendDate = DateTime.Now,
+                ActiveDate = req.ActiveDate,
+                Reason = req.Reason,
+                ReasonResign = Remark,
+                Remark = req.Remark,
+                Status = "APPROVE",
+                IsActive = true,
+                CreatedFullName = FullName ?? "System Administrator",
+                CreatedUserId = UserId ?? "",
+                CreatedAt = DateTime.Now,
+                LastUpdateFullName = FullName ?? "System Administrator",
+                LastUpdateUserId = UserId ?? "",
+                LastUpdatedAt = DateTime.Now,
+            };
+
+            var apiUrl = $"{_configuration["API"]}/org/profile-employee/profileid/position/{req.ProfileId}";
+            using (var client = new HttpClient())
+            {
+                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);
+                var _result = await _res.Content.ReadAsStringAsync();
+
+                var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
+
+                if (org == null || org.result == null)
+                    return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404);
+
+                retirementResignEmployee.profileId = org.result.profileId;
+                retirementResignEmployee.prefix = org.result.prefix;
+                retirementResignEmployee.firstName = org.result.firstName;
+                retirementResignEmployee.lastName = org.result.lastName;
+                retirementResignEmployee.citizenId = org.result.citizenId;
+                retirementResignEmployee.rootOld = org.result.root;
+                retirementResignEmployee.rootOldId = org.result.rootId;
+                retirementResignEmployee.rootDnaOldId = org.result.rootDnaId;
+                retirementResignEmployee.rootShortNameOld = org.result.rootShortName;
+                retirementResignEmployee.child1Old = org.result.child1;
+                retirementResignEmployee.child1OldId = org.result.child1Id;
+                retirementResignEmployee.child1DnaOldId = org.result.child1DnaId;
+                retirementResignEmployee.child1ShortNameOld = org.result.child1ShortName;
+                retirementResignEmployee.child2Old = org.result.child2;
+                retirementResignEmployee.child2OldId = org.result.child2Id;
+                retirementResignEmployee.child2DnaOldId = org.result.child2DnaId;
+                retirementResignEmployee.child2ShortNameOld = org.result.child2ShortName;
+                retirementResignEmployee.child3Old = org.result.child3;
+                retirementResignEmployee.child3OldId = org.result.child3Id;
+                retirementResignEmployee.child3DnaOldId = org.result.child3DnaId;
+                retirementResignEmployee.child3ShortNameOld = org.result.child3ShortName;
+                retirementResignEmployee.child4Old = org.result.child4;
+                retirementResignEmployee.child4OldId = org.result.child4Id;
+                retirementResignEmployee.child4DnaOldId = org.result.child4DnaId;
+                retirementResignEmployee.child4ShortNameOld = org.result.child4ShortName;
+                retirementResignEmployee.posMasterNoOld = org.result.posMasterNo;
+                retirementResignEmployee.posTypeOldId = org.result.posTypeId;
+                retirementResignEmployee.posTypeNameOld = org.result.posTypeName;
+                retirementResignEmployee.posLevelOldId = org.result.posLevelId;
+                retirementResignEmployee.posLevelNameOld = org.result.posLevelName;
+                retirementResignEmployee.AmountOld = org.result.salary;
+                retirementResignEmployee.PositionOld = org.result.position;
+                retirementResignEmployee.PositionLevelOld = org.result.posLevelName;
+                retirementResignEmployee.PositionTypeOld = org.result.posTypeName;
+                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") +
+                                                        (org.result.child1 == null ? "" : org.result.child1 + "\n") +
+                                                        (org.result.root == null ? "" : org.result.root);
+                retirementResignEmployee.OrganizationPositionOld = org.result.position + "\n" + retirementResignEmployee.OrganizationOld;
+                if ((retirementResignEmployee.posTypeNameOld == "ทั่วไป" && retirementResignEmployee.posLevelNameOld == "ชำนาญงาน") || (retirementResignEmployee.posTypeNameOld == "ทั่วไป" && retirementResignEmployee.posLevelNameOld == "ปฏิบัติงาน") || (retirementResignEmployee.posTypeNameOld == "วิชาการ" && retirementResignEmployee.posLevelNameOld == "ปฏิบัติการ") || (retirementResignEmployee.posTypeNameOld == "วิชาการ" && retirementResignEmployee.posLevelNameOld == "ชำนาญการ"))
+                {
+                    retirementResignEmployee.Group = "1.1";
+                }
+                else if ((retirementResignEmployee.posTypeNameOld == "ทั่วไป" && retirementResignEmployee.posLevelNameOld == "อาวุโส") || (retirementResignEmployee.posTypeNameOld == "วิชาการ" && retirementResignEmployee.posLevelNameOld == "ชำนาญการพิเศษ") || (retirementResignEmployee.posTypeNameOld == "อำนวยการ" && retirementResignEmployee.posLevelNameOld == "ต้น"))
+                {
+                    retirementResignEmployee.Group = "1.2";
+                }
+                else if ((retirementResignEmployee.posTypeNameOld == "ทั่วไป" && retirementResignEmployee.posLevelNameOld == "ทักษะพิเศษ") || (retirementResignEmployee.posTypeNameOld == "วิชาการ" && retirementResignEmployee.posLevelNameOld == "เชี่ยวชาญ") || (retirementResignEmployee.posTypeNameOld == "วิชาการ" && retirementResignEmployee.posLevelNameOld == "ทรงคุณวุฒิ") || (retirementResignEmployee.posTypeNameOld == "อำนวยการ" && retirementResignEmployee.posLevelNameOld == "สูง") || (retirementResignEmployee.posTypeNameOld == "บริหาร" && retirementResignEmployee.posLevelNameOld == "ต้น") || (retirementResignEmployee.posTypeNameOld == "บริหาร" && retirementResignEmployee.posLevelNameOld == "สูง"))
+                {
+                    retirementResignEmployee.Group = "2";
+                }
+            }
+            await _context.RetirementResignEmployees.AddAsync(retirementResignEmployee);
+            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 retirementResignEmployeeDoc = new RetirementResignEmployeeDoc
+                        {
+                            RetirementResignEmployee = retirementResignEmployee,
+                            Document = _doc,
+                            CreatedFullName = FullName ?? "System Administrator",
+                            CreatedUserId = UserId ?? "",
+                            CreatedAt = DateTime.Now,
+                            LastUpdateFullName = FullName ?? "System Administrator",
+                            LastUpdateUserId = UserId ?? "",
+                            LastUpdatedAt = DateTime.Now,
+                        };
+                        await _context.RetirementResignEmployeeDocs.AddAsync(retirementResignEmployeeDoc);
+                    }
+                }
+            }
+            await _context.SaveChangesAsync();
+            return Success(retirementResignEmployee);
+        }
+
         /// <summary>
         /// แก้ไขการลาออก
         /// </summary>
@@ -1936,7 +2078,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                     ? profileAdmin?.RootDnaId
                                     : "";
             }
-            else if (role == "ROOT" || role == "PARENT")
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
             {
                 nodeId = profileAdmin?.RootDnaId;
             }
@@ -1994,11 +2136,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 data = data
                     .Where(x => x.rootDnaId == nodeId).ToList();
             }
-            else if (role == "PARENT")
-            {
-                data = data
-                    .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
-            }
+            // else if (role == "PARENT")
+            // {
+            //     data = data
+            //         .Where(x => x.rootDnaId == nodeId && x.child1DnaId != null).ToList();
+            // }
             else if (role == "NORMAL")
             {
                 data = data.Where(x =>
@@ -2456,14 +2598,14 @@ namespace BMA.EHR.Retirement.Service.Controllers
                               }).ToList();
 
             var baseAPIOrg = _configuration["API"];
-            var reportDone = false;
-            if (data.Where(profile => profile.Status == "DONE").Any())
-            {
-                reportDone = true;
-            }
+            //var reportDone = false;
+            //if (data.Where(profile => profile.Status == "DONE").Any())
+            //{
+            //    reportDone = true;
+            //}
 
-            if (reportDone == true)
-            {
+            //if (reportDone == true)
+            //{
                 var apiUrlOrg = $"{baseAPIOrg}/org/command/excexute/salary-employee-leave";
                 using (var client = new HttpClient())
                 {
@@ -2481,27 +2623,27 @@ namespace BMA.EHR.Retirement.Service.Controllers
                         await _context.SaveChangesAsync();
                     }
                 }
-            }
-            else
-            {
-                var apiUrlOrg = $"{baseAPIOrg}/org/command/cancel-resign";
-                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
-                    {
-                        resignId = resultData.Select(x => x.resignId).ToList(),
-                    });
-                    var _result = await _res.Content.ReadAsStringAsync();
-                    if (_res.IsSuccessStatusCode)
-                    {
-                        data.ForEach(profile => profile.Status = "DONE");
-                        data.ForEach(profile => profile.RetirementResignEmployee.Status = "CANCEL");
-                        await _context.SaveChangesAsync();
-                    }
-                }
-            }
+            //}
+            //else
+            //{
+            //    var apiUrlOrg = $"{baseAPIOrg}/org/command/cancel-resign";
+            //    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
+            //        {
+            //            resignId = resultData.Select(x => x.resignId).ToList(),
+            //        });
+            //        var _result = await _res.Content.ReadAsStringAsync();
+            //        if (_res.IsSuccessStatusCode)
+            //        {
+            //            data.ForEach(profile => profile.Status = "DONE");
+            //            data.ForEach(profile => profile.RetirementResignEmployee.Status = "CANCEL");
+            //            await _context.SaveChangesAsync();
+            //        }
+            //    }
+            //}
             return Success();
         }
 
diff --git a/BMA.EHR.Retirement.Service/Requests/RetirementResignEmployeeRequest.cs b/BMA.EHR.Retirement.Service/Requests/RetirementResignEmployeeRequest.cs
index 409bc185..dd883d0d 100644
--- a/BMA.EHR.Retirement.Service/Requests/RetirementResignEmployeeRequest.cs
+++ b/BMA.EHR.Retirement.Service/Requests/RetirementResignEmployeeRequest.cs
@@ -19,4 +19,21 @@ namespace BMA.EHR.Retirement.Service.Requests
         public double? AmountOld { get; set; }
         public List<FormFile>? File { get; set; }
     }
+
+    public class RetirementResignEmployeeAdminRequest
+    {
+        public string ProfileId { get; set; }
+        public string? Location { get; set; }
+        public DateTime? ActiveDate { get; set; }
+        public string? Reason { get; set; }
+        public string? Remark { get; set; }
+        public string? ReasonResign { get; set; }
+        public string? OrganizationPositionOld { get; set; }
+        public string? PositionTypeOld { get; set; }
+        public string? PositionLevelOld { get; set; }
+        public string? PositionNumberOld { get; set; }
+        public string? RemarkHorizontal { get; set; }
+        public double? AmountOld { get; set; }
+        public List<FormFile>? File { get; set; }
+    }
 }
diff --git a/BMA.EHR.Retirement.Service/Requests/RetirementResignRequest.cs b/BMA.EHR.Retirement.Service/Requests/RetirementResignRequest.cs
index 7f1bf500..acef05aa 100644
--- a/BMA.EHR.Retirement.Service/Requests/RetirementResignRequest.cs
+++ b/BMA.EHR.Retirement.Service/Requests/RetirementResignRequest.cs
@@ -20,4 +20,21 @@ namespace BMA.EHR.Retirement.Service.Requests
         public double? AmountOld { get; set; }
         public List<FormFile>? File { get; set; }
     }
+    public class RetirementResignAdminRequest
+    {
+        public string ProfileId { get; set; }
+        public string? Location { get; set; }
+        public DateTime? ActiveDate { get; set; }
+        public string? Reason { get; set; }
+        public string? Remark { get; set; }
+        public string? ReasonResign { get; set; }
+        public string? OrganizationPositionOld { get; set; }
+        public string? PositionExecutiveOld { get; set; }
+        public string? PositionTypeOld { get; set; }
+        public string? PositionLevelOld { get; set; }
+        public string? PositionNumberOld { get; set; }
+        public string? RemarkHorizontal { get; set; }
+        public double? AmountOld { get; set; }
+        public List<FormFile>? File { get; set; }
+    }
 }
diff --git a/dotnet_keycloak_test.js b/dotnet_keycloak_test.js
new file mode 100644
index 00000000..1e623210
--- /dev/null
+++ b/dotnet_keycloak_test.js
@@ -0,0 +1,54 @@
+// ทดสอบการยิง 30,000 requests ในเวลา 10 นาที โดยให้กระจายการยิงในเวลาที่ต่างๆ กัน
+
+import { check, sleep } from "k6";
+import http from "k6/http";
+import { Rate } from "k6/metrics";
+
+export let errorRate = new Rate("errors");
+
+// จำนวน request ที่ต้องการยิง
+
+// ระยะเวลาทดสอบทั้งหมด
+
+// จำนวน Virtual Users เฉลี่ยที่ต้องการ 300 users
+//const averageVus = Math.ceil(totalRequests / totalDuration);
+const averageVus = 300;
+
+export let options = {
+  stages: [
+    { duration: "2m", target: averageVus * 0.5 }, // 20% ของการทดสอบ เพิ่ม VUs เป็น 50% ของค่าเฉลี่ย
+    { duration: "4m", target: averageVus }, // 40% ของการทดสอบ เพิ่ม VUs เป็น 100% ของค่าเฉลี่ย
+    { duration: "2m", target: averageVus * 1.5 }, // 20% ของการทดสอบ เพิ่ม VUs เป็น 150% ของค่าเฉลี่ย
+    { duration: "2m", target: 0 }, // ลด VUs ลงมาเป็น 0
+  ],
+  thresholds: {
+    errors: ["rate<0.01"], // อัตรา error ต้องน้อยกว่า 1%
+    http_req_duration: ["p(95)<2000"], // 95% ของ requests ควรใช้เวลาไม่เกิน 2 วินาที
+  },
+};
+
+export default function () {
+  // ตัวเลือก headers
+  let headers = {
+    "Content-Type": "application/json",
+    Authorization:
+      "Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJ4WTJWUi1FRnZ2TlBzTXMzOXU4b29WQldRTDZtUHdyTkpPaDNrb0pGVGdVIn0.eyJleHAiOjE3NzYyMTkxNjgsImlhdCI6MTc2ODQ0MzE2OCwianRpIjoiZDQxMmI5MWEtZmZhMi00N2JiLTliZDUtZDE5NTdmMDFjYzQyIiwiaXNzIjoiaHR0cHM6Ly9ocm1zLWlkLmJhbmdrb2suZ28udGgvcmVhbG1zL2hybXMiLCJhdWQiOiJhY2NvdW50Iiwic3ViIjoiYmFmYzU3OTUtYmVmYy00ZDNmLWE0NjEtMzUzM2MzOGE1ZmMxIiwidHlwIjoiQmVhcmVyIiwiYXpwIjoiZ2V0dG9rZW4tY2hlY2tpbiIsInNpZCI6IjBkNzdiY2Y5LTE4YWQtNGQyMS1hYjBjLTI4Y2ZiZjUyZGZiNCIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiaHR0cHM6Ly9ocm1zLmJhbmdrb2suZ28udGgiLCJodHRwczovL2hybXMtY2hlY2tpbi5iYW5na29rLmdvLnRoIl0sInJlYWxtX2FjY2VzcyI6eyJyb2xlcyI6WyJTVVBFUl9BRE1JTiIsInN0b3JhZ2VfbWFuYWdlbWVudCIsIm9mZmxpbmVfYWNjZXNzIiwiU1RBRkYiLCJkZWZhdWx0LXJvbGVzLWhybXMiLCJ1bWFfYXV0aG9yaXphdGlvbiIsIkFETUlOIiwiVVNFUiJdfSwicmVzb3VyY2VfYWNjZXNzIjp7ImFjY291bnQiOnsicm9sZXMiOlsibWFuYWdlLWFjY291bnQiLCJtYW5hZ2UtYWNjb3VudC1saW5rcyIsInZpZXctcHJvZmlsZSJdfX0sInNjb3BlIjoiZW1haWwgb3BlbmlkIHByb2ZpbGUiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsInJvbGUiOlsiU1VQRVJfQURNSU4iLCJzdG9yYWdlX21hbmFnZW1lbnQiLCJvZmZsaW5lX2FjY2VzcyIsIlNUQUZGIiwiZGVmYXVsdC1yb2xlcy1ocm1zIiwidW1hX2F1dGhvcml6YXRpb24iLCJBRE1JTiIsIlVTRVIiXSwibmFtZSI6IuC4p-C4seC4meC5gOC4ieC4peC4tOC4oSDguInguLHguJXguKPguJfguK3guIciLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiIzMTIwMjAwNDI0OTc1IiwiZ2l2ZW5fbmFtZSI6IuC4p-C4seC4meC5gOC4ieC4peC4tOC4oSIsImZhbWlseV9uYW1lIjoi4LiJ4Lix4LiV4Lij4LiX4Lit4LiHIn0.UhMn0NEkymPxMAcb4noZedHCSqXotCyD2RziBtLYHn5OhA9yk1915Rrt9iV4wVaebr74iZ2eZMpBwp8YVy8-3cPXSv9T3vzbXwFP7IeICPCDDf4bOPFEHP5FYow2s9v48qG81wnu01AG7_EL2-CQKh1sBVrCVUUlATlf-P4lT_lHeHOCKNXTmw4V0IWm96ec6pk-jFY3KH2JdRSWR7wq8g-KVxhLOxk_pF72kMwOpdvcr_99byg28zzj6QfeNYXLt61koHXnZppUqytt86mQQgfamv2FNVywCEzbRITUceu2rmJnwQE8ubeoCh4UOsYauUuSKd7RPqvvXxL_Vg__8Q",
+    //"Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJTT2wwWmFidm9rRzZET3pDZVBtT09Kek5haTdMUldkci1zV3lEYjRELTc0In0.eyJleHAiOjE3Njg4ODAzMjgsImlhdCI6MTc2ODc5MzkyOCwianRpIjoiMDYxODBlMWYtNTQzYy00MjU0LWFmN2QtYWI1NDA5NzFmNWY2IiwiaXNzIjoiaHR0cHM6Ly9ocm1zYmtrLWlkLmNhc2UtY29sbGVjdGlvbi5jb20vcmVhbG1zL2hybXMiLCJhdWQiOlsiYWNjb3VudCIsImdldHRva2VuIl0sInN1YiI6IjQzOWZhMzZkLTZiYzUtNGVmNS05NWFhLWVmMjllNjRkMmU5ZiIsInR5cCI6IkJlYXJlciIsImF6cCI6ImdldHRva2VuIiwic2lkIjoiZGI2YzUxNjItNzZhYS00MmVmLWI0ZDMtYThmOTk2N2NjZWM2IiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIqIl0sInJlYWxtX2FjY2VzcyI6eyJyb2xlcyI6WyJTVVBFUl9BRE1JTiIsIm9mZmxpbmVfYWNjZXNzIiwiU1RBRkYiLCJkZWZhdWx0LXJvbGVzLWhybXMiLCJ1bWFfYXV0aG9yaXphdGlvbiIsIkFETUlOIiwiVVNFUiJdfSwicmVzb3VyY2VfYWNjZXNzIjp7ImFjY291bnQiOnsicm9sZXMiOlsibWFuYWdlLWFjY291bnQiLCJtYW5hZ2UtYWNjb3VudC1saW5rcyIsInZpZXctcHJvZmlsZSJdfX0sInNjb3BlIjoiZW1haWwgb3BlbmlkIHByb2ZpbGUiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsInJvbGUiOlsiU1VQRVJfQURNSU4iLCJvZmZsaW5lX2FjY2VzcyIsIlNUQUZGIiwiZGVmYXVsdC1yb2xlcy1ocm1zIiwidW1hX2F1dGhvcml6YXRpb24iLCJBRE1JTiIsIlVTRVIiXSwibmFtZSI6IuC4p-C4seC4meC5gOC4ieC4peC4tOC4oSDguInguLHguJXguKPguJfguK3guIciLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiIzMTIwMjAwNDI0OTc1IiwiZ2l2ZW5fbmFtZSI6IuC4p-C4seC4meC5gOC4ieC4peC4tOC4oSIsImZhbWlseV9uYW1lIjoi4LiJ4Lix4LiV4Lij4LiX4Lit4LiHIn0.fHdMzpHMD4JcbzYnUrfM473FSXka2Z4lz_S3HI2c-dPXfO5ATpijqsi12C6-ExE0RJRXUK671erMuyVXL6u2qj-FvdliBL3ubKy4J3jIT3svkcZxZL2ib16dRg375dITefvqd-J4vw6MR4bq8YAGPbqRIy6BQ2pdEiZgNiwUUihHAFwZlVER1lNbaqlbL6vk_L4k-g25DBVnDr756BFvrw7zEDbawkKZ31EZF5_DYk4RWej0wvWrGHQWLw-RyzYVSBB_AooqHkncHn_CwLBGC5juOEfFO4a2ThuKwoxYCstjtBj-zmjpHFs-Hh3CBTWJCGFcKst1Ey28StlKtNkLiw",
+  };
+
+  // ส่ง GET request
+  let response = http.get(
+    //"https://bma-hrms.bangkok.go.th/api/v1/leave/fake-check-in",
+    //"https://hrmsbkk.case-collection.com/api/v1/org/dotnet/keycloak/439fa36d-6bc5-4ef5-95aa-ef29e64d2e9f",
+    "https://hrms.bangkok.go.th/api/v1/org/dotnet/keycloak/bafc5795-befc-4d3f-a461-3533c38a5fc1",
+    { headers: headers },
+  );
+
+  // ตรวจสอบการตอบสนอง
+  check(response, {
+    "is status 200": (r) => r.status === 200,
+  });
+
+  // หน่วงเวลา 1 วินาที
+  sleep(1);
+}
diff --git a/dotnet_leave_test.js b/dotnet_leave_test.js
new file mode 100644
index 00000000..658848ec
--- /dev/null
+++ b/dotnet_leave_test.js
@@ -0,0 +1,47 @@
+// ทดสอบการยิง 30,000 requests ในเวลา 10 นาที โดยให้กระจายการยิงในเวลาที่ต่างๆ กัน
+
+import { check, sleep } from "k6";
+import http from "k6/http";
+import { Rate } from "k6/metrics";
+
+export let errorRate = new Rate("errors");
+
+// จำนวน request ที่ต้องการยิง
+
+// ระยะเวลาทดสอบทั้งหมด
+
+// จำนวน Virtual Users เฉลี่ยที่ต้องการ 300 users
+//const averageVus = Math.ceil(totalRequests / totalDuration);
+const averageVus = 300;
+
+export let options = {
+  stages: [
+    { duration: "2m", target: averageVus * 0.5 }, // 20% ของการทดสอบ เพิ่ม VUs เป็น 50% ของค่าเฉลี่ย
+    { duration: "4m", target: averageVus }, // 40% ของการทดสอบ เพิ่ม VUs เป็น 100% ของค่าเฉลี่ย
+    { duration: "2m", target: averageVus * 1.5 }, // 20% ของการทดสอบ เพิ่ม VUs เป็น 150% ของค่าเฉลี่ย
+    { duration: "2m", target: 0 }, // ลด VUs ลงมาเป็น 0
+  ],
+  thresholds: {
+    errors: ["rate<0.01"], // อัตรา error ต้องน้อยกว่า 1%
+    http_req_duration: ["p(95)<2000"], // 95% ของ requests ควรใช้เวลาไม่เกิน 2 วินาที
+  },
+};
+
+export default function () {
+  // ตัวเลือก headers
+  let headers = {
+    "Content-Type": "application/json",
+    Authorization: "Bearer {Token}",
+  };
+
+  // ส่ง GET request
+  let response = http.get("https://{URL}", { headers: headers });
+
+  // ตรวจสอบการตอบสนอง
+  check(response, {
+    "is status 200": (r) => r.status === 200,
+  });
+
+  // หน่วงเวลา 1 วินาที
+  sleep(1);
+}