Linear Flow (DisciplineService) #224

autoAck: false - ไม่ ack อัตโนมัติ ต้องรอ process เสร็จก่อน
Manual Ack/Nack:
BasicAck เมื่อ API return success
BasicNack (reject) เมื่อ API return error (401, 500, etc.) หรือ exception
CallRestApi return bool - บอกว่าสำเร็จหรือล้มเหลว
Better logging - แสดง status code และ error message ชัดเจนขึ้น
ตอนนี้เมื่อ API return 401 หรือ error อื่น:

จะ log error พร้อม status code
Message จะถูก reject (ไม่ requeue)
Consumer จะทำงานต่อรับ message ถัดไปเลย (ไม่ค้าง)

.dockerignore

@@ -22,4 +22,12 @@
 **/secrets.dev.yaml
 **/values.dev.yaml
 LICENSE
-README.md
+README.md
+.git
+**/bin/
+**/obj/
+.vscode/
+.dockerignore
+.gitignore
+README.md
+*.md

.forgejo/workflows/build-checkin.yml

@@ -0,0 +1,83 @@
+name: Build & Deploy Checkin Service
+
+on:
+  push:
+    tags:
+      - "checkin-dev[0-9]+.[0-9]+.[0-9]+"
+      - "checkin-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: latest
+  SERVICE_NAME: hrms-api-checkin
+  DISCORD_WEBHOOK: ${{ vars.DISCORD_WEBHOOK }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Tag Version
+        shell: bash
+        run: |
+          if [[ "${{ github.event_name }}" == "push" ]]; then
+            VERSION=$(echo "${{ github.ref_name }}" | sed 's/checkin-dev//g')
+            echo "IMAGE_VERSION=${VERSION}" >> $GITHUB_ENV
+          else
+            echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV
+          fi
+      - name: Login in to registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ env.REGISTRY_USERNAME }}
+          password: ${{ env.REGISTRY_PASSWORD }}
+
+      - name: Build and push docker image
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64
+          context: .
+          file: ./BMA.EHR.CheckInConsumer/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_CHECKIN "${{ 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: \`${{ gitea.actor }}\`\",
+              \"color\": $COLOR,
+              \"footer\": {
+                \"text\": \"Release Notification\",
+                \"icon_url\": \"https://example.com/success-icon.png\"
+              },
+              \"timestamp\": \"$TIMESTAMP\"
+            }]
+          }" \
+          ${{ env.DISCORD_WEBHOOK }}

.forgejo/workflows/build-discipline.yml

@@ -0,0 +1,83 @@
+name: Build & Deploy Discipline Service
+
+on:
+  push:
+    tags:
+      - "discipline-dev[0-9]+.[0-9]+.[0-9]+"
+      - "discipline-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: latest
+  SERVICE_NAME: hrms-api-discipline
+  DISCORD_WEBHOOK: ${{ vars.DISCORD_WEBHOOK }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Tag Version
+        shell: bash
+        run: |
+          if [[ "${{ github.event_name }}" == "push" ]]; then
+            VERSION=$(echo "${{ github.ref_name }}" | sed 's/discipline-dev//g')
+            echo "IMAGE_VERSION=${VERSION}" >> $GITHUB_ENV
+          else
+            echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV
+          fi
+      - name: Login in to registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ env.REGISTRY_USERNAME }}
+          password: ${{ env.REGISTRY_PASSWORD }}
+
+      - name: Build and push docker image
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64
+          context: .
+          file: ./BMA.EHR.Discipline.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_DISCIPLINE "${{ 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: \`${{ gitea.actor }}\`\",
+              \"color\": $COLOR,
+              \"footer\": {
+                \"text\": \"Release Notification\",
+                \"icon_url\": \"https://example.com/success-icon.png\"
+              },
+              \"timestamp\": \"$TIMESTAMP\"
+            }]
+          }" \
+          ${{ env.DISCORD_WEBHOOK }}

.forgejo/workflows/build-insignia.yml

@@ -0,0 +1,83 @@
+name: Build & Deploy Insignia Service
+
+on:
+  push:
+    tags:
+      - "insignia-dev[0-9]+.[0-9]+.[0-9]+"
+      - "insignia-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: latest
+  SERVICE_NAME: hrms-api-insignia
+  DISCORD_WEBHOOK: ${{ vars.DISCORD_WEBHOOK }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Tag Version
+        shell: bash
+        run: |
+          if [[ "${{ github.event_name }}" == "push" ]]; then
+            VERSION=$(echo "${{ github.ref_name }}" | sed 's/insignia-dev//g')
+            echo "IMAGE_VERSION=${VERSION}" >> $GITHUB_ENV
+          else
+            echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV
+          fi
+      - name: Login in to registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ env.REGISTRY_USERNAME }}
+          password: ${{ env.REGISTRY_PASSWORD }}
+
+      - name: Build and push docker image
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64
+          context: .
+          file: ./BMA.EHR.Insignia/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_INSIGNIA "${{ 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: \`${{ gitea.actor }}\`\",
+              \"color\": $COLOR,
+              \"footer\": {
+                \"text\": \"Release Notification\",
+                \"icon_url\": \"https://example.com/success-icon.png\"
+              },
+              \"timestamp\": \"$TIMESTAMP\"
+            }]
+          }" \
+          ${{ env.DISCORD_WEBHOOK }}

.forgejo/workflows/build-leave.yml

@@ -0,0 +1,83 @@
+name: Build & Deploy Leave Service
+
+on:
+  push:
+    tags:
+      - "leave-dev[0-9]+.[0-9]+.[0-9]+"
+      - "leave-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: latest
+  SERVICE_NAME: hrms-api-leave
+  DISCORD_WEBHOOK: ${{ vars.DISCORD_WEBHOOK }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Tag Version
+        shell: bash
+        run: |
+          if [[ "${{ github.event_name }}" == "push" ]]; then
+            VERSION=$(echo "${{ github.ref_name }}" | sed 's/leave-dev//g')
+            echo "IMAGE_VERSION=${VERSION}" >> $GITHUB_ENV
+          else
+            echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV
+          fi
+      - name: Login in to registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ env.REGISTRY_USERNAME }}
+          password: ${{ env.REGISTRY_PASSWORD }}
+
+      - name: Build and push docker image
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64
+          context: .
+          file: ./BMA.EHR.Leave/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_LEAVE "${{ 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: \`${{ gitea.actor }}\`\",
+              \"color\": $COLOR,
+              \"footer\": {
+                \"text\": \"Release Notification\",
+                \"icon_url\": \"https://example.com/success-icon.png\"
+              },
+              \"timestamp\": \"$TIMESTAMP\"
+            }]
+          }" \
+          ${{ env.DISCORD_WEBHOOK }}

.forgejo/workflows/build-placement.yml

@@ -0,0 +1,83 @@
+name: Build & Deploy Placement Service
+
+on:
+  push:
+    tags:
+      - "placement-dev[0-9]+.[0-9]+.[0-9]+"
+      - "placement-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: latest
+  SERVICE_NAME: hrms-api-placement
+  DISCORD_WEBHOOK: ${{ vars.DISCORD_WEBHOOK }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Tag Version
+        shell: bash
+        run: |
+          if [[ "${{ github.event_name }}" == "push" ]]; then
+            VERSION=$(echo "${{ github.ref_name }}" | sed 's/placement-dev//g')
+            echo "IMAGE_VERSION=${VERSION}" >> $GITHUB_ENV
+          else
+            echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV
+          fi
+      - name: Login in to registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ env.REGISTRY_USERNAME }}
+          password: ${{ env.REGISTRY_PASSWORD }}
+
+      - name: Build and push docker image
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64
+          context: .
+          file: ./BMA.EHR.Placement.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_PLACEMENT "${{ 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: \`${{ gitea.actor }}\`\",
+              \"color\": $COLOR,
+              \"footer\": {
+                \"text\": \"Release Notification\",
+                \"icon_url\": \"https://example.com/success-icon.png\"
+              },
+              \"timestamp\": \"$TIMESTAMP\"
+            }]
+          }" \
+          ${{ env.DISCORD_WEBHOOK }}

.forgejo/workflows/build-retirement.yml

@@ -0,0 +1,83 @@
+name: Build & Deploy Retirement Service
+
+on:
+  push:
+    tags:
+      - "retirement-dev[0-9]+.[0-9]+.[0-9]+"
+      - "retirement-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: latest
+  SERVICE_NAME: hrms-api-retirement
+  DISCORD_WEBHOOK: ${{ vars.DISCORD_WEBHOOK }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Tag Version
+        shell: bash
+        run: |
+          if [[ "${{ github.event_name }}" == "push" ]]; then
+            VERSION=$(echo "${{ github.ref_name }}" | sed 's/retirement-dev//g')
+            echo "IMAGE_VERSION=${VERSION}" >> $GITHUB_ENV
+          else
+            echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV
+          fi
+      - name: Login in to registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ env.REGISTRY_USERNAME }}
+          password: ${{ env.REGISTRY_PASSWORD }}
+
+      - name: Build and push docker image
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64
+          context: .
+          file: ./BMA.EHR.Retirement.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_RETIREMENT "${{ 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: \`${{ gitea.actor }}\`\",
+              \"color\": $COLOR,
+              \"footer\": {
+                \"text\": \"Release Notification\",
+                \"icon_url\": \"https://example.com/success-icon.png\"
+              },
+              \"timestamp\": \"$TIMESTAMP\"
+            }]
+          }" \
+          ${{ env.DISCORD_WEBHOOK }}

.github/workflows/discord-notify.yml

@@ -0,0 +1,22 @@
+name: Discord PR Notify
+
+on:
+  pull_request:
+    types: [opened]
+
+jobs:
+  discord:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Discord
+        run: |
+          curl -X POST "${{ secrets.DISCORD_WEBHOOK_PULLREQUEST }}" \
+            -H "Content-Type: application/json" \
+            -d '{
+              "embeds": [{
+                "title": "🔔 **Service:** ${{ github.repository }}",
+                "description": "👤 **Author:** ${{ github.event.pull_request.user.login }}\n🌿 **Branch:** ${{ github.event.pull_request.head.ref }} → ${{ github.event.pull_request.base.ref }}\n📦 **Pull Request:** [#${{ github.event.pull_request.number }} - ${{ github.event.pull_request.title }}](${{ github.event.pull_request.html_url }})",
+                "color": 5814783,
+                "timestamp": "${{ github.event.pull_request.created_at }}"
+              }]
+            }'

.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"

.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"

.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"

.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"

.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"

.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"

.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"

.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"

.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

.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

.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
@@ -20,12 +20,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      # skip Set up QEMU because it fail on act and container
+      - 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='${GITHUB_REF/refs\/tags\//}'
+            IMAGE_VER=${{ steps.vars.outputs.tag }}
           else
             IMAGE_VER=${{ github.event.inputs.IMAGE_VER }}
           fi
@@ -33,7 +35,7 @@ jobs:
             IMAGE_VER='test-vBeta'
           fi
           echo '::set-output name=image_ver::'$IMAGE_VER
-      - name: Test Version
+      - name: Check Version
         run: |
           echo $GITHUB_REF
           echo ${{ steps.gen_ver.outputs.image_ver }}

.github/workflows/release_discipline.yaml

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

.github/workflows/release_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

.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
@@ -57,7 +57,7 @@ jobs:
           push: true
           tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest
       - name: Remote Deployment
-        uses: appleboy/ssh-action@v0.1.8
+        uses: appleboy/ssh-action@v1
         with:
           host: ${{env.DEPLOY_HOST}}
           username: frappet

.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

.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 }}

.gitignore

@@ -16,6 +16,19 @@
 # Mono auto generated files
 mono_crash.*
 
+# JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+.idea/
+*.iml
+*.ipr
+*.iws
+out/
+.idea_modules/
+atlassian-ide-plugin.xml
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
@@ -360,4 +373,10 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+
+# VS Code C# Dev Kit cache
+*.lscache
+
+# Claude Code
+.claude/

.idea/.idea.BMA.EHR.Solution/.idea/.name

@@ -1 +0,0 @@
-BMA.EHR.Solution

.idea/.idea.BMA.EHR.Solution/.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
-</project>

.idea/.idea.BMA.EHR.Solution/.idea/indexLayout.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="UserContentModel">
-    <attachedFolders />
-    <explicitIncludes />
-    <explicitExcludes />
-  </component>
-</project>

.idea/.idea.BMA.EHR.Solution/.idea/projectSettingsUpdater.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RiderProjectSettingsUpdater">
-    <option name="vcsConfiguration" value="2" />
-  </component>
-</project>

.idea/.idea.BMA.EHR.Solution/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.idea/.idea.BMA.EHR.Solution/.idea/workspace.xml

@@ -1,552 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoGeneratedRunConfigurationManager">
-    <projectFile kind="Docker">BMA.EHR.CheckInConsumer/BMA.EHR.CheckInConsumer.csproj</projectFile>
-    <projectFile profileName="BMA.EHR.CheckInConsumer">BMA.EHR.CheckInConsumer/BMA.EHR.CheckInConsumer.csproj</projectFile>
-    <projectFile kind="Docker">BMA.EHR.Command.Service/BMA.EHR.Command.Service.csproj</projectFile>
-    <projectFile profileName="http">BMA.EHR.Command.Service/BMA.EHR.Command.Service.csproj</projectFile>
-    <projectFile profileName="https">BMA.EHR.Command.Service/BMA.EHR.Command.Service.csproj</projectFile>
-    <projectFile profileName="http">BMA.EHR.Discipline.Service/BMA.EHR.Discipline.Service.csproj</projectFile>
-    <projectFile profileName="https">BMA.EHR.Discipline.Service/BMA.EHR.Discipline.Service.csproj</projectFile>
-    <projectFile kind="Docker">BMA.EHR.Insignia/BMA.EHR.Insignia.csproj</projectFile>
-    <projectFile profileName="http">BMA.EHR.Insignia/BMA.EHR.Insignia.csproj</projectFile>
-    <projectFile profileName="https">BMA.EHR.Insignia/BMA.EHR.Insignia.csproj</projectFile>
-    <projectFile kind="Docker">BMA.EHR.Leave/BMA.EHR.Leave.csproj</projectFile>
-    <projectFile profileName="http">BMA.EHR.Leave/BMA.EHR.Leave.csproj</projectFile>
-    <projectFile profileName="https">BMA.EHR.Leave/BMA.EHR.Leave.csproj</projectFile>
-    <projectFile kind="Docker">BMA.EHR.MetaData.Service/BMA.EHR.MetaData.Service.csproj</projectFile>
-    <projectFile profileName="http">BMA.EHR.MetaData.Service/BMA.EHR.MetaData.Service.csproj</projectFile>
-    <projectFile profileName="https">BMA.EHR.MetaData.Service/BMA.EHR.MetaData.Service.csproj</projectFile>
-    <projectFile kind="Docker">BMA.EHR.OrganizationEmployee.Service/BMA.EHR.OrganizationEmployee.Service.csproj</projectFile>
-    <projectFile profileName="http">BMA.EHR.OrganizationEmployee.Service/BMA.EHR.OrganizationEmployee.Service.csproj</projectFile>
-    <projectFile profileName="https">BMA.EHR.OrganizationEmployee.Service/BMA.EHR.OrganizationEmployee.Service.csproj</projectFile>
-    <projectFile kind="Docker">BMA.EHR.Placement.Service/BMA.EHR.Placement.Service.csproj</projectFile>
-    <projectFile profileName="http">BMA.EHR.Placement.Service/BMA.EHR.Placement.Service.csproj</projectFile>
-    <projectFile profileName="https">BMA.EHR.Placement.Service/BMA.EHR.Placement.Service.csproj</projectFile>
-    <projectFile kind="Docker">BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj</projectFile>
-    <projectFile profileName="dotnet">BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj</projectFile>
-    <projectFile profileName="http">BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj</projectFile>
-    <projectFile profileName="https">BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj</projectFile>
-    <projectFile profileName="report-designer">BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj</projectFile>
-    <projectFile kind="Docker">BMA.EHR.Retirement.Service/BMA.EHR.Retirement.Service.csproj</projectFile>
-    <projectFile profileName="http">BMA.EHR.Retirement.Service/BMA.EHR.Retirement.Service.csproj</projectFile>
-    <projectFile profileName="https">BMA.EHR.Retirement.Service/BMA.EHR.Retirement.Service.csproj</projectFile>
-  </component>
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="85fddeb6-44fd-40a4-864f-89daec07db75" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BMA.EHR.Insignia/appsettings.json" beforeDir="false" afterPath="$PROJECT_DIR$/BMA.EHR.Insignia/appsettings.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BMA.EHR.Leave/Controllers/LeaveController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/BMA.EHR.Leave/Controllers/LeaveController.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BMA.EHR.Leave/appsettings.json" beforeDir="false" afterPath="$PROJECT_DIR$/BMA.EHR.Leave/appsettings.json" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DpaMonitoringSettings">
-    <option name="autoShow" value="false" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "customColor": "",
-  "associatedIndex": 2
-}]]></component>
-  <component name="ProjectId" id="2lB1pnEIkATarPnZkJ5vo5hUlwn" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    ".NET Launch Settings Profile.BMA.EHR.Leave: https.executor": "Debug",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "working",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "preferences.lookFeel",
-    "vue.rearranger.settings.migration": "true"
-  },
-  "keyToStringList": {
-    "rider.external.source.directories": [
-      "/Users/suphonchai/Library/Application Support/JetBrains/Rider2024.1/resharper-host/DecompilerCache",
-      "/Users/suphonchai/Library/Application Support/JetBrains/Rider2024.1/resharper-host/SourcesCache",
-      "/Users/suphonchai/Library/Application Support/Symbols/src"
-    ]
-  }
-}]]></component>
-  <component name="RunManager" selected=".NET Launch Settings Profile.BMA.EHR.Leave: https">
-    <configuration name="BMA.EHR.CheckInConsumer" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.CheckInConsumer/BMA.EHR.CheckInConsumer.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net8.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="BMA.EHR.CheckInConsumer" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Command.Service: http" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Command.Service/BMA.EHR.Command.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="http" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Command.Service: https" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Command.Service/BMA.EHR.Command.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="https" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Discipline.Service: http" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Discipline.Service/BMA.EHR.Discipline.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="http" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Discipline.Service: https" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Discipline.Service/BMA.EHR.Discipline.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="https" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Insignia: http" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Insignia/BMA.EHR.Insignia.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="http" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Insignia: https" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Insignia/BMA.EHR.Insignia.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="https" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Leave: http" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Leave/BMA.EHR.Leave.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="http" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Leave: https" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Leave/BMA.EHR.Leave.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="https" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.MetaData.Service: http" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.MetaData.Service/BMA.EHR.MetaData.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="http" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.MetaData.Service: https" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.MetaData.Service/BMA.EHR.MetaData.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="https" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.OrganizationEmployee.Service: http" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.OrganizationEmployee.Service/BMA.EHR.OrganizationEmployee.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="http" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.OrganizationEmployee.Service: https" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.OrganizationEmployee.Service/BMA.EHR.OrganizationEmployee.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="https" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Placement.Service: http" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Placement.Service/BMA.EHR.Placement.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="http" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Placement.Service: https" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Placement.Service/BMA.EHR.Placement.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="https" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Report.Service: dotnet" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net6.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="dotnet" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Report.Service: http" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net6.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="http" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Report.Service: https" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net6.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="https" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Report.Service: report-designer" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Report.Service/BMA.EHR.Report.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net6.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="report-designer" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Retirement.Service: http" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Retirement.Service/BMA.EHR.Retirement.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="http" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.Retirement.Service: https" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/BMA.EHR.Retirement.Service/BMA.EHR.Retirement.Service.csproj" />
-      <option name="LAUNCH_PROFILE_TFM" value="net7.0" />
-      <option name="LAUNCH_PROFILE_NAME" value="https" />
-      <option name="USE_EXTERNAL_CONSOLE" value="0" />
-      <option name="USE_MONO" value="0" />
-      <option name="RUNTIME_ARGUMENTS" value="" />
-      <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
-      <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
-      <option name="SEND_DEBUG_REQUEST" value="1" />
-      <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
-      <method v="2">
-        <option name="Build" />
-      </method>
-    </configuration>
-    <configuration name="BMA.EHR.CheckInConsumer/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-      <deployment type="dockerfile">
-        <settings>
-          <option name="containerName" value="bma.ehr.checkinconsumer" />
-          <option name="contextFolderPath" value="$PROJECT_DIR$" />
-          <option name="sourceFilePath" value="BMA.EHR.CheckInConsumer/Dockerfile" />
-        </settings>
-      </deployment>
-      <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
-      <method v="2" />
-    </configuration>
-    <configuration name="BMA.EHR.Command.Service/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-      <deployment type="dockerfile">
-        <settings>
-          <option name="containerName" value="bma.ehr.command.service" />
-          <option name="contextFolderPath" value="$PROJECT_DIR$" />
-          <option name="publishAllPorts" value="true" />
-          <option name="sourceFilePath" value="BMA.EHR.Command.Service/Dockerfile" />
-        </settings>
-      </deployment>
-      <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="true" />
-      <method v="2" />
-    </configuration>
-    <configuration name="BMA.EHR.Insignia/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-      <deployment type="dockerfile">
-        <settings>
-          <option name="containerName" value="bma.ehr.insignia" />
-          <option name="contextFolderPath" value="$PROJECT_DIR$" />
-          <option name="publishAllPorts" value="true" />
-          <option name="sourceFilePath" value="BMA.EHR.Insignia/Dockerfile" />
-        </settings>
-      </deployment>
-      <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="true" />
-      <method v="2" />
-    </configuration>
-    <configuration name="BMA.EHR.Leave/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-      <deployment type="dockerfile">
-        <settings>
-          <option name="containerName" value="bma.ehr.leave" />
-          <option name="contextFolderPath" value="$PROJECT_DIR$" />
-          <option name="publishAllPorts" value="true" />
-          <option name="sourceFilePath" value="BMA.EHR.Leave/Dockerfile" />
-        </settings>
-      </deployment>
-      <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="true" />
-      <method v="2" />
-    </configuration>
-    <configuration name="BMA.EHR.MetaData.Service/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-      <deployment type="dockerfile">
-        <settings>
-          <option name="containerName" value="bma.ehr.metadata.service" />
-          <option name="contextFolderPath" value="$PROJECT_DIR$" />
-          <option name="publishAllPorts" value="true" />
-          <option name="sourceFilePath" value="BMA.EHR.MetaData.Service/Dockerfile" />
-        </settings>
-      </deployment>
-      <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="true" />
-      <method v="2" />
-    </configuration>
-    <configuration name="BMA.EHR.OrganizationEmployee.Service/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-      <deployment type="dockerfile">
-        <settings>
-          <option name="containerName" value="bma.ehr.organizationemployee.service" />
-          <option name="contextFolderPath" value="$PROJECT_DIR$" />
-          <option name="publishAllPorts" value="true" />
-          <option name="sourceFilePath" value="BMA.EHR.OrganizationEmployee.Service/Dockerfile" />
-        </settings>
-      </deployment>
-      <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="true" />
-      <method v="2" />
-    </configuration>
-    <configuration name="BMA.EHR.Placement.Service/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-      <deployment type="dockerfile">
-        <settings>
-          <option name="containerName" value="bma.ehr.placement.service" />
-          <option name="contextFolderPath" value="$PROJECT_DIR$" />
-          <option name="publishAllPorts" value="true" />
-          <option name="sourceFilePath" value="BMA.EHR.Placement.Service/Dockerfile" />
-        </settings>
-      </deployment>
-      <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="true" />
-      <method v="2" />
-    </configuration>
-    <configuration name="BMA.EHR.Report.Service/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-      <deployment type="dockerfile">
-        <settings>
-          <option name="containerName" value="bma.ehr.report.service" />
-          <option name="contextFolderPath" value="$PROJECT_DIR$" />
-          <option name="publishAllPorts" value="true" />
-          <option name="sourceFilePath" value="BMA.EHR.Report.Service/Dockerfile" />
-        </settings>
-      </deployment>
-      <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="true" />
-      <method v="2" />
-    </configuration>
-    <configuration name="BMA.EHR.Retirement.Service/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-      <deployment type="dockerfile">
-        <settings>
-          <option name="containerName" value="bma.ehr.retirement.service" />
-          <option name="contextFolderPath" value="$PROJECT_DIR$" />
-          <option name="publishAllPorts" value="true" />
-          <option name="sourceFilePath" value="BMA.EHR.Retirement.Service/Dockerfile" />
-        </settings>
-      </deployment>
-      <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="true" />
-      <method v="2" />
-    </configuration>
-    <configuration default="true" type="docker-deploy" factoryName="dockerfile" temporary="true">
-      <deployment type="dockerfile" />
-      <method v="2" />
-    </configuration>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="85fddeb6-44fd-40a4-864f-89daec07db75" name="Changes" comment="" />
-      <created>1724638841465</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1724638841465</updated>
-      <workItem from="1724638842250" duration="4068000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
-  <component name="VcsManagerConfiguration">
-    <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="DotNet Breakpoints">
-          <url>file://$PROJECT_DIR$/BMA.EHR.Leave/Controllers/LeaveController.cs</url>
-          <line>1152</line>
-          <properties documentPath="$PROJECT_DIR$/BMA.EHR.Leave/Controllers/LeaveController.cs" containingFunctionPresentation="Method 'GetTimeRecordAsync'">
-            <startOffsets>
-              <option value="52378" />
-            </startOffsets>
-            <endOffsets>
-              <option value="52431" />
-            </endOffsets>
-          </properties>
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-</project>

.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"
-        }
-    ]
-}
+  "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"
+    }
+  ]
+}

BMA.EHR.Application/ApplicationServicesRegistration.cs

@@ -23,6 +23,7 @@ namespace BMA.EHR.Application
             services.AddTransient<CommandStatusRepository>();
             services.AddTransient<InsigniaPeriodsRepository>();
             services.AddTransient<RetirementRepository>();
+            services.AddTransient<RetirementEmployeeRepository>();
             services.AddTransient<UserProfileRepository>();
             services.AddTransient<OrganizationCommonRepository>();
             services.AddTransient<InboxRepository>();
@@ -52,12 +53,16 @@ namespace BMA.EHR.Application
             services.AddTransient<UserDutyTimeRepository>();
             services.AddTransient<AdditionalCheckRequestRepository>();
             services.AddTransient<UserCalendarRepository>();
+            services.AddTransient<CheckInJobStatusRepository>();
 
             services.AddTransient<LeaveTypeRepository>();
             services.AddTransient<LeaveRequestRepository>();
+            services.AddTransient<LeaveBeginningRepository>();
 
             services.AddTransient<MinIOLeaveService>();
 
+            services.AddTransient<LeaveProcessJobStatusRepository>();
+
             return services;
         }
 

BMA.EHR.Application/BMA.EHR.Application.csproj

@@ -4,6 +4,9 @@
 		<TargetFramework>net6.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>
+
 	</PropertyGroup>
 
 	<ItemGroup>

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

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

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

