diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml index f5edbd96..8bbf3963 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml @@ -96,9 +96,9 @@ fc.contract_name AS fee_type, COALESCE(pi.identifier_no, ap.bus_no, '') AS identifier_no FROM doc_request_form drf - LEFT JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no - LEFT JOIN adm_patient ap ON ap.id = cs.patient_id - LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id + LEFT JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no AND cs.delete_flag = '0' + LEFT JOIN adm_patient ap ON ap.id = cs.patient_id AND ap.delete_flag = '0' + LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id AND ae.delete_flag = '0' LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0' LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0' LEFT JOIN op_schedule os ON os.apply_id = drf.id AND os.delete_flag = '0'