diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs
index 053f5bb0..17b02720 100644
--- a/AMESCoreStudio.Web/Controllers/QRSController.cs
+++ b/AMESCoreStudio.Web/Controllers/QRSController.cs
@@ -9238,7 +9238,10 @@ namespace AMESCoreStudio.Web.Controllers
             string yCode = DateTime.Now.Year.ToString();
             if (dateStart != null)
             {
-                yCode = dateStart.Substring(0, 4);
+                if (dateStart != "")
+                {
+                    yCode = dateStart.Substring(0, 4);
+                }
             }
 
             #region 單板
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipStationController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipStationController.cs
index e835dcf1..ab63563e 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipStationController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipStationController.cs
@@ -437,6 +437,8 @@ FROM JHAMES.WIP_STATION";
                 FirstCnt = q.Where(j => j.Year == x.Key.Year && j.WeekOfYear == x.Key.WeekOfYear && j.RuleStatus == x.Key.RuleStatus).Sum(k => k.FirstCnt)
             });
 
+            g = g.OrderBy(p => p.WeekCode);
+
             result.DataTotal = g.ToList().Count;
 
             result.Data = await g.ToListAsync();
@@ -620,6 +622,8 @@ FROM JHAMES.WIP_STATION";
                 FirstCnt = q.Where(j => j.Year == x.Key.Year && j.WeekOfYear == x.Key.WeekOfYear && j.RuleStatus == x.Key.RuleStatus).Sum(k => k.FirstCnt)
             });
 
+            g = g.OrderBy(p => p.WeekCode);
+
             result.DataTotal = g.ToList().Count;
 
             result.Data = await g.ToListAsync();
@@ -802,6 +806,8 @@ FROM JHAMES.WIP_STATION";
                 FirstCnt = q.Where(j => j.Year == x.Key.Year && j.WeekOfYear == x.Key.WeekOfYear && j.RuleStatus == x.Key.RuleStatus).Sum(k => k.FirstCnt)
             });
 
+            g = g.OrderBy(p => p.WeekCode);
+
             result.DataTotal = g.ToList().Count;
 
             result.Data = await g.ToListAsync();