@@ -919,7 +919,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -934,7 +934,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         using (var _client = new HttpClient())
                         {
                             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                            _client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            _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();
@@ -986,7 +986,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -1001,7 +1001,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         using (var _client = new HttpClient())
                         {
                             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                            _client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            _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();
@@ -1423,7 +1423,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -1440,7 +1440,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         using (var _client = new HttpClient())
                         {
                             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                            _client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            _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();
@@ -1534,7 +1534,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -1550,7 +1550,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         using (var _client = new HttpClient())
                         {
                             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                            _client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            _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();
@@ -1603,7 +1603,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -1832,7 +1832,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -1849,7 +1849,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         using (var _client = new HttpClient())
                         {
                             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                            _client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            _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();
@@ -1905,7 +1905,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -1922,7 +1922,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         using (var _client = new HttpClient())
                         {
                             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                            _client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            _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();
@@ -1978,7 +1978,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -1995,7 +1995,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         using (var _client = new HttpClient())
                         {
                             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                            _client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            _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();
@@ -2051,7 +2051,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -2068,7 +2068,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         using (var _client = new HttpClient())
                         {
                             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                            _client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            _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();
@@ -2124,7 +2124,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -2141,7 +2141,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         using (var _client = new HttpClient())
                         {
                             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                            _client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            _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();
@@ -2197,7 +2197,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -2214,7 +2214,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         using (var _client = new HttpClient())
                         {
                             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                            _client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            _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();
@@ -2270,7 +2270,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -2287,7 +2287,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         using (var _client = new HttpClient())
                         {
                             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                            _client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            _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();
@@ -2340,7 +2340,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -2355,7 +2355,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         using (var _client = new HttpClient())
                         {
                             _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                            _client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            _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();
@@ -2409,7 +2409,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -2462,7 +2462,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -2515,7 +2515,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -2568,7 +2568,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -2621,7 +2621,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -2673,7 +2673,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -2725,7 +2725,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -2994,7 +2994,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                         var _res = await client.PostAsJsonAsync(apiUrl, new
                         {
@@ -3046,7 +3046,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         using (var client = new HttpClient())
                         {
                             client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                            client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                             foreach (var edu in placementProfile.PlacementEducations)
                             {
                                 var _res = await client.PostAsJsonAsync(apiUrlEdu, new
@@ -3083,7 +3083,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         using (var client = new HttpClient())
                         {
                             client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                            client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                             foreach (var cer in placementProfile.PlacementCertificates)
                             {
                                 var _res = await client.PostAsJsonAsync(apiUrlCer, new
@@ -3104,7 +3104,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
                             profileId = profileId,
@@ -3113,11 +3113,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = placementProfile.PositionSalaryAmount,
                             mouthSalaryAmount = placementProfile.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.positionName == null ? string.Empty : placementProfile.positionName,
                             positionLine = string.Empty,
                             positionPathSide = string.Empty,
@@ -3135,7 +3135,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlOrg);
                         var _res = await client.PostAsJsonAsync(apiUrlOrg, new
                         {
@@ -3287,7 +3287,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -3297,11 +3297,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.positionName,
                             positionLine = "",
                             positionPathSide = "",
@@ -3319,7 +3319,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlOrg);
                         var _res = await client.PostAsJsonAsync(apiUrlOrg, new
                         {
@@ -3468,7 +3468,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -3478,11 +3478,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.positionName,
                             positionLine = "",
                             positionPathSide = "",
@@ -3500,7 +3500,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlOrg);
                         var _res = await client.PostAsJsonAsync(apiUrlOrg, new
                         {
@@ -3649,7 +3649,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -3659,11 +3659,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.positionName,
                             positionLine = "",
                             positionPathSide = "",
@@ -3681,7 +3681,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlOrg);
                         var _res = await client.PostAsJsonAsync(apiUrlOrg, new
                         {
@@ -3832,7 +3832,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -3842,11 +3842,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.position,
                             positionLine = "",
                             positionPathSide = "",
@@ -3864,7 +3864,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlOrg);
                         var _res = await client.PostAsJsonAsync(apiUrlOrg, new
                         {
@@ -4017,7 +4017,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -4027,11 +4027,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.position,
                             positionLine = "",
                             positionPathSide = "",
@@ -4049,7 +4049,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlOrg);
                         var _res = await client.PostAsJsonAsync(apiUrlOrg, new
                         {
@@ -4199,7 +4199,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -4209,11 +4209,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.position,
                             positionLine = "",
                             positionPathSide = "",
@@ -4231,7 +4231,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlOrg);
                         var _res = await client.PostAsJsonAsync(apiUrlOrg, new
                         {
@@ -4382,7 +4382,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -4409,7 +4409,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlLeave);
                         string? _null = null;
                         var _res = await client.PostAsJsonAsync(apiUrlLeave, new
@@ -4560,7 +4560,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -4587,7 +4587,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlLeave);
                         string? _null = null;
                         var _res = await client.PostAsJsonAsync(apiUrlLeave, new
@@ -4928,7 +4928,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                         var _res = await client.PostAsJsonAsync(apiUrl, new
                         {
@@ -5085,7 +5085,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                         var _res = await client.PostAsJsonAsync(apiUrl, new
                         {
@@ -5262,7 +5262,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -5440,7 +5440,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -5450,11 +5450,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = placementProfile.posMasterNo == null ? "" :
-                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName}{placementProfile.posMasterNo}" :
-                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName}{placementProfile.posMasterNo}" : "",
+                                                            placementProfile.node == 4 ? $"{placementProfile.child4ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 3 ? $"{placementProfile.child3ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 2 ? $"{placementProfile.child2ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 1 ? $"{placementProfile.child1ShortName} {placementProfile.posMasterNo}" :
+                                                            placementProfile.node == 0 ? $"{placementProfile.rootShortName} {placementProfile.posMasterNo}" : "",
                             position = placementProfile.position,
                             positionLine = "",
                             positionPathSide = "",
@@ -5472,7 +5472,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlOrg);
                         var _res = await client.PostAsJsonAsync(apiUrlOrg, new
                         {
@@ -5626,7 +5626,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -5805,7 +5805,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -5986,7 +5986,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                         var _res = await client.PostAsJsonAsync(apiUrl, new
                         {
@@ -6001,7 +6001,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -6182,7 +6182,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                         var _res = await client.PostAsJsonAsync(apiUrl, new
                         {
@@ -6197,7 +6197,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -6371,7 +6371,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                         var _res = await client.PostAsJsonAsync(apiUrl, new
                         {
@@ -6452,7 +6452,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, _apiUrl);
                     var res = await client.PostAsJsonAsync(_apiUrl, new { result = dataSend });
                     var result = await res.Content.ReadAsStringAsync();
@@ -6549,7 +6549,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                         var _res = await client.PostAsJsonAsync(apiUrl, new
                         {
@@ -6630,7 +6630,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, _apiUrl);
                     var res = await client.PostAsJsonAsync(_apiUrl, new { result = dataSend });
                     var result = await res.Content.ReadAsStringAsync();
@@ -6719,7 +6719,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                     var res = await client.PostAsJsonAsync(apiUrl, new { result = data });
                     var result = await res.Content.ReadAsStringAsync();
@@ -6877,7 +6877,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -6887,11 +6887,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = data.posMasterNo == null ? "" :
-                                                            data.node == 4 ? $"{data.child4ShortName}{data.posMasterNo}" :
-                                                            data.node == 3 ? $"{data.child3ShortName}{data.posMasterNo}" :
-                                                            data.node == 2 ? $"{data.child2ShortName}{data.posMasterNo}" :
-                                                            data.node == 1 ? $"{data.child1ShortName}{data.posMasterNo}" :
-                                                            data.node == 0 ? $"{data.rootShortName}{data.posMasterNo}" : "",
+                                                            data.node == 4 ? $"{data.child4ShortName} {data.posMasterNo}" :
+                                                            data.node == 3 ? $"{data.child3ShortName} {data.posMasterNo}" :
+                                                            data.node == 2 ? $"{data.child2ShortName} {data.posMasterNo}" :
+                                                            data.node == 1 ? $"{data.child1ShortName} {data.posMasterNo}" :
+                                                            data.node == 0 ? $"{data.rootShortName} {data.posMasterNo}" : "",
                             position = data.position,
                             positionType = data.posTypeName,
                             positionLevel = data.posLevelName,
@@ -6906,7 +6906,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlOrg);
                         var _res = await client.PostAsJsonAsync(apiUrlOrg, new
                         {
@@ -7062,7 +7062,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Put, apiUrl);
                         var _res = await client.PutAsJsonAsync(apiUrl, new
                         {
@@ -7215,7 +7215,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -7225,11 +7225,11 @@ namespace BMA.EHR.Application.Repositories.Commands
                             positionSalaryAmount = recv.PositionSalaryAmount,
                             mouthSalaryAmount = recv.MouthSalaryAmount,
                             posNo = data.posMasterNo == null ? "" :
-                                                            data.node == 4 ? $"{data.child4ShortName}{data.posMasterNo}" :
-                                                            data.node == 3 ? $"{data.child3ShortName}{data.posMasterNo}" :
-                                                            data.node == 2 ? $"{data.child2ShortName}{data.posMasterNo}" :
-                                                            data.node == 1 ? $"{data.child1ShortName}{data.posMasterNo}" :
-                                                            data.node == 0 ? $"{data.rootShortName}{data.posMasterNo}" : "",
+                                                            data.node == 4 ? $"{data.child4ShortName} {data.posMasterNo}" :
+                                                            data.node == 3 ? $"{data.child3ShortName} {data.posMasterNo}" :
+                                                            data.node == 2 ? $"{data.child2ShortName} {data.posMasterNo}" :
+                                                            data.node == 1 ? $"{data.child1ShortName} {data.posMasterNo}" :
+                                                            data.node == 0 ? $"{data.rootShortName} {data.posMasterNo}" : "",
                             position = data.position,
                             positionType = data.posTypeName,
                             positionLevel = data.posLevelName,
@@ -7244,7 +7244,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlOrg);
                         var _res = await client.PostAsJsonAsync(apiUrlOrg, new
                         {
@@ -7385,7 +7385,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                     var res = await client.PostAsJsonAsync(apiUrl, new { result = data });
                     var result = await res.Content.ReadAsStringAsync();
@@ -7411,7 +7411,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl2);
                         var _res = await client.PostAsJsonAsync(apiUrl2, new
                         {
@@ -7544,7 +7544,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                     var res = await client.PostAsJsonAsync(apiUrl, new { result = data });
                     var result = await res.Content.ReadAsStringAsync();
@@ -7570,7 +7570,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl2);
                         var _res = await client.PostAsJsonAsync(apiUrl2, new
                         {
@@ -7704,7 +7704,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                     var res = await client.PostAsJsonAsync(apiUrl, new { result = data });
                     var result = await res.Content.ReadAsStringAsync();
@@ -7730,7 +7730,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl2);
                         var _res = await client.PostAsJsonAsync(apiUrl2, new
                         {
@@ -7864,7 +7864,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                     var res = await client.PostAsJsonAsync(apiUrl, new { result = data });
                     var result = await res.Content.ReadAsStringAsync();
@@ -7890,7 +7890,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl2);
                         var _res = await client.PostAsJsonAsync(apiUrl2, new
                         {
@@ -8024,7 +8024,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                     var res = await client.PostAsJsonAsync(apiUrl, new { result = data });
                     var result = await res.Content.ReadAsStringAsync();
@@ -8050,7 +8050,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl2);
                         var _res = await client.PostAsJsonAsync(apiUrl2, new
                         {
@@ -8184,7 +8184,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                     var res = await client.PostAsJsonAsync(apiUrl, new { result = data });
                     var result = await res.Content.ReadAsStringAsync();
@@ -8210,7 +8210,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl2);
                         var _res = await client.PostAsJsonAsync(apiUrl2, new
                         {
@@ -8344,7 +8344,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                     var res = await client.PostAsJsonAsync(apiUrl, new { result = data });
                     var result = await res.Content.ReadAsStringAsync();
@@ -8370,7 +8370,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl2);
                         var _res = await client.PostAsJsonAsync(apiUrl2, new
                         {
@@ -8504,7 +8504,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                     var res = await client.PostAsJsonAsync(apiUrl, new { result = data });
                     var result = await res.Content.ReadAsStringAsync();
@@ -8530,7 +8530,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl2);
                         var _res = await client.PostAsJsonAsync(apiUrl2, new
                         {
@@ -8663,7 +8663,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                     var res = await client.PostAsJsonAsync(apiUrl, new { result = data });
                     var result = await res.Content.ReadAsStringAsync();
@@ -8806,7 +8806,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                     var res = await client.PostAsJsonAsync(apiUrl, new { result = data });
                     var result = await res.Content.ReadAsStringAsync();
@@ -8949,7 +8949,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                     var res = await client.PostAsJsonAsync(apiUrl, new { result = data });
                     var result = await res.Content.ReadAsStringAsync();
@@ -9091,7 +9091,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                     var res = await client.PostAsJsonAsync(apiUrl, new { result = data });
                     var result = await res.Content.ReadAsStringAsync();
@@ -9234,7 +9234,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                     var res = await client.PostAsJsonAsync(apiUrl, new { result = data });
                     var result = await res.Content.ReadAsStringAsync();
@@ -9612,7 +9612,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrl);
                         string? _null = null;
                         var _res = await client.PostAsJsonAsync(apiUrl, new
@@ -9628,7 +9628,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                         var _req = new HttpRequestMessage(HttpMethod.Post, apiUrlSalary);
                         var _res = await client.PostAsJsonAsync(apiUrlSalary, new
                         {
@@ -11388,7 +11388,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                         using (var client = new HttpClient())
                         {
                             client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                            client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                             foreach (var insignia in Insignias)
                             {
                                 var _res = await client.PostAsJsonAsync(apiUrlInsig, new

BMA.EHR.Application/Repositories/DisciplineRepository.cs

@@ -49,7 +49,7 @@ namespace BMA.EHR.Application.Repositories
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var _res = await client.PostAsJsonAsync(apiUrlOrg, new
                     {
                         refId = cronjobNoti.DisciplineComplaint_Profiles.Select(x => x.PersonId),
@@ -91,7 +91,7 @@ namespace BMA.EHR.Application.Repositories
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var _res = await client.PostAsJsonAsync(apiUrlOrg, new
                     {
                         refId = cronjobNoti.DisciplineInvestigate_ProfileComplaints.Select(x => x.PersonId),
@@ -132,7 +132,7 @@ namespace BMA.EHR.Application.Repositories
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var _res = await client.PostAsJsonAsync(apiUrlOrg, new
                     {
                         refId = cronjobNoti.DisciplineDisciplinary_ProfileComplaintInvestigates.Select(x => x.PersonId),

BMA.EHR.Application/Repositories/GenericRepository.cs

@@ -1,15 +1,16 @@
-using Amazon.S3.Model.Internal.MarshallTransformations;
+using Amazon.Runtime.Internal.Endpoints.StandardLibrary;
+using Amazon.S3.Model.Internal.MarshallTransformations;
 using BMA.EHR.Application.Common.Interfaces;
 using BMA.EHR.Domain.Models.Base;
 using BMA.EHR.Domain.Models.HR;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
-using Newtonsoft.Json.Linq;
+using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System.Net.Http.Headers;
 using System.Security.Claims;
 using System.Text;
-using Microsoft.Extensions.Configuration;
 
 namespace BMA.EHR.Application.Repositories
 {
@@ -52,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);
+                    client.DefaultRequestHeaders.Add("api-key", apiKey);
+                    var _res = await client.GetAsync(apiPath,cancellationToken: combinedCts.Token);
                     if (_res.IsSuccessStatusCode)
                     {
                         var _result = await _res.Content.ReadAsStringAsync();
@@ -76,19 +80,25 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
-        protected async Task<string> PostExternalAPIAsync(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);
+
+
                 var json = JsonConvert.SerializeObject(body);
-                var stringContent = new StringContent(json, UnicodeEncoding.UTF8, "application/json");
-                stringContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+                request.Content = new StringContent(json, Encoding.UTF8, "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);
+                    client.DefaultRequestHeaders.Add("api-key", apiKey);
+                    var _res = await client.SendAsync(request, combinedCts.Token);
                     if (_res.IsSuccessStatusCode)
                     {
                         var _result = await _res.Content.ReadAsStringAsync();
@@ -104,10 +114,45 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
-        protected async Task<bool> PostExternalAPIBooleanAsync(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");
+
+                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;
+            }
+        }
+
+        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");
@@ -115,8 +160,8 @@ namespace BMA.EHR.Application.Repositories
                 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);
+                    client.DefaultRequestHeaders.Add("api-key", apiKey);
+                    var _res = await client.PostAsync(apiPath, stringContent, combinedCts.Token);
                     return _res.IsSuccessStatusCode;
                 }
             }

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)

BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveBeginingRepository.cs

@@ -0,0 +1,587 @@
+using Amazon.S3.Model;
+using BMA.EHR.Application.Common.Interfaces;
+using BMA.EHR.Application.Messaging;
+using BMA.EHR.Application.Responses.Profiles;
+using BMA.EHR.Domain.Extensions;
+using BMA.EHR.Domain.Models.Leave.Commons;
+using BMA.EHR.Domain.Models.Leave.Requests;
+using BMA.EHR.Domain.Shared;
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using System.Collections.Concurrent;
+
+namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
+{
+    public class LeaveBeginningRepository : GenericLeaveRepository<Guid, LeaveBeginning>
+    {
+        #region " Fields "
+
+        private readonly ILeaveDbContext _dbContext;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly OrganizationCommonRepository _organizationCommonRepository;
+        private readonly UserProfileRepository _userProfileRepository;
+        private readonly IConfiguration _configuration;
+        private readonly EmailSenderService _emailSenderService;
+
+        /// <summary>
+        /// Keyed locks to serialize get-or-create for LeaveBeginning rows by (ProfileId, LeaveYear, LeaveTypeId).
+        /// Prevents duplicate inserts when concurrent requests (e.g. UI calling /user/check twice) hit the same key.
+        /// </summary>
+        private static readonly ConcurrentDictionary<string, SemaphoreSlim> _getOrAddLocks = new();
+
+        #endregion
+
+        #region " Constructor and Destuctor "
+
+        public LeaveBeginningRepository(ILeaveDbContext dbContext,
+                                   IHttpContextAccessor httpContextAccessor,
+                                   OrganizationCommonRepository organizationCommonRepository,
+                                   UserProfileRepository userProfileRepository,
+                                   IConfiguration configuration,
+                                   EmailSenderService emailSenderService) : base(dbContext, httpContextAccessor)
+        {
+            _dbContext = dbContext;
+            _httpContextAccessor = httpContextAccessor;
+            _organizationCommonRepository = organizationCommonRepository;
+            _userProfileRepository = userProfileRepository;
+            _configuration = configuration;
+            _emailSenderService = emailSenderService;
+        }
+
+        #endregion
+
+        #region " Properties "
+
+        protected Guid UserOrganizationId
+        {
+            get
+            {
+                if (UserId != null || UserId != "")
+                    return _userProfileRepository.GetUserOCId(Guid.Parse(UserId!), AccessToken);
+                else
+                    return Guid.Empty;
+            }
+        }
+
+        #endregion
+
+        public async Task<List<LeaveBeginning>> GetAllByYearAsync(int year)
+        {
+            return await _dbContext.Set<LeaveBeginning>()
+                .Include(x => x.LeaveType)
+                .Where(x => x.LeaveYear == year)
+                .ToListAsync();
+        }
+
+        public async Task<LeaveBeginning?> GetByYearAndTypeIdAsync(int year, Guid typeId)
+        {
+            var data = await _dbContext.Set<LeaveBeginning>()
+                .Include(x => x.LeaveType)
+                .FirstOrDefaultAsync(x => x.LeaveYear == year && x.LeaveTypeId == typeId);
+
+
+            return data;
+        }
+
+        public async Task UpdateLeaveUsageAsync(int year, Guid typeId, Guid userId, double day)
+        {
+            // 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.LeaveDaysUsed += day;
+
+            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 ProcessEarlyLeaveRequest(int year)
+        {
+            // Get Early Leave Request (กรองตามปีงบประมาณ: 1 ต.ค. (year-1) – 30 ก.ย. (year))
+            var fiscalStart = new DateTime(year - 1, 10, 1);
+            var fiscalEnd = new DateTime(year, 9, 30);
+
+            var leaveReq = await _dbContext.Set<LeaveRequest>()
+                .Include(x => x.Type)
+                .Where(x => x.LeaveStatus == "APPROVE")
+                .Where(x => x.LeaveStartDate.Date <= fiscalEnd && x.LeaveEndDate.Date >= fiscalStart)
+                .ToListAsync();
+
+            foreach (var leave in leaveReq)
+            {
+                await GetByYearAndTypeIdForUserWithUpdateAsync(year, leave.Type.Id, leave.KeycloakUserId);
+            }
+        }
+        
+        public async Task ProcessEarlyLeaveRequestSchedule()
+        {
+            int year = DateTime.Now.Year;
+            await ProcessEarlyLeaveRequest(year);
+        }
+
+        public async Task<LeaveBeginning?> GetByYearAndTypeIdForUserAsync(int year, Guid typeId, Guid userId)
+        {
+            // var pf = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var pf = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
+            if (pf == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+
+            var govAge = (pf?.DateStart?.Date ?? DateTime.Now.Date).DiffDay(DateTime.Now.Date);
+
+            var leaveType = await _dbContext.Set<LeaveType>().FirstOrDefaultAsync(x => x.Id == typeId);
+
+            LeaveBeginning Factory()
+            {
+                var limit = 0.0;
+
+                var prev = _dbContext.Set<LeaveBeginning>()
+                    .Include(x => x.LeaveType)
+                    .FirstOrDefault(x => x.LeaveYear == year - 1 && x.LeaveTypeId == typeId && x.ProfileId == pf.Id);
+                
+                // คำนวณปีงบประมาณจาก startDate (ปีงบประมาณเริ่ม 1 ต.ค. และสิ้นสุด 30 ก.ย.)
+                var isCurrentYear = DateTime.Now.Year == year;
+                
+
+                var prevRemain = 0.0;
+                if (prev != null)
+                {
+                    prevRemain = isCurrentYear ? prev.LeaveDays - (prev.LeaveDaysUsed ?? 0.0) : 0.0;
+                }
+
+                if (govAge >= 180)
+                {
+                    if (govAge >= 3650)
+                    {
+                        limit = 10 + prevRemain;
+                        if (limit > 30) limit = 30;
+                    }
+                    else
+                    {
+                        limit = 10 + prevRemain;
+                        if (limit > 20) limit = 20;
+                    }
+                }
+                else
+                {
+                    limit = 0.0;
+                }
+
+                return new LeaveBeginning
+                {
+                    LeaveYear = year,
+                    LeaveTypeId = typeId,
+                    ProfileId = pf.Id,
+                    Prefix = pf.Prefix,
+                    FirstName = pf.FirstName,
+                    LastName = pf.LastName,
+                    LeaveDaysUsed = 0,
+                    LeaveDays = leaveType?.Code == "LV-005" ? limit : 0,
+                    RootDnaId = pf.RootDnaId,
+                    Child1DnaId = pf.Child1DnaId,
+                    Child2DnaId = pf.Child2DnaId,
+                    Child3DnaId = pf.Child3DnaId,
+                    Child4DnaId = pf.Child4DnaId
+                };
+            }
+
+            return await GetOrAddForUserAsync(year, typeId, pf.Id, Factory);
+        }
+
+        public async Task<LeaveBeginning?> GetByYearAndTypeIdForUserWithUpdateAsync(int year, Guid typeId, Guid userId)
+        {
+            // var pf = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var pf = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
+            if (pf == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+
+            var govAge = (pf?.DateStart?.Date ?? DateTime.Now.Date).DiffDay(DateTime.Now.Date);
+
+            var leaveType = await _dbContext.Set<LeaveType>().FirstOrDefaultAsync(x => x.Id == typeId);
+
+
+            var limit = 0.0;
+
+            var prev = _dbContext.Set<LeaveBeginning>()
+                .Include(x => x.LeaveType)
+                .FirstOrDefault(x => x.LeaveYear == year - 1 && x.LeaveTypeId == typeId && x.ProfileId == pf.Id);
+
+            var prevRemain = 0.0;
+            
+            
+            
+            if (prev != null)
+            {
+                prevRemain = prev.LeaveDays - (prev.LeaveDaysUsed ?? 0.0);
+            }
+
+            if (govAge >= 180)
+            {
+                if (govAge >= 3650)
+                {
+                    limit = 10 + prevRemain;
+                    if (limit > 30) limit = 30;
+                }
+                else
+                {
+                    limit = 10 + prevRemain;
+                    if (limit > 20) limit = 20;
+                }
+            }
+            else
+            {
+                limit = 0.0;
+            }
+
+            var data = await _dbContext.Set<LeaveBeginning>()
+                .Where(x => x.LeaveYear == year && x.LeaveTypeId == typeId && x.ProfileId == pf.Id)
+                .FirstOrDefaultAsync();
+
+            if (data != null)
+            {
+                data.LeaveDays = leaveType?.Code == "LV-005" ? limit : 0;
+                await _dbContext.SaveChangesAsync();
+            }
+
+            // return new LeaveBeginning
+            // {
+            //     LeaveYear = year,
+            //     LeaveTypeId = typeId,
+            //     ProfileId = pf.Id,
+            //     Prefix = pf.Prefix,
+            //     FirstName = pf.FirstName,
+            //     LastName = pf.LastName,
+            //     LeaveDaysUsed = 0,
+            //     LeaveDays = leaveType?.Code == "LV-005" ? limit : 0,
+            //     RootDnaId = pf.RootDnaId,
+            //     Child1DnaId = pf.Child1DnaId,
+            //     Child2DnaId = pf.Child2DnaId,
+            //     Child3DnaId = pf.Child3DnaId,
+            //     Child4DnaId = pf.Child4DnaId
+            // };
+            return data;
+
+        }
+    
+        
+        public async Task<LeaveBeginning?> GetByYearAndTypeIdForUser(int year, Guid typeId, GetProfileByKeycloakIdDto? pf)
+        {
+            var govAge = (pf?.DateStart?.Date ?? DateTime.Now.Date).DiffDay(DateTime.Now.Date);
+
+            var leaveType = await _dbContext.Set<LeaveType>().FirstOrDefaultAsync(x => x.Id == typeId);
+
+            LeaveBeginning Factory()
+            {
+                var limit = 0.0;
+
+                var prev = _dbContext.Set<LeaveBeginning>()
+                    .Include(x => x.LeaveType)
+                    .FirstOrDefault(x => x.LeaveYear == year - 1 && x.LeaveTypeId == typeId && x.ProfileId == pf.Id);
+                
+                // คำนวณปีงบประมาณจาก startDate (ปีงบประมาณเริ่ม 1 ต.ค. และสิ้นสุด 30 ก.ย.)
+                var isCurrentYear = DateTime.Now.Year == year;
+
+                var prevRemain = 0.0;
+                if (prev != null)
+                {
+                    prevRemain = isCurrentYear ? prev.LeaveDays - (prev.LeaveDaysUsed ?? 0.0) : 0.0;
+                }
+
+                if (govAge >= 180)
+                {
+                    if (govAge >= 3650)
+                    {
+                        limit = 10 + prevRemain;
+                        if (limit > 30) limit = 30;
+                    }
+                    else
+                    {
+                        limit = 10 + prevRemain;
+                        if (limit > 20) limit = 20;
+                    }
+                }
+                else
+                {
+                    limit = 0.0;
+                }
+
+                return new LeaveBeginning
+                {
+                    LeaveYear = year,
+                    LeaveTypeId = typeId,
+                    ProfileId = pf.Id,
+                    Prefix = pf.Prefix,
+                    FirstName = pf.FirstName,
+                    LastName = pf.LastName,
+                    LeaveDaysUsed = 0,
+                    LeaveDays = leaveType?.Code == "LV-005" ? limit : 0,
+                    RootDnaId = pf.RootDnaId,
+                    Child1DnaId = pf.Child1DnaId,
+                    Child2DnaId = pf.Child2DnaId,
+                    Child3DnaId = pf.Child3DnaId,
+                    Child4DnaId = pf.Child4DnaId
+                };
+            }
+
+            return await GetOrAddForUserAsync(year, typeId, pf.Id, Factory);
+        }
+
+        public async Task<LeaveBeginning?> GetByYearAndTypeIdForUser2Async(int year, Guid typeId, Guid userId)
+        {
+            // var pf = await _userProfileRepository.GetProfileByKeycloakIdAsync(userId, AccessToken);
+            var pf = await _userProfileRepository.GetProfileByKeycloakIdNew2Async(userId, AccessToken);
+            if (pf == null)
+            {
+                return null;
+            }
+
+            var govAge = (pf?.DateStart?.Date ?? DateTime.Now.Date).DiffDay(DateTime.Now.Date);
+
+            var leaveType = await _dbContext.Set<LeaveType>().FirstOrDefaultAsync(x => x.Id == typeId);
+
+            LeaveBeginning Factory()
+            {
+                var limit = 0.0;
+
+                var prev = _dbContext.Set<LeaveBeginning>()
+                    .Include(x => x.LeaveType)
+                    .FirstOrDefault(x => x.LeaveYear == year - 1 && x.LeaveTypeId == typeId && x.ProfileId == pf.Id);
+                
+                // คำนวณปีงบประมาณจาก startDate (ปีงบประมาณเริ่ม 1 ต.ค. และสิ้นสุด 30 ก.ย.)
+                var isCurrentYear = DateTime.Now.Year == year;
+
+                var prevRemain = 0.0;
+                if (prev != null)
+                {
+                    prevRemain = isCurrentYear ? prev.LeaveDays - (prev.LeaveDaysUsed ?? 0.0) : 0.0;
+                }
+
+                if (govAge >= 180)
+                {
+                    if (govAge >= 3650)
+                    {
+                        limit = 10 + prevRemain;
+                        if (limit > 30) limit = 30;
+                    }
+                    else
+                    {
+                        limit = 10 + prevRemain;
+                        if (limit > 20) limit = 20;
+                    }
+                }
+                else
+                {
+                    limit = 0.0;
+                }
+
+                return new LeaveBeginning
+                {
+                    LeaveYear = year,
+                    LeaveTypeId = typeId,
+                    ProfileId = pf.Id,
+                    Prefix = pf.Prefix,
+                    FirstName = pf.FirstName,
+                    LastName = pf.LastName,
+                    LeaveDaysUsed = 0,
+                    LeaveDays = leaveType?.Code == "LV-005" ? limit : 0,
+                    RootDnaId = pf.RootDnaId,
+                    Child1DnaId = pf.Child1DnaId,
+                    Child2DnaId = pf.Child2DnaId,
+                    Child3DnaId = pf.Child3DnaId,
+                    Child4DnaId = pf.Child4DnaId
+                };
+            }
+
+            return await GetOrAddForUserAsync(year, typeId, pf.Id, Factory);
+        }
+
+        /// <summary>
+        /// Get-or-create a LeaveBeginning row for (ProfileId, LeaveYear, LeaveTypeId) with concurrency protection.
+        /// Uses a keyed SemaphoreSlim to serialize within-process requests, and re-queries after acquiring the lock.
+        /// If a cross-process insert wins (unique index violation), the duplicate key exception is caught and the row
+        /// created by the winner is returned.
+        /// </summary>
+        private async Task<LeaveBeginning?> GetOrAddForUserAsync(int year, Guid typeId, Guid profileId, Func<LeaveBeginning> factory)
+        {
+            var key = $"{profileId}_{year}_{typeId}";
+            var semaphore = _getOrAddLocks.GetOrAdd(key, _ => new SemaphoreSlim(1, 1));
+            await semaphore.WaitAsync();
+            try
+            {
+                // Re-query inside the lock — another thread may have created it while we waited.
+                var existing = await _dbContext.Set<LeaveBeginning>()
+                    .Include(x => x.LeaveType)
+                    .FirstOrDefaultAsync(x => x.LeaveYear == year && x.LeaveTypeId == typeId && x.ProfileId == profileId);
+                if (existing != null)
+                {
+                    return existing;
+                }
+
+                var entity = factory();
+                _dbContext.Set<LeaveBeginning>().Add(entity);
+                try
+                {
+                    await _dbContext.SaveChangesAsync();
+                    return entity;
+                }
+                catch (DbUpdateException)
+                {
+                    // Cross-process/cross-server race hit the unique index (IX_LeaveBeginnings_ProfileId_LeaveYear_LeaveTypeId).
+                    // Detach the failed insert and return the row created by the winner.
+                    _dbContext.Detach(entity);
+                    var winner = await _dbContext.Set<LeaveBeginning>()
+                        .Include(x => x.LeaveType)
+                        .FirstOrDefaultAsync(x => x.LeaveYear == year && x.LeaveTypeId == typeId && x.ProfileId == profileId);
+                    return winner;
+                }
+            }
+            finally
+            {
+                semaphore.Release();
+            }
+        }
+
+        public async Task<List<LeaveBeginning>> GetAllByYearAndTypeAsync(int year, Guid typeId, List<ProfileData> userIdList)
+        {
+
+            var updateList = new List<LeaveBeginning>();
+            var result = new List<LeaveBeginning>();
+
+            var beginningList = await _dbContext.Set<LeaveBeginning>()
+                .Include(x => x.LeaveType)
+                .Where(x => x.LeaveYear == year && x.LeaveTypeId == typeId)
+                .ToListAsync();
+
+            foreach (var pf in userIdList)
+            {
+                //var pf = await _userProfileRepository.GetProfileByKeycloakIdAsync(id, AccessToken);
+                //if (pf == null)
+                //{
+                //    continue; // Goto Next Id
+                //}
+
+                var profile = await _userProfileRepository.GetProfileByProfileIdAsync(pf.Id, AccessToken);
+                if (profile == null)
+                {
+                    return null;
+                }
+
+                var govAge = (pf?.DateStart?.Date ?? DateTime.Now.Date).DiffDay(DateTime.Now.Date);
+
+                var leaveType = await _dbContext.Set<LeaveType>().FirstOrDefaultAsync(x => x.Id == typeId);
+
+                var data = beginningList.FirstOrDefault(x => x.ProfileId == pf.Id);
+
+                if (data == null)
+                {
+                    var limit = 0.0;
+
+                    var prev = await _dbContext.Set<LeaveBeginning>()
+                        .Include(x => x.LeaveType)
+                        .FirstOrDefaultAsync(x => x.LeaveYear == year - 1 && x.LeaveTypeId == typeId && x.ProfileId == pf.Id);
+
+                    var prevRemain = 0.0;
+                    if (prev != null)
+                    {
+                        prevRemain = prev.LeaveDays - (prev.LeaveDaysUsed ?? 0.0);
+                    }
+
+                    if (govAge >= 180)
+                    {
+                        if (govAge >= 3650)
+                        {
+                            limit = 10 + prevRemain;
+                            if (limit > 30) limit = 30;
+                        }
+                        else
+                        {
+                            limit = 10 + prevRemain;
+                            if (limit > 20) limit = 20;
+                        }
+                    }
+                    else
+                    {
+                        limit = 0.0;
+                    }
+
+                    data = new LeaveBeginning
+                    {
+                        LeaveYear = year,
+                        LeaveTypeId = typeId,
+                        ProfileId = pf.Id,
+                        Prefix = pf.Prefix,
+                        FirstName = pf.FirstName,
+                        LastName = pf.LastName,
+                        LeaveDaysUsed = 0,
+                        LeaveDays = leaveType?.Code == "LV-005" ? limit : 0,
+                        RootDnaId = profile.RootDnaId,
+                        Child1DnaId = profile.Child1DnaId,
+                        Child2DnaId = profile.Child2DnaId,
+                        Child3DnaId = profile.Child3DnaId,
+                        Child4DnaId = profile.Child4DnaId
+                    };
+
+                    updateList.Add(data);
+                }
+                result.Add(data);
+            }
+            if (!updateList.Any())
+            {
+                await _dbContext.Set<LeaveBeginning>().AddRangeAsync(updateList);
+                await _dbContext.SaveChangesAsync();
+            }
+            return result;
+        }
+    }
+
+    public class ProfileData
+    {
+        public Guid Id { get; set; } = Guid.Empty;
+
+        public string Prefix { get; set; } = string.Empty;
+
+        public string FirstName { get; set; } = string.Empty;
+
+        public string LastName { get; set; } = string.Empty;
+
+        public DateTime? DateStart { get; set; } = null;
+
+        public DateTime? DateAppoint { get; set; } = null;
+    }
+}

BMA.EHR.Application/Repositories/Leaves/TimeAttendants/AdditionalCheckRequestRepository.cs

@@ -9,6 +9,8 @@ using BMA.EHR.Domain.Shared;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
+using Serilog;
+using System.Diagnostics;
 
 namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
 {
@@ -72,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
@@ -142,6 +145,147 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
             }
         }
 
+        public async Task<List<AdditionalCheckRequest>> GetAdditionalCheckRequestsByAdminRole(int year, int month, string role, string nodeId, int? node, string? keyword)
+        {
+            try
+            {
+                var data = await _dbContext.Set<AdditionalCheckRequest>().AsQueryable()
+                                    .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;
+                }
+                if (role == "OWNER" || role == "CHILD")
+                {
+                    data = data
+                        .Where(x => node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) : (node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) : (node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) : (node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) : (node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) : (node == null ? true : true))))))
+                        .ToList();
+                }
+                else if (role == "BROTHER")
+                {
+                    data = data
+                        .Where(x => node == 4 ? x.Child3DnaId == Guid.Parse(nodeId!) : (node == 3 ? x.Child2DnaId == Guid.Parse(nodeId!) : (node == 2 ? x.Child1DnaId == Guid.Parse(nodeId!) : (node == 1 || node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) : (node == null ? true : true)))))
+                        .ToList();
+                }
+                else if (role == "ROOT")
+                {
+                    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 == "NORMAL")
+                {
+                    data = data.Where(x =>
+                        node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) &&
+                                   (x.Child1DnaId == Guid.Empty || x.Child1DnaId == null) :
+                        node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) &&
+                                   (x.Child2DnaId == Guid.Empty || x.Child2DnaId == null) :
+                        node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) &&
+                                   (x.Child3DnaId == Guid.Empty || x.Child3DnaId == null) :
+                        node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) &&
+                                   (x.Child4DnaId == Guid.Empty || x.Child4DnaId == null) :
+                        node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) :
+                        true
+                    ).ToList();
+                }
+                return data;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        public async Task<List<AdditionalCheckRequest>> GetAdditionalCheckRequestsByAdminRole2(DateTime startDate, DateTime endDate, string role, string nodeId, int? node, string? keyword, string? status)
+        {
+            try
+            {
+                var data = await _dbContext.Set<AdditionalCheckRequest>().AsQueryable()
+                                    .Where(x => (x.CheckDate.Date >= startDate.Date && x.CheckDate.Date <= endDate.Date))
+                                    .OrderByDescending(x => x.CreatedAt.Date)
+                                    .ToListAsync();
+                
+                if(!string.IsNullOrEmpty(status))
+                    data = data.Where(x => x.Status == status).ToList();
+                
+
+                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;
+                }
+                if (role == "OWNER" || role == "CHILD")
+                {
+                    data = data
+                        .Where(x => node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) : (node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) : (node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) : (node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) : (node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) : (node == null ? true : true))))))
+                        .ToList();
+                }
+                else if (role == "BROTHER")
+                {
+                    data = data
+                        .Where(x => node == 4 ? x.Child3DnaId == Guid.Parse(nodeId!) : (node == 3 ? x.Child2DnaId == Guid.Parse(nodeId!) : (node == 2 ? x.Child1DnaId == Guid.Parse(nodeId!) : (node == 1 || node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) : (node == null ? true : true)))))
+                        .ToList();
+                }
+                else if (role == "ROOT")
+                {
+                    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 == "NORMAL")
+                {
+                    data = data.Where(x =>
+                        node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) &&
+                                   (x.Child1DnaId == Guid.Empty || x.Child1DnaId == null) :
+                        node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) &&
+                                   (x.Child2DnaId == Guid.Empty || x.Child2DnaId == null) :
+                        node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) &&
+                                   (x.Child3DnaId == Guid.Empty || x.Child3DnaId == null) :
+                        node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) &&
+                                   (x.Child4DnaId == Guid.Empty || x.Child4DnaId == null) :
+                        node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) :
+                        true
+                    ).ToList();
+                }
+                return data;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        
         #endregion
     }
 }

BMA.EHR.Application/Repositories/Leaves/TimeAttendants/CheckInJobStatusRepository.cs

@@ -0,0 +1,191 @@
+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>
+        /// ดึงข้อมูลงานที่ค้างอยู่ในสถานะ PENDING หรือ PROCESSING เกินเวลาที่กำหนด (นาที)
+        /// </summary>
+        public async Task<List<CheckInJobStatus>> GetStalePendingOrProcessingJobsAsync(int timeoutMinutes = 30)
+        {
+            //var cutoffDate = DateTime.Now.AddMinutes(-timeoutMinutes);
+            var cutoffDate = DateTime.Now.AddMinutes(-timeoutMinutes);
+            var staleJobs = await _dbContext.Set<CheckInJobStatus>()
+                                .Where(x => (x.Status == "PENDING" || x.Status == "PROCESSING")
+                                       && x.CreatedDate <= cutoffDate)
+                                .OrderBy(x => x.CreatedDate)
+                                .ToListAsync();
+
+            return staleJobs;
+        }
+
+        /// <summary>
+        /// ดึงข้อมูลงานที่ค้างอยู่ในสถานะ PENDING หรือ PROCESSING เกินเวลาที่กำหนด (นาที) ของ user คนใดคนหนึ่ง
+        /// </summary>
+        public async Task<List<CheckInJobStatus>> GetStalePendingOrProcessingJobsByUserAsync(Guid userId, int timeoutMinutes = 30)
+        {
+            var cutoffDate = DateTime.Now.AddMinutes(-timeoutMinutes);
+            //var cutoffDate = new DateTime(2026, 5, 28, 23, 59, 59);
+            var staleJobs = await _dbContext.Set<CheckInJobStatus>()
+                                .Where(x => x.KeycloakUserId == userId
+                                       && (x.Status == "PENDING" || x.Status == "PROCESSING")
+                                       && x.CreatedDate < cutoffDate)
+                                .OrderBy(x => x.CreatedDate)
+                                .ToListAsync();
+
+            return staleJobs;
+        }
+
+        /// <summary>
+        /// Mark งานที่ค้างเกินเวลาที่กำหนดเป็น FAILED
+        /// </summary>
+        public async Task<int> MarkStaleJobsAsFailedAsync(int timeoutMinutes = 30)
+        {
+            var staleJobs = await GetStalePendingOrProcessingJobsAsync(timeoutMinutes);
+
+            foreach (var job in staleJobs)
+            {
+                job.Status = "FAILED";
+                job.CompletedDate = DateTime.Now;
+                job.ErrorMessage = $"งานค้างในสถานะ {job.Status} เกิน {timeoutMinutes} นาที ระบบทำเครื่องหมายเป็น FAILED อัตโนมัติ";
+            }
+
+            if (staleJobs.Any())
+            {
+                _dbContext.Set<CheckInJobStatus>().UpdateRange(staleJobs);
+                await _dbContext.SaveChangesAsync();
+            }
+
+            return staleJobs.Count;
+        }
+
+        /// <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
+    }
+}

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

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; }
+    }
+
+}

BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs

@@ -139,26 +139,64 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
             return data;
         }
 
-        public async Task<List<ProcessUserTimeStamp>> GetTimestampByDateLateAsync(string type, string role, string nodeId, int node)
+        public async Task<List<ProcessUserTimeStamp>> GetTimestampByDateLateAsync(string type, string role, string nodeId, int? node, string nodeIdByReq, int? nodeByReq, DateTime StartDate, DateTime EndDate)
         {
-            var _nodeId = Guid.Parse(nodeId);
             var data = new List<ProcessUserTimeStamp>();
-            if (role == "OWNER" || role == "CHILD")
+            data = await _dbContext.Set<ProcessUserTimeStamp>().AsQueryable()
+                        .Where(x => x.CheckInStatus == "LATE")
+                        .Where(u => u.CheckIn.Date >= StartDate && u.CheckIn.Date <= EndDate)
+                        .Where(x => x.ProfileType == type.Trim().ToUpper()).ToListAsync();
+            // กรองตามสิทธิ์ admin ก่อน
+            if (role == "CHILD")
             {
-                data = await _dbContext.Set<ProcessUserTimeStamp>().AsQueryable()
-                                .Where(x => x.CheckInStatus == "LATE")
-                                .Where(x => x.ProfileType == type.Trim().ToUpper())
-                                .Where(x => node == 4 ? x.Child4Id == _nodeId : (node == 3 ? x.Child3Id == _nodeId : (node == 2 ? x.Child2Id == _nodeId : (node == 1 ? x.Child1Id == _nodeId : (node == 0 ? x.RootId == _nodeId : true)))))
-                                .ToListAsync();
+                data = data.Where(x =>
+                    node == 4 ? x.Child4DnaId == Guid.Parse(nodeId) :
+                    node == 3 ? x.Child3DnaId == Guid.Parse(nodeId) :
+                    node == 2 ? x.Child2DnaId == Guid.Parse(nodeId) :
+                    node == 1 ? x.Child1DnaId == Guid.Parse(nodeId) :
+                    node == 0 ? x.RootDnaId == Guid.Parse(nodeId) :
+                    node == null ? true : true
+                ).ToList();
             }
-            else
+            else if (role == "BROTHER")
             {
-                data = await _dbContext.Set<ProcessUserTimeStamp>().AsQueryable()
-                                .Where(x => x.CheckInStatus == "LATE")
-                                .Where(x => x.ProfileType == type.Trim().ToUpper())
-                                .Where(x => node == 4 ? x.Child4Id == _nodeId : (node == 3 ? x.Child3Id == _nodeId : (node == 2 ? x.Child2Id == _nodeId : (node == 1 ? x.Child1Id == _nodeId : (node == 0 ? x.RootId == _nodeId : true)))))
-                                .Where(x => node == 0 ? x.Child1Id == null : (node == 1 ? x.Child2Id == null : (node == 2 ? x.Child3Id == null : (node == 3 ? x.Child4Id == null : true))))
-                                .ToListAsync();
+                data = data.Where(x =>
+                    node == 4 ? x.Child3DnaId == Guid.Parse(nodeId) :
+                    node == 3 ? x.Child2DnaId == Guid.Parse(nodeId) :
+                    node == 2 ? x.Child1DnaId == Guid.Parse(nodeId) :
+                    node == 1 || node == 0 ? x.RootDnaId == Guid.Parse(nodeId) :
+                    node == null ? true : true
+                ).ToList();
+            }
+            else if (role == "ROOT")
+            {
+                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 == "NORMAL")
+            {
+                data = data.Where(x =>
+                    node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId == null :
+                    node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) && x.Child2DnaId == null :
+                    node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) && x.Child3DnaId == null :
+                    node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) && x.Child4DnaId == null :
+                    node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) :
+                    true
+                ).ToList();
+            }
+            // กรองตามที่ fe ส่งมา
+            if (role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "BROTHER" || role == "PARENT")
+            {
+                data = data.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();
             }
             return data;
         }
@@ -175,9 +213,12 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
 
         public async Task<List<ProcessUserTimeStamp>> GetTimeStampHistoryAsync(Guid keycloakId, int year, int page = 1, int pageSize = 10, string keyword = "")
         {
+            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.Year == year)
+                                .Where(u => u.CheckIn.Date >= fiscalDateStart && u.CheckIn.Date <= fiscalDateEnd)
                                 .OrderByDescending(u => u.CheckIn.Date)
                                 .Skip((page - 1) * pageSize)
                                 .Take(pageSize)
@@ -186,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>()
@@ -218,6 +272,55 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
             return data;
         }
 
+        public async Task<List<ProcessUserTimeStamp>> GetTimeStampHistoryForAdminRoleAsync(DateTime startDate, DateTime endDate, string role, string nodeId, int? node)
+        {
+            var data = await _dbContext.Set<ProcessUserTimeStamp>()
+                                .Where(u => u.CheckIn.Date >= startDate.Date && u.CheckIn.Date <= endDate.Date)
+                                .OrderBy(u => u.CheckIn)
+
+                                .ToListAsync();
+            if (role == "OWNER")
+            {
+                node = null;
+            }
+            if (role == "OWNER" || role == "CHILD")
+            {
+                data = data
+                    .Where(x => node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) : (node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) : (node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) : (node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) : (node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) : (node == null ? true : true))))))
+                    .ToList();
+            }
+            else if (role == "BROTHER")
+            {
+                data = data
+                    .Where(x => node == 4 ? x.Child3DnaId == Guid.Parse(nodeId!) : (node == 3 ? x.Child2DnaId == Guid.Parse(nodeId!) : (node == 2 ? x.Child1DnaId == Guid.Parse(nodeId!) : (node == 1 || node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) : (node == null ? true : true)))))
+                    .ToList();
+            }
+            else if (role == "ROOT")
+            {
+                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 == "NORMAL")
+            {
+                data = data.Where(x =>
+                    node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId == null :
+                    node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) && x.Child2DnaId == null :
+                    node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) && x.Child3DnaId == null :
+                    node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) && x.Child4DnaId == null :
+                    node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) :
+                    true
+                ).ToList();
+            }
+            return data;
+        }
+
         public async Task<ProcessUserTimeStamp?> GetTimeStampById(Guid id)
         {
             var data = await _dbContext.Set<ProcessUserTimeStamp>()

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;
         }

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;
         }
@@ -90,7 +94,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
                                 .Where(u => u.KeycloakUserId == keycloakId)
                                 .Where(u => u.CheckIn.Year == year)
                                 .OrderBy(u => u.CheckIn)
-                               
+
                                 .ToListAsync();
 
             return data;
@@ -101,12 +105,61 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
             var data = await _dbContext.Set<UserTimeStamp>()
                                 .Where(u => u.CheckIn.Date >= startDate.Date && u.CheckIn.Date <= endDate.Date)
                                 .OrderBy(u => u.CheckIn)
-                               
+
                                 .ToListAsync();
 
             return data;
         }
 
+        public async Task<List<UserTimeStamp>> GetTimeStampHistoryForAdminRoleAsync(DateTime startDate, DateTime endDate, string role, string nodeId, int? node)
+        {
+            var data = await _dbContext.Set<UserTimeStamp>()
+                                .Where(u => u.CheckIn.Date >= startDate.Date && u.CheckIn.Date <= endDate.Date)
+                                .OrderBy(u => u.CheckIn)
+
+                                .ToListAsync();
+            if (role == "OWNER")
+            {
+                node = null;
+            }
+            if (role == "OWNER" || role == "CHILD")
+            {
+                data = data
+                    .Where(x => node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) : (node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) : (node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) : (node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) : (node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) : (node == null ? true : true))))))
+                    .ToList();
+            }
+            else if (role == "BROTHER")
+            {
+                data = data
+                    .Where(x => node == 4 ? x.Child3DnaId == Guid.Parse(nodeId!) : (node == 3 ? x.Child2DnaId == Guid.Parse(nodeId!) : (node == 2 ? x.Child1DnaId == Guid.Parse(nodeId!) : (node == 1 || node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) : (node == null ? true : true)))))
+                    .ToList();
+            }
+            else if (role == "ROOT")
+            {
+                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 == "NORMAL")
+            {
+                data = data.Where(x =>
+                    node == 0 ? x.RootDnaId == Guid.Parse(nodeId!) && x.Child1DnaId == null :
+                    node == 1 ? x.Child1DnaId == Guid.Parse(nodeId!) && x.Child2DnaId == null :
+                    node == 2 ? x.Child2DnaId == Guid.Parse(nodeId!) && x.Child3DnaId == null :
+                    node == 3 ? x.Child3DnaId == Guid.Parse(nodeId!) && x.Child4DnaId == null :
+                    node == 4 ? x.Child4DnaId == Guid.Parse(nodeId!) :
+                    true
+                ).ToList();
+            }
+            return data;
+        }
+
         public async Task<UserTimeStamp?> GetTimeStampById(Guid id)
         {
             var data = await _dbContext.Set<UserTimeStamp>()

BMA.EHR.Application/Repositories/MessageQueue/InboxRepository.cs

@@ -51,12 +51,13 @@ 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())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();

BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs

@@ -55,12 +55,13 @@ 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())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -131,12 +132,13 @@ 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())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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();
@@ -185,6 +187,44 @@ namespace BMA.EHR.Application.Repositories.MessageQueue
             }
         }
 
+        private async Task<string> GetMyProfileIdAsync()
+        {
+            var apiUrl = $"{_configuration["API"]}/org/dotnet/get-profileId";
+            var response = await GetExternalAPIAsync(apiUrl, AccessToken!, _configuration["API_KEY"]!);
+
+            if (string.IsNullOrWhiteSpace(response))
+                return string.Empty;
+
+            var org = JsonConvert.DeserializeObject<OrgRequest>(response);
+            if (org == null || org.result == null)
+                return string.Empty;
+
+            return org.result.profileId ?? string.Empty;
+        }
+
+        public async Task<int> DeleteAllMyNotificationsAsync()
+        {
+            try
+            {
+                var profileId = await GetMyProfileIdAsync();
+                if (string.IsNullOrEmpty(profileId))
+                    return 0;
+
+                var notifications = await _dbContext.Set<Notification>()
+                                    .Where(x => x.ReceiverUserId == Guid.Parse(profileId))
+                                    .Where(x => x.DeleteDate == null)
+                                    .ToListAsync();
+
+                _dbContext.Set<Notification>().RemoveRange(notifications);
+                await _dbContext.SaveChangesAsync();
+                return notifications.Count;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
         public async Task PushNotificationAsync(Guid ReceiverUserId, string Subject, string Body, string Payload = "", string NotiLink = "", bool IsSendInbox = false, bool IsSendMail = false)
         {
             try
@@ -227,7 +267,7 @@ namespace BMA.EHR.Application.Repositories.MessageQueue
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        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();
@@ -287,7 +327,7 @@ namespace BMA.EHR.Application.Repositories.MessageQueue
                     using (var client = new HttpClient())
                     {
                         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                        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();
@@ -361,7 +401,7 @@ namespace BMA.EHR.Application.Repositories.MessageQueue
                         using (var client = new HttpClient())
                         {
                             client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                            client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            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();
@@ -434,7 +474,7 @@ namespace BMA.EHR.Application.Repositories.MessageQueue
                         using (var client = new HttpClient())
                         {
                             client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                            client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            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();
@@ -504,7 +544,7 @@ namespace BMA.EHR.Application.Repositories.MessageQueue
                         using (var client = new HttpClient())
                         {
                             client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                            client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            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();
@@ -566,7 +606,7 @@ namespace BMA.EHR.Application.Repositories.MessageQueue
                         using (var client = new HttpClient())
                         {
                             client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                            client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                            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();

BMA.EHR.Application/Repositories/MetaData/HolidayRepository.cs

@@ -26,6 +26,16 @@ namespace BMA.EHR.Application.Repositories.MetaData
 
         #region " Methods "
 
+        public async Task<string> GetHolidayAsync(DateTime date, string category = "NORMAL")
+        {
+            var data = await _dbContext.Set<Holiday>().AsQueryable()
+                                .Where(x => x.Category == category)
+                                .Where(x => x.HolidayDate.Date == date.Date)
+                                .Select(x => x.Name)
+                                .FirstOrDefaultAsync();
+            return data ?? string.Empty;
+        }
+
         public async Task<List<DateTime>> GetHolidayAsync(DateTime startDate, DateTime endDate, string category = "NORMAL")
         {
             var data = await _dbContext.Set<Holiday>().AsQueryable()
@@ -39,12 +49,16 @@ namespace BMA.EHR.Application.Repositories.MetaData
 
         public async Task<int> GetHolidayCountAsync(DateTime startDate, DateTime endDate, string category = "NORMAL")
         {
-            var data = await _dbContext.Set<Holiday>().AsQueryable()
+            var query = _dbContext.Set<Holiday>().AsQueryable()
                                 .Where(x => x.Category == category)
-                                .Where(x => x.HolidayDate.Date >= startDate && x.HolidayDate.Date <= endDate)
-                                .CountAsync();
+                                .Where(x => x.HolidayDate.Date >= startDate && x.HolidayDate.Date <= endDate);
 
-            return data;
+            if (category == "NORMAL")
+                query = query.Where(x => x.HolidayDate.DayOfWeek != DayOfWeek.Saturday && x.HolidayDate.DayOfWeek != DayOfWeek.Sunday);
+            else
+                query = query.Where(x => x.HolidayDate.DayOfWeek != DayOfWeek.Sunday);
+
+            return await query.CountAsync();
         }
 
         public List<DateTime> GetWeekEnd(DateTime startDate, DateTime endDate, string category = "NORMAL")

BMA.EHR.Application/Repositories/MinIOService.cs

@@ -155,6 +155,40 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
+        public async Task<FormFile> GetImageToFormFileAsync(string refId)
+        {
+            try
+            {
+                using var memoryStream = new MemoryStream();
+                var request = new GetObjectRequest
+                {
+                    BucketName = _bucketName,
+                    Key = refId
+                };
+
+                using var response = await _s3Client.GetObjectAsync(request);
+                using var responseStream = response.ResponseStream;
+
+                await responseStream.CopyToAsync(memoryStream);
+
+                var finalBytes = memoryStream.ToArray();
+
+                var finalStream = new MemoryStream(finalBytes);
+                var fileName = Path.GetFileName(refId);
+                var contentType = response.Headers.ContentType ?? "image/jpeg";
+
+                return new FormFile(finalStream, 0, finalStream.Length, "file", fileName)
+                {
+                    Headers = new HeaderDictionary(),
+                    ContentType = contentType
+                };
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
         public async Task DeleteFileAsync(Guid fileId)
         {
             try

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
 {
@@ -58,9 +59,14 @@ namespace BMA.EHR.Application.Repositories
 
                 using (var client = new HttpClient())
                 {
-                    client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    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 res = await req.Content.ReadAsStringAsync();
                     return res;
                 }
@@ -71,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
@@ -80,7 +119,7 @@ namespace BMA.EHR.Application.Repositories
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = await client.GetAsync(apiPath);
                     var res = await req.Content.ReadAsStringAsync();
                     return res;

BMA.EHR.Application/Repositories/PlacementRepository.cs

@@ -2,24 +2,40 @@
 using BMA.EHR.Domain.Models.Placement;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using System.Net.Http.Headers;
+using Newtonsoft.Json;
 
 namespace BMA.EHR.Application.Repositories
 {
+    /// <summary>
+    /// Response model จาก Org API (check-isLeave)
+    /// </summary>
+    public class OrgProfileResult
+    {
+        public string citizenId { get; set; } = "";
+        public string? profileId { get; set; }
+        public bool isLeave { get; set; }
+        public bool isActive { get; set; }
+    }
+
     public class PlacementRepository : GenericRepository<Guid, Placement>
     {
         #region " Fields "
 
         private readonly IApplicationDBContext _dbContext;
         private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IConfiguration _configuration;
 
         #endregion
 
         #region " Constructor and Destructor "
 
-        public PlacementRepository(IApplicationDBContext dbContext, IHttpContextAccessor httpContextAccessor) : base(dbContext, httpContextAccessor)
+        public PlacementRepository(IApplicationDBContext dbContext, IHttpContextAccessor httpContextAccessor, IConfiguration configuration) : base(dbContext, httpContextAccessor)
         {
             _dbContext = dbContext;
             _httpContextAccessor = httpContextAccessor;
+            _configuration = configuration;
         }
 
         #endregion
@@ -76,6 +92,148 @@ namespace BMA.EHR.Application.Repositories
             return data;
         }
 
+        /// <summary>
+        /// Job อัพเดทสถานะผู้สอบผ่านที่ลาออกไปแล้วแต่ยังไม่ส่งไปออกคำสั่ง
+        /// และอัพเดทบุคคลภายนอกที่เข้ามาอยู่ในระบบแล้ว
+        /// ทำงานทุกวันเวลา 05:00 น.
+        /// </summary>
+        public async Task UpdateStatusPlacementProfiles()
+        {
+            Console.WriteLine("[Job:UpdateStatusPlacementProfiles] === STARTED ===");
+
+            // 1. Query ทั้ง 2 กรณี: ทุกคนที่ยังไม่ DONE
+            var allCitizenIds = await _dbContext.Set<PlacementProfile>()
+                                            .Where(p => !string.IsNullOrEmpty(p.CitizenId)
+                                                && p.PlacementStatus != "DONE"
+                                                // && p.CitizenId == "2536721883131"
+                                            )
+                                            .Select(p => new { p.CitizenId, p.IsOfficer })
+                                            .ToListAsync();
+
+            if (!allCitizenIds.Any())
+            {
+                Console.WriteLine("[Job:UpdateStatusPlacementProfiles] No profiles to process");
+                return;
+            }
+
+            var officerCount = allCitizenIds.Count(x => x.IsOfficer == true);
+            var notOfficerCount = allCitizenIds.Count(x => x.IsOfficer == false);
+            Console.WriteLine($"[Job:UpdateStatusPlacementProfiles] พบข้าราชการ {officerCount} คน, บุคคลภายนอก {notOfficerCount} คน");
+
+            // 2. ส่ง citizenIds ทั้งหมดไป Org API ครั้งเดียว
+            var citizenIds = allCitizenIds.Select(x => x.CitizenId).Distinct().ToList();
+            var apiUrl = $"{_configuration["API"]}/org/dotnet/check-isLeave";
+
+            List<OrgProfileResult> orgResults = new();
+
+            using (var client = new HttpClient())
+            {
+                client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
+
+                var payload = new { citizenIds };
+                var jsonPayload = JsonConvert.SerializeObject(payload);
+                var content = new StringContent(jsonPayload, System.Text.Encoding.UTF8, "application/json");
+
+                try
+                {
+                    var response = await client.PostAsync(apiUrl, content);
+                    var result = await response.Content.ReadAsStringAsync();
+
+                    var responseObj = JsonConvert.DeserializeAnonymousType(result, new
+                    {
+                        status = 0,
+                        message = "",
+                        result = new List<OrgProfileResult>()
+                    });
+
+                    orgResults = responseObj?.result ?? new();
+                    Console.WriteLine($"[Job:UpdateStatusPlacementProfiles] Org API ตอบกลับ {orgResults.Count} รายการ");
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"[Job:UpdateStatusPlacementProfiles] Call API failed: {ex.Message}");
+                    return;
+                }
+            }
+
+            if (!orgResults.Any())
+            {
+                Console.WriteLine("[Job:UpdateStatusPlacementProfiles] ไม่มีรายการต้องอัปเดต");
+                Console.WriteLine("[Job:UpdateStatusPlacementProfiles] === COMPLETED ===");
+                return;
+            }
+
+            // 3. แยกข้อมูลตามเงื่อนไข
+            var leaveCitizenIds = orgResults.Where(x => x.isLeave).Select(x => x.citizenId).ToList();
+            var inSystemProfiles = orgResults.Where(x => x.isActive && !x.isLeave && !string.IsNullOrEmpty(x.profileId)).ToList();
+
+            Console.WriteLine($"[Job:UpdateStatusPlacementProfiles] ลาออก {leaveCitizenIds.Count} รายการ, อยู่ที่ทะเบียนประวัติ {inSystemProfiles.Count} รายการ");
+
+            // 4. Split Batch Update (500 รายการ/batch)
+            var batchSize = 500;
+            var totalUpdated = 0;
+
+            // 4.1 Update คนลาออก → IsOfficer = false
+            if (leaveCitizenIds.Any())
+            {
+                var totalBatches = (int)Math.Ceiling((double)leaveCitizenIds.Count / batchSize);
+                for (int i = 0; i < totalBatches; i++)
+                {
+                    var batch = leaveCitizenIds.Skip(i * batchSize).Take(batchSize).ToList();
+
+                    var profilesToUpdate = await _dbContext.Set<PlacementProfile>()
+                                                    .Where(p => !string.IsNullOrEmpty(p.CitizenId)
+                                                        && batch.Contains(p.CitizenId)
+                                                        && p.IsOfficer == true)
+                                                    .ToListAsync();
+
+                    foreach (var profile in profilesToUpdate)
+                    {
+                        profile.profileId = null;
+                        profile.IsOfficer = false;
+                    }
+
+                    await _dbContext.SaveChangesAsync();
+                    totalUpdated += profilesToUpdate.Count;
+                    Console.WriteLine($"[Job:UpdateStatusPlacementProfiles] [ลาออก] Batch {i + 1}/{totalBatches} → อัปเดต {profilesToUpdate.Count} รายการ");
+                }
+            }
+
+            // 4.2 Update คนที่อยู่ในทะเบียนประวัติ → profileId + IsOfficer = true
+            if (inSystemProfiles.Any())
+            {
+                var totalBatches = (int)Math.Ceiling((double)inSystemProfiles.Count / batchSize);
+                for (int i = 0; i < totalBatches; i++)
+                {
+                    var batch = inSystemProfiles.Skip(i * batchSize).Take(batchSize).ToList();
+                    var batchCitizenIds = batch.Select(x => x.citizenId).ToList();
+
+                    var profilesToUpdate = await _dbContext.Set<PlacementProfile>()
+                                                    .Where(p => !string.IsNullOrEmpty(p.CitizenId)
+                                                        && batchCitizenIds.Contains(p.CitizenId)
+                                                        && p.IsOfficer == false)
+                                                    .ToListAsync();
+
+                    foreach (var profile in profilesToUpdate)
+                    {
+                        var orgProfile = batch.FirstOrDefault(x => x.citizenId == profile.CitizenId);
+                        if (orgProfile != null)
+                        {
+                            profile.profileId = orgProfile.profileId;
+                            profile.IsOfficer = true;
+                        }
+                    }
+
+                    await _dbContext.SaveChangesAsync();
+                    totalUpdated += profilesToUpdate.Count;
+                    Console.WriteLine($"[Job:UpdateStatusPlacementProfiles] [เข้าระบบ] Batch {i + 1}/{totalBatches} → อัปเดต {profilesToUpdate.Count} รายการ");
+                }
+            }
+
+            Console.WriteLine($"[Job:UpdateStatusPlacementProfiles] อัปเดตรวมทั้งหมด {totalUpdated} รายการ");
+            Console.WriteLine("[Job:UpdateStatusPlacementProfiles] === COMPLETED ===");
+        }
+
         #endregion
     }
 }

BMA.EHR.Application/Repositories/Reports/CandidateReportRepository.cs

@@ -5,6 +5,7 @@ using BMA.EHR.Domain.Shared;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
 using System.Text;
+using System.Text.RegularExpressions;
 using static BMA.EHR.Domain.Extensions.DateTimeExtension;
 
 namespace BMA.EHR.Application.Repositories.Reports
@@ -82,76 +83,128 @@ namespace BMA.EHR.Application.Repositories.Reports
                 sb.Append(monthDiff == 0 ? "" : $"{monthDiff} เดือน ");
                 sb.Append(dayDiff == 0 ? "" : $"{dayDiff} วัน ");
             }
-            var data = await _dbExamContext.Set<Candidate>().AsQueryable()
-                        .Where(x => x.Id == id)
-                        .Select(p => new
-                        {
-                            p.Id,
-                            AvatarId = p.ProfileImg == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.ProfileImg.Id,
-                            ExamIdenNumber = p.ExamIdenNumber == null ? "-" : p.ExamIdenNumber.ToThaiNumber(),
-                            PositionName = p.PositionExam == null ? "-" : p.PositionExam.PositionName.ToThaiNumber(),
-                            PositionLevelName = p.PositionExam == null ? "-" : p.PositionExam.PositionLevelName.ToThaiNumber(),
-                            PeriodExamName = p.PeriodExam == null ? "-" : p.PeriodExam.Name.ToThaiNumber(),
-                            PeriodExamRound = p.PeriodExam == null ? "-" : p.PeriodExam.Round.ToString().ToThaiNumber(),
-                            PeriodExamYear = p.PeriodExam == null ? "-" : (p.PeriodExam.Year + 543).ToString().ToThaiNumber(),
+            var candidate = await _dbExamContext.Set<Candidate>()
+                .Where(x => x.Id == id)
+                .Include(p => p.PeriodExam)
+                .Include(p => p.Educations)
+                .Include(p => p.PositionExam)
+                .Include(p => p.ProfileImg)
+                .FirstOrDefaultAsync();
 
-                            FullName = $"{p.PrefixName}{p.FirstName} {p.LastName}",
-                            Religion = p.ReligionName == null ? "-" : p.ReligionName,
-                            Nationality = p.Nationality == null ? "-" : p.Nationality,
-                            DateOfBirth = p.DateOfBirth == null ? "-" : p.DateOfBirth.Value.ToThaiFullDate2().ToThaiNumber(),
-                            Age = p.DateOfBirth == null ? "-" : p.DateOfBirth.Value.CalculateAgeStrV2(0, 0).ToThaiNumber(),
-                            CitizenId = p.CitizenId == null ? "-" : p.CitizenId.ToThaiNumber(),
-
-                            EducationLevelExamName = p.Educations.FirstOrDefault() == null ? "-" : p.Educations.FirstOrDefault().EducationLevelExamName.ToThaiNumber(),
-                            EducationName = p.Educations.FirstOrDefault() == null ? null : (p.Educations.FirstOrDefault().EducationLevelExamName == "ปริญญาตรี" || p.Educations.FirstOrDefault().EducationLevelExamName == "ปริญญาโท" || p.Educations.FirstOrDefault().EducationLevelExamName == "ปริญญาเอก" ? p.Educations.FirstOrDefault().EducationName : null),
-                            EducationMajor = p.Educations.FirstOrDefault() == null ? "-" : p.Educations.FirstOrDefault().EducationMajor.ToThaiNumber(),
-                            EducationLocation = p.Educations.FirstOrDefault() == null ? "-" : p.Educations.FirstOrDefault().EducationLocation,
-                            EducationEndDate = p.Educations.FirstOrDefault() == null || p.Educations.FirstOrDefault().EducationEndDate == null ? "-" : p.Educations.FirstOrDefault().EducationEndDate.Value.ToThaiFullDate2().ToThaiNumber(),
-                            EducationScores = p.Educations.FirstOrDefault() == null ? "-" : p.Educations.FirstOrDefault().EducationScores.ToThaiNumber(),
-                            EducationType = p.Educations.FirstOrDefault() == null ? "-" : p.Educations.FirstOrDefault().EducationType,
-                            EducationLevelHighName = p.Educations.FirstOrDefault() == null ? "-" : p.Educations.FirstOrDefault().EducationLevelHighName,
-
-                            OccupationPositionType = p.OccupationPositionType == "other" ? "ผู้ปฏิบัติงานอื่นในกรุงเทพมหานคร" : (p.OccupationPositionType == "temp" ? "ลูกจ้างชั่วคราว" : (p.OccupationPositionType == "prem" ? "ลูกจ้างประจำ" : "-")),
-                            OccupationPosition = p.OccupationPosition == null ? "-" : p.OccupationPosition,
-                            OccupationSalary = p.OccupationSalary == null ? "-" : p.OccupationSalary.Value.ToString("N0").ToThaiNumber(),
-                            OccupationGroup = p.OccupationGroup == null ? "-" : p.OccupationGroup,
-                            OccupationPile = p.OccupationPile == null ? "-" : p.OccupationPile,
-                            OccupationOrg = p.OccupationOrg == null ? "-" : p.OccupationOrg,
-                            OccupationTelephone = p.OccupationTelephone == null ? "-" : p.OccupationTelephone.ToThaiNumber(),
-
-                            CareersTotal = sb.ToString().ToThaiNumber(),
-                            // Careers = p.Careers.Select(y => new
-                            // {
-                            //     Position = y.Position,
-                            //     Type = y.Type,
-                            //     DurationStart = y.DurationStart.ToThaiShortDate2(),
-                            //     DurationEnd = y.DurationEnd.ToThaiShortDate2(),
-                            //     RangeDate = y.RangeDate,
-                            // }).ToList(),
-
-                            RegistAddress = p.RegistAddress == null ? "-" : p.RegistAddress.ToThaiNumber(),
-                            RegistProvinceName = p.RegistProvinceName == null ? "-" : p.RegistProvinceName,
-                            RegistDistrictName = p.RegistDistrictName == null ? "-" : p.RegistDistrictName,
-                            RegistSubDistrictName = p.RegistSubDistrictName == null ? "-" : p.RegistSubDistrictName,
-                            RegistZipCode = p.RegistZipCode == null ? "-" : p.RegistZipCode.ToThaiNumber(),
-                            CurrentAddress = p.CurrentAddress == null ? (p.RegistAddress == null ? "-" : p.RegistAddress.ToThaiNumber()) : p.CurrentAddress.ToThaiNumber(),
-                            CurrentProvinceName = p.CurrentProvinceName == null ? (p.RegistProvinceName == null ? "-" : p.RegistProvinceName) : p.CurrentProvinceName,
-                            CurrentDistrictName = p.CurrentDistrictName == null ? (p.RegistDistrictName == null ? "-" : p.RegistDistrictName) : p.CurrentDistrictName,
-                            CurrentSubDistrictName = p.CurrentSubDistrictName == null ? (p.RegistSubDistrictName == null ? "-" : p.RegistSubDistrictName) : p.CurrentSubDistrictName,
-                            CurrentZipCode = p.CurrentZipCode == null ? (p.RegistZipCode == null ? "-" : p.RegistZipCode.ToThaiNumber()) : p.CurrentZipCode.ToThaiNumber(),
-                            Telephone = p.Telephone == null ? "-" : p.Telephone.ToThaiNumber(),
-                            Email = p.Email == null ? "-" : p.Email,
-
-                            ContactFullName = $"{p.ContactPrefixName}{p.ContactFirstname} {p.ContactLastname}",
-                            ContactRelations = p.ContactRelations == null ? "-" : p.ContactRelations,
-                            ContactTel = p.ContactTel == null ? "-" : p.ContactTel.ToThaiNumber(),
-
-                            RegisterDate = p.RegisterDate == null ? "-" : p.RegisterDate.Value.ToThaiFullDate().ToThaiNumber(),
-                        })
-                       .FirstOrDefaultAsync();
-            if (data == null)
+            if (candidate == null)
                 throw new Exception(GlobalMessages.CandidateNotFound);
-            return data;
+
+            List<string> editorConfirmLists;
+
+            var textOnly = string.IsNullOrEmpty(candidate.PeriodExam?.EditorConfirm)
+                ? null
+                : Regex.Replace(
+                      candidate.PeriodExam.EditorConfirm,
+                      "<[^>]+>",
+                      string.Empty
+                  )
+                  .Replace("&nbsp;", " ")
+                  .Trim();
+
+            if (!string.IsNullOrEmpty(textOnly))
+            {
+                // ลบข้อความทั้งหมดก่อน "1." เพื่อให้เริ่มต้นที่ข้อแรกเสมอ
+                var cleanedText = Regex.Replace(textOnly, @"^.*?1\.", "1.").Trim();
+
+                // ถ้าข้อ 3 จบด้วย "มาตรา 1374." แล้วเลข 4. ติดกับประโยค ให้แทรกขึ้นบรรทัดใหม่เป็นข้อ 4.
+                if (!cleanedText.Contains("\n4.") && Regex.IsMatch(cleanedText, @"1374\.\s*"))
+                {
+                    cleanedText = Regex.Replace(cleanedText, @"1374\.\s*", "137\n4. ");
+                }
+
+                // แยกข้อความเป็นแต่ละข้อ โดย split เมื่อเจอ pattern "ตัวเลข. "
+                // ใช้ lookahead (?=...) เพื่อไม่กินตัวเลขทิ้ง และให้ตัวเลขยังอยู่ในผลลัพธ์
+                editorConfirmLists = Regex.Split(cleanedText, @"(?=\d+\. )")
+                    .Where(s => !string.IsNullOrWhiteSpace(s))
+                    .Select(s => s.Replace("\n", "").Replace("\r", "").Trim())
+                    .ToList();
+            }
+            else
+            {
+                editorConfirmLists = new List<string> { "-" };
+            }
+
+            return new
+            {
+                candidate.Id,
+                AvatarId = candidate.ProfileImg?.Id ?? Guid.Empty,
+                ExamIdenNumber = candidate.ExamIdenNumber ?? "-",
+                PositionName = candidate.PositionExam?.PositionName ?? "-",
+                PositionLevelName = candidate.PositionExam?.PositionLevelName ?? "-",
+                PeriodExamName = candidate.PeriodExam?.Name ?? "-",
+                PeriodExamRound = candidate.PeriodExam?.Round.ToString() ?? "-",
+                PeriodExamYear = candidate.PeriodExam != null ? (candidate.PeriodExam.Year + 543).ToString() : "-",
+                FullName = $"{candidate.PrefixName}{candidate.FirstName} {candidate.LastName}",
+                Religion = candidate.ReligionName ?? "-",
+                Nationality = candidate.Nationality ?? "-",
+                DateOfBirth = candidate.DateOfBirth?.ToThaiFullDate2() ?? "-",
+                Age = candidate.DateOfBirth?.CalculateAgeStrV2(0, 0) ?? "-",
+                CitizenId = candidate.CitizenId ?? "-",
+
+                EducationLevelExamName = candidate.Educations.FirstOrDefault()?.EducationLevelExamName ?? "-",
+                EducationName = (candidate.Educations.FirstOrDefault()?.EducationLevelExamName is "ปริญญาตรี" or "ปริญญาโท" or "ปริญญาเอก")
+                    ? candidate.Educations.FirstOrDefault()?.EducationName
+                    : null,
+                EducationMajor = candidate.Educations.FirstOrDefault()?.EducationMajor ?? "-",
+                EducationLocation = candidate.Educations.FirstOrDefault()?.EducationLocation ?? "-",
+                EducationEndDate = candidate.Educations.FirstOrDefault()?.EducationEndDate?.ToThaiFullDate2() ?? "-",
+                EducationScores = candidate.Educations.FirstOrDefault()?.EducationScores ?? "-",
+                EducationType = candidate.Educations.FirstOrDefault()?.EducationType ?? "-",
+                EducationLevelHighName = candidate.Educations.FirstOrDefault()?.EducationLevelHighName ?? "-",
+
+                OccupationPositionType = candidate.OccupationPositionType == "other" ? "ผู้ปฏิบัติงานอื่นในกรุงเทพมหานคร" :
+                                         candidate.OccupationPositionType == "temp" ? "ลูกจ้างชั่วคราว" :
+                                         candidate.OccupationPositionType == "prem" ? "ลูกจ้างประจำ" : "-",
+                OccupationPosition = candidate.OccupationPosition ?? "-",
+                OccupationSalary = candidate.OccupationSalary.HasValue
+                    ? (candidate.OccupationSalary.Value % 1 == 0
+                        ? candidate.OccupationSalary.Value.ToString("N0")
+                        : candidate.OccupationSalary.Value.ToString("N2"))
+                    : "-",
+                OccupationGroup = candidate.OccupationGroup ?? "-",
+                OccupationPile = candidate.OccupationPile ?? "-",
+                OccupationOrg = candidate.OccupationOrg ?? "-",
+                OccupationTelephone = candidate.OccupationTelephone ?? "-",
+
+                CareersTotal = sb.ToString(),
+
+                RegistAddress = candidate.RegistAddress ?? "-",
+                RegistProvinceName = candidate.RegistProvinceName ?? "-",
+                RegistDistrictName = candidate.RegistDistrictName ?? "-",
+                RegistSubDistrictName = candidate.RegistSubDistrictName ?? "-",
+                RegistZipCode = candidate.RegistZipCode ?? "-",
+                CurrentAddress = candidate.CurrentAddress ?? candidate.RegistAddress ?? "-",
+                CurrentProvinceName = candidate.CurrentProvinceName ?? candidate.RegistProvinceName ?? "-",
+                CurrentDistrictName = candidate.CurrentDistrictName ?? candidate.RegistDistrictName ?? "-",
+                CurrentSubDistrictName = candidate.CurrentSubDistrictName ?? candidate.RegistSubDistrictName ?? "-",
+                CurrentZipCode = candidate.CurrentZipCode ?? candidate.RegistZipCode ?? "-",
+                Telephone = candidate.Telephone ?? "-",
+                Email = candidate.Email ?? "-",
+
+                ContactFullName = $"{candidate.ContactPrefixName}{candidate.ContactFirstname} {candidate.ContactLastname}",
+                ContactRelations = candidate.ContactRelations ?? "-",
+                ContactTel = candidate.ContactTel ?? "-",
+
+                RegisterDate = candidate.RegisterDate?.ToThaiFullDate() ?? "-",
+                
+                IsBachelors = candidate.PositionExam != null && !string.IsNullOrEmpty(candidate.PositionExam.PositionLevelName) && candidate.PositionExam.PositionLevelName.Trim() == "ปฏิบัติการ"
+                    ? new List<object>
+                        {
+                            new { label = "ชื่อปริญญา", value = candidate.Educations.FirstOrDefault()?.EducationName ?? "-" },
+                            new { label = "สาขาวิชา/วิชาเอก", value = candidate.Educations.FirstOrDefault()?.EducationMajor ?? "-" }
+                        }
+                    : new List<object>
+                        {
+                            new { label = "สาขาวิชา/วิชาเอก", value = candidate.Educations.FirstOrDefault()?.EducationMajor ?? "-" }
+                        },
+
+                EditorConfirms = editorConfirmLists
+            };
         }
         public async Task<dynamic> GetExamCareerCandidateAsync(Guid id)
         {
@@ -176,10 +229,10 @@ namespace BMA.EHR.Application.Repositories.Reports
                 {
                     Position = item.Position,
                     Type = item.Type,
-                    DurationStart = item.DurationStart.ToThaiNumber(),
-                    DurationEnd = item.DurationEnd.ToThaiNumber(),
-                    RangeDate = item.RangeDate.ToThaiNumber(),
-                    Index = retVal.ToString().ToThaiNumber(),
+                    DurationStart = item.DurationStart,
+                    DurationEnd = item.DurationEnd,
+                    RangeDate = item.RangeDate,
+                    Index = retVal.ToString(),
                 };
                 data.Add(_data);
                 retVal++;

BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs

@@ -18,6 +18,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System.Globalization;
 using System.Net;
 using System.Net.Http.Headers;
 
@@ -844,13 +845,16 @@ namespace BMA.EHR.Application.Repositories.Reports
                  OcId = x.Request.OrganizationId // Organization ID
              })
              .ToListAsync();
-
+            var org = _userProfileRepository.GetOc(nodeId, 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 insignia = (from r in data
                             group r by new { OcId = r.OcId, InsigniaInitial = r.InsigniaInitial } into g
                             select new
                             {
                                 RowNo = 1,
-                                DepartmentName = _userProfileRepository.GetOc(g.Key.OcId, 0, AccessToken).Root, //_organizationCommonRepository.GetOrganizationNameFullPath(g.Key.OcId, false, false),
+                                DepartmentName = organizationName,
+                                //_userProfileRepository.GetOc(g.Key.OcId, 0, AccessToken).Root,
+                                //_organizationCommonRepository.GetOrganizationNameFullPath(g.Key.OcId, false, false),
                                 InsigniaInitial = g.Key.InsigniaInitial,
                                 G1Male = g.Sum(x => x.Gendor == "ชาย" && x.RequestInsigniaName == "เหรียญจักรพรรดิมาลา" ? 1 : 0).ToString().ToThaiNumber(),
                                 G1Female = g.Sum(x => x.Gendor == "หญิง" && x.RequestInsigniaName == "เหรียญจักรพรรดิมาลา" ? 1 : 0).ToString().ToThaiNumber(),
@@ -889,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),
@@ -1000,6 +1004,16 @@ namespace BMA.EHR.Application.Repositories.Reports
                     r.FirstName,
                     r.LastName,
                     r.Gender,
+                    r.Root,
+                    r.RootId,
+                    r.Child1,
+                    r.Child1Id,
+                    r.Child2,
+                    r.Child2Id,
+                    r.Child3,
+                    r.Child3Id,
+                    r.Child4,
+                    r.Child4Id,
                     r.RequestInsignia.Id,
                     r.Request.OrganizationId
                 })
@@ -1010,6 +1024,16 @@ namespace BMA.EHR.Application.Repositories.Reports
                     ProfileId = group.Key.ProfileId,
                     FullName = $"{group.Key.Prefix}{group.Key.FirstName} {group.Key.LastName}",
                     Gender = group.Key.Gender,
+                    Root = group.Key.Root ?? "",
+                    RootId = group.Key.RootId,
+                    Child1 = group.Key.Child1 ?? "",
+                    Child1Id = group.Key.Child1Id,
+                    Child2 = group.Key.Child2 ?? "",
+                    Child2Id = group.Key.Child2Id,
+                    Child3 = group.Key.Child3 ?? "",
+                    Child3Id = group.Key.Child3Id,
+                    Child4 = group.Key.Child4 ?? "",
+                    Child4Id = group.Key.Child4Id,
                     Male = group.Count(r => r.Gender == "Male"),  // Count male entries
                     Female = group.Count(r => r.Gender == "Female"),  // Count female entries
                     InsigniaId = group.Key.Id,
@@ -1035,6 +1059,16 @@ namespace BMA.EHR.Application.Repositories.Reports
                         ProfileId = Guid.Parse("00000000-0000-0000-0000-000000000000"),
                         FullName = "",
                         Gender = "",
+                        Root = "",
+                        RootId = (Guid?)Guid.Parse("00000000-0000-0000-0000-000000000000"),
+                        Child1 = "",
+                        Child1Id = (Guid?)Guid.Parse("00000000-0000-0000-0000-000000000000"),
+                        Child2 = "",
+                        Child2Id = (Guid?)Guid.Parse("00000000-0000-0000-0000-000000000000"),
+                        Child3 = "",
+                        Child3Id = (Guid?)Guid.Parse("00000000-0000-0000-0000-000000000000"),
+                        Child4 = "",
+                        Child4Id = (Guid?)Guid.Parse("00000000-0000-0000-0000-000000000000"),
                         Male = 0,
                         Female = 0,
                         InsigniaId = ins.InsigniaId,
@@ -1081,6 +1115,60 @@ namespace BMA.EHR.Application.Repositories.Reports
             return s_data;
         }
 
+        public async Task<dynamic> GeInsigniaRequestProfiles(Guid id)
+        {
+            var profile = await _dbContext.Set<InsigniaRequestProfile>()
+                            .Where(x => x.Id == id)
+                            .Select(x => new
+                            {
+                                Fullname = $"{x.Prefix}{x.FirstName} {x.LastName}",
+                                Position = x.Position ?? "",
+                                Oc = (x.Child4 == null ? "" : x.Child4 + " ") +
+                                    (x.Child3 == null ? "" : x.Child3 + " ") +
+                                    (x.Child2 == null ? "" : x.Child2 + " ") +
+                                    (x.Child1 == null ? "" : x.Child1 + " ") +
+                                    (x.Root == null ? "" : x.Root),
+                                BirthDate = x.BirthDate == null ? "" : x.BirthDate.Value.ToThaiShortDate().ToString().ToThaiNumber(),
+                                DateAppoint = x.DateAppoint == null ? "" : x.DateAppoint.Value.ToThaiShortDate().ToString().ToThaiNumber(),
+                                ProfileId = x.ProfileId
+                            })
+                            .FirstOrDefaultAsync();
+
+            if (profile == null)
+                throw new Exception(GlobalMessages.DataNotFound);
+
+            var profileSalarys = await _userProfileRepository.GetProfileSalaryById(profile.ProfileId, AccessToken);
+            var salarys = profileSalarys.Select(x => new
+            {
+                DateAffect = x.DateAffect == null ? "" : x.DateAffect.ToThaiShortDate().ToString().ToThaiNumber(),
+                Position = x.Position ?? "",
+                Root = x.Root,
+                Child1 = x.Child1,
+                Child2 = x.Child2,
+                Child3 = x.Child3,
+                Child4 = x.Child4,
+                Oc = (x.Child4 == null ? "" : x.Child4 + " ") +
+                                    (x.Child3 == null ? "" : x.Child3 + " ") +
+                                    (x.Child2 == null ? "" : x.Child2 + " ") +
+                                    (x.Child1 == null ? "" : x.Child1 + " ") +
+                                    (x.Root == null ? "" : x.Root),
+                Age = x.Age == null ? "" : x.Age.ToString().ToThaiNumber(),
+                Amount = x.Amount == null ? "" : x.Amount.ToString("N0", new CultureInfo("th-TH")).ToThaiNumber(),
+                Remark = x.Remark == null ? "" : x.Remark.ToThaiNumber(),
+            }).ToList();
+
+            var result = new
+            {
+                profile.Fullname,
+                profile.Position,
+                profile.Oc,
+                profile.BirthDate,
+                profile.DateAppoint,
+                Salarys = salarys
+            };
+            return result;
+        }
+
         //47-บัญชีระดับผลการประเมินผลการปฏิบัติราชการในรอบ 5 ปี
         public async Task<dynamic> GetEvaluationResultReport(Guid id, string type = null, int node = -1, Guid nodeId = default)
         {
@@ -1148,7 +1236,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                 var _apiUrl = $"{_baseAPI}/org/unauthorize/calculateEvaluation/{type}";
                 using (var _client = new HttpClient())
                 {
-                    _client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    _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();
@@ -1167,7 +1255,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                         if (matchedData != null)
                         {
                             resultList.Add(new
-                            {   
+                            {
                                 rowNo = seq++.ToString().ToThaiNumber(),
                                 d.ProfileId,
                                 d.FullName,
@@ -1253,6 +1341,104 @@ namespace BMA.EHR.Application.Repositories.Reports
             return resultList;
         }
 
+        //47-บัญชีระดับผลการประเมินผลการปฏิบัติราชการในรอบ 5 ปี NEW
+        public async Task<dynamic> GetEvaluationResult5YearReport(Guid id, string type = null, int node = -1, Guid nodeId = default)
+        {
+            var period = await _dbContext.Set<InsigniaPeriod>()
+                                .FirstOrDefaultAsync(x => x.Id == id);
+            if (period == null)
+                throw new Exception(GlobalMessages.InsigniaPeriodNotFound);
+
+            var data_insigniaQuery = _dbContext.Set<InsigniaRequestProfile>()
+                    .Where(x => x.Request.Period.Id == period.Id)
+                    .Where(x => x.IsApprove == true)
+                    .Where(x => x.Status == "PENDING")
+                    .Where(x => x.RequestInsignia.InsigniaType != null);
+
+            if (type == "officer")
+            {
+                data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType == "officer");
+            }
+            else if (type == "employee")
+            {
+                data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType == "employee");
+            }
+
+
+            switch (node)
+            {
+                case 0:
+                    data_insigniaQuery = data_insigniaQuery.Where(r => r.RootDnaId == nodeId);
+                    break;
+
+                case 1:
+                    data_insigniaQuery = data_insigniaQuery.Where(r => r.Child1DnaId == nodeId);
+                    break;
+
+                case 2:
+                    data_insigniaQuery = data_insigniaQuery.Where(r => r.Child2DnaId == nodeId);
+                    break;
+
+                case 3:
+                    data_insigniaQuery = data_insigniaQuery.Where(r => r.Child3DnaId == nodeId);
+                    break;
+
+                case 4:
+                    data_insigniaQuery = data_insigniaQuery.Where(r => r.Child4DnaId == nodeId);
+                    break;
+
+                default:
+                    break;
+            }
+            var data = await data_insigniaQuery
+            .Select(x => new
+            {
+                ProfileId = x.ProfileId,
+                FullName = $"{x.Prefix}{x.FirstName} {x.LastName}",
+                RequestInsigniaName = x.RequestInsignia.Name, // Name of the Insignia
+                Reason = x.Reason,
+                Agency = x.Root,
+                ResultAPR1 = x.APR1,
+                ResultOCT1 = x.OCT1,
+                ResultAPR2 = x.APR2,
+                ResultOCT2 = x.OCT2,
+                ResultAPR3 = x.APR3,
+                ResultOCT3 = x.OCT3,
+                ResultAPR4 = x.APR4,
+                ResultOCT4 = x.OCT4,
+                ResultAPR5 = x.APR5,
+                ResultOCT5 = x.OCT5
+            })
+            .ToListAsync();
+
+            var seq = 1;
+            var resultList = new List<object>();
+            foreach (var d in data)
+            {
+                resultList.Add(new
+                {
+                    rowNo = seq++.ToString().ToThaiNumber(),
+                    d.ProfileId,
+                    d.FullName,
+                    d.RequestInsigniaName,
+                    Agency = d.Agency,
+                    ResultAPR1 = d.ResultAPR1 ?? "-",
+                    ResultOCT1 = d.ResultOCT1 ?? "-",
+                    ResultAPR2 = d.ResultAPR2 ?? "-",
+                    ResultOCT2 = d.ResultOCT2 ?? "-",
+                    ResultAPR3 = d.ResultAPR3 ?? "-",
+                    ResultOCT3 = d.ResultOCT3 ?? "-",
+                    ResultAPR4 = d.ResultAPR4 ?? "-",
+                    ResultOCT4 = d.ResultOCT4 ?? "-",
+                    ResultAPR5 = d.ResultAPR5 ?? "-",
+                    ResultOCT5 = d.ResultOCT5 ?? "-",
+                    Remark = d.Reason ?? "-"
+                });
+            }
+
+            return resultList;
+        }
+
         //noti ยื่นเสนอคน
         public async Task NotifyInsignia()
         {
@@ -1389,7 +1575,53 @@ namespace BMA.EHR.Application.Repositories.Reports
             }
         }
 
+        public void CalculateInsigniaRequestBkkByType(string type = "officer")
+        {
+            CalInsigniaRequestBkkByType(type).GetAwaiter().GetResult();
+        }
+
         //คำนวนผู้ได้รับเครื่องราชฯ
+        public async Task CalInsigniaRequestBkkByType(string type = "officer")
+        {
+            var insigniaPeriods = await _dbContext.Set<InsigniaPeriod>()
+                                    .Include(x => x.InsigniaRequests)
+                                    .AsQueryable()
+                                    .ToListAsync();
+            insigniaPeriods = insigniaPeriods
+                .Where(x => x.StartDate <= DateTime.Now.Date && x.InsigniaRequests.Where(x => x.ProfileType!.ToLower().Trim() == type.Trim().ToLower()).Count() == 0).ToList();
+
+            foreach (var insigniaPeriod in insigniaPeriods)
+            {
+                var organizations = await _userProfileRepository.GetActiveRootLatestAsync(AccessToken);
+                if (organizations == null)
+                    continue;
+                insigniaPeriod.RevisionId = Guid.Parse(organizations[0].OrgRevisionId);
+                foreach (var organization in organizations)
+                {
+                    if (organization == null)
+                        continue;
+
+                    var result = await _repositoryInsignia.GetInsigniaRequestByTypeAsync(insigniaPeriod.Id, organization.Id, type);
+                    if (result != null)
+                    {
+                        Guid period = result.PeriodId;
+                        string requestStatus = result.RequestStatus;
+                        var candidate = await _repositoryInsignia.GetInsigniaCandidateBKKByTypeAsync(insigniaPeriod.Id, organization.Id, type);
+                        // ตรวจสอบว่ารายการอยู่ใน table insignia_request_new
+                        if (requestStatus == null)
+                        {
+                            // บันทึกรายชื่อ
+                            if (candidate != null)
+                                await _repositoryInsignia.InsertCandidate(period, organization.Id, organization.OrgRootName, candidate, type);
+                        }
+
+
+                    }
+                }
+            }
+        }
+
+
         public async Task CalInsignaiRequestBkk()
         {
             var insigniaPeriods = await _dbContext.Set<InsigniaPeriod>()
@@ -1430,6 +1662,8 @@ namespace BMA.EHR.Application.Repositories.Reports
                 }
             }
         }
+
+
         public async Task<dynamic> GetKhr5TotalReport(Guid id, string type = null, int node = -1, Guid nodeId = default)
         {
             var period = await _dbContext.Set<InsigniaNote>()
@@ -1447,11 +1681,11 @@ namespace BMA.EHR.Application.Repositories.Reports
 
             if (type == "officer")
             {
-                data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "OFFICER");
+                data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "officer");
             }
             else if (type == "employee")
             {
-                data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "EMPLOYEE");
+                data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "employee");
             }
 
             switch (node)
@@ -1520,11 +1754,11 @@ namespace BMA.EHR.Application.Repositories.Reports
 
             if (type == "officer")
             {
-                data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "OFFICER");
+                data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "officer");
             }
             else if (type == "employee")
             {
-                data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "EMPLOYEE");
+                data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "employee");
             }
 
             switch (node)
@@ -1560,6 +1794,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                 RequestInsigniaName = x.RequestInsignia.Name,
                 IsApprove = x.IsApprove,
                 InsigniaInitial = $"{x.RequestInsignia.Name}({x.RequestInsignia.ShortName})", // Insignia's full name and short name
+                DatePayment = x.DatePayment,
                 OcId = x.Root
             }).ToListAsync();
             var insignia = (from r in data
@@ -1570,8 +1805,10 @@ namespace BMA.EHR.Application.Repositories.Reports
                                 DepartmentName = g.Key.OcId,
                                 InsigniaTypeName = g.Key.InsigniaTypeName,
                                 RequestInsigniaName = g.Key.RequestInsigniaName,
-                                Pending = g.Sum(x => x.IsApprove == false ? 1 : 0),
-                                Done = g.Sum(x => x.IsApprove == true ? 1 : 0),
+                                /* Pending = g.Sum(x => x.IsApprove == false ? 1 : 0),
+                                 Done = g.Sum(x => x.IsApprove == true ? 1 : 0),*/
+                                Pending = g.Sum(x => x.DatePayment == null ? 1 : 0),
+                                Done = g.Sum(x => x.DatePayment != null ? 1 : 0),
                                 Remark = "",
                             }).ToList();
 
@@ -1593,11 +1830,11 @@ namespace BMA.EHR.Application.Repositories.Reports
 
             if (type == "officer")
             {
-                data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "OFFICER");
+                data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "officer");
             }
             else if (type == "employee")
             {
-                data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToUpper() == "EMPLOYEE");
+                data_insigniaQuery = data_insigniaQuery.Where(r => r.ProfileType.Trim().ToLower() == "employee");
             }
 
             switch (node)
