diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
index 2f57a12..7831eb9 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
@@ -982,7 +982,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                                         EndTime = q2.EndTime,
                                                         WipNo = q1.WipNo,
                                                         ItemNo = q1.ItemNo,
-                                                        ProcessType = q1.ItemNo.EndsWith("CPK") ? "精包CPK" : "單板",
+                                                        ProcessType = q1.ItemNo.EndsWith("CPK") ? "精包CPK" :
+                                                                      q1.ItemNo.EndsWith("I") ? "單板" :
+                                                                      q1.ItemNo.EndsWith("S") ? "單板" :
+                                                                      q1.ItemNo.EndsWith("D") ? "單板" :
+                                                                      q1.ItemNo.EndsWith("P") ? "單板" : "組裝",
                                                         InhouseNo = q1.InhouseNo,
                                                         InhouseId = q1.InhouseNo.Substring(13, 3),
                                                         CustomerType = q1.ItemNo.Substring(0, 2),
@@ -990,9 +994,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                                         InhouseQty = q1.InhouseQty,
                                                         QaQty = q2.QaQty,
                                                         FailQty = q2.FailQty,
-                                                        QaResult = q2.QaResult == "P" ? "允收 PASS" : "拒收 REJECT",
+                                                        QaResult = q2.QaResult == "P" ? "允收 PASS" : 
+                                                                   q2.QaResult == "R" ? "拒收 REJECT" : "未檢驗完畢",
                                                     };
 
+            q = q.Where(w => w.QaResult != "未檢驗完畢");
+
             if (wipNo != null && wipNo != "")
             {
                 q = q.Where(w => w.WipNo == wipNo);
@@ -1013,7 +1020,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 }
                 if (processType == "ISDP")
                 {
-                    q = q.Where(w => w.ItemNo.EndsWith("I") || w.ItemNo.EndsWith("S") || w.ItemNo.EndsWith("D") || w.ItemNo.EndsWith("P") || w.ItemNo.EndsWith("R"));
+                    q = q.Where(w => w.ItemNo.EndsWith("I") || w.ItemNo.EndsWith("S") || w.ItemNo.EndsWith("D") || w.ItemNo.EndsWith("P"));
                 }
                 if (processType == "OBT")
                 {
@@ -1071,7 +1078,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                                         ItemNo = q1.ItemNo,
                                                         BarcodeNo = q3.BarcodeNo,
                                                         QaResult = q3.StatusNo,
-                                                        ProcessType = q1.ItemNo.EndsWith("CPK") ? "精包CPK" : "單板",
+                                                        ProcessType = q1.ItemNo.EndsWith("CPK") ? "精包CPK" :
+                                                                      q1.ItemNo.EndsWith("I") ? "單板" :
+                                                                      q1.ItemNo.EndsWith("S") ? "單板" :
+                                                                      q1.ItemNo.EndsWith("D") ? "單板" :
+                                                                      q1.ItemNo.EndsWith("P") ? "單板" : "組裝",
                                                         NGReasonDesc = q4.NGReasonDesc,
                                                         PartPosition = q3.PartPosition,
                                                         NGMemo = q3.NgMemo,
@@ -1109,7 +1120,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 DateTime startDate = DateTime.Parse(date_str + " 00:00:00");
                 DateTime endDate = DateTime.Parse(date_end + " 23:59:59");
-                q = q.Where(w => w.EndTime >= startDate && w.EndTime <= endDate);
+                q = q.Where(w => w.CreateDate >= startDate && w.CreateDate <= endDate);
             }
             q = q.Where(w => w.QaResult == "F");