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

Merge branch 'main' of https://git.shiblysolution.id/SAUDE-TL/service-master-data

Browse Source
This commit is contained in:
wayanrivan
2026-04-21 13:38:29 +07:00
parent 48016bfa88 030b819417
commit df18b9cdfe
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/controllers/inpatient_room.ts
View File

@ -75,6 +75,7 @@ export class InpatientRoomController {
const res_count = query; const res_count = query;
const res_list = query const res_list = query
.leftJoinAndSelect("InpatientRoom.room", "room") .leftJoinAndSelect("InpatientRoom.room", "room")
.leftJoinAndSelect("room.serviceclass", "service_class")
.orderBy("InpatientRoom." + param.order_field, param.order_direction) .orderBy("InpatientRoom." + param.order_field, param.order_direction)
.offset(offset) .offset(offset)
.limit(limit); .limit(limit);
@ -166,7 +167,7 @@ export class InpatientRoomController {
let param: any = await schema.validateAsync(req.params); let param: any = await schema.validateAsync(req.params);
let data = await InpatientRoomModel.list({ id: param.id }).then((q) => let data = await InpatientRoomModel.list({ "InpatientRoom.id": param.id }).then((q) =>
q // q //
.leftJoinAndSelect("InpatientRoom.room", "room") .leftJoinAndSelect("InpatientRoom.room", "room")
.getOne(), .getOne(),

8
src/model/schedule.ts
View File

@ -74,6 +74,7 @@ export class ScheduleModel {
} }
const filterRoomId = filterObj && filterObj.roomId !== "" && filterObj.roomId !== null && filterObj.roomId !== undefined ? String(filterObj.roomId) : ""; const filterRoomId = filterObj && filterObj.roomId !== "" && filterObj.roomId !== null && filterObj.roomId !== undefined ? String(filterObj.roomId) : "";
const filterDoctorId = filterObj && filterObj.doctorId !== "" && filterObj.doctorId !== null && filterObj.doctorId !== undefined ? String(filterObj.doctorId) : "";
const page = options.page ?? 1; const page = options.page ?? 1;
const limit = options.limit ?? 10; const limit = options.limit ?? 10;
@ -83,10 +84,8 @@ export class ScheduleModel {
const roomQuery = query const roomQuery = query
.select(["Room.id", "Room.room", "Room.code", "Room.picture", "Room.location", "Room.status", "Department.name"]) .select(["Room.id", "Room.room", "Room.code", "Room.picture", "Room.location", "Room.status", "Department.name"])
.leftJoin("Room.department", "Department") .leftJoin("Room.department", "Department")
.where("Department.name = :departmentName", { departmentName: "Outpatient" }); .where("Department.name = :departmentName", { departmentName: "Outpatient" })
if (filterRoomId !== "") { .andWhere(filterRoomId !== "" ? "Room.id = :roomId" : "1=1", { roomId: filterRoomId });
roomQuery.andWhere("Room.id = :roomId", { roomId: filterRoomId });
}
const roomTotalCount = await roomQuery const roomTotalCount = await roomQuery
.getCount(); .getCount();
@ -103,6 +102,7 @@ export class ScheduleModel {
.andWhere("ScheduleSeries.start_date <= :rangeEndDate", { rangeEndDate: dayjs(rangeEnd).format("YYYY-MM-DD") }) .andWhere("ScheduleSeries.start_date <= :rangeEndDate", { rangeEndDate: dayjs(rangeEnd).format("YYYY-MM-DD") })
.andWhere("(ScheduleSeries.until_date IS NULL OR ScheduleSeries.until_date >= :rangeStartDate)", { rangeStartDate: dayjs(rangeStart).format("YYYY-MM-DD") }) .andWhere("(ScheduleSeries.until_date IS NULL OR ScheduleSeries.until_date >= :rangeStartDate)", { rangeStartDate: dayjs(rangeStart).format("YYYY-MM-DD") })
.andWhere("ScheduleSeries.deleted_at IS NULL") .andWhere("ScheduleSeries.deleted_at IS NULL")
.andWhere(filterDoctorId !== "" ? "ScheduleSeries.doctor_id = :doctorId" : "1=1", { doctorId: filterDoctorId })
.orderBy("ScheduleSeries.start_time", "ASC") .orderBy("ScheduleSeries.start_time", "ASC")
.getMany(); .getMany();