@@ -1630,7 +1867,7 @@ namespace BMA.EHR.Application.Repositories.Reports
             {
                 CitizenId = x.CitizenId,
                 Prefix = x.Prefix,
-                FullName = $"{x.Prefix}{x.FirstName} {x.LastName}",
+                FullName = $"{x.FirstName} {x.LastName}",
                 PosTypeName = x.PosTypeName,
                 PosLevelName = x.PosLevelName,
                 Position = x.Position,

BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs

@@ -51,7 +51,7 @@ namespace BMA.EHR.Application.Repositories.Reports
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                 var req = new HttpRequestMessage(HttpMethod.Get, api_url);
                 var res = await client.SendAsync(req);
                 var result = await res.Content.ReadAsStringAsync();
@@ -161,7 +161,7 @@ namespace BMA.EHR.Application.Repositories.Reports
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                 var req = new HttpRequestMessage(HttpMethod.Get, api_url);
                 var res = await client.SendAsync(req);
                 var result = await res.Content.ReadAsStringAsync();
@@ -433,7 +433,7 @@ namespace BMA.EHR.Application.Repositories.Reports
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                 var req = new HttpRequestMessage(HttpMethod.Get, api_url);
                 var res = await client.SendAsync(req);
                 var result = await res.Content.ReadAsStringAsync();
@@ -642,7 +642,7 @@ namespace BMA.EHR.Application.Repositories.Reports
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                 var req = new HttpRequestMessage(HttpMethod.Get, api_url);
                 var res = await client.SendAsync(req);
                 var result = await res.Content.ReadAsStringAsync();
@@ -894,7 +894,7 @@ namespace BMA.EHR.Application.Repositories.Reports
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
-                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                 var req = new HttpRequestMessage(HttpMethod.Get, api_url);
                 var res = await client.SendAsync(req);
                 var result = await res.Content.ReadAsStringAsync();

BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs

@@ -87,7 +87,7 @@ namespace BMA.EHR.Application.Repositories.Reports
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                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();
@@ -192,7 +192,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                         }).ToList();
                     }
                     string SignDate = retireHistorys.SignDate != null ? DateTime.Parse(retireHistorys.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "-";
-                    return new { SignDate, retireHistorys.Detail, retireHistorys.Id, retireHistorys.CreatedAt, Year = retireHistorys.Year.ToThaiYear().ToString().ToThaiNumber(), retireHistorys.Round, retireHistorys.Type, retireHistorys.TypeReport, Total = retireHistorys.Total.ToString().ToThaiNumber(), profiles = mapProfiles };
+                    return new { SignDate, Detail = retireHistorys.Detail.ToThaiNumber(), retireHistorys.Id, retireHistorys.CreatedAt, Year = retireHistorys.Year.ToThaiYear().ToString().ToThaiNumber(), retireHistorys.Round, retireHistorys.Type, retireHistorys.TypeReport, Total = retireHistorys.Total.ToString().ToThaiNumber(), profiles = mapProfiles };
                 }
             }
             else
