Attempt to untangle HDS/patientapi dependencies

Signed-off-by: Jeremy Ho <jujaga@gmail.com>