Updated OrderService.saveOrder to auto set the careSetting and orderType fields if they are null but present on the passed OrderContext