diff --git a/src/interfaces/utils.ts b/src/interfaces/utils.ts
index 183561b1..b4beacde 100644
--- a/src/interfaces/utils.ts
+++ b/src/interfaces/utils.ts
@@ -548,15 +548,15 @@ export function commandTypePath(commandCode: string): string | null {
     case "C-PM-32":
       return "/discipline/result/command32/report";
     case "C-PM-33":
-      return "/salary/report/command/officer/report"; //SALARY
+      return "/salary/report/command33/officer/report"; //SALARY
     case "C-PM-34":
-      return "/salary/report/command/officer/report"; //SALARY
+      return "/salary/report/command34/officer/report"; //SALARY
     case "C-PM-35":
-      return "/salary/report/command/officer/report"; //SALARY
+      return "/salary/report/command35/officer/report"; //SALARY
     case "C-PM-36":
-      return "/salary/report/command/employee/report"; //SALARY
+      return "/salary/report/command36/employee/report"; //SALARY
     case "C-PM-37":
-      return "/salary/report/command/employee/report"; //SALARY
+      return "/salary/report/command37/employee/report"; //SALARY
     case "C-PM-38":
       return "/org/command/command38/officer/report"; //ORG
     case "C-PM-39":
diff --git a/src/services/rabbitmq.ts b/src/services/rabbitmq.ts
index e11c2177..cfc26fb7 100644
--- a/src/services/rabbitmq.ts
+++ b/src/services/rabbitmq.ts
@@ -1711,17 +1711,20 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
     });
     // await posMasterRepository.remove(_posMasters);
     const batchSize = 1000;
-    for (let i = 0; i < _posMasters.length; i += batchSize) {
-      const batch = _posMasters.slice(i, i + batchSize);
-      try {
-        await posMasterRepository.remove(batch);
-        console.log(`Removed PosMaster batch ${i / batchSize + 1}`);
-      } catch (error) {
-        console.log(`Failed to remove batch ${i / batchSize + 1}`);
+    const removeInBatches = async (repository:any, data:any, label:any) => {
+      for (let i = 0; i < data.length; i += batchSize) {
+        const batch = data.slice(i, i + batchSize);
+        try {
+          await repository.remove(batch);
+          console.log(`Removed ${label} batch ${i / batchSize + 1}`);
+        } catch (error) {
+          console.log(`Failed to remove ${label} batch ${i / batchSize + 1}`);
+        }
       }
-    }
-    await employeePosMasterRepository.remove(_employeePosMasters);
-    await employeeTempPosMasterRepository.remove(_employeeTempPosMasters);
+    };
+    await removeInBatches(posMasterRepository, _posMasters, "PosMaster");
+    await removeInBatches(employeePosMasterRepository, _employeePosMasters, "EmployeePosMaster");
+    await removeInBatches(employeeTempPosMasterRepository, _employeeTempPosMasters, "EmployeeTempPosMaster");
     await child4Repository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) });
     await child3Repository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) });
     await child2Repository.delete({ orgRevisionId: In(_orgRevisions.map((x) => x.id)) });