This commit is contained in:
mamoss 2025-03-27 17:45:47 +07:00
parent 121dc4ff70
commit 8d41347670

View file

@ -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),
});