diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
index ad9a940d1..41b1cb525 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
@@ -127,6 +127,11 @@ public class RequestBaseDto {
* 请求状态
*/
private Integer statusEnum;
+
+ /**
+ * 退回原因
+ */
+ private String reasonText;
private String statusEnum_enumText;
/**
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 4366dea5e..5bc8fe5b8 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
@@ -517,6 +517,7 @@
'med_medication_definition' AS advice_table_name,
T1.medication_id AS advice_definition_id
, T1.content_json::jsonb ->> 'remark' AS remark
+ , T1.back_reason AS reason_text
FROM med_medication_request AS T1
LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id
AND T2.delete_flag = '0'
@@ -579,6 +580,7 @@
'med_medication_definition' AS advice_table_name,
T3.ID AS advice_definition_id
, T2.content_json::jsonb ->> 'remark' AS remark
+ , T2.back_reason AS reason_text
FROM adm_charge_item AS T1
INNER JOIN med_medication_request AS T2 ON T2.ID = T1.service_id AND T2.delete_flag = '0'
LEFT JOIN med_medication_definition AS T3 ON T3.ID = T2.medication_id AND T3.delete_flag = '0'
@@ -643,6 +645,7 @@
'adm_device_definition' AS advice_table_name,
CI.product_id AS advice_definition_id
, NULL AS remark
+ , NULL AS reason_text
FROM adm_charge_item AS CI
LEFT JOIN adm_charge_item_definition CID ON CID.id = CI.definition_id AND CID.delete_flag = '0'
LEFT JOIN wor_device_request DR ON DR.id = CI.service_id AND DR.delete_flag = '0'
@@ -698,6 +701,7 @@
'adm_device_definition' AS advice_table_name,
T1.device_def_id AS advice_definition_id
, T1.content_json::jsonb ->> 'remark' AS remark
+ , NULL AS reason_text
FROM wor_device_request AS T1
LEFT JOIN adm_device_definition AS T2 ON T2.ID = T1.device_def_id
AND T2.delete_flag = '0'
@@ -755,6 +759,7 @@
'wor_activity_definition' AS advice_table_name,
T1.activity_id AS advice_definition_id,
T1.remark AS remark
+ , T1.reason_text AS reason_text
FROM wor_service_request AS T1
LEFT JOIN wor_activity_definition AS T2
ON T2.ID = T1.activity_id
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
index 7ab3842bb..28b661fee 100755
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -1345,6 +1345,18 @@
+
+
+
+ {{ scope.row.reasonText || '-' }}
+
+
+