From abcc0b9246d64128ac76b8799f96bd28ae5ccdaf Mon Sep 17 00:00:00 2001 From: Bright Date: Thu, 27 Mar 2025 14:47:56 +0700 Subject: [PATCH 1/4] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?= =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?= =?UTF-8?q?=E0=B8=95=E0=B8=B4=E0=B8=96=E0=B9=89=E0=B8=B2=E0=B9=84=E0=B8=A1?= =?UTF-8?q?=E0=B9=88=E0=B9=84=E0=B8=94=E0=B9=89=E0=B9=80=E0=B8=A5=E0=B8=B7?= =?UTF-8?q?=E0=B8=AD=E0=B8=81=20filter=20=E0=B8=95=E0=B9=89=E0=B8=AD?= =?UTF-8?q?=E0=B8=87=E0=B9=80=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=87=E0=B8=88?= =?UTF-8?q?=E0=B8=B2=E0=B8=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=A7=E0=B8=A2?= =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99/=E0=B8=AA=E0=B9=88=E0=B8=A7?= =?UTF-8?q?=E0=B8=99=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3?= =?UTF-8?q?=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=A5=E0=B8=82=E0=B8=97?= =?UTF-8?q?=E0=B8=B5=E0=B9=88=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?= =?UTF-8?q?=E0=B9=88=E0=B8=87=20(issue=20#113)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ProfileController.ts | 8 +++++++- src/controllers/ProfileEmployeeController.ts | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 0ad007d5..eda3f03e 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -6119,7 +6119,13 @@ export class ProfileController extends Controller { }), ) // .orderBy("current_holders.posMasterNo", "ASC") - .orderBy(`${sortBy}`, sort) + // .orderBy(`${sortBy}`, sort) + .orderBy("orgRoot.orgRootOrder", sort) + .addOrderBy("orgChild1.orgChild1Order", sort) + .addOrderBy("orgChild2.orgChild2Order", sort) + .addOrderBy("orgChild3.orgChild3Order", sort) + .addOrderBy("orgChild4.orgChild4Order", sort) + .addOrderBy("current_holders.posMasterNo", sort) .skip((page - 1) * pageSize) .take(pageSize) .getManyAndCount(); diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 0ffcfd2d..62208219 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -2235,7 +2235,13 @@ export class ProfileEmployeeController extends Controller { // orgRevisionId: findRevision.id, // }) // .orderBy("current_holders.posMasterNo", "ASC") - .orderBy(`${sortBy}`, sort) + // .orderBy(`${sortBy}`, sort) + .orderBy("orgRoot.orgRootOrder", sort) + .addOrderBy("orgChild1.orgChild1Order", sort) + .addOrderBy("orgChild2.orgChild2Order", sort) + .addOrderBy("orgChild3.orgChild3Order", sort) + .addOrderBy("orgChild4.orgChild4Order", sort) + .addOrderBy("current_holders.posMasterNo", sort) .skip((page - 1) * pageSize) .take(pageSize) .getManyAndCount(); From 89744233bd1d63339cc29d3124ff5a7b5b1bf0fb Mon Sep 17 00:00:00 2001 From: mamoss <> Date: Thu, 27 Mar 2025 17:05:07 +0700 Subject: [PATCH 2/4] add hospital --- src/controllers/OrganizationController.ts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts index c44120df..038f5314 100644 --- a/src/controllers/OrganizationController.ts +++ b/src/controllers/OrganizationController.ts @@ -7564,7 +7564,21 @@ export class OrganizationController extends Controller { where: { orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true }, }, - order: { isDeputy: "DESC", orgRootOrder: "ASC" }, + order: { isDeputy: "DESC", DEPARTMENT_CODE: "ASC", orgRootName: "ASC" }, + select: ["orgRootName"], + }); + const hospital = await this.orgRootRepository.find({ + where: [ + { + orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true }, + isDeputy: true, + }, + { + orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true }, + orgRootRankSub: "HOSPITAL", + }, + ], + order: { isDeputy: "DESC", DEPARTMENT_CODE: "ASC", orgRootName: "ASC" }, select: ["orgRootName"], }); const posType = await this.posTypeRepository.find({ @@ -7577,6 +7591,7 @@ export class OrganizationController extends Controller { }); return new HttpSuccess({ root: root.map((x) => x.orgRootName), + hospital: hospital.map((x) => x.orgRootName), posTypeNameOrder: posType.map((x) => x.posTypeName), posLevelNameOrder: posLevel.map((x) => x.posLevelName), }); From 8d413476701ff40c219a81340b6acf3a630431dd Mon Sep 17 00:00:00 2001 From: mamoss <> Date: Thu, 27 Mar 2025 17:45:47 +0700 Subject: [PATCH 3/4] sort hos --- src/controllers/OrganizationController.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts index 038f5314..438eb469 100644 --- a/src/controllers/OrganizationController.ts +++ b/src/controllers/OrganizationController.ts @@ -7567,19 +7567,18 @@ export class OrganizationController extends Controller { order: { isDeputy: "DESC", DEPARTMENT_CODE: "ASC", orgRootName: "ASC" }, select: ["orgRootName"], }); - const hospital = await this.orgRootRepository.find({ + const hospital = await this.child1Repository.find({ where: [ { orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true }, - isDeputy: true, + orgRoot: { isDeputy: true }, }, { orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true }, - orgRootRankSub: "HOSPITAL", + orgChild1RankSub: "HOSPITAL", }, ], - order: { isDeputy: "DESC", DEPARTMENT_CODE: "ASC", orgRootName: "ASC" }, - select: ["orgRootName"], + select: ["orgChild1Name"], }); const posType = await this.posTypeRepository.find({ order: { posTypeRank: "DESC" }, @@ -7591,7 +7590,7 @@ export class OrganizationController extends Controller { }); return new HttpSuccess({ root: root.map((x) => x.orgRootName), - hospital: hospital.map((x) => x.orgRootName), + hospital: hospital.map((x) => x.orgChild1Name), posTypeNameOrder: posType.map((x) => x.posTypeName), posLevelNameOrder: posLevel.map((x) => x.posLevelName), }); From 0589313d715e61761bac2304e75981b53c314683 Mon Sep 17 00:00:00 2001 From: mamoss <> Date: Thu, 27 Mar 2025 17:52:55 +0700 Subject: [PATCH 4/4] sort child1 --- src/controllers/OrganizationController.ts | 32 +++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts index 438eb469..a1a13762 100644 --- a/src/controllers/OrganizationController.ts +++ b/src/controllers/OrganizationController.ts @@ -7567,6 +7567,34 @@ export class OrganizationController extends Controller { order: { isDeputy: "DESC", DEPARTMENT_CODE: "ASC", orgRootName: "ASC" }, select: ["orgRootName"], }); + const child1 = await this.child1Repository.find({ + where: { + orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true }, + }, + order: { orgChild1Order: "ASC" }, + select: ["orgChild1Name"], + }); + const child2 = await this.child2Repository.find({ + where: { + orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true }, + }, + order: { orgChild2Order: "ASC" }, + select: ["orgChild2Name"], + }); + const child3 = await this.child3Repository.find({ + where: { + orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true }, + }, + order: { orgChild3Order: "ASC" }, + select: ["orgChild3Name"], + }); + const child4 = await this.child4Repository.find({ + where: { + orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true }, + }, + order: { orgChild4Order: "ASC" }, + select: ["orgChild4Name"], + }); const hospital = await this.child1Repository.find({ where: [ { @@ -7590,6 +7618,10 @@ export class OrganizationController extends Controller { }); return new HttpSuccess({ root: root.map((x) => x.orgRootName), + child1: child1.map((x) => x.orgChild1Name), + child2: child2.map((x) => x.orgChild2Name), + child3: child3.map((x) => x.orgChild3Name), + child4: child4.map((x) => x.orgChild4Name), hospital: hospital.map((x) => x.orgChild1Name), posTypeNameOrder: posType.map((x) => x.posTypeName), posLevelNameOrder: posLevel.map((x) => x.posLevelName),