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 old mode 100644 new mode 100755 index f320bc64..b8c08a35 --- 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 @@ -547,7 +547,7 @@ CI.enterer_id AS requester_id, CI.entered_date AS request_time, CASE WHEN CI.enterer_id = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag, - NULL AS content_json, + COALESCE(DR.content_json, CI.content_json) AS content_json, NULL AS skin_test_flag, NULL AS inject_flag, NULL AS group_id, @@ -556,7 +556,7 @@ NULL AS lot_number, CI.quantity_value AS quantity, CI.quantity_unit AS unit_code, - NULL AS status_enum, + COALESCE(DR.status_enum, CI.status_enum) AS status_enum, '' AS method_code, '' AS rate_code, NULL AS dose,