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 723d64929..77879a155 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 @@ -219,6 +219,7 @@ T1.effective_dose_start AS start_time, T1.based_on_id AS based_on_id, T1.medication_id AS advice_definition_id, + T1.content_json::jsonb ->> 'remark' AS remark, T1.effective_dose_end AS stop_time, T1.update_by AS stop_user_name FROM med_medication_request AS T1 @@ -275,6 +276,7 @@ T1.req_authored_time AS start_time, T1.based_on_id AS based_on_id, T1.device_def_id AS advice_definition_id, + T1.content_json::jsonb ->> 'remark' AS remark, NULL::timestamp AS stop_time, '' AS stop_user_name FROM wor_device_request AS T1 @@ -328,6 +330,7 @@ T1.occurrence_start_time AS start_time, T1.based_on_id AS based_on_id, T1.activity_id AS advice_definition_id, + T1.remark AS remark, T1.occurrence_end_time AS stop_time, T1.update_by AS stop_user_name FROM wor_service_request AS T1 diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue index fc751e3ca..e41a0f471 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue @@ -200,6 +200,9 @@ /> + + +
- - -
确定 取消 diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue index 153ab0cf2..b7fac23cc 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue @@ -342,6 +342,13 @@ + + +