diff --git a/BMA.EHR.Placement.Service/appsettings.json b/BMA.EHR.Placement.Service/appsettings.json
index 6d3526dc..254ef302 100644
--- a/BMA.EHR.Placement.Service/appsettings.json
+++ b/BMA.EHR.Placement.Service/appsettings.json
@@ -1,35 +1,35 @@
 {
-  "Serilog": {
-    "MinimumLevel": {
-      "Default": "Information",
-      "Override": {
-        "Microsoft": "Information",
-        "System": "Warning"
-      }
-    }
-  },
-  "ElasticConfiguration": {
-    "Uri": "http://localhost:9200"
-  },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB",
-    "DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
-  },
-  "Jwt": {
-    "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
-    "Issuer": "https://identity.frappet.com/realms/bma-ehr"
-  },
-  "EPPlus": {
-    "ExcelPackage": {
-      "LicenseContext": "NonCommercial"
-    }
-  },
-  "MinIO": {
-    "Endpoint": "https://s3.frappet.com/",
-    "AccessKey": "frappet",
-    "SecretKey": "P@ssw0rd",
-    "BucketName": "bma-recruit"
-  },
-  "Protocol": "HTTPS"
-}
+    "Serilog": {
+        "MinimumLevel": {
+            "Default": "Information",
+            "Override": {
+                "Microsoft": "Information",
+                "System": "Warning"
+            }
+        }
+    },
+    "ElasticConfiguration": {
+        "Uri": "http://localhost:9200"
+    },
+    "AllowedHosts": "*",
+    "ConnectionStrings": {
+        //"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB",
+        "DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
+    },
+    "Jwt": {
+        "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
+        "Issuer": "https://identity.frappet.com/realms/bma-ehr"
+    },
+    "EPPlus": {
+        "ExcelPackage": {
+            "LicenseContext": "NonCommercial"
+        }
+    },
+    "MinIO": {
+        "Endpoint": "https://s3.frappet.com/",
+        "AccessKey": "frappet",
+        "SecretKey": "P@ssw0rd",
+        "BucketName": "bma-recruit"
+    },
+    "Protocol": "HTTPS"
+}
\ No newline at end of file
diff --git a/BMA.EHR.Report.Service/Reports/คำสั่งบรรจุ-examinationHead.trdp b/BMA.EHR.Report.Service/Reports/คำสั่งบรรจุ-examinationHead.trdp
index 020ebcf7..919bab25 100644
Binary files a/BMA.EHR.Report.Service/Reports/คำสั่งบรรจุ-examinationHead.trdp and b/BMA.EHR.Report.Service/Reports/คำสั่งบรรจุ-examinationHead.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/คำสั่งย้าย-transferHead.trdp b/BMA.EHR.Report.Service/Reports/คำสั่งย้าย-transferHead.trdp
index 3b213f54..d87c799a 100644
Binary files a/BMA.EHR.Report.Service/Reports/คำสั่งย้าย-transferHead.trdp and b/BMA.EHR.Report.Service/Reports/คำสั่งย้าย-transferHead.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/คำสั่งแต่งตั้ง-appointment.trdp b/BMA.EHR.Report.Service/Reports/คำสั่งแต่งตั้ง-appointment.trdp
index 59b015d6..f6214101 100644
Binary files a/BMA.EHR.Report.Service/Reports/คำสั่งแต่งตั้ง-appointment.trdp and b/BMA.EHR.Report.Service/Reports/คำสั่งแต่งตั้ง-appointment.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/คำสั่งแต่งตั้ง-appointmentHead.trdp b/BMA.EHR.Report.Service/Reports/คำสั่งแต่งตั้ง-appointmentHead.trdp
index 3b213f54..7848afac 100644
Binary files a/BMA.EHR.Report.Service/Reports/คำสั่งแต่งตั้ง-appointmentHead.trdp and b/BMA.EHR.Report.Service/Reports/คำสั่งแต่งตั้ง-appointmentHead.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-1.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-1.trdp
index 9ccb8ed7..380c2597 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-1.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-1.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-2.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-2.trdp
index 8cb402bf..003726f6 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-2.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-2.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-3.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-3.trdp
index 0bcedd4b..863ac3dd 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-3.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-3.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-4.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-4.trdp
index 0e68207c..162ba7a7 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-4.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-4.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-5.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-5.trdp
index 447bb18e..f6553dcb 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-5.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-5.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-6.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-6.trdp
index 7af68673..2225c69b 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-6.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-6.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-7.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-7.trdp
index b00c68d9..ee8c1d3b 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-7.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-7.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-8.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-8.trdp
index ed86d03d..5a22d0f8 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก23-8.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก23-8.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก24-1.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก24-1.trdp
index 3f9d855c..9e6f6873 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก24-1.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก24-1.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก24-2.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก24-2.trdp
index 26d75461..ad5c1dd5 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก24-2.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก24-2.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก24-3.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก24-3.trdp
index e7ed76cb..03cf159d 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก24-3.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก24-3.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก25-1.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก25-1.trdp
index fb632bd4..73b9d9a1 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก25-1.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก25-1.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก26-1.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก26-1.trdp
index 2f7e3af4..d5cb670a 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก26-1.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก26-1.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก26-2.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก26-2.trdp
index d19c42ec..26750250 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก26-2.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก26-2.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก26-3.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก26-3.trdp
index 784ba983..0dd7aa87 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก26-3.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก26-3.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก26-4.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก26-4.trdp
index e0c9ea1f..4658a57c 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก26-4.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก26-4.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก27-1.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก27-1.trdp
index 26ef861c..635c3794 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก27-1.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก27-1.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-10.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก35-10.trdp
index 8031c7e2..a958e01b 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-10.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก35-10.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-4.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก35-4.trdp
index dfa88831..f3a9c1e3 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-4.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก35-4.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-5.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก35-5.trdp
index 098d06f2..4c43c18d 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-5.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก35-5.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-6.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก35-6.trdp
index f78b268d..d5ed30b4 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-6.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก35-6.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-7.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก35-7.trdp
index 3f9605dd..6ef8bd12 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-7.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก35-7.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-8.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก35-8.trdp
index cc5710c2..7ebaf15c 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-8.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก35-8.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-9.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก35-9.trdp
index 0341c9fb..bbd0410a 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก35-9.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก35-9.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก36-1.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก36-1.trdp
index 3d583872..15cda956 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก36-1.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก36-1.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก36-2.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก36-2.trdp
index fa582b7c..555d8dfa 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก36-2.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก36-2.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก36-3.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก36-3.trdp
index f41c6f88..8fa8d4ab 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก36-3.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก36-3.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก36-4.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก36-4.trdp
index 810efed7..3f69033c 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก36-4.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก36-4.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก36-5.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก36-5.trdp
index 601fe9a3..f470e379 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก36-5.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก36-5.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ1.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ1.trdp
index 588f8744..4abd4dc8 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ1.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ1.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ10.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ10.trdp
index 258f7516..4f86bafb 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ10.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ10.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ11.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ11.trdp
index 909dfdc9..083a2304 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ11.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ11.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ2.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ2.trdp
index 2b418c13..bf2d0571 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ2.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ2.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ3.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ3.trdp
index 53c11587..7584c293 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ3.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ3.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ4.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ4.trdp
index ca88c12b..b71ee52e 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ4.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ4.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ5.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ5.trdp
index df00ff9f..1bf97365 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ5.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ5.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ6.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ6.trdp
index 77273421..f42a1f24 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ6.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ6.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ7.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ7.trdp
index c77c062a..a0cead4e 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ7.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ7.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ8.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ8.trdp
index dcfe9312..977c9da5 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ8.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ8.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ9.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ9.trdp
index c12757cf..a69bfa83 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ9.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก59-เครื่องราชฯ9.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก7.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก7.trdp
index 44cda411..51943939 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก7.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก7.trdp differ
diff --git a/BMA.EHR.Report.Service/Reports/ภาคผนวก8.trdp b/BMA.EHR.Report.Service/Reports/ภาคผนวก8.trdp
index e2849604..8bf231b2 100644
Binary files a/BMA.EHR.Report.Service/Reports/ภาคผนวก8.trdp and b/BMA.EHR.Report.Service/Reports/ภาคผนวก8.trdp differ