@@ -274,13 +274,15 @@ namespace BMA.EHR.Application.Repositories.Reports
                 {
                     if (retire.TypeReport == null)
                     {
-                        profile_retire = profile_retire.OrderBy(x => rootOrder.ToObject<List<string>>().IndexOf(x.root))
+                        profile_retire = profile_retire
+                            .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 ?? ""))
                             .ThenBy(x => child3Order.ToObject<List<string>>().IndexOf(x.child3 ?? ""))
                             .ThenBy(x => child4Order.ToObject<List<string>>().IndexOf(x.child4 ?? ""))
                             .ThenBy(x => posTypeNameOrder.ToObject<List<string>>().IndexOf(x.posTypeName ?? ""))
-                            .ThenBy(x => posLevelNameOrder.ToObject<List<string>>().IndexOf(x.posLevelName ?? "")).ToList();
+                            .ThenBy(x => posLevelNameOrder.ToObject<List<string>>().IndexOf(x.posLevelName ?? ""))
+                            .ThenBy(x => x.posNo).ToList();
                     }
                     mapProfiles = profile_retire.Select((profile, index) =>
                     {
@@ -310,7 +312,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                             root = (isDuplicateRoot ? "" : profile.root + "\n") +
                                    (isDuplicateHospital || !hospital.ToObject<List<string>>().Contains(profile.child1) ? "" : profile.child1 + "\n") +
                                    (isDuplicatePosType ? "" : $"ตำแหน่งประเภท{profile.posTypeName}" + "\n") +
-                                   (isDuplicatePosLevel ? "" : $"ระดับ{profile.posLevelName}"),
+                                   (isDuplicatePosLevel ? "" : $"ระดับ{profile.posLevelName}").ToThaiNumber(),
                             child = (profile.posExecutiveName == null ? "" : profile.posExecutiveName + "\n") +
                                     (profile.child4 == null ? "" : profile.child4 + "\n") +
                                     (profile.child3 == null ? "" : profile.child3 + "\n") +
@@ -324,7 +326,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                     }).ToList();
                 }
                 string SignDate = retire.SignDate != null ? DateTime.Parse(retire.SignDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "-";
-                return new { SignDate, retire.Detail, retire.Id, retire.CreatedAt, Year = retire.Year.ToThaiYear().ToString().ToThaiNumber(), retire.Round, retire.Type, retire.TypeReport, Total = profile_retire.Count.ToString().ToThaiNumber(), profiles = mapProfiles };
+                return new { SignDate, Detail = retire.Detail.ToThaiNumber(), retire.Id, retire.CreatedAt, Year = retire.Year.ToThaiYear().ToString().ToThaiNumber(), retire.Round, retire.Type, retire.TypeReport, Total = profile_retire.Count.ToString().ToThaiNumber(), profiles = mapProfiles };
             }
         }
         #endregion
@@ -503,6 +505,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                             p.CommanderRejectReason,
                             p.CommanderRejectDate,
                             p.RemarkHorizontal,
+                            Type = "OFFICER"
                         })
                        .FirstOrDefaultAsync();
             if (data == null)
@@ -540,10 +543,130 @@ namespace BMA.EHR.Application.Repositories.Reports
                             p.CommanderRejectReason,
                             p.CommanderRejectDate,
                             p.RemarkHorizontal,
+                            Type = "EMPLOYEE",
                         })
                        .FirstOrDefaultAsync();
             if (data == null)
                 return null;
