diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index e0140fb..69ca226 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -67,21 +67,21 @@ jobs:
                       docker compose pull
                       docker compose up -d
                       echo "${{ steps.gen_ver.outputs.image_ver }}"> success
-            # - uses: snow-actions/line-notify@v1.1.0
-            #   if: success()
-            #   with:
-            #       access_token: ${{ env.TOKEN_LINE }}
-            #       message: |
-            #           -Success✅✅✅
-            #           Image: ${{env.IMAGE_NAME}}
-            #           Version: ${{ github.event.inputs.IMAGE_VER }}
-            #           By: ${{secrets.DOCKER_USER}}
-            # - uses: snow-actions/line-notify@v1.1.0
-            #   if: failure()
-            #   with:
-            #       access_token: ${{ env.TOKEN_LINE }}
-            #       message: |
-            #           -Failure❌❌❌
-            #           Image: ${{env.IMAGE_NAME}}
-            #           Version: ${{ github.event.inputs.IMAGE_VER }}
-            #           By: ${{secrets.DOCKER_USER}}
+            - uses: snow-actions/line-notify@v1.1.0
+              if: success()
+              with:
+                  access_token: ${{ env.TOKEN_LINE }}
+                  message: |
+                      -Success✅✅✅
+                      Image: ${{env.IMAGE_NAME}}
+                      Version: ${{ github.event.inputs.IMAGE_VER }}
+                      By: ${{secrets.DOCKER_USER}}
+            - uses: snow-actions/line-notify@v1.1.0
+              if: failure()
+              with:
+                  access_token: ${{ env.TOKEN_LINE }}
+                  message: |
+                      -Failure❌❌❌
+                      Image: ${{env.IMAGE_NAME}}
+                      Version: ${{ github.event.inputs.IMAGE_VER }}
+                      By: ${{secrets.DOCKER_USER}}
diff --git a/Services/PeriodExamService.cs b/Services/PeriodExamService.cs
index f71721e..a5cf4ff 100644
--- a/Services/PeriodExamService.cs
+++ b/Services/PeriodExamService.cs
@@ -2209,9 +2209,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                     PlacementStatus = "UN-CONTAIN",
                     Pass = candidate.Pass,
                     RemarkHorizontal = "โดยมีเงื่อนไขว่าต้องปฏิบัติงานให้กรุงเทพมหานครเป็นระยะเวลาไม่น้อยกว่า ๕ ปี นับแต่วันที่ได้รับการบรรจุและแต่งตั้ง โดยห้ามโอนไปหน่วยงานหรือส่วนราชการอื่น เว้นเเต่ลาออกจากราชการ",
-                    Amount = profile == null || profile.Salaries.Count() == 0 ? 0 : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
-                    PositionSalaryAmount = profile == null || profile.Salaries.Count() == 0 ? 0 : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount,
-                    MouthSalaryAmount = profile == null || profile.Salaries.Count() == 0 ? 0 : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().MouthSalaryAmount,
+                    Amount = org == null || org.result == null ? null : org.result.amount,
+                    PositionSalaryAmount = org == null || org.result == null ? null : org.result.positionSalaryAmount,
+                    MouthSalaryAmount = org == null || org.result == null ? null : org.result.mouthSalaryAmount,
                     CreatedAt = DateTime.Now,
                     CreatedUserId = UserId ?? "",
                     CreatedFullName = FullName ?? "",
@@ -2434,9 +2434,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                     Pass = disableScore == null ? null : disableScore.ExamStatus,
                     RemarkHorizontal = "โดยมีเงื่อนไขว่าต้องปฏิบัติงานให้กรุงเทพมหานครเป็นระยะเวลาไม่น้อยกว่า ๕ ปี นับแต่วันที่ได้รับการบรรจุและแต่งตั้ง โดยห้ามโอนไปหน่วยงานหรือส่วนราชการอื่น เว้นเเต่ลาออกจากราชการ",
                     // ReportingDate = DateTime.Now,
-                    Amount = profile == null || profile.Salaries.Count() == 0 ? 0 : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
-                    PositionSalaryAmount = profile == null || profile.Salaries.Count() == 0 ? 0 : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().PositionSalaryAmount,
-                    MouthSalaryAmount = profile == null || profile.Salaries.Count() == 0 ? 0 : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().MouthSalaryAmount,
+                    Amount = org == null || org.result == null ? null : org.result.amount,
+                    PositionSalaryAmount = org == null || org.result == null ? null : org.result.positionSalaryAmount,
+                    MouthSalaryAmount = org == null || org.result == null ? null : org.result.mouthSalaryAmount,
                     CreatedAt = DateTime.Now,
                     CreatedUserId = UserId ?? "",
                     CreatedFullName = FullName ?? "",