Ex-doctor in HIV data leak given more jail time for failing to give urine sample, breaching OSA