Waste Documentation and Financial Class

To set up to capture waste, we have to enter Y on the individual pharmacy items. Then for the JW/JZ modifier to drop to the claim, we have to enter the JW modifier on the financial class. Please link these so that if we have set up a pharmacy item to capture waste but the visit doesn't have a financial class assigned that requires waste that it does not trigger for waste to be entered when manually charging the item. We are running in to lots of issues because commercial payors don't require waste to be captured yet if we have a CAH split incorrectly and have to manually move the charges, it is asking for the poster to enter the waste when waste isn't even required. We truly desire the waste capture to work in conjunction with the financial class that is turned on for waste so we are only prompted to capture waste if the financial class requires it.