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

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

@@ -258,7 +258,8 @@ class OrderController extends Controller
                 $str.=$val_s->name;
             }
         }
-
+        $data['content'] = str_replace('<p>','',$data['content']);
+        $data['content'] = str_replace('</p>','',$data['content']);
         $data['combo'] = unserialize($data['combo']);
         return view('admin.medical.order.view',compact('data','str'));
     }