+
+            var approverPositionExecutiveName = "...............";
+            var approverStatus = "☐ อนุญาต";
+            var approverRejectStatus = "☐ ยับยั้งการลาออกไว้จนถึงวันที่...................";
+            var approver = "...................";
+            var approverPosition = "...................";
+
+            var diffDate = "☐ ไม่น้อยกว่า ๓๐ วัน  ☐ น้อยกว่า ๓๐ วัน";
+            if (data.SendDate.HasValue && data.ActiveDate.HasValue)
+            {
+                var time = data.ActiveDate.Value - data.SendDate.Value;
+                var day = time.TotalDays;
+                if (day < 30)
+                {
+                    diffDate = "☐ ไม่น้อยกว่า ๓๐ วัน  ☑ น้อยกว่า ๓๐ วัน";
+                }
+                else
+                {
+                    diffDate = "☑ ไม่น้อยกว่า ๓๐ วัน  ☐ น้อยกว่า ๓๐ วัน";
+                }
+            }
+
+            var commanderDateUpdate = "วันที่...................";
+            var commanderStatus = "☐ อนุญาต ตั้งแต่วันที่...................";
+            var commanderCommentApprove = "...................";
+            var commanderRejectStatus = "☐ ยับยั้งการลาออกไว้จนถึงวันที่...................";
+            var commanderCommentReject = "...................";
+            var commander = "...................";
+            var commanderPosition = "...................";
+
+            if (data.Type == "OFFICER")
+            {
+                var Approver = _dbContext.Set<RetirementResignApprover>()
+                    .Where(x => x.RetirementResign.Id == data.Id && x.ApproveType == "APPROVER")
+                    .ToList();
+                var Commander = _dbContext.Set<RetirementResignApprover>()
+                    .Where(x => x.RetirementResign.Id == data.Id && x.ApproveType == "COMMANDER")
+                    .OrderByDescending(x => x.Seq)
+                    .ToList();
+                if (Approver.Count > 0)
+                {
+                    approverPositionExecutiveName = Approver[0].PositionExecutiveName;
+                    approverStatus = Approver[0].ApproveStatus == "APPROVE" ? "☑ อนุญาต" : approverStatus;
+                    approverRejectStatus = Approver[0].ApproveStatus == "REJECT"
+                        ? $"☑ ยับยั้งการลาออกไว้จนถึง{(Approver[0].RejectDate != null ? DateTime.Parse(Approver[0].RejectDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "วันที่...................")}"
+                        : approverRejectStatus;
+                    approver = $"{Approver[0].Prefix}{Approver[0].FirstName} {Approver[0].LastName}";
+                    approverPosition = Approver[0].PositionName;
+                }
+                if (Commander.Count > 0)
+                {
+                    commanderDateUpdate = Commander.Count > 1
+                        ? Commander[1].LastUpdatedAt != null
+                            ? DateTime.Parse(Commander[1].LastUpdatedAt.ToString()).ToThaiFullDate().ToString().ToThaiNumber()
+                            : commanderDateUpdate
+                        : Commander[0].LastUpdatedAt != null
+                            ? DateTime.Parse(Commander[0].LastUpdatedAt.ToString()).ToThaiFullDate().ToString().ToThaiNumber()
+                            : commanderDateUpdate;
+                    commanderStatus = Commander[0].ApproveStatus == "APPROVE"
+                        ? $"☑ อนุญาต ตั้งแต่{(Commander[0].LastUpdatedAt != null ? DateTime.Parse(Commander[0].LastUpdatedAt.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "วันที่...................")}"
+                        : commanderStatus;
+                    commanderCommentApprove = Commander[0].ApproveStatus == "APPROVE"
+                        ? !string.IsNullOrWhiteSpace(Commander[0].Comment) ? Commander[0].Comment : commanderCommentApprove
+                        : commanderCommentApprove;
+                    commanderRejectStatus = Commander[0].ApproveStatus == "REJECT"
+                        ? $"☑ ยับยั้งการลาออกไว้จนถึง{(Commander[0].RejectDate != null ? DateTime.Parse(Commander[0].RejectDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "วันที่...................")}"
+                        : approverRejectStatus;
+                    commanderCommentReject = Commander[0].ApproveStatus == "REJECT"
+                        ? !string.IsNullOrWhiteSpace(Commander[0].Comment) ? Commander[0].Comment : commanderCommentReject
+                        : commanderCommentReject;
+                    commander = $"{Commander[0].Prefix}{Commander[0].FirstName} {Commander[0].LastName}";
+                    commanderPosition = Commander[0].PositionName;
+                }
+            }
+            else
+            {
+                var EmpApproves = _dbContext.Set<RetirementResignEmployeeApprover>()
+                    .Where(x => x.RetirementResignEmployee.Id == data.Id && x.ApproveType == "APPROVER")
+                    .ToList();
+                var EmpCommander = _dbContext.Set<RetirementResignEmployeeApprover>()
+                    .Where(x => x.RetirementResignEmployee.Id == data.Id && x.ApproveType == "COMMANDER")
+                    .OrderByDescending(x => x.Seq)
+                    .ToList();
+                if (EmpApproves.Count > 0)
+                {
+                    approverPositionExecutiveName = EmpApproves[0].PositionExecutiveName;
+                    approverStatus = EmpApproves[0].ApproveStatus == "APPROVE" ? "☑ อนุญาต" : approverStatus;
+                    approverRejectStatus = EmpApproves[0].ApproveStatus == "REJECT"
+                        ? $"☑ ยับยั้งการลาออกไว้จนถึง{(EmpApproves[0].RejectDate != null ? DateTime.Parse(EmpApproves[0].RejectDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "วันที่...................")}"
+                        : approverRejectStatus;
+                    approver = $"{EmpApproves[0].Prefix}{EmpApproves[0].FirstName} {EmpApproves[0].LastName}";
+                    approverPosition = EmpApproves[0].PositionName;
+                }
+                if (EmpCommander.Count > 0)
+                {
+                    commanderDateUpdate = EmpCommander.Count > 1
+                        ? EmpCommander[1].LastUpdatedAt != null
+                            ? DateTime.Parse(EmpCommander[1].LastUpdatedAt.ToString()).ToThaiFullDate().ToString().ToThaiNumber()
+                            : commanderDateUpdate
+                        : EmpCommander[0].LastUpdatedAt != null
+                            ? DateTime.Parse(EmpCommander[0].LastUpdatedAt.ToString()).ToThaiFullDate().ToString().ToThaiNumber()
+                            : commanderDateUpdate;
+                    commanderStatus = EmpCommander[0].ApproveStatus == "APPROVE"
+                        ? $"☑ อนุญาต ตั้งแต่{(EmpCommander[0].LastUpdatedAt != null ? DateTime.Parse(EmpCommander[0].LastUpdatedAt.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "วันที่...................")}"
+                        : commanderStatus;
+                    commanderCommentApprove = EmpCommander[0].ApproveStatus == "APPROVE"
+                        ? !string.IsNullOrWhiteSpace(EmpCommander[0].Comment) ? EmpCommander[0].Comment : commanderCommentApprove
+                        : commanderCommentApprove;
+                    commanderRejectStatus = EmpCommander[0].ApproveStatus == "REJECT"
+                        ? $"☑ ยับยั้งการลาออกไว้จนถึง{(EmpCommander[0].RejectDate != null ? DateTime.Parse(EmpCommander[0].RejectDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber() : "วันที่...................")}"
+                        : approverRejectStatus;
+                    commanderCommentReject = EmpCommander[0].ApproveStatus == "REJECT"
+                        ? !string.IsNullOrWhiteSpace(EmpCommander[0].Comment) ? EmpCommander[0].Comment : commanderCommentReject
+                        : commanderCommentReject;
+                    commander = $"{EmpCommander[0].Prefix}{EmpCommander[0].FirstName} {EmpCommander[0].LastName}";
+                    commanderPosition = EmpCommander[0].PositionName;
+                }
+            }
+
             var _data = new
             {
                 data.Id,
@@ -578,6 +701,19 @@ namespace BMA.EHR.Application.Repositories.Reports
                 data.CommanderRejectReason,
                 CommanderRejectDate = string.IsNullOrEmpty(data.CommanderRejectDate.ToString()) ? string.Empty : DateTime.Parse(data.CommanderRejectDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(),
                 data.RemarkHorizontal,
+                dear = approverPositionExecutiveName,
+                approverStatus,
+                approverRejectStatus,
+                approver,
+                approverPosition,
+                diffDate,
+                commanderDateUpdate,
+                commanderStatus,
+                commanderCommentApprove,
+                commanderRejectStatus,
+                commanderCommentReject,
+                commander,
+                commanderPosition
             };
 
             return _data;

BMA.EHR.Application/Repositories/Reports/TransferReportRepository.cs

@@ -37,7 +37,8 @@ namespace BMA.EHR.Application.Repositories.Reports
 
             return new
             {
-                CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM")).ToThaiFullDate().ToString().ToThaiNumber().Remove(0, 15),
+                //CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM")).ToThaiFullDate().ToString().ToThaiNumber().Remove(0, 15),
+                CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).ToThaiFullDate2().ToString().ToThaiNumber(),
                 Name = $"{data.prefix}{data.firstName} {data.lastName}",
             };
         }
@@ -52,7 +53,7 @@ namespace BMA.EHR.Application.Repositories.Reports
 
             return new
             {
-                CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM")).ToThaiFullDate().ToString().ToThaiNumber().Remove(0, 15),
+                CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).ToThaiFullDate2().ToString().ToThaiNumber(),
                 Subject = $"ข้าราชการกรุงเทพมหานครสามัญขอโอน",
                 Name = $"{data.prefix}{data.firstName} {data.lastName}",
             };
@@ -67,7 +68,7 @@ namespace BMA.EHR.Application.Repositories.Reports
                        .FirstOrDefaultAsync();
             return new
             {
-                CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM")).ToThaiFullDate().ToString().ToThaiNumber().Remove(0, 15),
+                CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).ToThaiFullDate2().ToString().ToThaiNumber(),
                 Subject = $"ข้าราชการขอโอน",
                 Name = $"{data.prefix}{data.firstName} {data.lastName}",
                 Location = $"สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร ๑๗๓  ถนนดินสอ  กทม. ๑๐๒๐๐",
@@ -84,7 +85,7 @@ namespace BMA.EHR.Application.Repositories.Reports
 
             return new
             {
-                CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM")).ToThaiFullDate().ToString().ToThaiNumber().Remove(0, 15),
+                CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).ToThaiFullDate2().ToString().ToThaiNumber(),
                 Subject = $"ข้าราชการกรุงเทพมหานครสามัญขอโอน",
                 Subject2 = $"ตรวจสอบหนี้สิน และภาระผูกพันกับกรุงเทพมหานครของข้าราชการ",
                 Subject3 = $"ตรวจสอบหนี้สินและภาระผูกพันของข้าราชการ",
@@ -105,7 +106,7 @@ namespace BMA.EHR.Application.Repositories.Reports
 
             return new
             {
-                CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM")).ToThaiFullDate().ToString().ToThaiNumber().Remove(0, 15),
+                CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).ToThaiFullDate2().ToString().ToThaiNumber(),
                 Subject = $"ข้าราชการกรุงเทพมหานครสามัญขอโอน",
                 Subject2 = $"ตรวจสอบพฤติการณ์ทางวินัย และภาระหนี้สิน (เงินกู้สวัสดิการข้าราชการ) ของข้าราชการ",
                 Subject3 = $"ตรวจสอบภาระผูกพันกับกรุงเทพมหานครเกี่ยวกับการลาศึกษา อบรม ของข้าราชการ",
@@ -126,7 +127,7 @@ namespace BMA.EHR.Application.Repositories.Reports
 
             return new
             {
-                CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM")).ToThaiFullDate().ToString().ToThaiNumber().Remove(0, 15),
+                CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).ToThaiFullDate2().ToString().ToThaiNumber(),
                 Subject = $"ข้าราชการกรุงเทพมหานครสามัญขอโอน",
                 Subject2 = $"ตรวจสอบพฤติการณ์ทางวินัย และภาระหนี้สิน (เงินกู้สวัสดิการข้าราชการ) ของข้าราชการ",
                 Subject3 = $"ตรวจสอบภาระผูกพันกับกรุงเทพมหานครเกี่ยวกับการลาศึกษา อบรม ของข้าราชการ",

BMA.EHR.Application/Repositories/RetirementRepository.cs

@@ -1,11 +1,14 @@
 using BMA.EHR.Application.Common.Interfaces;
 using BMA.EHR.Application.Repositories.MessageQueue;
+using BMA.EHR.Domain.Models.Notifications;
 using BMA.EHR.Domain.Models.Retirement;
+using BMA.EHR.Domain.Shared;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 using System.Net.Http.Headers;
+using System.Net.Http.Json;
 using System.Security.Claims;
 using System.Text;
 
@@ -17,15 +20,18 @@ namespace BMA.EHR.Application.Repositories
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly NotificationRepository _repositoryNoti;
         private readonly IConfiguration _configuration;
+        private readonly string URL = string.Empty;
         public RetirementRepository(IApplicationDBContext dbContext,
                                     NotificationRepository repositoryNoti,
                                     IHttpContextAccessor httpContextAccessor,
+                                      UserProfileRepository userProfileRepository,
                                     IConfiguration configuration) : base(dbContext, httpContextAccessor)
         {
             _dbContext = dbContext;
             _httpContextAccessor = httpContextAccessor;
             _repositoryNoti = repositoryNoti;
             _configuration = configuration;
+            URL = _configuration["VITE_URL_MGT"];
         }
 
         #region " Properties "
@@ -83,54 +89,836 @@ namespace BMA.EHR.Application.Repositories
             await _dbContext.SaveChangesAsync();
         }
 
-        //เกษียณอายุราชการ
-        //public async Task ExecuteRetirement()
-        //{
-        //    var retirePeriodOfficer = await _dbContext.Set<RetirementPeriod>()
-        //                        .Include(x => x.RetirementRawProfiles.Where(y => y.Remove != "REMOVE"))
-        //                        .Where(x => x.Year == DateTime.Now.Year)
-        //                        .Where(x => x.Type.Trim().ToUpper().Contains("OFFICER"))
-        //                        .FirstOrDefaultAsync();
-
-        //    if (retirePeriodOfficer == null)
-        //        return;
-
-        //    var body = new
-        //    {
-        //        data = retirePeriodOfficer.RetirementRawProfiles
-        //        .Select(x => new
-        //        {
-        //            profileId = x.profileId
-        //        })
-        //        .ToList()
-        //    };
-
-        //    //ข้าราชการ
-        //    //var apiUrl = $"{_configuration["API"]}/org/unauthorize/retirement";
-        //    using (var client = new HttpClient())
-        //    {
-        //        client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-        //        client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
-
-        //        var jsonBody = JsonConvert.SerializeObject(body);
-        //        var content = new StringContent(jsonBody, Encoding.UTF8, "application/json");
-
-        //        var _req = new HttpRequestMessage(HttpMethod.Patch, apiUrl)
-        //        {
-        //            Content = content
-        //        };
-        //        var response = await client.SendAsync(_req);
-        //        var responseContent = await response.Content.ReadAsStringAsync();
-        //        if (!response.IsSuccessStatusCode)
-        //        {
-
-        //        }
-        //    }
-        //}
-
         public void TestMethod()
         {
             return;
         }
+        public async Task<RetirementResign?> GetByIdAsync(Guid id)
+        {
+            try
+            {
+                var data = await _dbContext.Set<RetirementResign>().AsQueryable()
+                                .Include(x => x.Approvers)
+                                .FirstOrDefaultAsync(x => x.Id == id);
+
+                return data;
+            }
+            catch
+            {
+                throw;
+            }
+
+        }
+        public async Task OfficerApproveRetirementResign(Guid id)
+        {
+            var rawData = await GetByIdAsync(id);
+            if (rawData == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+
+            rawData.Status = "PENDING";
+            if (rawData.ApproveStep == "st1")
+            {
+                rawData.ApproveStep = "st2";
+            }
+            else if (rawData.ApproveStep == "st3")
+            {
+                rawData.ApproveStep = "st4";
+                // TODO: Send notification to 1st Approver
+                var _firstCommander = rawData.Approvers
+                           .Where(x => x.ApproveType!.ToUpper() == "APPROVER")
+                           .OrderBy(x => x.Seq)
+                           .FirstOrDefault();
+                // Send Notification
+                var _noti1 = new Notification
+                {
+                    Body = $"การขอลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                    ReceiverUserId = _firstCommander!.ProfileId,
+                    Type = "",
+                    Payload = $"{URL}/retirement/resign-detail/{id}",
+                };
+                _dbContext.Set<Notification>().Add(_noti1);
+            }
+
+            // TODO: Send notification to 1st Commander
+            var firstCommander = rawData.Approvers
+                            .Where(x => x.ApproveType!.ToUpper() == "COMMANDER")
+                            .OrderBy(x => x.Seq)
+                            .FirstOrDefault();
+            // Send Notification
+            var noti1 = new Notification
+            {
+                Body = $"การขอลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                ReceiverUserId = firstCommander!.ProfileId,
+                Type = "",
+                Payload = $"{URL}/retirement/resign-detail/{id}",
+            };
+            _dbContext.Set<Notification>().Add(noti1);
+            await _dbContext.SaveChangesAsync();
+        }
+
+        public async Task CommanderApproveRetirementResign(Guid id, string reason, DateTime? date)
+        {
+            // Get UserId from token
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+
+
+            var rawData = await GetByIdAsync(id);
+            if (rawData == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+
+            // if (rawData.ApproveStep != "st2")
+            // {
+            //     throw new Exception("คำขอนี้ยังไม่ได้อยู่ในขั้นตอนที่สามารถอนุมัติได้ ไม่สามารถทำรายการได้");
+            // }
+
+            var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "COMMANDER").OrderBy(x => x.Seq).ToList();
+
+            var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
+            if (approver == null)
+            {
+                throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาออกในขั้นตอนนี้");
+            }
+
+            // check prev approver มี action แล้วหรือไม่?
+            var prevApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq - 1);
+
+            if (prevApprover != null)
+            {
+                if (prevApprover.ApproveStatus == "PENDING")
+                {
+                    throw new Exception("ไม่สามารถทำการอนุมัติได้ เนื่องจากยังอยู่ระหว่างการพิจารณาโดยผู้บังคับบัญชารายก่อนหน้า");
+                }
+            }
+
+            var maxSeq = approvers.Max(x => x.Seq);
+
+            approver.ApproveStatus = "APPROVE";
+            approver.Comment = reason;
+            approver.RejectDate = date;
+
+            if (approver.Seq != maxSeq)
+            {
+                rawData.Status = "PENDING";
+
+                var nextApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq + 1);
+
+                // Send Noti
+                var noti = new Notification
+                {
+                    Body = $"การขอลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                    ReceiverUserId = nextApprover!.ProfileId,
+                    Type = "",
+                    Payload = $"{URL}/retirement/resign-detail/{id}",
+                };
+                _dbContext.Set<Notification>().Add(noti);
+                await _dbContext.SaveChangesAsync();
+            }
+            else
+            {
+                rawData.Status = "PENDING";
+                rawData.ApproveStep = "st3";
+
+                if (rawData.Group == "1.1")
+                {
+                    // TODO: Send notification to 1st Approver
+                    var firstCommander = rawData.Approvers
+                               .Where(x => x.ApproveType!.ToUpper() == "APPROVER")
+                               .OrderBy(x => x.Seq)
+                               .FirstOrDefault();
+
+                    // Send Notification
+                    var noti1 = new Notification
+                    {
+                        Body = $"การขอลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                        ReceiverUserId = firstCommander!.ProfileId,
+                        Type = "",
+                        Payload = $"{URL}/retirement/resign-detail/{id}",
+                    };
+                    _dbContext.Set<Notification>().Add(noti1);
+                }
+                await _dbContext.SaveChangesAsync();
+            }
+        }
+
+        public async Task CommanderRejectRetirementResign(Guid id, string reason, DateTime? date)
+        {
+            // Get UserId from token
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+
+
+            var rawData = await GetByIdAsync(id);
+            if (rawData == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+
+            // if (rawData.ApproveStep != "st2")
+            // {
+            //     throw new Exception("คำขอนี้ยังไม่ได้อยู่ในขั้นตอนที่สามารถอนุมัติได้ ไม่สามารถทำรายการได้");
+            // }
+
+            // check commander approve
+            var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "COMMANDER").OrderBy(x => x.Seq).ToList();
+
+            var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
+            if (approver == null)
+            {
+                throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาออกในขั้นตอนนี้");
+            }
+
+            // check prev approver มี action แล้วหรือไม่?
+            var prevApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq - 1);
+
+            if (prevApprover != null)
+            {
+                if (prevApprover.ApproveStatus == "PENDING")
+                {
+                    throw new Exception("ไม่สามารถทำการอนุมัติได้ เนื่องจากยังอยู่ระหว่างการพิจารณาโดยผู้บังคับบัญชารายก่อนหน้า");
+                }
+            }
+
+
+            var maxSeq = approvers.Max(x => x.Seq);
+
+            approver.ApproveStatus = "REJECT";
+            approver.Comment = reason;
+            approver.RejectDate = date;
+
+            if (approver.Seq != maxSeq)
+            {
+
+
+                var nextApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq + 1);
+                // Send Noti
+                var noti = new Notification
+                {
+                    Body = $"การขอลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                    ReceiverUserId = nextApprover!.ProfileId,
+                    Type = "",
+                    Payload = $"{URL}/retirement/resign-detail/{id}",
+                };
+                _dbContext.Set<Notification>().Add(noti);
+
+                rawData.Status = "PENDING";
+                await _dbContext.SaveChangesAsync();
+            }
+            else
+            {
+                rawData.Status = "PENDING";
+                // rawData.LeaveComment = reason;
+                // if (rawData.Group != "1.1")
+                // {
+                rawData.ApproveStep = "st3";
+                // }
+
+                if (rawData.Group == "1.1")
+                {
+                    // TODO: Send notification to 1st Approver
+                    var firstCommander = rawData.Approvers
+                               .Where(x => x.ApproveType!.ToUpper() == "APPROVER")
+                               .OrderBy(x => x.Seq)
+                               .FirstOrDefault();
+                    // Send Notification
+                    var noti1 = new Notification
+                    {
+                        Body = $"การขอลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                        ReceiverUserId = firstCommander!.ProfileId,
+                        Type = "",
+                        Payload = $"{URL}/retirement/resign-detail/{id}",
+                    };
+                    _dbContext.Set<Notification>().Add(noti1);
+                }
+                await _dbContext.SaveChangesAsync();
+            }
+
+        }
+
+        public async Task ApproveRetirementResign(Guid id, string reason, DateTime? date)
+        {
+            // Get UserId from token
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+
+            var rawData = await GetByIdAsync(id);
+            if (rawData == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+
+            // if (rawData.ApproveStep != "st3")
+            // {
+            //     throw new Exception("คำขอนี้ยังไม่ได้อยู่ในขั้นตอนที่สามารถอนุมัติได้ ไม่สามารถทำรายการได้");
+            // }
+
+            // check commander approve
+            var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "APPROVER").OrderBy(x => x.Seq).ToList();
+
+            var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
+            if (approver == null)
+            {
+                throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาออกในขั้นตอนนี้");
+            }
+
+            // check prev approver มี action แล้วหรือไม่?
+            var prevApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq - 1);
+
+            if (prevApprover != null)
+            {
+                if (prevApprover.ApproveStatus == "PENDING")
+                {
+                    throw new Exception("ไม่สามารถทำการอนุมัติได้ เนื่องจากยังอยู่ระหว่างการพิจารณาโดยผู้บังคับบัญชารายก่อนหน้า");
+                }
+            }
+
+
+            var maxSeq = approvers.Max(x => x.Seq);
+
+            approver.ApproveStatus = "APPROVE";
+            approver.Comment = reason;
+            approver.RejectDate = date;
+
+            if (approver.Seq != maxSeq)
+            {
+                var nextApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq + 1);
+                // Send Noti
+                var noti1 = new Notification
+                {
+                    Body = $"การขอลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                    ReceiverUserId = nextApprover!.ProfileId,
+                    Type = "",
+                    Payload = "",
+                };
+                _dbContext.Set<Notification>().Add(noti1);
+                await _dbContext.SaveChangesAsync();
+            }
+            else
+            {
+                rawData.Status = "APPROVE";
+                // rawData.LeaveDirectorComment = reason;
+                if (rawData.Group != "1.1")
+                {
+                    rawData.ApproveStep = "st5";
+                }
+                else
+                {
+                    rawData.ApproveStep = "st4";
+                }
+
+                if (rawData.profileId != null)
+                {
+                    // Send Noti
+                    var noti = new Notification
+                    {
+                        Body = $"การขอลาออกของคุณได้รับการอนุมัติ",
+                        ReceiverUserId = Guid.Parse(rawData.profileId),
+                        Type = "",
+                        Payload = "",
+                    };
+                    _dbContext.Set<Notification>().Add(noti);
+                }
+                await _dbContext.SaveChangesAsync();
+            }
+
+        }
+
+        public async Task RejectRetirementResign(Guid id, string reason, DateTime? date)
+        {
+            // Get UserId from token
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+
+            var rawData = await GetByIdAsync(id);
+            if (rawData == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+
+            // if (rawData.ApproveStep != "st3")
+            // {
+            //     throw new Exception("คำขอนี้ยังไม่ได้อยู่ในขั้นตอนที่สามารถอนุมัติได้ ไม่สามารถทำรายการได้");
+            // }
+
+            // check commander approve
+            var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "APPROVER").OrderBy(x => x.Seq).ToList();
+
+            var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
+            if (approver == null)
+            {
+                throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาออกในขั้นตอนนี้");
+            }
+
+            // check prev approver มี action แล้วหรือไม่?
+            var prevApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq - 1);
+
+            if (prevApprover != null)
+            {
+                if (prevApprover.ApproveStatus == "PENDING")
+                {
+                    throw new Exception("ไม่สามารถทำการอนุมัติได้ เนื่องจากยังอยู่ระหว่างการพิจารณาโดยผู้บังคับบัญชารายก่อนหน้า");
+                }
+            }
+
+
+            var maxSeq = approvers.Max(x => x.Seq);
+
+            approver.ApproveStatus = "REJECT";
+            approver.Comment = reason;
+            approver.RejectDate = date;
+
+            if (approver.Seq != maxSeq)
+            {
+                var nextApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq + 1);
+                // Send Noti
+                var noti1 = new Notification
+                {
+                    Body = $"การขอลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                    ReceiverUserId = nextApprover!.ProfileId,
+                    Type = "",
+                    Payload = "",
+                };
+                _dbContext.Set<Notification>().Add(noti1);
+                await _dbContext.SaveChangesAsync();
+            }
+            else
+            {
+                rawData.Status = "REJECT";
+                if (rawData.Group != "1.1")
+                {
+                    rawData.ApproveStep = "st5";
+                }
+                else
+                {
+                    rawData.ApproveStep = "st4";
+                }
+
+                // Send Noti
+                var noti = new Notification
+                {
+                    Body = $"การขอลาออกของคุณไม่ได้รับการอนุมัติ \r\nเนื่องจาก{reason}",
+                    ReceiverUserId = Guid.Parse(rawData.profileId),
+                    Type = "",
+                    Payload = "",
+                };
+                _dbContext.Set<Notification>().Add(noti);
+                await _dbContext.SaveChangesAsync();
+            }
+        }
+
+
+        public async Task<RetirementResignCancel?> GetByIdCancelAsync(Guid id)
+        {
+            try
+            {
+                var data = await _dbContext.Set<RetirementResignCancel>().AsQueryable()
+                                .Include(x => x.Approvers)
+                                .FirstOrDefaultAsync(x => x.Id == id);
+
+                return data;
+            }
+            catch
+            {
+                throw;
+            }
+
+        }
+        public async Task OfficerApproveRetirementResignCancel(Guid id)
+        {
+            var rawData = await GetByIdCancelAsync(id);
+            if (rawData == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+
+            rawData.Status = "PENDING";
+            if (rawData.ApproveStep == "st1")
+            {
+                rawData.ApproveStep = "st2";
+            }
+            else if (rawData.ApproveStep == "st3")
+            {
+                rawData.ApproveStep = "st4";
+                // TODO: Send notification to 1st Approver
+                var _firstCommander = rawData.Approvers
+                           .Where(x => x.ApproveType!.ToUpper() == "APPROVER")
+                           .OrderBy(x => x.Seq)
+                           .FirstOrDefault();
+                // Send Notification
+                var _noti1 = new Notification
+                {
+                    Body = $"การขอยกเลิกลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                    ReceiverUserId = _firstCommander!.ProfileId,
+                    Type = "",
+                    Payload = $"{URL}/retirement/resign-detail-reject/{rawData.Id}",
+                };
+                _dbContext.Set<Notification>().Add(_noti1);
+            }
+
+            // TODO: Send notification to 1st Commander
+            var firstCommander = rawData.Approvers
+                            .Where(x => x.ApproveType!.ToUpper() == "COMMANDER")
+                            .OrderBy(x => x.Seq)
+                            .FirstOrDefault();
+            // Send Notification
+            var noti1 = new Notification
+            {
+                Body = $"การขอยกเลิกลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                ReceiverUserId = firstCommander!.ProfileId,
+                Type = "",
+                Payload = $"{URL}/retirement/resign-detail-reject/{rawData.Id}",
+            };
+            _dbContext.Set<Notification>().Add(noti1);
+            await _dbContext.SaveChangesAsync();
+        }
+
+        public async Task CommanderApproveRetirementResignCancel(Guid id, string reason, DateTime? date)
+        {
+            // Get UserId from token
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+
+
+            var rawData = await GetByIdCancelAsync(id);
+            if (rawData == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+
+            // if (rawData.ApproveStep != "st2")
+            // {
+            //     throw new Exception("คำขอนี้ยังไม่ได้อยู่ในขั้นตอนที่สามารถอนุมัติได้ ไม่สามารถทำรายการได้");
+            // }
+
+            var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "COMMANDER").OrderBy(x => x.Seq).ToList();
+
+            var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
+            if (approver == null)
+            {
+                throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาออกในขั้นตอนนี้");
+            }
+
+            // check prev approver มี action แล้วหรือไม่?
+            var prevApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq - 1);
+
+            if (prevApprover != null)
+            {
+                if (prevApprover.ApproveStatus == "PENDING")
+                {
+                    throw new Exception("ไม่สามารถทำการอนุมัติได้ เนื่องจากยังอยู่ระหว่างการพิจารณาโดยผู้บังคับบัญชารายก่อนหน้า");
+                }
+            }
+
+            var maxSeq = approvers.Max(x => x.Seq);
+
+            approver.ApproveStatus = "APPROVE";
+            approver.Comment = reason;
+            approver.RejectDate = date;
+
+            if (approver.Seq != maxSeq)
+            {
+                rawData.Status = "PENDING";
+
+                var nextApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq + 1);
+
+                // Send Noti
+                var noti = new Notification
+                {
+                    Body = $"การขอยกเลิกลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                    ReceiverUserId = nextApprover!.ProfileId,
+                    Type = "",
+                    Payload = $"{URL}/retirement/resign-detail-reject/{rawData.Id}",
+                };
+                _dbContext.Set<Notification>().Add(noti);
+                await _dbContext.SaveChangesAsync();
+            }
+            else
+            {
+                rawData.Status = "PENDING";
+                rawData.ApproveStep = "st3";
+
+                if (rawData.Group == "1.1")
+                {
+                    // TODO: Send notification to 1st Approver
+                    var firstCommander = rawData.Approvers
+                               .Where(x => x.ApproveType!.ToUpper() == "APPROVER")
+                               .OrderBy(x => x.Seq)
+                               .FirstOrDefault();
+
+                    // Send Notification
+                    var noti1 = new Notification
+                    {
+                        Body = $"การขอยกเลิกลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                        ReceiverUserId = firstCommander!.ProfileId,
+                        Type = "",
+                        Payload = $"{URL}/retirement/resign-detail-reject/{rawData.Id}",
+                    };
+                    _dbContext.Set<Notification>().Add(noti1);
+                }
+                await _dbContext.SaveChangesAsync();
+            }
+        }
+
+        public async Task CommanderRejectRetirementResignCancel(Guid id, string reason, DateTime? date)
+        {
+            // Get UserId from token
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+
+
+            var rawData = await GetByIdCancelAsync(id);
+            if (rawData == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+
+            // if (rawData.ApproveStep != "st2")
+            // {
+            //     throw new Exception("คำขอนี้ยังไม่ได้อยู่ในขั้นตอนที่สามารถอนุมัติได้ ไม่สามารถทำรายการได้");
+            // }
+
+            // check commander approve
+            var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "COMMANDER").OrderBy(x => x.Seq).ToList();
+
+            var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
+            if (approver == null)
+            {
+                throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาออกในขั้นตอนนี้");
+            }
+
+            // check prev approver มี action แล้วหรือไม่?
+            var prevApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq - 1);
+
+            if (prevApprover != null)
+            {
+                if (prevApprover.ApproveStatus == "PENDING")
+                {
+                    throw new Exception("ไม่สามารถทำการอนุมัติได้ เนื่องจากยังอยู่ระหว่างการพิจารณาโดยผู้บังคับบัญชารายก่อนหน้า");
+                }
+            }
+
+
+            var maxSeq = approvers.Max(x => x.Seq);
+
+            approver.ApproveStatus = "REJECT";
+            approver.Comment = reason;
+            approver.RejectDate = date;
+
+            if (approver.Seq != maxSeq)
+            {
+
+
+                var nextApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq + 1);
+                // Send Noti
+                var noti = new Notification
+                {
+                    Body = $"การขอยกเลิกลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                    ReceiverUserId = nextApprover!.ProfileId,
+                    Type = "",
+                    Payload = $"{URL}/retirement/resign-detail-reject/{rawData.Id}",
+                };
+                _dbContext.Set<Notification>().Add(noti);
+
+                rawData.Status = "PENDING";
+                await _dbContext.SaveChangesAsync();
+            }
+            else
+            {
+                rawData.Status = "PENDING";
+                // rawData.LeaveComment = reason;
+                // if (rawData.Group != "1.1")
+                // {
+                rawData.ApproveStep = "st3";
+                // }
+
+                if (rawData.Group == "1.1")
+                {
+                    // TODO: Send notification to 1st Approver
+                    var firstCommander = rawData.Approvers
+                               .Where(x => x.ApproveType!.ToUpper() == "APPROVER")
+                               .OrderBy(x => x.Seq)
+                               .FirstOrDefault();
+                    // Send Notification
+                    var noti1 = new Notification
+                    {
+                        Body = $"การขอยกเลิกลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                        ReceiverUserId = firstCommander!.ProfileId,
+                        Type = "",
+                        Payload = $"{URL}/retirement/resign-detail-reject/{rawData.Id}",
+                    };
+                    _dbContext.Set<Notification>().Add(noti1);
+                }
+                await _dbContext.SaveChangesAsync();
+            }
+
+        }
+
+        public async Task ApproveRetirementResignCancel(Guid id, string reason, DateTime? date)
+        {
+            // Get UserId from token
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+
+            var rawData = await GetByIdCancelAsync(id);
+            if (rawData == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+
+            // if (rawData.ApproveStep != "st3")
+            // {
+            //     throw new Exception("คำขอนี้ยังไม่ได้อยู่ในขั้นตอนที่สามารถอนุมัติได้ ไม่สามารถทำรายการได้");
+            // }
+
+            // check commander approve
+            var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "APPROVER").OrderBy(x => x.Seq).ToList();
+
+            var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
+            if (approver == null)
+            {
+                throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาออกในขั้นตอนนี้");
+            }
+
+            // check prev approver มี action แล้วหรือไม่?
+            var prevApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq - 1);
+
+            if (prevApprover != null)
+            {
+                if (prevApprover.ApproveStatus == "PENDING")
+                {
+                    throw new Exception("ไม่สามารถทำการอนุมัติได้ เนื่องจากยังอยู่ระหว่างการพิจารณาโดยผู้บังคับบัญชารายก่อนหน้า");
+                }
+            }
+
+
+            var maxSeq = approvers.Max(x => x.Seq);
+
+            approver.ApproveStatus = "APPROVE";
+            approver.Comment = reason;
+            approver.RejectDate = date;
+
+            if (approver.Seq != maxSeq)
+            {
+                var nextApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq + 1);
+                // Send Noti
+                var noti1 = new Notification
+                {
+                    Body = $"การขอยกเลิกลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                    ReceiverUserId = nextApprover!.ProfileId,
+                    Type = "",
+                    Payload = "",
+                };
+                _dbContext.Set<Notification>().Add(noti1);
+                await _dbContext.SaveChangesAsync();
+            }
+            else
+            {
+                rawData.Status = "APPROVE";
+                // rawData.LeaveDirectorComment = reason;
+                if (rawData.Group != "1.1")
+                {
+                    rawData.ApproveStep = "st5";
+                }
+                else
+                {
+                    rawData.ApproveStep = "st4";
+                }
+
+                if (rawData.profileId != null)
+                {
+                    // Send Noti
+                    var noti = new Notification
+                    {
+                        Body = $"การขอยกเลิกลาออกของคุณได้รับการอนุมัติ",
+                        ReceiverUserId = Guid.Parse(rawData.profileId),
+                        Type = "",
+                        Payload = "",
+                    };
+                    _dbContext.Set<Notification>().Add(noti);
+                }
+                await _dbContext.SaveChangesAsync();
+            }
+
+        }
+
+        public async Task RejectRetirementResignCancel(Guid id, string reason, DateTime? date)
+        {
+            // Get UserId from token
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+
+            var rawData = await GetByIdCancelAsync(id);
+            if (rawData == null)
+            {
+                throw new Exception(GlobalMessages.DataNotFound);
+            }
+
+            // if (rawData.ApproveStep != "st3")
+            // {
+            //     throw new Exception("คำขอนี้ยังไม่ได้อยู่ในขั้นตอนที่สามารถอนุมัติได้ ไม่สามารถทำรายการได้");
+            // }
+
+            // check commander approve
+            var approvers = rawData.Approvers.Where(x => x.ApproveType!.ToUpper() == "APPROVER").OrderBy(x => x.Seq).ToList();
+
+            var approver = approvers.FirstOrDefault(x => x.KeycloakId == userId);
+            if (approver == null)
+            {
+                throw new Exception("คุณไม่มีสิทธิ์อนุมัติการลาออกในขั้นตอนนี้");
+            }
+
+            // check prev approver มี action แล้วหรือไม่?
+            var prevApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq - 1);
+
+            if (prevApprover != null)
+            {
+                if (prevApprover.ApproveStatus == "PENDING")
+                {
+                    throw new Exception("ไม่สามารถทำการอนุมัติได้ เนื่องจากยังอยู่ระหว่างการพิจารณาโดยผู้บังคับบัญชารายก่อนหน้า");
+                }
+            }
+
+
+            var maxSeq = approvers.Max(x => x.Seq);
+
+            approver.ApproveStatus = "REJECT";
+            approver.Comment = reason;
+            approver.RejectDate = date;
+
+            if (approver.Seq != maxSeq)
+            {
+                var nextApprover = approvers.FirstOrDefault(x => x.Seq == approver.Seq + 1);
+                // Send Noti
+                var noti1 = new Notification
+                {
+                    Body = $"การขอยกเลิกลาออกของคุณ {rawData.firstName} {rawData.lastName} รอรับการอนุมัติจากคุณ",
+                    ReceiverUserId = nextApprover!.ProfileId,
+                    Type = "",
+                    Payload = "",
+                };
+                _dbContext.Set<Notification>().Add(noti1);
+                await _dbContext.SaveChangesAsync();
+            }
+            else
+            {
+                rawData.Status = "REJECT";
+                if (rawData.Group != "1.1")
+                {
+                    rawData.ApproveStep = "st5";
+                }
+                else
+                {
+                    rawData.ApproveStep = "st4";
+                }
+
+                // Send Noti
+                var noti = new Notification
+                {
+                    Body = $"การขอยกเลิกลาออกของคุณไม่ได้รับการอนุมัติ \r\nเนื่องจาก{reason}",
+                    ReceiverUserId = Guid.Parse(rawData.profileId),
+                    Type = "",
+                    Payload = "",
+                };
+                _dbContext.Set<Notification>().Add(noti);
+                await _dbContext.SaveChangesAsync();
+            }
+        }
+
     }
 }

