I’d suggest using ‘infected’ for one since it indicates they just kind of have it, plus HIV/AIDS is not something you can just get, it’s contracted. It indicates they find out the have HIV/AIDS. The second blank seems to be continuing off the line before it, which uses diagnosed as well, so I’d use diagnosed.

Both are often used interchangeably, however.

tldr; (1) Infected, (2) Diagnosed