#1320: Fixing issue for non current drug order