BMA.EHR.Application/Repositories/UserProfileRepository.cs

@@ -1,5 +1,6 @@
 using BMA.EHR.Application.Common.Interfaces;
 using BMA.EHR.Application.Responses.Insignias;
+using BMA.EHR.Application.Responses.Leaves;
 using BMA.EHR.Application.Responses.Organizations;
 using BMA.EHR.Application.Responses.Profiles;
 using BMA.EHR.Domain.Models.HR;
@@ -9,8 +10,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
-using System.Reflection.Emit;
-using System.Security.Cryptography;
 
 namespace BMA.EHR.Application.Repositories
 {
@@ -67,7 +66,7 @@ namespace BMA.EHR.Application.Repositories
         {
             try
             {
-                var apiPath = $"{_configuration["API"]}/org/dotnet/root/officer/{rootId}";
+                var apiPath = $"{_configuration["API"]}/org/unauthorize/root/officer/{rootId}";
                 var apiKey = _configuration["API_KEY"];
 
 
@@ -129,11 +128,11 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
-        public async Task<List<GetProfileByRootIdDto>> GetEmployeeProfileByPositionAsync(Guid rootId, dynamic empPosId, string? accessToken)
+        public async Task<List<GetProfileByRootIdDto>> GetEmployeeProfileByPositionAsync(Guid rootId, string[] empPosId, string? accessToken)
         {
             try
             {
-                var apiPath = $"{_configuration["API"]}/org/dotnet/find/employee/position";
+                var apiPath = $"{_configuration["API"]}/org/unauthorize/find/employee/position";
                 var apiKey = _configuration["API_KEY"];
 
                 var body = new
@@ -142,7 +141,12 @@ namespace BMA.EHR.Application.Repositories
                     empPosId
                 };
 
-                var apiResult = await PostExternalAPIAsync(apiPath, accessToken, body, apiKey);
+                //var bodyJson = JsonConvert.SerializeObject(bodyRaw);
+
+                // สร้าง HTTP content
+                //var body = new StringContent(bodyJson, Encoding.UTF8, "application/json");
+
+                var apiResult = await PostExternalAPIAsync(apiPath, accessToken ?? "", body, apiKey);
 
                 if (apiResult != null)
                 {
@@ -153,7 +157,7 @@ namespace BMA.EHR.Application.Repositories
 
                 return null;
             }
-            catch
+            catch (Exception ex)
             {
                 throw;
             }
@@ -182,11 +186,36 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
-        public async Task<GetProfileByKeycloakIdDto?> GetProfileByProfileIdAsync(Guid keycloakId, string? accessToken)
+
+
+        public async Task<GetProfileByKeycloakIdDto?> GetProfileByKeycloakIdNewAsync(Guid keycloakId, string? accessToken,CancellationToken cancellationToken = default)
         {
             try
             {
-                var apiPath = $"{_configuration["API"]}/org/dotnet/profile/{keycloakId}";
+                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);
@@ -204,6 +233,161 @@ namespace BMA.EHR.Application.Repositories
                 throw;
             }
         }
+        
+        public async Task<GetProfileByKeycloakIdDto?> GetProfileByCheckInAsync(Guid keycloakId, string? accessToken)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/check-keycloak/{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
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/profile-leave/keycloak/{keycloakId}";
+                var apiKey = _configuration["API_KEY"];
+
+                var apiResult = await GetExternalAPIAsync(apiPath, accessToken ?? "", apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetProfileLeaveByKeycloakResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                }
+
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        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
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/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<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)
         {
@@ -493,6 +677,223 @@ 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, DateTime? startDate, DateTime? endDate)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/officer-by-admin-role";
+                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>> 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
@@ -526,6 +927,41 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
+        public async Task<List<GetProfileByKeycloakIdRootDto>> GetProfileWithKeycloakAllOfficerRetireFilterAndRevisionAndDate(string? accessToken, int? node, string? nodeId, bool isAll, bool? isRetirement, string? revisionId, DateTime? startDate, DateTime? endDate)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/keycloak-all-officer/date";
+                var apiKey = _configuration["API_KEY"];
+                var body = new
+                {
+                    node = node,
+                    nodeId = nodeId,
+                    isAll = isAll,
+                    isRetirement = isRetirement,
+                    revisionId = revisionId,
+                    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>> GetProfileWithKeycloakAllEmployeeAndRevision(string? accessToken, int? node, string? nodeId, bool isAll, string? revisionId)
         {
             try
@@ -589,7 +1025,80 @@ namespace BMA.EHR.Application.Repositories
                 throw;
             }
         }
-        public async Task<List<SearchProfileDto>> SearchProfile(string? citizenId, string? firstName, string? lastName, string accessToken)
+
+        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
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/employee-by-admin-role";
+                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>> GetEmployeeByAdminRolev2(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/employee-by-admin-rolev2";
+                var apiKey = _configuration["API_KEY"];
+                var body = new
+                {
+                    node = node,
+                    nodeId = nodeId,
+                    role = role,
+                    // isRetirement
+                    reqNode = reqNode,
+                    reqNodeId = reqNodeId,
+                    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<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
             {
@@ -599,42 +1108,31 @@ namespace BMA.EHR.Application.Repositories
                 {
                     citizenId = citizenId,
                     firstName = firstName,
-                    lastName = lastName
+                    lastName = lastName,
+                    role = role,
+                    nodeId = nodeId,
+                    node = node,
+                    page = page,
+                    pageSize = pageSize,
+                    selectedNodeId = selectedNodeId,
+                    selectedNode = selectedNode
                 };
 
-                var profiles = new List<SearchProfileDto>();
+                var profiles = new List<GetProfileByKeycloakIdRootDto>();
+                var total = 0;
 
                 var apiResult = await PostExternalAPIAsync(apiPath, accessToken, body, apiKey);
                 if (apiResult != null)
                 {
-                    var raw = JsonConvert.DeserializeObject<SearchProfileResultDto>(apiResult);
+                    var raw = JsonConvert.DeserializeObject<GetListProfileByKeycloakIdRootResultAddTotalDto>(apiResult);
                     if (raw != null && raw.Result != null)
                     {
-                        profiles.AddRange(raw.Result);
+                        profiles = raw.Result.Data;
+                        total = raw.Result.Total;
                     }
                 }
 
-                return profiles;
-
-                //var data = _dbContext.Set<Profile>().AsQueryable()
-                //                     .Where(x => x.ProfileType == "officer");
-
-
-                //if (citizenId != null)
-                //    data = data.Where(x => x.CitizenId!.Contains(citizenId));
-
-                //if (firstName != null)
-                //    data = data.Where(x => x.FirstName!.Contains(firstName));
-
-                //if (lastName != null)
-                //    data = data.Where(x => x.LastName!.Contains(lastName));
-
-                //data = data.Include(x => x.Prefix)
-                //           .Include(x => x.Position)
-                //           .Include(x => x.PositionLevel)
-                //           .Include(x => x.PosNo);
-
-                //return await data.ToListAsync();
+                return new GetProfileByKeycloakIdRootAddTotalDto { Data = profiles, Total = total };
             }
             catch
             {
@@ -642,7 +1140,7 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
-        public async Task<List<SearchProfileDto>> SearchProfileEmployee(string? citizenId, string? firstName, string? lastName, string accessToken)
+        public async Task<GetProfileByKeycloakIdRootAddTotalDto> SearchProfileEmployee(string? citizenId, string? firstName, string? lastName, string accessToken, int page, int pageSize, string? role, string? nodeId, int? node)
         {
             try
             {
@@ -652,42 +1150,29 @@ namespace BMA.EHR.Application.Repositories
                 {
                     citizenId = citizenId,
                     firstName = firstName,
-                    lastName = lastName
+                    lastName = lastName,
+                    role = role,
+                    nodeId = nodeId,
+                    node = node,
+                    page = page,
+                    pageSize = pageSize,
                 };
 
-                var profiles = new List<SearchProfileDto>();
+                var profiles = new List<GetProfileByKeycloakIdRootDto>();
+                var total = 0;
 
                 var apiResult = await PostExternalAPIAsync(apiPath, accessToken, body, apiKey);
                 if (apiResult != null)
                 {
-                    var raw = JsonConvert.DeserializeObject<SearchProfileResultDto>(apiResult);
+                    var raw = JsonConvert.DeserializeObject<GetListProfileByKeycloakIdRootResultAddTotalDto>(apiResult);
                     if (raw != null && raw.Result != null)
                     {
-                        profiles.AddRange(raw.Result);
+                        profiles.AddRange(raw.Result.Data);
+                        total = raw.Result.Total;
                     }
                 }
 
-                return profiles;
-
-
-                //var data = _dbContext.Set<Profile>().AsQueryable()
-                //                     .Where(x => x.ProfileType == "employee");
-
-
-                //if (citizenId != null)
-                //    data = data.Where(x => x.CitizenId!.Contains(citizenId));
-
-                //if (firstName != null)
-                //    data = data.Where(x => x.FirstName!.Contains(firstName));
-
-                //if (lastName != null)
-                //    data = data.Where(x => x.LastName!.Contains(lastName));
-
-                //data = data.Include(x => x.Prefix);
-                ////.Include(x => x.PosNoEmployee);
-
-
-                //return await data.ToListAsync();
+                return new GetProfileByKeycloakIdRootAddTotalDto { Data = profiles, Total = total };
             }
             catch
             {
@@ -756,7 +1241,30 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
-        public GetUserOCIdDto? GetUserOC(Guid keycloakId, string? accessToken)
+        public async Task<GetUserOCAllDto?> GetUserOCAll(Guid keycloakId, string? accessToken)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/user-oc-all/{keycloakId}";
+                var apiKey = _configuration["API_KEY"];
+
+                var apiResult = await GetExternalAPIAsync(apiPath, accessToken ?? "", apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetUserOCAllResultDto>(apiResult);
+                    return raw?.Result;
+                }
+
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+
+        public async Task<GetUserOCIdDto?> GetUserOC(Guid keycloakId, string? accessToken)
         {
             try
             {
@@ -767,15 +1275,11 @@ namespace BMA.EHR.Application.Repositories
                 var apiResult = GetExternalAPIAsync(apiPath, accessToken ?? "", apiKey);
                 if (apiResult.Result != null)
                 {
-                    var raw = JsonConvert.DeserializeObject<GetUserOCIdDto>(apiResult.Result);
+                    var raw = JsonConvert.DeserializeObject<GetUserOCIdResultDto>(apiResult.Result);
 
-                    return raw;
-
-                    //if (raw == null || raw.RootId == null)
-                    //    return Guid.Empty;
-                    //return raw.RootId;
+                    if (raw != null)
+                        return raw.Result;
                 }
-
                 return null;
             }
             catch
@@ -814,7 +1318,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
             {
@@ -845,6 +1349,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
@@ -964,7 +1500,7 @@ namespace BMA.EHR.Application.Repositories
         {
             try
             {
-                var apiPath = $"{_configuration["API"]}/org/active/root/all";
+                var apiPath = $"{_configuration["API"]}/org/unauthorize/active/root/all";
                 var apiKey = _configuration["API_KEY"];
 
                 var apiResult = await GetExternalAPIAsync(apiPath, accessToken ?? "", apiKey);
@@ -1002,6 +1538,48 @@ namespace BMA.EHR.Application.Repositories
 
         }
 
+        public async Task PostInsigniaMessageToSocket(string message, string userId, string? accessToken)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/through-socket/notify";
+                var apiKey = _configuration["API_KEY"];
+
+                var body = new
+                {
+                    message = message,
+                    userId = userId
+                };
+
+                var apiResult = await PostExternalAPIBooleanAsync(apiPath, accessToken ?? "", body, apiKey);
+
+            }
+            catch
+            {
+                throw;
+            }
+
+        }
+
+        public async Task PostProfileEmpInsigniaAsync(PostProfileEmpInsigniaDto body, string? accessToken)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/profile-employee/insignia";
+                var apiKey = _configuration["API_KEY"];
+
+                var profiles = new List<SearchProfileDto>();
+
+                var apiResult = await PostExternalAPIBooleanAsync(apiPath, accessToken ?? "", body, apiKey);
+
+            }
+            catch
+            {
+                throw;
+            }
+
+        }
+
         public async Task<GetIsOfficerDto> GetIsOfficerRootAsync(string? accessToken, string sys)
         {
             try
@@ -1024,6 +1602,82 @@ namespace BMA.EHR.Application.Repositories
 
         }
 
+        public async Task<List<GetMarkStatusDto>> GetInsigniaRequestsProfileAsync(string[] profileIds, string type, string? accessToken)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/dotnet/find/insignia-requests-profile/{type}";
+                var apiKey = _configuration["API_KEY"];
+
+                var body = new
+                {
+                    profileIds
+                };
+
+                var apiResult = await PostExternalAPIAsync(apiPath, accessToken, body, apiKey);
+
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetMarkStatusResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                }
+
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
+        public GetOrgProfileByProfileIdDto GetOrgProfileByProfileId(Guid id, string? accessToken)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/profile/org-user/{id}";
+                var apiKey = _configuration["API_KEY"];
+
+                var apiResult = GetExternalAPIAsync(apiPath, accessToken ?? "", apiKey);
+                if (apiResult.Result != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetOrgProfileByProfileIdResultDto>(apiResult.Result);
+                    if (raw != null)
+                        return raw.Result;
+                }
+
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+        public async Task<List<GetProfileSalaryDto>> GetProfileSalaryById(Guid profileId, string? accessToken)
+        {
+            try
+            {
+                var apiPath = $"{_configuration["API"]}/org/profile/insignia/position";
+                var apiKey = _configuration["API_KEY"];
+                var body = new
+                {
+                    profileId = profileId.ToString(),
+                };
+                var apiResult = await PostExternalAPIAsync(apiPath, accessToken ?? "", body, apiKey);
+                if (apiResult != null)
+                {
+                    var raw = JsonConvert.DeserializeObject<GetProfileSalaryResultDto>(apiResult);
+                    if (raw != null)
+                        return raw.Result;
+                }
+                return null;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
         #endregion
     }
 }

BMA.EHR.Application/Requests/InsigniaBorrowRequest.cs

@@ -9,4 +9,18 @@ namespace BMA.EHR.Application.Requests
         public Guid? BorrowOrganizationId { get; set; }
         public Guid InsigniaNoteProfileId { get; set; }
     }
+
+    public class InsigniaReclaimRequest
+    {
+        public DateTime ReclaimDate { get; set; }
+        public Guid InsigniaNoteProfileId { get; set; }
+
+        public string? ReclaimNote { get; set; }
+    }
+
+    public class UpdateInsigniaReclaimRequest
+    {
+        public DateTime ReclaimDate { get; set; }
+        public string? ReclaimNote { get; set; }
+    }
 }

BMA.EHR.Application/Requests/InsigniaRequestItem.cs

@@ -23,6 +23,7 @@
         public bool? MarkDiscipline { get; set; }
         public bool? MarkLeave { get; set; }
         public bool? MarkRate { get; set; }
+        public bool? MarkInsignia { get; set; }
         public List<InsigniaRequestDoc>? Docs { get; set; }
 
         public List<MatchingCondition> MatchingConditions { get; set; } = new List<MatchingCondition>();

BMA.EHR.Application/Requests/InsigniaResultSet.cs

@@ -68,6 +68,14 @@ namespace BMA.EHR.Application.Requests
         public string? Child4 { get; set; }
 
         public List<MatchingCondition> MatchingConditions { get; set; } = new List<MatchingCondition>();
+
+        public bool? MarkDiscipline { get; set; } = false;
+
+        public bool? MarkLeave { get; set; } = false;
+
+        public bool? MarkRate { get; set; } = false;
+
+        public bool? MarkInsignia { get; set; } = false;
     }
 
     public class MatchingCondition

BMA.EHR.Application/Responses/CommandPayload.cs

@@ -13,5 +13,6 @@
 
         public bool? isReport { get; set; }
 
+        public bool? isTemplate { get; set; }
     }
 }

BMA.EHR.Application/Responses/Insignias/PostProfileEmpInsigniaDto.cs

@@ -0,0 +1,33 @@
+namespace BMA.EHR.Application.Responses.Insignias
+{
+    public class PostProfileEmpInsigniaDto
+    {
+        public Guid profileEmployeeId { get; set; }
+
+        public int year { get; set; } = 0;
+
+        public string no { get; set; } = string.Empty;
+
+        public string volume { get; set; } = string.Empty;
+
+        public string section { get; set; } = string.Empty;
+
+        public string page { get; set; } = string.Empty;
+
+        public DateTime receiveDate { get; set; } = DateTime.MinValue;
+
+        public Guid insigniaId { get; set; }
+
+        public DateTime dateAnnounce { get; set; } = DateTime.MinValue;
+
+        public string issue { get; set; } = string.Empty;
+
+        public string volumeNo { get; set; } = string.Empty;
+
+        public DateTime? refCommandDate { get; set; }
+
+        public string refCommandNo { get; set; } = string.Empty;
+
+        public string note { get; set; } = string.Empty;
+    }
+}

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();
+    }
+}

BMA.EHR.Application/Responses/Leaves/GetProfileLeaveByKeycloakDto.cs

@@ -0,0 +1,56 @@
+namespace BMA.EHR.Application.Responses.Leaves
+{
+    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; } = 0;
+        public string? TelephoneNumber { 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; }
+        public string? Child3 { get; set; }
+        public string? Child4 { get; set; }
+        public List<ProfileLeavePosition> Positions { get; set; } = new();
+        public List<ProfileLeaveEducation> Educations { get; set; } = new();
+    }
+
+    public class ProfileLeavePosition
+    {
+        public string? PositionName { get; set; } = string.Empty;
+        public DateTime DateStart { get; set; }
+        public DateTime DateEnd { get; set; }
+        public string? PositionType { get; set; } = string.Empty;
+        public string? PositionLevel { get; set; } = string.Empty;
+        public string? OrgRoot { get; set; } = string.Empty;
+        public string? OrgChild1 { get; set; } = string.Empty;
+        public string? OrgChild2 { get; set; } = string.Empty;
+        public string? OrgChild3 { get; set; } = string.Empty;
+        public string? OrgChild4 { get; set; } = string.Empty;
+    }
+
+    public class ProfileLeaveEducation
+    {
+        public string EducationLevel { get; set; } = string.Empty;
+        public string Institute { get; set; } = string.Empty;
+        public string? Country { get; set; } = string.Empty;
+        public DateTime? FinishDate { get; set; }
+    }
+}

BMA.EHR.Application/Responses/Leaves/GetProfileLeaveByKeycloakResultDto.cs

@@ -0,0 +1,11 @@
+namespace BMA.EHR.Application.Responses.Leaves
+{
+    public class GetProfileLeaveByKeycloakResultDto
+    {
+        public string Message { get; set; } = string.Empty;
+
+        public int Status { get; set; } = -1;
+
+        public GetProfileLeaveByKeycloakDto? Result { get; set; }
+    }
+}

BMA.EHR.Application/Responses/Leaves/GetSumApproveLeaveByTypeDto.cs

@@ -8,6 +8,8 @@
 
         public string LeaveTypeCode { get; set; } = string.Empty;
 
-        public double SumLeaveDay { get; set; }
+        public double SumLeaveDay { get; set; } = 0.0;
+
+        public int CountLeaveDay { get; set; } = 0;
     }
 }

BMA.EHR.Application/Responses/Organizations/GetOrganizationResponseDTO.cs

@@ -37,5 +37,11 @@ namespace BMA.EHR.Application.Responses.Organizations
         public string? Child4 { get; set; }
 
         public string? Child4ShortName { 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; }
     }
 }

BMA.EHR.Application/Responses/Profiles/GetListProfileByKeycloakIdRootResultDto.cs

@@ -8,4 +8,12 @@
 
         public List<GetProfileByKeycloakIdRootDto> Result { get; set; } = new();
     }
+    public class GetListProfileByKeycloakIdRootResultAddTotalDto
+    {
+        public string Message { get; set; } = string.Empty;
+
+        public int Status { get; set; } = -1;
+
+        public GetProfileByKeycloakIdRootAddTotalDto Result { get; set; } = new();
+    }
 }

BMA.EHR.Application/Responses/Profiles/GetMarkStatusDto.cs

@@ -0,0 +1,23 @@
+namespace BMA.EHR.Application.Responses.Profiles
+{
+    public class GetMarkStatusDto
+    {
+        public Guid Id { get; set; }
+        public bool? MarkDiscipline { get; set; } = false;
+        public bool? MarkLeave { get; set; } = false;
+        public bool? MarkRate { get; set; } = false;
+        public bool? MarkInsignia { get; set; } = false;
+
+        public string? APR1 { get; set; }
+        public string? APR2 { get; set; }
+        public string? APR3 { get; set; }
+        public string? APR4 { get; set; }
+        public string? APR5 { get; set; }
+
+        public string? OCT1 { get; set; }
+        public string? OCT2 { get; set; }
+        public string? OCT3 { get; set; }
+        public string? OCT4 { get; set; }
+        public string? OCT5 { get; set; }
+    }
+}

BMA.EHR.Application/Responses/Profiles/GetMarkStatusResultDto.cs

@@ -0,0 +1,12 @@
+namespace BMA.EHR.Application.Responses.Profiles
+{
+    public class GetMarkStatusResultDto
+    {
+        public string Message { get; set; } = string.Empty;
+
+        public int Status { get; set; } = -1;
+
+        public List<GetMarkStatusDto> Result { get; set; } = new();
+
+    }
+}

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();
+
+    }
+}

BMA.EHR.Application/Responses/Profiles/GetOrgProfileByProfileIdDto.cs

@@ -0,0 +1,11 @@
+namespace BMA.EHR.Application.Responses.Profiles
+{
+    public class GetOrgProfileByProfileIdDto
+    {
+        public string? Root { get; set; }
+        public string? Child1 { get; set; }
+        public string? Child2 { get; set; }
+        public string? Child3 { get; set; }
+        public string? Child4 { get; set; }
+    }
+}

BMA.EHR.Application/Responses/Profiles/GetOrgProfileByProfileIdResultDto.cs

@@ -0,0 +1,11 @@
+namespace BMA.EHR.Application.Responses.Profiles
+{
+    public class GetOrgProfileByProfileIdResultDto
+    {
+        public string Message { get; set; } = string.Empty;
+
+        public int Status { get; set; } = -1;
+
+        public GetOrgProfileByProfileIdDto? Result { get; set; }
+    }
+}

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,10 @@ 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;
 
     }
 

BMA.EHR.Application/Responses/Profiles/GetProfileByKeycloakIdRootDto.cs

@@ -16,5 +16,27 @@ namespace BMA.EHR.Application.Responses.Profiles
         public string? PositionLevel { get; set; }
         public string? PositionType { get; set; }
         public string? Oc { get; set; }
+        public string? OrgRootId { get; set; }
+        public string? OrgChild1Id { get; set; }
+        public string? OrgChild2Id { get; set; }
+        public string? OrgChild3Id { get; set; }
+        public string? OrgChild4Id { get; set; }
+
+        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
+    {
+        public List<GetProfileByKeycloakIdRootDto> Data { get; set; } = new();
+
+        public int Total { get; set; }
     }
 }

BMA.EHR.Application/Responses/Profiles/GetProfileByRootIdDto.cs

@@ -63,5 +63,15 @@ namespace BMA.EHR.Application.Responses.Profiles
         public Guid? Child4Id { get; set; }
         public Guid? Child4DnaId { get; set; }
         public string? Child4 { get; set; }
+
+        public string? ProfileType { get; set; }
+
+        public bool? MarkDiscipline { get; set; } = false;
+
+        public bool? MarkLeave { get; set; } = false;
+
+        public bool? MarkRate { get; set; } = false;
+
+        public bool? MarkInsignia { get; set; } = false;
     }
 }

BMA.EHR.Application/Responses/Profiles/GetProfileSalaryDto.cs

