TRUNK-4436: Drug orders for different formulations of the same concept

This is a fix for https://issues.openmrs.org/browse/TRUNK-4436
These @should don't match the unit tests and logic in this method, i will clean it up as i merge the code