diff --git a/app/Models/OrderItems.php b/app/Models/OrderItems.php
index 0e0f98d..9e604d2 100755
--- a/app/Models/OrderItems.php
+++ b/app/Models/OrderItems.php
@@ -68,8 +68,15 @@ class OrderItems extends SoftDeletesModel
 
     public function createItem($order_id, $service_date)
     {
-        $order = (new Orders())->find($order_id);
+        $record = (new OrderItems())->where([
+            "order_id" => $order_id,
+            "service_date" => $service_date
+        ])->first();
+        if ($record) {
+            return $record;
+        }
 
+        $order = (new Orders())->find($order_id);
         $patient_quantity = (new Orders())
             ->where("status", Orders::STATUS_ONGOING)
             ->where("paramedic_id", $order->paramedic_id)
diff --git a/app/Models/Orders.php b/app/Models/Orders.php
index 4c61d1f..61ad564 100755
--- a/app/Models/Orders.php
+++ b/app/Models/Orders.php
@@ -68,6 +68,9 @@ class Orders extends SoftDeletesModel
                 if (is_numeric($v) && is_numeric($original_v) && floatval($v) == floatval($original_v)) {
                     unset($dirty[$k]);
                 }
+                if ($k == "updated_at") {
+                    unset($dirty[$k]);
+                }
             }
             if (empty($dirty)) {
                 return;
diff --git a/database/migrations/2021_04_11_214637_update_orders_audit_creator_type_nullable.php b/database/migrations/2021_04_11_214637_update_orders_audit_creator_type_nullable.php
new file mode 100644
index 0000000..8827134
--- /dev/null
+++ b/database/migrations/2021_04_11_214637_update_orders_audit_creator_type_nullable.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class UpdateOrdersAuditCreatorTypeNullable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table("order_audit", function (Blueprint $table) {
+            $table->string("operator_type")->nullable()->change();
+            $table->integer("operator_id")->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}