@@ -0,0 +1,16 @@
+namespace BMA.EHR.Application.Responses.Profiles
+{
+    public class GetProfileSalaryDto
+    {
+        public DateTime DateAffect { get; set; }
+        public string Position { get; set; } = string.Empty;
+        public string Root { get; set; } = string.Empty;
+        public string Child1 { get; set; } = string.Empty;
+        public string Child2 { get; set; } = string.Empty;
+        public string Child3 { get; set; } = string.Empty;
+        public string Child4 { get; set; } = string.Empty;
+        public int Age { get; set; }  = 0;
+        public int Amount { get; set; } = 0;
+        public string Remark { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Application/Responses/Profiles/GetProfileSalaryResultDto.cs

@@ -0,0 +1,11 @@
+namespace BMA.EHR.Application.Responses.Profiles
+{
+    public class GetProfileSalaryResultDto
+    {
+        public string Message { get; set; } = string.Empty;
+
+        public int Status { get; set; } = -1;
+
+        public List<GetProfileSalaryDto> Result { get; set; } = new();
+    }
+}

BMA.EHR.Application/Responses/Profiles/GetUserOCAllDto.cs

@@ -0,0 +1,57 @@
+namespace BMA.EHR.Application.Responses.Profiles
+{
+    public class GetUserOCAllDto
+    {
+        public Guid ProfileId { get; set; }
+        public string? Prefix { get; set; }
+        public string? Rank { get; set; }
+        public string? Avatar { get; set; }
+        public string? AvatarName { get; set; }
+        public string? FirstName { get; set; }
+        public string? LastName { get; set; }
+        public string? CitizenId { get; set; }
+        public DateTime? BirthDate { get; set; }
+        public string? Position { get; set; }
+
+        public int? PosMaster { get; set; }
+        public int? PosMasterNo { get; set; }
+        public string? PosLevelName { get; set; }
+        public string? PosLevelRank { get; set; }
+        public Guid? PosLevelId { get; set; }
+        public string? PosTypeName { get; set; }
+        public string? PosTypeRank { get; set; }
+        public Guid? PosTypeId { get; set; }
+
+        public string? PosExecutiveName { get; set; }
+        public int? PosExecutivePriority { get; set; }
+        public Guid? PosExecutiveId { get; set; }
+
+        public string RootId { get; set; }
+        public string? RootDnaId { get; set; }
+        public string? Root { get; set; }
+        public string? RootShortName { get; set; }
+
+        public string? Child1Id { get; set; }
+        public string? Child1DnaId { get; set; }
+        public string? Child1 { get; set; }
+        public string? Child1ShortName { get; set; }
+
+        public string? Child2Id { get; set; }
+        public string? Child2DnaId { get; set; }
+        public string? Child2 { get; set; }
+        public string? Child2ShortName { get; set; }
+
+        public string? Child3Id { get; set; }
+        public string? Child3DnaId { get; set; }
+        public string? Child3 { get; set; }
+        public string? Child3ShortName { get; set; }
+
+        public string? Child4Id { get; set; }
+        public string? Child4DnaId { get; set; }
+        public string? Child4 { get; set; }
+        public string? Child4ShortName { get; set; }
+
+        public int? Node { get; set; }
+        public string? NodeId { get; set; }
+    }
+}

BMA.EHR.Application/Responses/Profiles/GetUserOCAllResultDto.cs

@@ -0,0 +1,11 @@
+namespace BMA.EHR.Application.Responses.Profiles
+{
+    public class GetUserOCAllResultDto
+    {
+        public string Message { get; set; } = string.Empty;
+
+        public int Status { get; set; } = -1;
+
+        public GetUserOCAllDto? Result { get; set; }
+    }
+}

BMA.EHR.Application/Responses/Profiles/GetUserOCIdDto.cs

@@ -4,26 +4,27 @@
     {
         public Guid ProfileId { get; set; }
 
-        public string Prefix { get; set; } = string.Empty;
+        public string? Prefix { get; set; } = string.Empty;
 
-        public string Rank { get; set; } = string.Empty;
+        public string? Rank { get; set; } = string.Empty;
 
-        public string Avatar {  get; set; } = string.Empty;
+        public string? Avatar { get; set; } = string.Empty;
 
-        public string FirstName { get; set; } = string.Empty;
+        public string? FirstName { get; set; } = string.Empty;
 
-        public string LastName { get; set; } = string.Empty;
+        public string? LastName { get; set; } = string.Empty;
 
-        public string CitizenId { get; set; } = string.Empty;
+        public string? CitizenId { get; set; } = string.Empty;
 
-        public DateTime BirthDate { get; set; } = DateTime.MinValue;
+        public DateTime? BirthDate { get; set; } = DateTime.MinValue;
 
-        public string Position { get; set; } = string.Empty;
+        public string? Position { get; set; } = string.Empty;
 
         public Guid RootId { get; set; }
+        public Guid? RootDnaId { get; set; }
 
-        public string Root { get; set; } = string.Empty;
+        public string? Root { get; set; } = string.Empty;
 
-        public string RootShortName { get; set; } = string.Empty;
+        public string? RootShortName { get; set; } = string.Empty;
     }
 }

BMA.EHR.CheckInConsumer/.dockerignore

@@ -0,0 +1,24 @@
+# Build artifacts
+bin/
+obj/
+
+# IDE / tooling
+Properties/
+.vs/
+.vscode/
+.idea/
+
+# Source control
+.git/
+.gitignore
+
+# Documentation
+*.md
+
+# Docker
+Dockerfile
+.dockerignore
+
+# OS files
+.DS_Store
+Thumbs.db

BMA.EHR.CheckInConsumer/BMA.EHR.CheckInConsumer.csproj

@@ -1,25 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-    <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
-  </ItemGroup>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <None Update="appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
+		<PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Update="appsettings.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
 
 </Project>

BMA.EHR.CheckInConsumer/CHANGELOG-checkin-speedup.md

@@ -0,0 +1,83 @@
+# สรุปการปรับปรุงระบบลงเวลา (CheckInConsumer)
+
+วันที่แก้ไข: 23 มิถุนายน 2026
+
+---
+
+## ปัญหาเดิม
+
+ตอนที่พนักงานลงเวลาพร้อมกันจำนวนมาก (ประมาณ 2,000 รายการ) ระบบประมวลผลทีละรายการ ทำให้ต้องรอคิวนานถึง **22 นาที** กว่าจะประมวลผลเสร็จทั้งหมด
+
+เปรียบเทียบเหมือน **โต๊ะบัญชี 1 คน รับคิวทีละคน** ทั้งที่มีคนรอ 2,000 คน → คิวยาวมาก
+
+---
+
+## วิธีที่แก้ (เข้าใจง่าย ๆ)
+
+### 1. เพิ่มคนช่วยประมวลผลพร้อมกัน (Concurrency)
+- **ก่อน:** ประมวลผลทีละรายการ (เหมือนมีโต๊ะบัญชี 1 โต๊ะ)
+- **หลัง:** ประมวลผลพร้อมกันได้สูงสุด **5 รายการ** (เหมือนเปิดโต๊ะบัญชี 5 โต๊ะ)
+
+> ผลที่ได้: เวลารอคิวลดลงจาก **22 นาที → ประมาณ 4–5 นาที**
+
+### 2. จัดคิวล่วงหน้าให้ RabbitMQ (Prefetch)
+- **ก่อน:** ระบบดึงข้อมูลมาทีละชิ้น ทำให้เสียเวลารอส่งต่อ
+- **หลัง:** ระบบดึงข้อมูลมาเป็นชุด ๆ ละ 20 ชิ้นไว้เตรียมพร้อม → ลดเวลารอระหว่างรายการ
+
+### 3. ลดเวลารอเมื่อ API มีปัญหา (Timeout)
+- **ก่อน:** ถ้า API ค้าง ระบบจะรอนานถึง **5 นาที** ต่อรายการ
+- **หลัง:** ลดเหลือ **1 นาที** → รายการที่มีปัญหาจะถูกปฏิเสธเร็วขึ้น ไม่ทำให้คิวค้าง
+
+### 4. ปรับปรุงการเชื่อมต่อ HTTP
+- เปลี่ยนระบบเชื่อมต่อให้รองรับการส่งคำขอหลายรายการพร้อมกันโดยไม่สะดุด
+
+---
+
+## ตัวเลขเปรียบเทียบ
+
+| รายการ | ก่อนแก้ | หลังแก้ |
+|---|---|---|
+| จำนวนรายการที่ประมวลผลพร้อมกัน | 1 | 5 |
+| เวลารอคิวสูงสุด (2,000 รายการ) | ~22 นาที | ~4–5 นาที |
+| เวลารอเมื่อ API มีปัญหา | 5 นาที | 1 นาที |
+
+---
+
+## ไฟล์ที่แก้ไข
+
+1. **`Program.cs`** — โค้ดหลักของตัวประมวลผลคิว
+2. **`appsettings.json`** — ไฟล์ตั้งค่าระบบ
+
+---
+
+## วิธีปรับความเร็วเพิ่มเติม (ไม่ต้องเขียนโค้ดใหม่)
+
+ถ้าหลังทดสอบแล้วเห็นว่าระบบรับได้ และอยากให้เร็วขึ้นอีก ให้แก้ไขไฟล์ `appsettings.json` แล้ว restart โปรแกรมได้เลย:
+
+```json
+{
+  "MaxConcurrency": 10,       ← เพิ่มจาก 5 เป็น 10 (ประมวลผลพร้อมกัน 10 รายการ)
+  "PrefetchCount": 50,        ← ควรตั้งเป็น ประมาณ MaxConcurrency × 2 ขึ้นไป
+  "HttpTimeoutSeconds": 60    ← เวลารอ API วินาที
+}
+```
+
+**ค่าที่ใช้และผลที่คาดการณ์:**
+- `MaxConcurrency = 5` → ใช้เวลา ~4–5 นาที (ค่าเริ่มต้นปลอดภัย)
+- `MaxConcurrency = 10` → ใช้เวลา ~2–3 นาที
+- `MaxConcurrency = 20` → ใช้เวลา ~1–2 นาที (ต้องตรวจสอบว่าระบบหลังบ้านรับไหวก่อน)
+
+---
+
+## ข้อควรระวัง / คำแนะนำ
+
+1. **ควรทดสอบในระบบทดสอบก่อน** โดยดูว่า
+   - ไม่มี error ในระบบหลัก (API)
+   - ฐานข้อมูลไม่ช้าผิดปกติ
+   - ไม่พบปัญหาลงเวลาซ้ำซ้อน
+
+2. ถ้าพบปัญหา เช่น
+   - มี error ใน API → **ลด** `MaxConcurrency` เหลือ 2 หรือ 3
+   - ลงเวลาซ้ำ → แจ้งทีมเทคนิคเพื่อแก้ฝั่ง API เพิ่มเติม
+
+3. **ค่า `MaxConcurrency = 5` เป็นค่าปลอดภัย** เพราะระบบ API ด้านหลังยังมีข้อจำกัดอยู่บางส่วน หากต้องการเพิ่มให้สูงกว่านี้ (เช่น 20–50) ควรปรึกษาทีมเทคนิคเพื่อปรับปรุงฝั่ง API ก่อน

BMA.EHR.CheckInConsumer/Dockerfile

@@ -1,4 +1,4 @@
-## See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
+## See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
 #
 ## This stage is used when running from VS in fast mode (Default for Debug configuration)
 #FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base
@@ -21,6 +21,7 @@
 #ARG BUILD_CONFIGURATION=Release
 #RUN dotnet publish "BMA.EHR.CheckInConsumer.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
 #
+
 ## This stage is used in production or when running from VS in regular mode (Default when not using the Debug configuration)
 #FROM base AS final
 #WORKDIR /app
@@ -29,30 +30,25 @@
 
 
 # ใช้ official .NET SDK image สำหรับการ build
+# Note: Build context = repository root (ตามที่ GitHub Actions ใช้)
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 
-# กำหนด working directory ภายใน container
 WORKDIR /src
 
-# คัดลอกไฟล์ .csproj และ restore dependencies
-# COPY *.csproj ./
-COPY . ./
-RUN dotnet restore
+# copy เฉพาะ .csproj ก่อน เพื่อใช้ layer caching (restore เร็ว เก็บ cache นาน)
+COPY BMA.EHR.CheckInConsumer/BMA.EHR.CheckInConsumer.csproj ./BMA.EHR.CheckInConsumer/
+WORKDIR /src/BMA.EHR.CheckInConsumer
+RUN dotnet restore "BMA.EHR.CheckInConsumer.csproj"
 
-# คัดลอกไฟล์ทั้งหมดและ build
-COPY . ./
-RUN dotnet build -c Release -o /app/build
-# WORKDIR "/src/BMA.EHR.CheckInConsumer"
-# RUN dotnet build "BMA.EHR.CheckInConsumer.csproj" -c Release -o /app/build
+# คัดลอก source ที่เหลือแล้ว publish
+COPY BMA.EHR.CheckInConsumer/ ./
+RUN dotnet publish "BMA.EHR.CheckInConsumer.csproj" -c Release -o /app/publish /p:UseAppHost=false
 
-# ใช้ stage ใหม่สำหรับการ runtime
+# ใช้ stage ใหม่สำหรับ runtime (image เล็กลง)
 FROM mcr.microsoft.com/dotnet/runtime:8.0 AS runtime
 
-# กำหนด working directory สำหรับ runtime
 WORKDIR /app
 
-# คัดลอกไฟล์จาก build stage มายัง runtime stage
-COPY --from=build /app/build .
+COPY --from=build /app/publish .
 
-# ระบุ entry point ของแอปพลิเคชัน
 ENTRYPOINT ["dotnet", "BMA.EHR.CheckInConsumer.dll"]

BMA.EHR.CheckInConsumer/Program.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 using System.Text;
@@ -18,84 +18,136 @@ var user = configuration["Rabbit:User"] ?? "";
 var pass = configuration["Rabbit:Password"] ?? "";
 var queue = configuration["Rabbit:Queue"] ?? "basic-queue";
 
+// Concurrency & prefetch (configurable via appsettings.json)
+var maxConcurrency = int.TryParse(configuration["MaxConcurrency"], out var c) && c > 0 ? c : 5;
+var prefetchCount = ushort.TryParse(configuration["PrefetchCount"], out var p) && p > 0 ? p : (ushort)20;
+var httpTimeoutSec = int.TryParse(configuration["HttpTimeoutSeconds"], out var t) && t > 0 ? t : 60;
+
+WriteToConsole($"Config -> MaxConcurrency: {maxConcurrency}, PrefetchCount: {prefetchCount}, HttpTimeout: {httpTimeoutSec}s");
+
 // create connection
 var factory = new ConnectionFactory()
 {
-    //Uri = new Uri("amqp://admin:P@ssw0rd@192.168.4.11:5672")
-    HostName = host,// หรือ hostname ของ RabbitMQ Server ที่คุณใช้
-    UserName = user, // ใส่ชื่อผู้ใช้ของคุณ
-    Password = pass // ใส่รหัสผ่านของคุณ
+    HostName = host,
+    UserName = user,
+    Password = pass,
+    DispatchConsumersAsync = true
 };
 
 using var connection = factory.CreateConnection();
 using var channel = connection.CreateModel();
 
-//channel.QueueDeclare(queue: "bma-checkin-queue", durable: true, exclusive: false, autoDelete: false, arguments: null);
 channel.QueueDeclare(queue: queue, durable: true, exclusive: false, autoDelete: false, arguments: null);
 
-var consumer = new EventingBasicConsumer(channel);
+// Prefetch: RabbitMQ จะส่ง message หลายตัวมาที่ consumer พร้อมกัน (ลด network round-trip)
+channel.BasicQos(prefetchSize: 0, prefetchCount: prefetchCount, global: false);
 
-consumer.Received += async (model, ea) =>
+// HttpClient แบบ SocketsHttpHandler พร้อม connection pooling รองรับ concurrent requests
+var socketsHandler = new SocketsHttpHandler
 {
-    var body = ea.Body.ToArray();
-    var message = Encoding.UTF8.GetString(body);
-    await CallRestApi(message);
+    MaxConnectionsPerServer = maxConcurrency * 2,
+    PooledConnectionLifetime = TimeSpan.FromMinutes(2),
+    PooledConnectionIdleTimeout = TimeSpan.FromSeconds(30)
+};
+using var httpClient = new HttpClient(socketsHandler);
+httpClient.Timeout = TimeSpan.FromSeconds(httpTimeoutSec);
 
-    // convert string into object
-    //var request = JsonConvert.DeserializeObject<CheckInRequest>(message);
-    //using (var db = new ApplicationDbContext())
-    //{
-    //    var item = new AttendantItem
-    //    {
-    //        Name = request.Name,
-    //        CheckInDateTime = request.CheckInDateTime,
-    //    };
-    //    db.AttendantItems.Add(item);
-    //    db.SaveChanges();
+// SemaphoreSlim คุมจำนวน message ที่ประมวลผลพร้อมกัน (เนื่องจาก API มีข้อจำกัดเรื่อง concurrency)
+using var semaphore = new SemaphoreSlim(maxConcurrency, maxConcurrency);
 
-    //    WriteToConsole($"ได้รับคำขอจาก Queue: {message}");
-    //    WriteToConsole($"ตอบกลับจาก REST API: {JsonConvert.SerializeObject(item)}");
-    //}
+var consumer = new AsyncEventingBasicConsumer(channel);
 
-    WriteToConsole($"ได้รับคำขอจาก Queue: {message}");
-    //WriteToConsole($"ตอบกลับจาก REST API: {JsonConvert.SerializeObject(item)}");
+consumer.Received += (model, ea) =>
+{
+    // รอ semaphore ก่อนเริ่มประมวลผล
+    semaphore.WaitAsync().ContinueWith(async _ =>
+    {
+        try
+        {
+            var body = ea.Body.ToArray();
+            var message = Encoding.UTF8.GetString(body);
+
+            WriteToConsole($"Received message: {message}");
+
+            var success = await CallRestApi(message, httpClient, configuration);
+
+            if (success)
+            {
+                channel.BasicAck(ea.DeliveryTag, multiple: false);
+                WriteToConsole("Message processed successfully");
+            }
+            else
+            {
+                channel.BasicNack(ea.DeliveryTag, multiple: false, requeue: false);
+                WriteToConsole("Message processing failed - message rejected");
+            }
+        }
+        catch (Exception ex)
+        {
+            WriteToConsole($"Error processing message: {ex.Message}");
+            channel.BasicNack(ea.DeliveryTag, multiple: false, requeue: false);
+        }
+        finally
+        {
+            semaphore.Release();
+        }
+    }, TaskScheduler.Default).ConfigureAwait(false);
+
+    return Task.CompletedTask;
 };
 
-//channel.BasicConsume(queue: "bma-checkin-queue", autoAck: true, consumer: consumer);
-channel.BasicConsume(queue: queue, autoAck: true, consumer: consumer);
+channel.BasicConsume(queue: queue, autoAck: false, consumer: consumer);
 
-//Console.WriteLine("\nPress 'Enter' to exit the process...");
+WriteToConsole("Consumer started. Waiting for messages...");
 
+// Keep the application running
 await Task.Delay(-1);
 
 static void WriteToConsole(string message)
 {
-    Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} : {message}");
+    Console.WriteLine($"{DateTime.Now:yyyy-MM-dd HH:mm:ss} : {message}");
 }
 
-async Task CallRestApi(string requestData)
+static async Task<bool> CallRestApi(string requestData, HttpClient client, IConfiguration configuration)
 {
-    using var client = new HttpClient();
-    var apiPath = $"{configuration["API"]}/leave/process-check-in";
-
-    var content = new StringContent(requestData, Encoding.UTF8, "application/json");
-
-    var response = await client.PostAsync(apiPath, content);
-
-    if (response.IsSuccessStatusCode)
+    try
     {
-        var responseContent = await response.Content.ReadAsStringAsync();
-        WriteToConsole(responseContent);
+        var apiPath = $"{configuration["API"]}/leave/process-check-in";
+        var content = new StringContent(requestData, Encoding.UTF8, "application/json");
+
+        var response = await client.PostAsync(apiPath, content);
+
+        if (response.IsSuccessStatusCode)
+        {
+            var responseContent = await response.Content.ReadAsStringAsync();
+            WriteToConsole($"API Success: {responseContent}");
+            return true;
+        }
+        else
+        {
+            var errorMessage = await response.Content.ReadAsStringAsync();
+            var res = JsonSerializer.Deserialize<ResponseObject>(errorMessage);
+            WriteToConsole($"API Error ({response.StatusCode}): {res?.Message ?? errorMessage}");
+            return false;
+        }
     }
-    else
+    catch (HttpRequestException ex)
     {
-        var errorMessage = await response.Content.ReadAsStringAsync();
-        var res = JsonSerializer.Deserialize<ResponseObject>(errorMessage);
-        WriteToConsole($"Error: {res.Message}");
+        WriteToConsole($"HTTP Error: {ex.Message}");
+        return false;
+    }
+    catch (TaskCanceledException ex)
+    {
+        WriteToConsole($"Timeout: {ex.Message}");
+        return false;
+    }
+    catch (Exception ex)
+    {
+        WriteToConsole($"Unexpected Error: {ex.Message}");
+        return false;
     }
 }
 
-
 public class ResponseObject
 {
     [JsonPropertyName("status")]
@@ -111,28 +163,14 @@ public class ResponseObject
 public class CheckTimeDtoRB
 {
     public Guid? CheckInId { get; set; }
-
-
     public double Lat { get; set; } = 0;
-
-
     public double Lon { get; set; } = 0;
-
-
     public string POI { get; set; } = string.Empty;
-
-
     public bool IsLocation { get; set; } = true;
-
     public string? LocationName { get; set; } = string.Empty;
-
     public string? Remark { get; set; } = string.Empty;
-
     public Guid? UserId { get; set; }
-
     public DateTime? CurrentDate { get; set; }
-
     public string? CheckInFileName { get; set; }
-
     public byte[]? CheckInFileBytes { get; set; }
-}
+}

BMA.EHR.CheckInConsumer/appsettings.json

@@ -1,9 +1,12 @@
 {
-    "Rabbit": {
-        "Host": "192.168.1.40",
-        "User": "admin",
-        "Password": "Test123456",
-        "Queue": "bma-checkin-queue"
-    },
-    "API": "https://localhost:7283/api/v1"
-}
+  "Rabbit": {
+    "Host": "192.168.1.63",
+    "User": "admin",
+    "Password": "12345678",
+    "Queue": "hrms-checkin-queue-dev"
+  },
+  "API": "https://localhost:7283/api/v1",
+  "MaxConcurrency": 5,
+  "PrefetchCount": 20,
+  "HttpTimeoutSeconds": 60
+}

BMA.EHR.Command.Service/BMA.EHR.Command.Service.csproj

@@ -9,6 +9,9 @@
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<DockerfileContext>.</DockerfileContext>
 		<RootNamespace>BMA.EHR.Command.Service</RootNamespace>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>
+
 	</PropertyGroup>
 
 	<ItemGroup>

BMA.EHR.Command.Service/Program.cs

@@ -115,12 +115,15 @@ var app = builder.Build();
     
     app.UseHttpsRedirection();
     app.UseCors();
+    
+    app.UseMiddleware<CombinedErrorHandlerAndLoggingMiddleware>();
+    
     app.UseAuthentication();
     app.UseAuthorization();
     app.UseDefaultFiles();
     app.UseStaticFiles();
     app.MapControllers();
-    app.UseMiddleware<ErrorHandlerMiddleware>();
+   
 
     // apply migrations
     //await using var scope = app.Services.CreateAsyncScope();

BMA.EHR.Discipline.Service/BMA.EHR.Discipline.Service.csproj

@@ -1,17 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>9d934a68-d1dd-449d-bde0-3078a774ad0f</UserSecretsId>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerfileContext>.</DockerfileContext>
-    <RootNamespace>BMA.EHR.Discipline.Service</RootNamespace>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net7.0</TargetFramework>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<UserSecretsId>9d934a68-d1dd-449d-bde0-3078a774ad0f</UserSecretsId>
+		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<DockerfileContext>.</DockerfileContext>
+		<RootNamespace>BMA.EHR.Discipline.Service</RootNamespace>
+		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+		<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>
 
-  <ItemGroup>
+	</PropertyGroup>
+
+	<ItemGroup>
 		<PackageReference Include="Hangfire" Version="1.8.5" />
 		<PackageReference Include="Hangfire.AspNetCore" Version="1.8.5" />
 		<PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" />
@@ -36,10 +39,10 @@
 		<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
 		<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-  </ItemGroup>
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\BMA.EHR.Infrastructure\BMA.EHR.Infrastructure.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\BMA.EHR.Infrastructure\BMA.EHR.Infrastructure.csproj" />
+	</ItemGroup>
 
 </Project>

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

@@ -8,14 +8,15 @@ using BMA.EHR.Infrastructure.Persistence;
 // using BMA.EHR.Placement.Service.Requests;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.EntityFrameworkCore;
-using Swashbuckle.AspNetCore.Annotations;
-using System.Runtime.Serialization;
-using System.Security.Claims;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Microsoft.AspNetCore.Mvc.RazorPages;
+using Swashbuckle.AspNetCore.Annotations;
+using System.Linq;
 using System.Net.Http.Headers;
+using System.Runtime.Serialization;
+using System.Security.Claims;
 
 namespace BMA.EHR.DisciplineComplaint.Service.Controllers
 {
@@ -33,12 +34,14 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
         private readonly NotificationRepository _repositoryNoti;
         private readonly PermissionRepository _permission;
         private readonly IConfiguration _configuration;
+        private readonly UserProfileRepository _userProfileRepository;
 
         public DisciplineComplaintController(DisciplineDbContext context,
                                    MinIODisciplineService documentService,
                                    NotificationRepository repositoryNoti,
                                    IHttpContextAccessor httpContextAccessor,
                                    IConfiguration configuration,
+                                   UserProfileRepository userProfileRepository,
                                    PermissionRepository permission)
         {
             // _repository = repository;
@@ -48,6 +51,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
             _repositoryNoti = repositoryNoti;
             _permission = permission;
             _configuration = configuration;
+            _userProfileRepository = userProfileRepository;
         }
 
         #region " Properties "
@@ -103,6 +107,152 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
             return Success(new { data, total = data_search.Count() });
         }
 
+        /// <summary>
+        /// list รายการวินัยเรื่องร้องเรียน (ค้นหาขั้นสูง)
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("advance-search")]
+        public async Task<ActionResult<ResponseObject>> GetAdvanceSearchDisciplineComplaint([FromBody] DisciplineComplaintAdvanceSearcRequest req)
+        {
+            var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_DISCIPLINE_COMPLAIN");
+            var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
+            if (jsonData["status"]?.ToString() != "200")
+            {
+                return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
+            }
+
+            var page = req.page <= 0 ? 1 : req.page;
+            var pageSize = req.pageSize <= 0 ? 25 : req.pageSize;
+            var keyword = string.IsNullOrEmpty(req.keyword) ? string.Empty : req.keyword;
+            var status = string.IsNullOrEmpty(req.status) ? string.Empty : req.status;
+
+            var data_search = (from x in _context.DisciplineComplaints
+                               where x.Title.Contains(keyword) ||
+                                       (x.Appellant == null ? false : x.Appellant.Contains(keyword))
+                               select x).ToList();
+
+            if (status.Trim().ToUpper() != "ALL")
+                data_search = data_search.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
+
+            if (
+                 (req.dateReceivedStart.HasValue && req.dateReceivedEnd.HasValue) ||
+                 (req.dateConsiderationStart.HasValue && req.dateConsiderationEnd.HasValue) ||
+                 (!string.IsNullOrEmpty(req.respondentType)) ||
+                 (!string.IsNullOrEmpty(req.offenseDetails)) ||
+                 (!string.IsNullOrEmpty(req.levelConsideration))
+             )
+            {
+                data_search = data_search
+                    .Where(x =>
+                        (!req.dateReceivedStart.HasValue || !req.dateReceivedEnd.HasValue ||
+                         (x.DateReceived.HasValue &&
+                          x.DateReceived.Value.Date <= req.dateReceivedStart.Value.Date &&
+                          x.DateReceived.Value.Date >= req.dateReceivedEnd.Value.Date))
+                        &&
+                        (!req.dateConsiderationStart.HasValue || !req.dateConsiderationEnd.HasValue ||
+                         (x.DateConsideration.HasValue &&
+                          x.DateConsideration.Value.Date <= req.dateConsiderationStart.Value.Date &&
+                          x.DateConsideration.Value.Date >= req.dateConsiderationEnd.Value.Date))
+                        &&
+                        (string.IsNullOrEmpty(req.respondentType) || x.RespondentType == req.respondentType)
+                        &&
+                        (string.IsNullOrEmpty(req.offenseDetails) || x.OffenseDetails == req.offenseDetails)
+                        &&
+                        (string.IsNullOrEmpty(req.levelConsideration) || x.LevelConsideration == req.levelConsideration)
+                    )
+                    .ToList();
+            }
+
+            var query = data_search
+                            .Select(x => new
+                            {
+                                Id = x.Id,//id ข้อมูลเรื่องร้องเรียน
+                                Title = x.Title,//ชื่อเรื่อง
+                                RespondentType = x.RespondentType,
+                                Appellant = x.Appellant,//ผู้ถูกร้องเรียน
+                                OffenseDetails = x.OffenseDetails,//ลักษณะความผิด
+                                CreatedAt = x.CreatedAt,//วันที่สร้างเรื่องร้องเรียน
+                                LevelConsideration = x.LevelConsideration,//ระดับการพิจารณา
+                                DateConsideration = x.DateConsideration,//วันที่กำหนดพิจารณา
+                                DateReceived = x.DateReceived,//วันที่รับเรื่อง
+                                Status = x.Status,//สถานะเรื่องร้องเรียน มีดังนี้ ใหม่ (NEW), ยุติเรื่อง (STOP), มีมูลส่งไปสืบสวนแล้ว (SEND_INVESTIGATE)
+                                Result = x.Result,
+                            });
+
+            bool desc = req.descending ?? false;
+            if (!string.IsNullOrEmpty(req.sortBy))
+            {
+                switch (req.sortBy)
+                {
+                    case "title":
+                        query = desc ? query.OrderByDescending(x => x.Title)
+                                     : query.OrderBy(x => x.Title);
+                        break;
+
+                    case "respondentType":
+                        query = desc ? query.OrderByDescending(x => x.RespondentType)
+                                     : query.OrderBy(x => x.RespondentType);
+                        break;
+
+                    case "appellant":
+                        query = desc ? query.OrderByDescending(x => x.Appellant)
+                                     : query.OrderBy(x => x.Appellant);
+                        break;
+
+                    case "offenseDetails":
+                        query = desc ? query.OrderByDescending(x => x.OffenseDetails)
+                                     : query.OrderBy(x => x.OffenseDetails);
+                        break;
+
+                    case "createdAt":
+                        query = desc ? query.OrderByDescending(x => x.CreatedAt)
+                                     : query.OrderBy(x => x.CreatedAt);
+                        break;
+
+                    case "levelConsideration":
+                        query = desc ? query.OrderByDescending(x => x.LevelConsideration)
+                                     : query.OrderBy(x => x.LevelConsideration);
+                        break;
+
+                    case "dateConsideration":
+                        query = desc ? query.OrderByDescending(x => x.DateConsideration)
+                                     : query.OrderBy(x => x.DateConsideration);
+                        break;
+
+                    case "dateReceived":
+                        query = desc ? query.OrderByDescending(x => x.DateReceived)
+                                     : query.OrderBy(x => x.DateReceived);
+                        break;
+
+                    case "status":
+                        query = desc ? query.OrderByDescending(x => x.Status)
+                                     : query.OrderBy(x => x.Status);
+                        break;
+
+                    case "result":
+                        query = desc ? query.OrderByDescending(x => x.Result)
+                                     : query.OrderBy(x => x.Result);
+                        break;
+
+                    default:
+                        query = query.OrderByDescending(x => x.DateConsideration);
+                        break;
+                }
+
+            }
+
+            var data = query
+            .Skip((page - 1) * pageSize)
+            .Take(pageSize)
+            .ToList();
+
+            return Success(new { data, total = data_search.Count() });
+        }
+
         /// <summary>
         /// list รายการวินัยเรื่องร้องเรียนในหน้าออกคำสั่ง
         /// </summary>
@@ -299,6 +449,11 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+
+            var profile = await _userProfileRepository.GetUserOC(userId, token.Replace("Bearer ", ""));
+            if (profile == null)
+                return Error(GlobalMessages.DataNotFound);
             var disciplineComplaint = new Domain.Models.Discipline.DisciplineComplaint
             {
                 RespondentType = req.respondentType.Trim().ToUpper(),
@@ -310,6 +465,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
                 Title = req.title,
                 Description = req.description,
                 DateReceived = req.dateReceived,
+                RootDnaId = profile.RootDnaId,
                 LevelConsideration = req.levelConsideration == null ? null : req.levelConsideration.Trim().ToUpper(),
                 DateConsideration = req.dateConsideration,
                 OffenseDetails = req.offenseDetails == null ? null : req.offenseDetails.Trim().ToUpper(),
@@ -582,6 +738,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
             {
                 RespondentType = data.RespondentType.Trim().ToUpper(),
                 Organization = data.Organization,
+                RootDnaId = data.RootDnaId,
                 ConsideredAgency = data.ConsideredAgency,
                 OrganizationId = data.OrganizationId,
                 ConsideredAgencyId = data.ConsideredAgencyId,
@@ -680,7 +837,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                 var _res = await client.PostAsJsonAsync(apiUrlOrg, new
                 {
                     refId = persons.Select(x => x.PersonId),

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

@@ -1,5 +1,6 @@
 using BMA.EHR.Application.Repositories;
 using BMA.EHR.Application.Repositories.MessageQueue;
+using BMA.EHR.Application.Responses.Profiles;
 using BMA.EHR.Discipline.Service.Requests;
 using BMA.EHR.Domain.Common;
 using BMA.EHR.Domain.Extensions;
@@ -32,6 +33,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly NotificationRepository _repositoryNoti;
         private readonly IConfiguration _configuration;
+        private readonly UserProfileRepository _userProfileRepository;
         private readonly PermissionRepository _permission;
 
         public DisciplineComplaint_AppealController(DisciplineDbContext context,
@@ -40,6 +42,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
                                    MinIODisciplineService documentService,
                                    IHttpContextAccessor httpContextAccessor,
                                    IConfiguration configuration,
+                                   UserProfileRepository userProfileRepository,
                                    PermissionRepository permission)
         {
             // _repository = repository;
@@ -49,6 +52,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
             _documentService = documentService;
             _httpContextAccessor = httpContextAccessor;
             _configuration = configuration;
+            _userProfileRepository = userProfileRepository;
             _permission = permission;
         }
 
@@ -58,6 +62,8 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
 
         private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
         private string? token => _httpContextAccessor?.HttpContext?.Request.Headers["Authorization"];
+
+        private string? AccessToken => _httpContextAccessor?.HttpContext?.Request.Headers["Authorization"];
         private static string StatusDisciplineComplaintAppeal(string value)
         {
             switch (value)
@@ -84,14 +90,15 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpGet("user")]
-        public async Task<ActionResult<ResponseObject>> GetDisciplineUser(string status = "ALL", string type = "ALL", int year = 0, int page = 1, int pageSize = 25, string keyword = "")
+        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 ", ""));
-                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                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();
@@ -119,7 +126,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
                     data_search = data_search.Where(x => x.Type == type).ToList();
                 if (year != 0)
                     data_search = data_search.Where(x => x.Year == year).ToList();
-                var data = data_search
+                var query = data_search
                                 .Select(x => new
                                 {
                                     Id = x.Id,
@@ -135,11 +142,45 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
                                     ProfileId = x.ProfileId,
                                     LastUpdatedAt = x.LastUpdatedAt,
                                     CreatedAt = x.CreatedAt
-                                })
-                                .OrderByDescending(x => x.CreatedAt)
-                                .Skip((page - 1) * pageSize)
-                                .Take(pageSize)
-                                .ToList();
+                                });
+                if (!string.IsNullOrEmpty(sortBy))
+                {
+                    {
+                        if (sortBy == "title")
+                            query = descending ? query.OrderByDescending(x => x.Title) : query.OrderBy(x => x.Title);
+                        else if (sortBy == "year")
+                            query = descending ? query.OrderByDescending(x => x.Year) : query.OrderBy(x => x.Year);
+                        else if (sortBy == "status")
+                            query = descending ? query.OrderByDescending(x => x.Status) : query.OrderBy(x => x.Status);
+                        else if (sortBy == "description")
+                            query = descending ? query.OrderByDescending(x => x.Description) : query.OrderBy(x => x.Description);
+                        else if (sortBy == "type")
+                            query = descending ? query.OrderByDescending(x => x.Type) : query.OrderBy(x => x.Type);
+                        else if (sortBy == "caseType")
+                            query = descending ? query.OrderByDescending(x => x.CaseType) : query.OrderBy(x => x.CaseType);
+                        else if (sortBy == "caseNumber")
+                            query = descending ? query.OrderByDescending(x => x.CaseNumber) : query.OrderBy(x => x.CaseNumber);
+                        else if (sortBy == "fullname")
+                            query = descending ? query.OrderByDescending(x => x.Fullname) : query.OrderBy(x => x.Fullname);
+                        else if (sortBy == "citizenId")
+                            query = descending ? query.OrderByDescending(x => x.CitizenId) : query.OrderBy(x => x.CitizenId);
+                        else if (sortBy == "lastUpdatedAt")
+                            query = descending ? query.OrderByDescending(x => x.LastUpdatedAt) : query.OrderBy(x => x.LastUpdatedAt);
+                        else if (sortBy == "createdAt")
+                            query = descending ? query.OrderByDescending(x => x.CreatedAt) : query.OrderBy(x => x.CreatedAt);
+                        else
+                            query = query.OrderByDescending(x => x.CreatedAt); // default
+                    }
+                }
+                else
+                {
+                    query = query.OrderByDescending(x => x.CreatedAt);
+                }
+
+                var data = query
+                    .Skip((page - 1) * pageSize)
+                    .Take(pageSize)
+                    .ToList();
                 return Success(new { data, total = data_search.Count() });
             }
         }
