diff --git a/admin/controllers/drug/DrugController.php b/admin/controllers/drug/DrugController.php
index 24386cd..d495acf 100644
--- a/admin/controllers/drug/DrugController.php
+++ b/admin/controllers/drug/DrugController.php
@@ -466,6 +466,10 @@ class DrugController extends BaseAdminController
                 'setFirstRecordAsKeys' => true,
                 'getOnlySheet' => 'Sheet1',
             ]);
+            ds([
+                $data,
+                @unlink($filename)
+            ]);
 
             $ImportForm = new ImportForm();
             $ImportForm->attributes = $post;
diff --git a/admin/controllers/store/WareController.php b/admin/controllers/store/WareController.php
index a94efca..ef24d27 100644
--- a/admin/controllers/store/WareController.php
+++ b/admin/controllers/store/WareController.php
@@ -659,7 +659,7 @@ class WareController extends BaseAdminController
                 }
 
                 //文件名
-                $filename = date('His') . md5($file->getBaseName()) . mt_rand(1000, 9999) . '.' . $file->getExtension();
+                $filename = date('YmdHi') . md5($file->getBaseName()) . mt_rand(1000, 9999) . '.' . $file->getExtension();
                 //保存文件
                 $file->saveAs($filename);
                 //            $fullFileName = $absolute_path . $filename;
@@ -667,7 +667,6 @@ class WareController extends BaseAdminController
                     'setFirstRecordAsKeys' => true,
                     'getOnlySheet' => 'Sheet1',
                 ]);
-
                 ds([
                     $data,
                     @unlink($filename)
@@ -677,12 +676,6 @@ class WareController extends BaseAdminController
                 return $ImportForm->ExportUpdateDrugPrice($data, $storeId);
             }
         } catch (\Exception $e) {
-            ds([
-                $e->getMessage(),
-                $e->getTrace(),
-                $e->getLine(),
-                $e->getFile(),
-            ]);
             // 删除文件
             @unlink($filename);
             return ['error' => $e->getMessage()];