From 8d413476701ff40c219a81340b6acf3a630431dd Mon Sep 17 00:00:00 2001 From: mamoss <> Date: Thu, 27 Mar 2025 17:45:47 +0700 Subject: [PATCH] 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), });