Update diagnosis discharge to deal with confirmations.

refs #365