@@ -317,12 +358,15 @@ 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())
             {
-                client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                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();
@@ -331,126 +375,27 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
 
                 if (org == null || org.result == null)
                     return Success(new { data = new List<dynamic>(), total = 0 });
-                var id = org.result.profileId;
+                id = org.result.profileId;
                 if (id == "")
                     return Success(new { data = new List<dynamic>(), total = 0 });
-                var disciplineComplaint_Appeal = new Domain.Models.Discipline.DisciplineComplaint_Appeal
-                {
-                    Title = req.Title,
-                    Description = req.Description,
-                    Status = "NEW",
-                    Type = req.Type.Trim().ToUpper(),
-                    Year = req.Year == null ? DateTime.Now.Year : req.Year,
-                    CaseType = req.CaseType,
-                    CaseNumber = req.CaseNumber,
-                    Fullname = req.Fullname,
-                    CitizenId = req.CitizenId,
-                    ProfileId = id,
-                    Position = req.Position,
-                    Oc = req.Oc,
-                    profileType = org.result.profileType,
-                    CreatedFullName = FullName ?? "System Administrator",
-                    CreatedUserId = UserId ?? "",
-                    CreatedAt = DateTime.Now,
-                    LastUpdateFullName = FullName ?? "System Administrator",
-                    LastUpdateUserId = UserId ?? "",
-                    LastUpdatedAt = DateTime.Now,
-                };
-                var disciplineComplaint_Appeal_History = new DisciplineComplaint_Appeal_History
-                {
-                    DisciplineComplaint_Appeal = disciplineComplaint_Appeal,
-                    Status = "NEW",
-                    CreatedFullName = FullName ?? "System Administrator",
-                    CreatedUserId = UserId ?? "",
-                    CreatedAt = DateTime.Now,
-                    LastUpdateFullName = FullName ?? "System Administrator",
-                    LastUpdateUserId = UserId ?? "",
-                    LastUpdatedAt = DateTime.Now,
-                };
-                // await _context.DisciplineComplaint_Appeals.AddAsync(disciplineComplaint_Appeal);
-                await _context.DisciplineComplaint_Appeal_Historys.AddAsync(disciplineComplaint_Appeal_History);
-                await _context.SaveChangesAsync();
-                if (Request.Form.Files != null && Request.Form.Files.Count != 0)
-                {
-                    foreach (var file in Request.Form.Files)
-                    {
-                        var fileExtension = Path.GetExtension(file.FileName);
-                        var doc = await _documentService.UploadFileAsync(file, file.FileName);
-                        var _doc = await _context.Documents.AsQueryable()
-                                            .FirstOrDefaultAsync(x => x.Id == doc.Id);
-                        if (_doc != null)
-                        {
-                            var disciplineComplaint_Appeal_Doc = new DisciplineComplaint_Appeal_Doc
-                            {
-                                DisciplineComplaint_Appeal = disciplineComplaint_Appeal,
-                                Document = _doc,
-                                CreatedFullName = FullName ?? "System Administrator",
-                                CreatedUserId = UserId ?? "",
-                                CreatedAt = DateTime.Now,
-                                LastUpdateFullName = FullName ?? "System Administrator",
-                                LastUpdateUserId = UserId ?? "",
-                                LastUpdatedAt = DateTime.Now,
-                            };
-                            await _context.DisciplineComplaint_Appeal_Docs.AddAsync(disciplineComplaint_Appeal_Doc);
-                        }
-                    }
-                }
-                var baseAPIOrg = _configuration["API"];
-                var apiUrlOrg = $"{baseAPIOrg}/org/workflow/find/director";
-                var refId = new List<Guid>();
-                client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
-                var __res = await client.PostAsJsonAsync(apiUrlOrg, new
-                {
-                    refId = new List<Guid> { id },
-                });
-                var __result = await __res.Content.ReadAsStringAsync();
-                var __org = JsonConvert.DeserializeObject<DirectorRequest>(__result);
-                if (__res.IsSuccessStatusCode)
-                {
-                    refId = __org.result.Select(x => Guid.Parse(x.id)).ToList();
-                }
-                await _repositoryNoti.PushNotificationsAsync(
-                    refId.ToArray(),
-                    $"มีคำขอยื่นอุทธรณ์/ร้องทุกข์จาก {req.Fullname}",
-                    $"มีคำขอยื่นอุทธรณ์/ร้องทุกข์จาก {req.Fullname}",
-                    "",
-                    "",
-                    true,
-                    true
-                );
-                await _context.SaveChangesAsync();
-                return Success(disciplineComplaint_Appeal.Id);
+                type = org.result.profileType;
             }
 
-        }
-
-        /// <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>> CreateDisciplineAdmin([FromForm] DisciplineComplaint_AppealRequest req)
-        {
             var disciplineComplaint_Appeal = new Domain.Models.Discipline.DisciplineComplaint_Appeal
             {
                 Title = req.Title,
                 Description = req.Description,
                 Status = "NEW",
                 Type = req.Type.Trim().ToUpper(),
-                Year = req.Year == null ? DateTime.Now.Year : req.Year,
+                Year = req.Year == null ? DateTime.Now.CalculateFisicalYear() : req.Year,
                 CaseType = req.CaseType,
                 CaseNumber = req.CaseNumber,
                 Fullname = req.Fullname,
                 CitizenId = req.CitizenId,
-                ProfileId = req.ProfileId,
+                ProfileId = id,
                 Position = req.Position,
                 Oc = req.Oc,
-                profileType = req.profileType,
+                profileType = type,
                 CreatedFullName = FullName ?? "System Administrator",
                 CreatedUserId = UserId ?? "",
                 CreatedAt = DateTime.Now,
@@ -458,6 +403,36 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
                 LastUpdateUserId = UserId ?? "",
                 LastUpdatedAt = DateTime.Now,
             };
+            using (var client = new HttpClient())
+            {
+                client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
+                client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
+                var _apiUrl = $"{_configuration["API"]}/org/profile/profileid/position/{id}";
+                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);
+
+                disciplineComplaint_Appeal.root = org.result.root;
+                disciplineComplaint_Appeal.rootId = org.result.rootId;
+                disciplineComplaint_Appeal.rootDnaId = org.result.rootDnaId;
+                disciplineComplaint_Appeal.child1 = org.result.child1;
+                disciplineComplaint_Appeal.child1Id = org.result.child1Id;
+                disciplineComplaint_Appeal.child1DnaId = org.result.child1DnaId;
+                disciplineComplaint_Appeal.child2 = org.result.child2;
+                disciplineComplaint_Appeal.child2Id = org.result.child2Id;
+                disciplineComplaint_Appeal.child2DnaId = org.result.child2DnaId;
+                disciplineComplaint_Appeal.child3 = org.result.child3;
+                disciplineComplaint_Appeal.child3Id = org.result.child3Id;
+                disciplineComplaint_Appeal.child3DnaId = org.result.child3DnaId;
+                disciplineComplaint_Appeal.child4 = org.result.child4;
+                disciplineComplaint_Appeal.child4Id = org.result.child4Id;
+                disciplineComplaint_Appeal.child4DnaId = org.result.child4DnaId;
+            }
             var disciplineComplaint_Appeal_History = new DisciplineComplaint_Appeal_History
             {
                 DisciplineComplaint_Appeal = disciplineComplaint_Appeal,
@@ -498,13 +473,153 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
                 }
             }
             var baseAPIOrg = _configuration["API"];
-            var apiUrlOrg = $"{baseAPIOrg}/org/workflow/find/director";
+            var system = "SYS_DISCIPLINE_APPEAL";
+            var apiUrlOrg = $"{baseAPIOrg}/org/workflow/find/director/{system}";
+            var refId = new List<Guid>();
+
+            using (var client = new HttpClient())
+            {
+                client.DefaultRequestHeaders.Authorization =
+                    new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
+                client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
+                var __res = await client.PostAsJsonAsync(apiUrlOrg, new
+                {
+                    refId = new List<Guid> { Guid.Parse(id) },
+                });
+                var __result = await __res.Content.ReadAsStringAsync();
+                var __org = JsonConvert.DeserializeObject<DirectorRequest>(__result);
+                if (__res.IsSuccessStatusCode)
+                {
+                    refId = __org.result.Select(x => Guid.Parse(x.id)).ToList();
+                }
+
+                await _repositoryNoti.PushNotificationsAsync(
+                    refId.ToArray(),
+                    $"มีคำขอยื่นอุทธรณ์/ร้องทุกข์จาก {req.Fullname}",
+                    $"มีคำขอยื่นอุทธรณ์/ร้องทุกข์จาก {req.Fullname}",
+                    "",
+                    "",
+                    true,
+                    true
+                );
+            }
+
+            await _context.SaveChangesAsync();
+            return Success(disciplineComplaint_Appeal.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>> CreateDisciplineAdmin([FromForm] DisciplineComplaint_AppealRequest req)
+        {
+            var disciplineComplaint_Appeal = new Domain.Models.Discipline.DisciplineComplaint_Appeal
+            {
+                Title = req.Title,
+                Description = req.Description,
+                Status = "NEW",
+                Type = req.Type.Trim().ToUpper(),
+                Year = req.Year == null ? DateTime.Now.Year : req.Year,
+                CaseType = req.CaseType,
+                CaseNumber = req.CaseNumber,
+                Fullname = req.Fullname,
+                CitizenId = req.CitizenId,
+                ProfileId = req.ProfileId,
+                Position = req.Position,
+                Oc = req.Oc,
+                profileType = req.profileType,
+                CreatedFullName = FullName ?? "System Administrator",
+                CreatedUserId = UserId ?? "",
+                CreatedAt = DateTime.Now,
+                LastUpdateFullName = FullName ?? "System Administrator",
+                LastUpdateUserId = UserId ?? "",
+                LastUpdatedAt = DateTime.Now,
+            };
+
+            using (var client = new HttpClient())
+            {
+                client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
+                client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
+                var apiUrl = $"{_configuration["API"]}/org/profile/profileid/position/{req.ProfileId}";
+                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);
+
+                disciplineComplaint_Appeal.root = org.result.root;
+                disciplineComplaint_Appeal.rootId = org.result.rootId;
+                disciplineComplaint_Appeal.rootDnaId = org.result.rootDnaId;
+                disciplineComplaint_Appeal.child1 = org.result.child1;
+                disciplineComplaint_Appeal.child1Id = org.result.child1Id;
+                disciplineComplaint_Appeal.child1DnaId = org.result.child1DnaId;
+                disciplineComplaint_Appeal.child2 = org.result.child2;
+                disciplineComplaint_Appeal.child2Id = org.result.child2Id;
+                disciplineComplaint_Appeal.child2DnaId = org.result.child2DnaId;
+                disciplineComplaint_Appeal.child3 = org.result.child3;
+                disciplineComplaint_Appeal.child3Id = org.result.child3Id;
+                disciplineComplaint_Appeal.child3DnaId = org.result.child3DnaId;
+                disciplineComplaint_Appeal.child4 = org.result.child4;
+                disciplineComplaint_Appeal.child4Id = org.result.child4Id;
+                disciplineComplaint_Appeal.child4DnaId = org.result.child4DnaId;
+            }
+            var disciplineComplaint_Appeal_History = new DisciplineComplaint_Appeal_History
+            {
+                DisciplineComplaint_Appeal = disciplineComplaint_Appeal,
+                Status = "NEW",
+                CreatedFullName = FullName ?? "System Administrator",
+                CreatedUserId = UserId ?? "",
+                CreatedAt = DateTime.Now,
+                LastUpdateFullName = FullName ?? "System Administrator",
+                LastUpdateUserId = UserId ?? "",
+                LastUpdatedAt = DateTime.Now,
+            };
+            // await _context.DisciplineComplaint_Appeals.AddAsync(disciplineComplaint_Appeal);
+            await _context.DisciplineComplaint_Appeal_Historys.AddAsync(disciplineComplaint_Appeal_History);
+            await _context.SaveChangesAsync();
+            if (Request.Form.Files != null && Request.Form.Files.Count != 0)
+            {
+                foreach (var file in Request.Form.Files)
+                {
+                    var fileExtension = Path.GetExtension(file.FileName);
+                    var doc = await _documentService.UploadFileAsync(file, file.FileName);
+                    var _doc = await _context.Documents.AsQueryable()
+                                        .FirstOrDefaultAsync(x => x.Id == doc.Id);
+                    if (_doc != null)
+                    {
+                        var disciplineComplaint_Appeal_Doc = new DisciplineComplaint_Appeal_Doc
+                        {
+                            DisciplineComplaint_Appeal = disciplineComplaint_Appeal,
+                            Document = _doc,
+                            CreatedFullName = FullName ?? "System Administrator",
+                            CreatedUserId = UserId ?? "",
+                            CreatedAt = DateTime.Now,
+                            LastUpdateFullName = FullName ?? "System Administrator",
+                            LastUpdateUserId = UserId ?? "",
+                            LastUpdatedAt = DateTime.Now,
+                        };
+                        await _context.DisciplineComplaint_Appeal_Docs.AddAsync(disciplineComplaint_Appeal_Doc);
+                    }
+                }
+            }
+            var baseAPIOrg = _configuration["API"];
+            var system = "SYS_DISCIPLINE_APPEAL";
+            var apiUrlOrg = $"{baseAPIOrg}/org/workflow/find/director/{system}";
             var refId = new List<Guid>();
 
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                 var __res = await client.PostAsJsonAsync(apiUrlOrg, new
                 {
                     refId = new List<Guid> { Guid.Parse(req.ProfileId) },
@@ -633,7 +748,7 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpGet("admin")]
-        public async Task<ActionResult<ResponseObject>> GetDisciplineAdmin(string status = "ALL", string type = "ALL", int year = 0, int page = 1, int pageSize = 25, string keyword = "")
+        public async Task<ActionResult<ResponseObject>> GetDisciplineAdmin(string status = "ALL", string type = "ALL", int year = 0, int page = 1, int pageSize = 25, string keyword = "", string? sortBy = "", bool? descending = false)
         {
             var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_DISCIPLINE_APPEAL");
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
@@ -641,6 +756,42 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
+            string role = jsonData["result"]?.ToString();
+            var nodeId = string.Empty;
+            var profileAdmin = new GetUserOCAllDto();
+            profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
+            if (role == "NORMAL" || role == "CHILD")
+            {
+                nodeId = profileAdmin?.Node == 4
+                         ? profileAdmin?.Child4DnaId
+                         : profileAdmin?.Node == 3
+                            ? profileAdmin?.Child3DnaId
+                            : profileAdmin?.Node == 2
+                                ? profileAdmin?.Child2DnaId
+                                : profileAdmin?.Node == 1
+                                    ? profileAdmin?.Child1DnaId
+                                    : profileAdmin?.Node == 0
+                                        ? profileAdmin?.RootDnaId
+                                        : "";
+            }
+            if (role == "BROTHER")
+            {
+                nodeId = profileAdmin?.Node == 4
+                         ? profileAdmin?.Child3DnaId
+                         : profileAdmin?.Node == 3
+                            ? profileAdmin?.Child2DnaId
+                            : profileAdmin?.Node == 2
+                                ? profileAdmin?.Child1DnaId
+                                : profileAdmin?.Node == 1 || profileAdmin?.Node == 0
+                                    ? profileAdmin?.RootDnaId
+                                    : "";
+            }
+            else if (role == "ROOT" /*|| role == "PARENT"*/)
+            {
+                nodeId = profileAdmin?.RootDnaId;
+            }
+
+            var node = profileAdmin?.Node;
             var data_search = (from x in _context.DisciplineComplaint_Appeals
                                where (x.Title == null ? false : x.Title.Contains(keyword)) ||
                                (x.Description == null ? false : x.Description.Contains(keyword)) ||
@@ -655,7 +806,43 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
                 data_search = data_search.Where(x => x.Type == type).ToList();
             if (year != 0)
                 data_search = data_search.Where(x => x.Year == year).ToList();
-            var data = data_search
+
+            if (role == "OWNER")
+            {
+                node = null;
+            }
+            if (role == "OWNER" || role == "CHILD")
+            {
+                data_search = data_search
+                    .Where(x => node == 4 ? x.child4DnaId == nodeId : (node == 3 ? x.child3DnaId == nodeId : (node == 2 ? x.child2DnaId == nodeId : (node == 1 ? x.child1DnaId == nodeId : (node == 0 ? x.rootDnaId == nodeId : (node == null ? true : true)))))).ToList();
+            }
+            else if (role == "BROTHER")
+            {
+                data_search = data_search
+                    .Where(x => node == 4 ? x.child3DnaId == nodeId : (node == 3 ? x.child2DnaId == nodeId : (node == 2 ? x.child1DnaId == nodeId : (node == 1 || node == 0 ? x.rootDnaId == nodeId : (node == null ? true : true))))).ToList();
+            }
+            else if (role == "ROOT")
+            {
+                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 == "NORMAL")
+            {
+                data_search = data_search.Where(x =>
+                    node == 0 ? x.rootDnaId == nodeId && x.child1DnaId == null :
+                    node == 1 ? x.child1DnaId == nodeId && x.child2DnaId == null :
+                    node == 2 ? x.child2DnaId == nodeId && x.child3DnaId == null :
+                    node == 3 ? x.child3DnaId == nodeId && x.child4DnaId == null :
+                    node == 4 ? x.child4DnaId == nodeId :
+                    true
+                ).ToList();
+            }
+            var query = data_search
                             .Select(x => new
                             {
                                 Id = x.Id,
@@ -671,12 +858,76 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
                                 ProfileId = x.ProfileId,
                                 LastUpdatedAt = x.LastUpdatedAt,
                                 profileType = x.profileType
-                            })
+                            });
+            bool desc = descending ?? false;
+            if (!string.IsNullOrEmpty(sortBy))
+            {
+                switch (sortBy)
+                {
+                    case "title":
+                        query = desc ? query.OrderByDescending(x => x.Title)
+                                        : query.OrderBy(x => x.Title);
+                        break;
+
+                    case "description":
+                        query = desc ? query.OrderByDescending(x => x.Description)
+                                        : query.OrderBy(x => x.Description);
+                        break;
+
+                    case "status":
+                        query = desc ? query.OrderByDescending(x => x.Status)
+                                        : query.OrderBy(x => x.Status);
+                        break;
+
+                    case "type":
+                        query = desc ? query.OrderByDescending(x => x.Type)
+                                        : query.OrderBy(x => x.Type);
+                        break;
+
+                    case "year":
+                        query = desc ? query.OrderByDescending(x => x.Year)
+                                        : query.OrderBy(x => x.Year);
+                        break;
+
+                    case "caseType":
+                        query = desc ? query.OrderByDescending(x => x.CaseType)
+                                        : query.OrderBy(x => x.CaseType);
+                        break;
+
+                    case "caseNumber":
+                        query = desc ? query.OrderByDescending(x => x.CaseNumber)
+                                        : query.OrderBy(x => x.CaseNumber);
+                        break;
+
+                    case "fullname":
+                        query = desc ? query.OrderByDescending(x => x.Fullname)
+                                        : query.OrderBy(x => x.Fullname);
+                        break;
+
+                    case "lastUpdatedAt":
+                        query = desc ? query.OrderByDescending(x => x.LastUpdatedAt)
+                                        : query.OrderBy(x => x.LastUpdatedAt);
+                        break;
+
+                    case "profileType":
+                        query = desc ? query.OrderByDescending(x => x.profileType)
+                                        : query.OrderBy(x => x.profileType);
+                        break;
+
+                    default:
+                        query = query
                             .OrderByDescending(x => x.profileType)
-                            .ThenByDescending(x => x.LastUpdatedAt)
-                            .Skip((page - 1) * pageSize)
-                            .Take(pageSize)
-                            .ToList();
+                            .ThenByDescending(x => x.LastUpdatedAt);
+                        break;
+                }
+
+            }
+
+            var data = query
+                .Skip((page - 1) * pageSize)
+                .Take(pageSize)
+                .ToList();
+
             return Success(new { data, total = data_search.Count() });
         }
 

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

@@ -29,10 +29,12 @@ namespace BMA.EHR.DisciplineDirector.Service.Controllers
         private readonly MinIOService _documentService;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly PermissionRepository _permission;
+        private readonly UserProfileRepository _userProfileRepository;
 
         public DisciplineDirectorController(DisciplineDbContext context,
                                    MinIOService documentService,
                                    IHttpContextAccessor httpContextAccessor,
+                                   UserProfileRepository userProfileRepository,
                                    PermissionRepository permission)
         {
             // _repository = repository;
@@ -40,6 +42,7 @@ namespace BMA.EHR.DisciplineDirector.Service.Controllers
             _documentService = documentService;
             _httpContextAccessor = httpContextAccessor;
             _permission = permission;
+            _userProfileRepository = userProfileRepository;
         }
 
         #region " Properties "
@@ -47,6 +50,7 @@ namespace BMA.EHR.DisciplineDirector.Service.Controllers
         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"];
 
         #endregion
 
@@ -59,8 +63,9 @@ namespace BMA.EHR.DisciplineDirector.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpGet("{path}")]
-        public async Task<ActionResult<ResponseObject>> GetDiscipline(string path, int page = 1, int pageSize = 25, string keyword = "")
+        public async Task<ActionResult<ResponseObject>> GetDiscipline(string path, int page = 1, int pageSize = 25, string keyword = "", string? sortBy = "", bool? descending = false)
         {
+            // สิทธิ์การเข้าถึง
             path = path.Trim().ToUpper();
             string getPermission;
             if (path == "MAIN")
@@ -80,23 +85,27 @@ namespace BMA.EHR.DisciplineDirector.Service.Controllers
                 getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_DISCIPLINE_INFO");
             }
 
-
             var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
             if (jsonData["status"]?.ToString() != "200")
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
+            var _permiss = jsonData["result"]?.ToString();
+            // สิทธิ์มองเห็นรายชื่อ
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+            var profile = await _userProfileRepository.GetUserOC(userId, token.Replace("Bearer ", ""));
+            if (profile == null)
+                return Error(GlobalMessages.DataNotFound);
+
             var data_search = (from x in _context.DisciplineDirectors.Include(x => x.DisciplineInvestigate_Directors).Include(x => x.DisciplineDisciplinary_DirectorInvestigates)
-                               where /*x.Prefix.Contains(keyword) ||
-                                       x.FirstName.Contains(keyword) ||
-                                       x.LastName.Contains(keyword) ||*/
-                                       ((x.Prefix ?? "") + (x.FirstName ?? "") + " " + (x.LastName ?? "")).Contains(keyword) ||
+                               where  (((x.Prefix ?? "") + (x.FirstName ?? "") + " " + (x.LastName ?? "")).Contains(keyword) ||
                                        x.Position.Contains(keyword) ||
                                        x.Email.Contains(keyword) ||
                                        x.Phone.Contains(keyword) ||
-                                       x.Qualification.Contains(keyword)
+                                       x.Qualification.Contains(keyword)) && 
+                                       (_permiss != "OWNER" && x.RootDnaId == profile.RootDnaId || _permiss == "OWNER" && true)
                                select x).ToList();
-            var data = data_search
+            var query = data_search
                             .Select(x => new
                             {
                                 Id = x.Id,
@@ -109,7 +118,66 @@ namespace BMA.EHR.DisciplineDirector.Service.Controllers
                                 Qualification = x.Qualification,
                                 TotalInvestigate = x.DisciplineInvestigate_Directors.Count(),
                                 TotalDisciplinary = x.DisciplineDisciplinary_DirectorInvestigates.Count(),
-                            })
+                            });
+
+                             bool desc = descending ?? false;
+                            if (!string.IsNullOrEmpty(sortBy))
+                            {
+                                if (sortBy == "position")
+                                {
+                                    query = desc ? query.OrderByDescending(x => x.Position)
+                                                    : query.OrderBy(x => x.Position);
+                                }
+                                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 == "email")
+                                {
+                                    {
+                                        query = desc ? query.OrderByDescending(x => x.Email)
+                                                        : query.OrderBy(x => x.Email);
+                                    }
+                                }
+                                else if (sortBy == "phone")
+                                {
+                                    {
+                                        query = desc ? query.OrderByDescending(x => x.Phone)
+                                                        : query.OrderBy(x => x.Phone);
+                                    }
+                                }
+                                else if (sortBy == "qualification")
+                                {
+                                    {
+                                        query = desc ? query.OrderByDescending(x => x.Qualification)
+                                                        : query.OrderBy(x => x.Qualification);
+                                    }
+                                }
+                                else if (sortBy == "totalInvestigate")
+                                {
+                                    {
+                                        query = desc ? query.OrderByDescending(x => x.TotalInvestigate)
+                                                        : query.OrderBy(x => x.TotalInvestigate);
+                                    }
+                                }
+                                else if (sortBy == "totalDisciplinary")
+                                {
+                                    {
+                                        query = desc ? query.OrderByDescending(x => x.TotalDisciplinary)
+                                                        : query.OrderBy(x => x.TotalDisciplinary);
+                                    }
+                                }
+                            }
+
+                            var data = query
                             .Skip((page - 1) * pageSize)
                             .Take(pageSize)
                             .ToList();
@@ -188,6 +256,7 @@ namespace BMA.EHR.DisciplineDirector.Service.Controllers
                 Email = req.email,
                 Phone = req.phone,
                 Qualification = req.qualification,
+                RootDnaId = req.rootDnaId,
                 CreatedFullName = FullName ?? "System Administrator",
                 CreatedUserId = UserId ?? "",
                 CreatedAt = DateTime.Now,
@@ -279,7 +348,13 @@ namespace BMA.EHR.DisciplineDirector.Service.Controllers
             if (director == null)
                 return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
 
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+            var profile = await _userProfileRepository.GetUserOC(userId, token.Replace("Bearer ", ""));
+            if (profile == null)
+                return Error(GlobalMessages.DataNotFound);
+
             var data = await _context.DisciplineInvestigates
+                            .Where(x => x.RootDnaId == profile.RootDnaId || x.RootDnaId == null)
                             .Where(x => x.DisciplineInvestigate_Directors
                                         .Where(x => x.DisciplineDirector == director)
                                         .FirstOrDefault() != null
@@ -316,7 +391,13 @@ namespace BMA.EHR.DisciplineDirector.Service.Controllers
             if (director == null)
                 return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
 
+            var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
+            var profile = await _userProfileRepository.GetProfileByKeycloakIdNewAsync(userId, token.Replace("Bearer ", ""));
+            if (profile == null)
+                return Error(GlobalMessages.DataNotFound);
+
             var data = await _context.DisciplineDisciplinarys
+                            .Where(x => x.RootDnaId == profile.RootDnaId || x.RootDnaId == null)
                             .Where(x => x.DisciplineDisciplinary_DirectorInvestigates
                                         .Where(x => x.DisciplineDirector == director)
                                         .FirstOrDefault() != null

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

@@ -100,6 +100,157 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
             return Success(new { data, total = data_search.Count() });
         }
 
+        /// <summary>
+        /// list รายการวินัยเรื่องสอบสวน (ค้นหาขั้นสูง)
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("advance-search")]
+        public async Task<ActionResult<ResponseObject>> GetAdvanceSearcDisciplineDisciplinary([FromBody] DisciplineDisciplinaryAdvanceSearcRequest req)
+        {
+            var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_DISCIPLINE_INTERROGATE");
+            var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
+            if (jsonData["status"]?.ToString() != "200")
+            {
+                return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
+            }
+
+            var page = req.page <= 0 ? 1 : req.page;
+            var pageSize = req.pageSize <= 0 ? 25 : req.pageSize;
+            var keyword = string.IsNullOrEmpty(req.keyword) ? string.Empty : req.keyword;
+            var status = string.IsNullOrEmpty(req.status) ? string.Empty : req.status;
+
+            var data_search = (from x in _context.DisciplineDisciplinarys
+                               where x.Title.Contains(keyword) ||
+                                  x.DisciplinaryFaultLevel.Contains(keyword) ||
+                                  x.DisciplinaryCaseFault.Contains(keyword)
+                               select x).ToList();
+            if (status.Trim().ToUpper() != "ALL")
+                data_search = data_search.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
+
+            if (
+                 (req.disciplinaryDateStart.HasValue && req.disciplinaryDateEnd.HasValue) ||
+                 (req.dateReceivedStart.HasValue && req.dateReceivedEnd.HasValue) ||
+                 (!string.IsNullOrEmpty(req.respondentType)) ||
+                 (!string.IsNullOrEmpty(req.offenseDetails)) ||
+                 (!string.IsNullOrEmpty(req.disciplinaryFaultLevel)) ||
+                 (!string.IsNullOrEmpty(req.disciplinaryCaseFault))
+             )
+            {
+                data_search = data_search
+                    .Where(x =>
+                        //วันที่รับเรือง
+                        (!req.dateReceivedStart.HasValue || !req.dateReceivedEnd.HasValue ||
+                         (x.DateReceived.HasValue &&
+                          x.DateReceived.Value.Date <= req.dateReceivedStart.Value.Date &&
+                          x.DateReceived.Value.Date >= req.dateReceivedEnd.Value.Date))
+                        &&
+                        //วันที่สอบสวน
+                        (!req.disciplinaryDateStart.HasValue || !req.disciplinaryDateEnd.HasValue ||
+                         (x.DisciplinaryDateStart.HasValue && x.DisciplinaryDateEnd.HasValue &&
+                          x.DisciplinaryDateStart.Value.Date <= req.disciplinaryDateStart.Value.Date &&
+                          x.DisciplinaryDateEnd.Value.Date >= req.disciplinaryDateEnd.Value.Date))
+                        &&
+                        (string.IsNullOrEmpty(req.respondentType) || x.RespondentType == req.respondentType)
+                        &&
+                        (string.IsNullOrEmpty(req.offenseDetails) || x.OffenseDetails == req.offenseDetails)
+                        &&
+                        (string.IsNullOrEmpty(req.disciplinaryFaultLevel) || x.DisciplinaryFaultLevel == req.disciplinaryFaultLevel)
+                        &&
+                        (string.IsNullOrEmpty(req.disciplinaryCaseFault) || (x.DisciplinaryCaseFault?.Contains(req.disciplinaryCaseFault) ?? false))
+                    )
+                    .ToList();
+            }
+
+            var query = data_search
+                            .Select(x => new
+                            {
+                                Id = x.Id,//id ข้อมูลเรื่องสอบสวน
+                                Title = x.Title,//ชื่อเรื่อง
+                                RespondentType = x.RespondentType,//ผู้ถูกสืบสวน
+                                OffenseDetails = x.OffenseDetails,//ลักษณะความผิด
+                                DisciplinaryFaultLevel = x.DisciplinaryFaultLevel,//ระดับโทษความผิด
+                                DisciplinaryCaseFault = x.DisciplinaryCaseFault,//กรณีความผิด
+                                Status = x.Status,//สถานะหรือผลการสอบสวน
+                                DateReceived = x.DateReceived, //วันที่รับเรื่อง
+                                CreatedAt = x.CreatedAt,//วันที่สร้างเรื่องสอบสวน
+                                DisciplinaryDateStart = x.DisciplinaryDateStart, //วันที่เริ่มการสอบสวน
+                                DisciplinaryDateEnd = x.DisciplinaryDateEnd, //วันที่สิ้นสุดการสอบสวน
+                            });
+
+                            bool desc = req.descending ?? false;
+                            if (!string.IsNullOrEmpty(req.sortBy))
+                            {
+                                switch (req.sortBy)
+                                {
+                                    case "title":
+                                        query = desc ? query.OrderByDescending(x => x.Title)
+                                                        : query.OrderBy(x => x.Title);
+                                        break;
+
+                                    case "respondentType":
+                                        query = desc ? query.OrderByDescending(x => x.RespondentType)
+                                                        : query.OrderBy(x => x.RespondentType);
+                                        break;
+
+                                    case "offenseDetails":
+                                        query = desc ? query.OrderByDescending(x => x.OffenseDetails)
+                                                        : query.OrderBy(x => x.OffenseDetails);
+                                        break;
+
+                                    case "disciplinaryFaultLevel":
+                                        query = desc ? query.OrderByDescending(x => x.DisciplinaryFaultLevel)
+                                                        : query.OrderBy(x => x.DisciplinaryFaultLevel);
+                                        break;
+
+                                    case "disciplinaryCaseFault":
+                                        query = desc ? query.OrderByDescending(x => x.DisciplinaryCaseFault)
+                                                        : query.OrderBy(x => x.DisciplinaryCaseFault);
+                                        break;
+
+                                    case "status":
+                                        query = desc ? query.OrderByDescending(x => x.Status)
+                                                        : query.OrderBy(x => x.Status);
+                                        break;
+
+                                    case "dateReceived":
+                                        query = desc ? query.OrderByDescending(x => x.DateReceived)
+                                                        : query.OrderBy(x => x.DateReceived);
+                                        break;
+
+                                    case "createdAt":
+                                        query = desc ? query.OrderByDescending(x => x.CreatedAt)
+                                                        : query.OrderBy(x => x.CreatedAt);
+                                        break;
+
+                                    case "disciplinaryDateStart":
+                                        query = desc ? query.OrderByDescending(x => x.DisciplinaryDateStart)
+                                                        : query.OrderBy(x => x.DisciplinaryDateStart);
+                                        break;
+
+                                    case "disciplinaryDateEnd":
+                                        query = desc ? query.OrderByDescending(x => x.DisciplinaryDateEnd)
+                                                        : query.OrderBy(x => x.DisciplinaryDateEnd);
+                                        break;                       
+
+                                    default:
+                                        query = query.OrderByDescending(x => x.DisciplinaryDateStart);
+                                        break;
+                                }
+
+                            }
+
+                            var data = query
+                            .Skip((page - 1) * pageSize)
+                            .Take(pageSize)
+                            .ToList();
+
+            return Success(new { data, total = data_search.Count() });
+        }
+
         /// <summary>
         /// get รายการวินัยเรื่องสอบสวน
         /// </summary>
@@ -1561,7 +1712,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
             {
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
-            foreach (var item in req.Id)
+            foreach (var item in req.id)
             {
                 var uppdated = await _context.DisciplineDisciplinary_ProfileComplaintInvestigates
                                 .FirstOrDefaultAsync(x => x.Id == item);