疫苗订单修改

app/Community/Actions/Vaccine/AddVaccine.php

@@ -81,12 +81,20 @@ class AddVaccine extends RowAction
         $org_id =$admin->org_id;
         $order_id = $this->row->id;
 
+        $ids = OrderVaccine::where(['order_id'=>$order_id])->pluck('vaccine_id')->toArray();
         if($is_admin){
-            $list = Vaccine::where('stock','>',0)->pluck('name','id');
+            $list = Vaccine::where('stock','>',0)->whereNotIn('id',$ids)->pluck('name','id')->toArray();
         } else {
-            $list = Vaccine::where('stock','>',0)->where('org_id',$org_id)->pluck('name','id');
+            $list = Vaccine::where('stock','>',0)->whereNotIn('id',$ids)->where('org_id',$org_id)->pluck('name','id')->toArray();
+        }
+
+        //找出老疫苗
+        $vaccine = Vaccine::whereIn('id',$ids)->pluck('name','id')->toArray();
+        if(!empty($list)){
+            $list = ($list+$vaccine);
+        } else {
+            $list = $vaccine;
         }
-        $ids = OrderVaccine::where(['order_id'=>$order_id])->pluck('vaccine_id')->toArray();
         $this->multipleSelect('vaccine_id','选择疫苗')->options($list)->value($ids)->required();
     }