diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs
index e23812e0..b38e9dcf 100644
--- a/AMESCoreStudio.Web/Controllers/QRSController.cs
+++ b/AMESCoreStudio.Web/Controllers/QRSController.cs
@@ -1154,7 +1154,7 @@ namespace AMESCoreStudio.Web.Controllers
 
 
         [HttpPost]
-        public async Task<JsonResult> GetYieldData4QRS014SAsync(string id)
+        public async Task<JsonResult> GetYieldData4QRS014BSAsync(string id)
         {
             string[] param = id.Split('_');
 
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
index 46aa1c8e..949ca28a 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
@@ -1564,7 +1564,8 @@ FROM [SFIS].[dbo].[ZPDKeyPart]  B WHERE B.[IsActive] = 1  AND B.[ProductSN] = (S
             {
                 q = q.Where(w => w.WipNO == wipNO);
             }
-            if (dateType == "WipDate")
+
+            if (dateType == "WipDate" || dateType == null)
             {
                 if (dateStart != null && dateStart != "" && dateEnd != null && dateEnd != "")
                 {