|
@@ -75,7 +75,8 @@
|
|
|
select ei.*, ec.contract_number as contractNumber
|
|
select ei.*, ec.contract_number as contractNumber
|
|
|
from elderly_info ei
|
|
from elderly_info ei
|
|
|
LEFT JOIN elderly_contract ec ON ec.elder_id = ei.id AND ec.status = 1
|
|
LEFT JOIN elderly_contract ec ON ec.elder_id = ei.id AND ec.status = 1
|
|
|
- where 1 = 1 and ei.deleted = 0
|
|
|
|
|
|
|
+ LEFT JOIN elderly_refund_settlement_order efso ON efso.elder_id = ei.id
|
|
|
|
|
+ where 1 = 1 and ei.deleted = 0 AND (efso.`status` != 1 OR efso.`status` is null)
|
|
|
<if test="pageVO.elderName != null and pageVO.elderName != '' ">
|
|
<if test="pageVO.elderName != null and pageVO.elderName != '' ">
|
|
|
and ei.elder_name like concat('%', #{pageVO.elderName}, '%')
|
|
and ei.elder_name like concat('%', #{pageVO.elderName}, '%')
|
|
|
</if>
|
|
</if>
|
