diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml index fc86b35cf..723d64929 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml @@ -214,9 +214,9 @@ T1.dispense_per_duration AS dispense_per_duration, T2.part_percent AS part_percent, ccd.name AS condition_definition_name, - T1.effective_dose_start AS start_time, T1.therapy_enum AS therapyEnum, T1.sort_number AS sort_number, + T1.effective_dose_start AS start_time, T1.based_on_id AS based_on_id, T1.medication_id AS advice_definition_id, T1.effective_dose_end AS stop_time, @@ -275,7 +275,7 @@ T1.req_authored_time AS start_time, T1.based_on_id AS based_on_id, T1.device_def_id AS advice_definition_id, - NULL AS stop_time, + NULL::timestamp AS stop_time, '' AS stop_user_name FROM wor_device_request AS T1 LEFT JOIN adm_device_definition AS T2 ON T2.ID = T1.device_def_id