diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts
index 026e2410..aa9841a6 100644
--- a/src/controllers/OrganizationController.ts
+++ b/src/controllers/OrganizationController.ts
@@ -252,6 +252,13 @@ export class OrganizationController extends Controller {
                   delete item.id;
                   const posMaster = Object.assign(new PosMaster(), item);
                   posMaster.positions = [];
+                  if (requestBody.typeDraft.toUpperCase() == "ORG_POSITION_PERSON") {
+                    posMaster.next_holderId = item.current_holderId;
+                  } else {
+                    posMaster.next_holderId = null;
+                    posMaster.isSit = false;
+                  }
+                  posMaster.current_holderId = null;
                   posMaster.orgRevisionId = revision.id;
                   posMaster.orgRootId = data.id;
                   posMaster.createdUserId = request.user.sub;
@@ -266,6 +273,9 @@ export class OrganizationController extends Controller {
                     delete pos.id;
                     const position = Object.assign(new Position(), pos);
                     position.posMasterId = posMaster.id;
+                    if (requestBody.typeDraft.toUpperCase() == "ORG_POSITION") {
+                      position.positionIsSelected = false;
+                    }
                     position.createdUserId = request.user.sub;
                     position.createdFullName = request.user.name;
                     position.createdAt = new Date();
@@ -305,6 +315,13 @@ export class OrganizationController extends Controller {
                       delete item.id;
                       const posMaster = Object.assign(new PosMaster(), item);
                       posMaster.positions = [];
+                      if (requestBody.typeDraft.toUpperCase() == "ORG_POSITION_PERSON") {
+                        posMaster.next_holderId = item.current_holderId;
+                      } else {
+                        posMaster.next_holderId = null;
+                        posMaster.isSit = false;
+                      }
+                      posMaster.current_holderId = null;
                       posMaster.orgRevisionId = revision.id;
                       posMaster.orgRootId = data.id;
                       posMaster.orgChild1Id = data1.id;
@@ -320,6 +337,9 @@ export class OrganizationController extends Controller {
                         delete pos.id;
                         const position = Object.assign(new Position(), pos);
                         position.posMasterId = posMaster.id;
+                        if (requestBody.typeDraft.toUpperCase() == "ORG_POSITION") {
+                          position.positionIsSelected = false;
+                        }
                         position.createdUserId = request.user.sub;
                         position.createdFullName = request.user.name;
                         position.createdAt = new Date();
@@ -360,6 +380,13 @@ export class OrganizationController extends Controller {
                           delete item.id;
                           const posMaster = Object.assign(new PosMaster(), item);
                           posMaster.positions = [];
+                          if (requestBody.typeDraft.toUpperCase() == "ORG_POSITION_PERSON") {
+                            posMaster.next_holderId = item.current_holderId;
+                          } else {
+                            posMaster.next_holderId = null;
+                            posMaster.isSit = false;
+                          }
+                          posMaster.current_holderId = null;
                           posMaster.orgRevisionId = revision.id;
                           posMaster.orgRootId = data.id;
                           posMaster.orgChild1Id = data1.id;
@@ -376,6 +403,9 @@ export class OrganizationController extends Controller {
                             delete pos.id;
                             const position = Object.assign(new Position(), pos);
                             position.posMasterId = posMaster.id;
+                            if (requestBody.typeDraft.toUpperCase() == "ORG_POSITION") {
+                              position.positionIsSelected = false;
+                            }
                             position.createdUserId = request.user.sub;
                             position.createdFullName = request.user.name;
                             position.createdAt = new Date();
@@ -419,6 +449,13 @@ export class OrganizationController extends Controller {
                               delete item.id;
                               const posMaster = Object.assign(new PosMaster(), item);
                               posMaster.positions = [];
+                              if (requestBody.typeDraft.toUpperCase() == "ORG_POSITION_PERSON") {
+                                posMaster.next_holderId = item.current_holderId;
+                              } else {
+                                posMaster.next_holderId = null;
+                                posMaster.isSit = false;
+                              }
+                              posMaster.current_holderId = null;
                               posMaster.orgRevisionId = revision.id;
                               posMaster.orgRootId = data.id;
                               posMaster.orgChild1Id = data1.id;
@@ -436,6 +473,9 @@ export class OrganizationController extends Controller {
                                 delete pos.id;
                                 const position = Object.assign(new Position(), pos);
                                 position.posMasterId = posMaster.id;
+                                if (requestBody.typeDraft.toUpperCase() == "ORG_POSITION") {
+                                  position.positionIsSelected = false;
+                                }
                                 position.createdUserId = request.user.sub;
                                 position.createdFullName = request.user.name;
                                 position.createdAt = new Date();
@@ -478,6 +518,15 @@ export class OrganizationController extends Controller {
                                   delete item.id;
                                   const posMaster = Object.assign(new PosMaster(), item);
                                   posMaster.positions = [];
+                                  if (
+                                    requestBody.typeDraft.toUpperCase() == "ORG_POSITION_PERSON"
+                                  ) {
+                                    posMaster.next_holderId = item.current_holderId;
+                                  } else {
+                                    posMaster.next_holderId = null;
+                                    posMaster.isSit = false;
+                                  }
+                                  posMaster.current_holderId = null;
                                   posMaster.orgRevisionId = revision.id;
                                   posMaster.orgRootId = data.id;
                                   posMaster.orgChild1Id = data1.id;
@@ -496,6 +545,9 @@ export class OrganizationController extends Controller {
                                     delete pos.id;
                                     const position = Object.assign(new Position(), pos);
                                     position.posMasterId = posMaster.id;
+                                    if (requestBody.typeDraft.toUpperCase() == "ORG_POSITION") {
+                                      position.positionIsSelected = false;
+                                    }
                                     position.createdUserId = request.user.sub;
                                     position.createdFullName = request.user.name;
                                     position.createdAt = new Date();
diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index 66931761..933c67f9 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -44,13 +44,13 @@ export class ReportController extends Controller {
   private child4Repository = AppDataSource.getRepository(OrgChild4);
 
   /**
-   * API ค้นหารายการตำแหน่ง
+   * API Report2
    *
-   * @summary ORG_029 - ค้นหารายการตำแหน่ง (ADMIN) #32
+   * @summary Report2
    *
    */
-  @Get("position")
-  async findPosition() {
+  @Get("report2")
+  async findReport2() {
     try {
       const orgRevision = await this.orgRevisionRepository.findOne({
         where: { orgRevisionIsDraft: true, orgRevisionIsCurrent: false },