Issue 4358 - fix the bug of Issue drug in patient queue