diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml index 3aa27ecb..762f36fc 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml @@ -169,7 +169,7 @@ T1.performer_check_id, T2."name" AS advice_name, T2.id AS item_id, - T3.total_volume AS volume, + (SELECT mm.total_volume FROM med_medication mm WHERE mm.medication_def_id = T2.id AND mm.delete_flag = '0' LIMIT 1) AS volume, T1.lot_number AS lot_number, T1.quantity AS quantity, T1.unit_code AS unit_code, @@ -199,14 +199,11 @@ personal_account.balance_amount, personal_account.id AS account_id, T2.category_code, - mmd.status_enum AS dispense_status + (SELECT mmd.status_enum FROM med_medication_dispense mmd WHERE mmd.med_req_id = T1.id AND mmd.delete_flag = '0' LIMIT 1) AS dispense_status FROM med_medication_request AS T1 LEFT JOIN med_medication_definition AS T2 ON T2.id = T1.medication_id AND T2.delete_flag = '0' - LEFT JOIN med_medication AS T3 - ON T3.medication_def_id = T2.ID - AND T3.delete_flag = '0' LEFT JOIN adm_location AS al1 ON al1.id = T1.perform_location AND al1.delete_flag = '0' @@ -280,9 +277,6 @@ aa.balance_amount ) AS personal_account ON personal_account.encounter_id = ae.id - LEFT JOIN med_medication_dispense mmd - ON mmd.med_req_id = T1.id - AND mmd.delete_flag = '0' WHERE T1.delete_flag = '0' AND T1.refund_medicine_id IS NULL AND T1.generate_source_enum = #{doctorPrescription}