Trunk 4446: Support deriving auto_expire_date from duration and duration units for Drug Orders

Changes for ticket https://issues.openmrs.org/browse/TRUNK-4446
The where clause in the query should use the pre generated uuid and not name of the concept source