Rohan, Shruthi | #1373 | Fixing more bugs with compute drug orders