diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs
index 277b1ee9..66ab600d 100644
--- a/AMESCoreStudio.Web/Controllers/QRSController.cs
+++ b/AMESCoreStudio.Web/Controllers/QRSController.cs
@@ -121,7 +121,7 @@ namespace AMESCoreStudio.Web.Controllers
                                 rate = 100;
                             }
 
-                            if (j == rule_sation.Count - 2)
+                            if (j == rule_sation.Count - 1)
                             {
                                 if (rate <= 90)
                                 {
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs
index 03fdb1ec..3e1b2b17 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs
@@ -110,7 +110,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             ResultModel<dynamic> result = new ResultModel<dynamic>();
             var q = from q1 in _context.BarcodeStation
                     join q2 in _context.BarcodeInfoes on q1.BarcodeID equals q2.BarcodeID
-                    join q3 in _context.LineInfoes on q1.LineId equals q3.LineID
+                    join q3 in _context.LineInfoes on q1.LineId equals q3.LineID into line_data
+                    from x in line_data.DefaultIfEmpty()
                     join q4 in _context.UserInfoes on q1.CreateUserID equals q4.UserID
                     select new
                     {
@@ -118,7 +119,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         q1.WipID,
                         q1.StationID,
                         q2.BarcodeNo,
-                        q3.LineDesc,
+                        x.LineDesc,
                         q1.RuleStatus,
                         q1.Systype,
                         q1.InputDate,