diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs
index d36e57e4..dd2b2c38 100644
--- a/AMESCoreStudio.Web/Controllers/QRSController.cs
+++ b/AMESCoreStudio.Web/Controllers/QRSController.cs
@@ -1060,7 +1060,7 @@ namespace AMESCoreStudio.Web.Controllers
 
                     if (rate > 0)
                     {
-                        sum_rate = sum_rate * rate;
+                        sum_rate = sum_rate * (rate / 100.0);
                     }
                 }
 
@@ -1147,7 +1147,7 @@ namespace AMESCoreStudio.Web.Controllers
 
                             if (rate > 0)
                             {
-                                sum_rate = sum_rate * rate;
+                                sum_rate = sum_rate * (rate / 100.0);
                             }
                             rateDataList = rateDataList + "<td width='60'>" + inputQty + "</td><td width='60'>" + okQty + "</td><td width='60'>" + ngQty + "</td><td width='60'>" + rate.ToString("0.00") + "%</td>";
                         }
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
index b6dc82d7..6d20ff26 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
@@ -1213,6 +1213,8 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
                         q4.UnitName
                     };
 
+            q = q.Where(w => w.CompleteQTY > 0);
+
             if (unitNo != "*")
             {
                 q = q.Where(w => w.UnitNO == unitNo);
@@ -1227,7 +1229,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
             }
             if (dateStart != null && dateStart != "" && dateEnd != null && dateEnd != "")
             {
-                q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd));
+                q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd).AddDays(1));
             }
 
             //紀錄筆數