|
|
@@ -88,7 +88,7 @@
|
|
|
|
|
|
eei.item_name,
|
|
|
ob.build_name,
|
|
|
- obb.bed_name,
|
|
|
+ CONCAT_WS('-', bf.floor_name, br.room_name, obb.bed_name) AS bed_name,
|
|
|
eesa.amount AS 'expenseSubsidyBalance',
|
|
|
eb.amount AS 'virtualBalance',
|
|
|
ei.org_type,
|
|
|
@@ -105,6 +105,8 @@
|
|
|
|
|
|
LEFT JOIN org_build ob ON ob.id = ei.build_id
|
|
|
LEFT JOIN org_build_bed obb ON ei.bed_id = obb.id
|
|
|
+ LEFT JOIN org_build_room br ON obb.room_id = br.id
|
|
|
+ LEFT JOIN org_build_floor bf ON br.floor_id = bf.id
|
|
|
LEFT JOIN elderly_expense_subsidy_account eesa ON eesa.elder_id = ei.id
|
|
|
LEFT JOIN elderly_balance eb ON eb.elder_id = ei.id
|
|
|
|
