update
This commit is contained in:
@ -41,20 +41,20 @@ export class ServiceExaminationController {
|
||||
|
||||
let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {};
|
||||
|
||||
var query = await ServiceModel.list(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;
|
||||
let limit = param.limit;
|
||||
|
||||
const res_count = query;
|
||||
const res_list = query
|
||||
res_list
|
||||
.leftJoinAndSelect("Service.serviceType", "serviceType")
|
||||
.leftJoinAndSelect("Service.examination_details", "examinationDetails")
|
||||
.leftJoinAndSelect("examinationDetails.measurement_unit", "measurementUnit")
|
||||
.leftJoinAndSelect("examinationDetails.reference_range", "referenceRange")
|
||||
.orderBy("Service." + param.order_field, param.order_direction)
|
||||
.orderBy("Service." + param.order_field, param.order_direction as "ASC" | "DESC")
|
||||
.offset(offset)
|
||||
.limit(limit);
|
||||
.limit(param.limit);
|
||||
|
||||
if (param.with_deleted) {
|
||||
res_count.withDeleted();
|
||||
@ -66,7 +66,14 @@ export class ServiceExaminationController {
|
||||
const list_data = await res_list.getMany();
|
||||
const count_data = CommonHelper.countObject(list_data);
|
||||
|
||||
return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, current_page, total_count_data, list_data);
|
||||
return ReturnHelper.successResponselist(
|
||||
res, 200,
|
||||
Language.lang.success_view,
|
||||
count_data,
|
||||
current_page,
|
||||
total_count_data,
|
||||
list_data
|
||||
);
|
||||
} catch (e: unknown) {
|
||||
log.error(e);
|
||||
const err = e as Error;
|
||||
|
||||
Reference in New Issue
Block a user