diff --git a/DM_Weight/Report/GridReportUtil.cs b/DM_Weight/Report/GridReportUtil.cs
index 7efcfce..defe82f 100644
--- a/DM_Weight/Report/GridReportUtil.cs
+++ b/DM_Weight/Report/GridReportUtil.cs
@@ -346,7 +346,7 @@ namespace DM_Weight.Report
 									 inner join drug_info di on dm.drug_id=di.drug_id	
                                      where dm.type=32 and dm.machine_id = '{p_machine_id}' and dm.operation_time>'{p_startDate}' and dm.operation_time<'{p_endDate}'";
 
-            SQL += " order by di.drug_iddm.operation_time,";
+            SQL += " order by di.drug_id,dm.operation_time";
 
             Report.DetailGrid.Recordset.ConnectionString = gridConnectionString;
             Report.DetailGrid.Recordset.QuerySQL = SQL;
diff --git a/DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs b/DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs
index dfed495..0f2cb86 100644
--- a/DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs
+++ b/DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs
@@ -391,7 +391,7 @@ namespace DM_Weight.ViewModels
                                 ReturnPerson = ReturnPerson,
                                 ReceivePerson = ReceivePerson,
                                 OperationTime = DateTime.Now,
-                                Quantity = ReturnQuantity,
+                                Quantity = _MachineRecord.Quantity, //ReturnQuantity,
                                 Type = 32,
                                 InvoiceId = _MachineRecord.InvoiceId, //InvoiceId,
                                 GetId = _MachineRecord.Id,