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 1c5f440c..feea0f6f 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 @@ -541,9 +541,9 @@ CI.service_id AS request_id, CI.service_id || '-ci-dev' AS unique_key, '' AS prescription_no, - CI.enterer_id AS requester_id, + COALESCE(DR.requester_id, 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, + CASE WHEN COALESCE(DR.requester_id, CI.enterer_id) = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag, DR.content_json AS content_json, NULL AS skin_test_flag, NULL AS inject_flag,