diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml index ead82c745..2a7b17e29 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml @@ -515,7 +515,7 @@ T1.encounter_id AS encounter_id, T1.patient_id AS patient_id, 'med_medication_definition' AS advice_table_name, - T1.medication_id AS advice_definition_id, + T1.medication_id AS advice_definition_id , T1.content_json::jsonb ->> 'remark' AS remark FROM med_medication_request AS T1 LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id @@ -696,7 +696,7 @@ T1.encounter_id AS encounter_id, T1.patient_id AS patient_id, 'adm_device_definition' AS advice_table_name, - T1.device_def_id AS advice_definition_id, + T1.device_def_id AS advice_definition_id , T1.content_json::jsonb ->> 'remark' AS remark FROM wor_device_request AS T1 LEFT JOIN adm_device_definition AS T2 ON T2.ID = T1.device_def_id @@ -753,8 +753,8 @@ T1.encounter_id AS encounter_id, T1.patient_id AS patient_id, 'wor_activity_definition' AS advice_table_name, - , T1.remark AS remark T1.activity_id AS advice_definition_id, + T1.remark AS remark FROM wor_service_request AS T1 LEFT JOIN wor_activity_definition AS T2 ON T2.ID = T1.activity_id