diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index 3c9de5ff..a888eeff 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -3164,8 +3164,8 @@ export class CommandController extends Controller {
 
         posMaster.current_holderId = item.profileId;
         posMaster.lastUpdatedAt = new Date();
-        posMaster.conditionReason = _null;
-        posMaster.isCondition = false;
+        // posMaster.conditionReason = _null;
+        // posMaster.isCondition = false;
         if (posMasterOld != null) {
           await this.posMasterRepository.save(posMasterOld);
           await CreatePosMasterHistoryOfficer(posMasterOld.id, req);
@@ -3608,8 +3608,8 @@ export class CommandController extends Controller {
               }
               posMaster.current_holderId = profile.id;
               posMaster.lastUpdatedAt = new Date();
-              posMaster.conditionReason = _null;
-              posMaster.isCondition = false;
+              // posMaster.conditionReason = _null;
+              // posMaster.isCondition = false;
               await this.posMasterRepository.save(posMaster);
               const positionNew = await this.positionRepository.findOne({
                 where: {
@@ -6067,8 +6067,8 @@ export class CommandController extends Controller {
 
             posMaster.current_holderId = profile.id;
             posMaster.lastUpdatedAt = new Date();
-            posMaster.conditionReason = _null;
-            posMaster.isCondition = false;
+            // posMaster.conditionReason = _null;
+            // posMaster.isCondition = false;
             if (posMasterOld != null) {
               await this.posMasterRepository.save(posMasterOld);
               await CreatePosMasterHistoryOfficer(posMasterOld.id, req);
diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts
index 2961ae9e..9625f729 100644
--- a/src/controllers/PositionController.ts
+++ b/src/controllers/PositionController.ts
@@ -3642,8 +3642,8 @@ export class PositionController extends Controller {
     // dataMaster.next_holderId = requestBody.profileId;
     dataMaster.lastUpdatedAt = new Date();
     //add on
-    dataMaster.conditionReason = _null;
-    dataMaster.isCondition = false;
+    // dataMaster.conditionReason = _null;
+    // dataMaster.isCondition = false;
     //เช็คถ้า revision ปัจจุบันให้ปั๊มที่ profile
     const chkRevision = await this.orgRevisionRepository.findOne({
       where: { id: dataMaster.orgRevisionId },
@@ -4937,8 +4937,8 @@ export class PositionController extends Controller {
     posMaster.current_holderId = body.profileId;
     posMaster.lastUpdatedAt = new Date();
     const _null: any = null;
-    posMaster.conditionReason = _null;
-    posMaster.isCondition = false;
+    // posMaster.conditionReason = _null;
+    // posMaster.isCondition = false;
     if (posMasterOld != null) {
       await this.posMasterRepository.save(posMasterOld);
       await CreatePosMasterHistoryOfficer(posMasterOld.id, request);
diff --git a/src/services/rabbitmq.ts b/src/services/rabbitmq.ts
index d55667a6..dd57d886 100644
--- a/src/services/rabbitmq.ts
+++ b/src/services/rabbitmq.ts
@@ -571,11 +571,11 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
         }
       }
       item.current_holderId = item.next_holderId;
-      item.conditionReason = _null;
-      if (item.current_holderId) {
-        item.conditionReason = _null;
-        item.isCondition = false;
-      }
+      // item.conditionReason = _null;
+      // if (item.current_holderId) {
+      //   item.conditionReason = _null;
+      //   item.isCondition = false;
+      // }
       item.next_holderId = null;
       item.lastUpdateUserId = lastUpdateUserId;
       item.lastUpdateFullName = lastUpdateFullName;
@@ -1760,10 +1760,10 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
               )
             ) {
               posMaster.next_holderId = item.current_holderId;
-              if (posMaster.next_holderId) {
-                posMaster.conditionReason = _null;
-                posMaster.isCondition = false;
-              }
+              // if (posMaster.next_holderId) {
+              //   posMaster.conditionReason = _null;
+              //   posMaster.isCondition = false;
+              // }
             } else {
               posMaster.next_holderId = null;
               posMaster.isSit = false;
@@ -1856,10 +1856,10 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
                 )
               ) {
                 posMaster.next_holderId = item.current_holderId;
-                if (posMaster.next_holderId) {
-                  posMaster.conditionReason = _null;
-                  posMaster.isCondition = false;
-                }
+                // if (posMaster.next_holderId) {
+                //   posMaster.conditionReason = _null;
+                //   posMaster.isCondition = false;
+                // }
               } else {
                 posMaster.next_holderId = null;
                 posMaster.isSit = false;
@@ -1954,10 +1954,10 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
                   )
                 ) {
                   posMaster.next_holderId = item.current_holderId;
-                  if (posMaster.next_holderId) {
-                    posMaster.conditionReason = _null;
-                    posMaster.isCondition = false;
-                  }
+                  // if (posMaster.next_holderId) {
+                  //   posMaster.conditionReason = _null;
+                  //   posMaster.isCondition = false;
+                  // }
                 } else {
                   posMaster.next_holderId = null;
                   posMaster.isSit = false;
@@ -2054,10 +2054,10 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
                     )
                   ) {
                     posMaster.next_holderId = item.current_holderId;
-                    if (posMaster.next_holderId) {
-                      posMaster.conditionReason = _null;
-                      posMaster.isCondition = false;
-                    }
+                    // if (posMaster.next_holderId) {
+                    //   posMaster.conditionReason = _null;
+                    //   posMaster.isCondition = false;
+                    // }
                   } else {
                     posMaster.next_holderId = null;
                     posMaster.isSit = false;
@@ -2157,10 +2157,10 @@ async function handler_org_draft(msg: amqp.ConsumeMessage): Promise<boolean> {
                       )
                     ) {
                       posMaster.next_holderId = item.current_holderId;
-                      if (posMaster.next_holderId) {
-                        posMaster.conditionReason = _null;
-                        posMaster.isCondition = false;
-                      }
+                      // if (posMaster.next_holderId) {
+                      //   posMaster.conditionReason = _null;
+                      //   posMaster.isCondition = false;
+                      // }
                     } else {
                       posMaster.next_holderId = null;
                       posMaster.isSit = false;