Merge branch 'master' of http://git.9026.com/richod/dcj

app/Http/Controllers/Admin/Medical/OrderController.php

@@ -253,9 +253,12 @@ class OrderController extends Controller
         $data = $this->repository->find(request('id'));
         $data['single'] = unserialize($data['single']);
         $str = '';
-        foreach ($data['single'] as $key_s=>$val_s){
-            $str.=$val_s->name;
+        if(!empty($data['single'])){
+            foreach ($data['single'] as $key_s=>$val_s){
+                $str.=$val_s->name;
+            }
         }
+
         $data['combo'] = unserialize($data['combo']);
         return view('admin.medical.order.view',compact('data','str'));
     }