Rework last cd4 calculation to use both clinician recorded and lab recorded cd4 concepts