diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index ccef4e4a..049bbda6 100644
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -36,33 +36,39 @@ class Oqs::EditController < BaseOqsController
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
       # print
       assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)    
-      # order queue stations
-      oqs = assigned_item.order_queue_station
-
-      order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
+      assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
       
-      unique_code="OrderItemPdf"
-      if !order_slim_pdf.empty?
-        order_slim_pdf.each do |order_item_slim|
-          if order_item_slim[0] == 'OrderSlimPdf' 
-            if order_item_slim[1] == '1'
-              unique_code="OrderItemSlimPdf"
-            else
-              unique_code="OrderItemPdf"
-            end
-          elsif order_item_slim[0] == 'OrderSetPdf' 
-            if order_item_slim[1] == '1'
-              unique_code="OrderSetItemPdf"
-            else
-              unique_code="OrderItemPdf"
+      if !assigned_items.nil?
+        assigned_items.each do |assign_item|
+          # order queue stations
+          oqs = assign_item.order_queue_station
+
+          order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
+          
+          unique_code="OrderItemPdf"
+          if !order_slim_pdf.empty?
+            order_slim_pdf.each do |order_item_slim|
+              if order_item_slim[0] == 'OrderSlimPdf' 
+                if order_item_slim[1] == '1'
+                  unique_code="OrderItemSlimPdf"
+                else
+                  unique_code="OrderItemPdf"
+                end
+              elsif order_item_slim[0] == 'OrderSetPdf' 
+                if order_item_slim[1] == '1'
+                  unique_code="OrderSetItemPdf"
+                else
+                  unique_code="OrderItemPdf"
+                end
+              end
             end
           end
+
+          print_settings=PrintSetting.find_by_unique_code(unique_code)
+          order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+          order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty )
         end
       end
-
-      print_settings=PrintSetting.find_by_unique_code(unique_code)
-      order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-      order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty )
     end
   end
 
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index baa4af40..930d3d5c 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -26,7 +26,7 @@ class Oqs::PrintController < ApplicationController
       assigned_item_id = params[:id]
       options = params[:options]
       assigned_item = AssignedOrderItem.find(assigned_item_id) 
-      assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
+      assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
 
       # order queue stations
       oqs = assigned_item.order_queue_station