diff --git a/src/controllers/EvaluationController.ts b/src/controllers/EvaluationController.ts
index a79c8ee..09e4e86 100644
--- a/src/controllers/EvaluationController.ts
+++ b/src/controllers/EvaluationController.ts
@@ -1800,20 +1800,23 @@ export class EvaluationController {
         })
         .catch((x) => {});
 
-        
-      await new CallAPI()
-        .PostData(request, "/placement/noti/keycloak", {
-          subject: `${evaluation.fullName} แบบประเมินมีการบันทึกตรวจสอบจัดเตรียมเอกสารเล่ม 1`,
-          body: `${evaluation.fullName} แบบประเมินมีการบันทึกตรวจสอบจัดเตรียมเอกสารเล่ม 1`,
-          receiverUserId: "59134ef9-9e62-41d0-aac5-339be727f2b0",
-          payload: "",
-          isSendMail: true,
-          isSendInbox: true,
-          isSendNotification: true,
+      await Promise.all(
+        _director.map((director:any) => {
+          return new CallAPI()
+          .PostData(request, "/placement/noti/keycloak", {
+            subject: `${evaluation.fullName} แบบประเมินมีการบันทึกตรวจสอบจัดเตรียมเอกสารเล่ม 1`,
+            body: `${evaluation.fullName} แบบประเมินมีการบันทึกตรวจสอบจัดเตรียมเอกสารเล่ม 1`,
+            receiverUserId: director.id,
+            payload: "",
+            isSendMail: true,
+            isSendInbox: true,
+            isSendNotification: true,
+          })
+          .then((x) => {})
+          .catch((x) => {});
         })
-        .then((x) => {})
-        .catch((x) => {});
-
+      );
+      
       return new HttpSuccess();
     } catch (error: any) {
       if (error instanceof HttpError) {
diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index eac19d0..d2ba20e 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -411,8 +411,8 @@ export class ReoportController {
                 certificateNo: certificate.certificateNo
                   ? Extension.ToThaiNumber(certificate.certificateNo)
                   : "-",
-                issueDate: certificate.issueDate,
-                expireDate: certificate.expireDate,
+                issueDate: certificate.issueDate ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(certificate.issueDate)) : "-",
+                expireDate: certificate.expireDate ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(certificate.expireDate)) : "-",
               }))
             : [
                 {
@@ -460,10 +460,10 @@ export class ReoportController {
                 name: training.name ? Extension.ToThaiNumber(training.name) : "-",
                 topic: training.topic ? Extension.ToThaiNumber(training.topic) : "-",
                 startDate: training.startDate
-                  ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(training.startDate))
+                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(training.startDate))
                   : "-",
                 endDate: training.endDate
-                  ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(training.endDate))
+                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(training.endDate))
                   : "-",
                 yearly: training.yearly ? Extension.ToThaiNumber(training.yearly.toString()) : "-",
                 place: training.place,