TIMOR-TELECOM/service-master-data-revenue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix service examination

Browse Source
This commit is contained in:
avicenan
2026-04-23 14:30:48 +07:00
parent 6a1f2da890
commit a0c6d97ea8
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/controllers/room_services.ts
View File

@ -154,15 +154,15 @@ export class RoomServicesController {
"serviceType.name", "serviceType.name",
"serviceFare.id", "serviceFare.id",
"serviceFare.fare", "serviceFare.fare",
"faretype.id", "fareType.id",
"faretype.name", "fareType.name",
]) ])
.leftJoin("Service.serviceType", "serviceType") .leftJoin("Service.serviceType", "serviceType")
.leftJoin("Service.rooms", "room") .leftJoin("Service.rooms", "room")
.leftJoin("room.serviceclass", "roomClass") .leftJoin("room.serviceclass", "roomClass")
.innerJoin("Service.servicefare", "serviceFare") .innerJoin("Service.servicefare", "serviceFare")
.innerJoin("serviceFare.serviceClass", "serviceClass", "serviceClass.id = roomClass.id") .innerJoin("serviceFare.serviceClass", "serviceClass", "serviceClass.id = roomClass.id")
.innerJoin("serviceFare.faretype", "faretype") .innerJoin("serviceFare.faretype", "fareType")
.where("room.id = :roomId", { roomId }) .where("room.id = :roomId", { roomId })
.orderBy("Service." + param.order_field, param.order_direction) .orderBy("Service." + param.order_field, param.order_direction)
.skip(offset) .skip(offset)

16
src/controllers/service_examination.ts
View File

@ -41,20 +41,20 @@ export class ServiceExaminationController {
let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {}; let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {};
// Clone terpisah untuk count dan list
const res_count = await ServiceModel.list(filter);
const res_list = await ServiceModel.list(filter);
const offset = (param.page - 1) * param.limit; const offset = (param.page - 1) * param.limit;
let limit = param.limit;
res_list var query = await ServiceModel.list(filter);
const res_count = query;
const res_list = query
.leftJoinAndSelect("Service.serviceType", "serviceType") .leftJoinAndSelect("Service.serviceType", "serviceType")
.leftJoinAndSelect("Service.examination_details", "examinationDetails") .leftJoinAndSelect("Service.examination_details", "examinationDetails")
.leftJoinAndSelect("examinationDetails.measurement_unit", "measurementUnit") .leftJoinAndSelect("examinationDetails.measurement_unit", "measurementUnit")
.leftJoinAndSelect("examinationDetails.reference_range", "referenceRange") .leftJoinAndSelect("examinationDetails.reference_range", "referenceRange")
.orderBy("Service." + param.order_field, param.order_direction as "ASC" | "DESC") .orderBy("Service." + param.order_field, param.order_direction)
.offset(offset) .skip(offset)
.limit(param.limit); .take(limit);
if (param.with_deleted) { if (param.with_deleted) {
res_count.withDeleted(); res_count.withDeleted();