diff --git a/Myshipping.Application/Service/EmbedProjectGoodsStatus/EmbedTraceProductService.cs b/Myshipping.Application/Service/EmbedProjectGoodsStatus/EmbedTraceProductService.cs
index b2cbf4e0..2bacc864 100644
--- a/Myshipping.Application/Service/EmbedProjectGoodsStatus/EmbedTraceProductService.cs
+++ b/Myshipping.Application/Service/EmbedProjectGoodsStatus/EmbedTraceProductService.cs
@@ -185,7 +185,8 @@ namespace Myshipping.Application
                         var longContainerStatusList = longContainerStatus.containerStatusInfoList;
                     }
 
-                    var takeList = result.resultData.containerInfoList.SelectMany(p => p.containerStatusInfoList).GroupBy(a => a.statusCd).Select(a =>
+                    var takeList = result.resultData.containerInfoList.SelectMany(p => p.containerStatusInfoList)
+                        .GroupBy(a => a.statusCd).Select(a =>
                     {
                         var currArg = a.ToList();
 
@@ -222,8 +223,12 @@ namespace Myshipping.Application
 
                     var APODtotal = takeList.Where(p => p.statusCd.Equals("APOD", StringComparison.OrdinalIgnoreCase)).ToList();
 
+                    bool isMoreAPOD = false;
+
                     if (APODtotal.Count > 1 && APODtotal.Any(p => p.isComplete))
                     {
+                        isMoreAPOD = true;
+
                         takeList = takeList.Select(a =>
                         {
                             if (a.statusCd.Equals("APOD", StringComparison.OrdinalIgnoreCase) && !a.isComplete)
@@ -298,7 +303,8 @@ namespace Myshipping.Application
                                 return null;
                             }
 
-                            if (!string.IsNullOrWhiteSpace(c.statusCd) && c.statusCd.Equals("APOD", StringComparison.OrdinalIgnoreCase) && !c.isEst.Equals("N", StringComparison.OrdinalIgnoreCase))
+                            if (!string.IsNullOrWhiteSpace(c.statusCd) && c.statusCd.Equals("APOD", StringComparison.OrdinalIgnoreCase)
+                            && !c.isEst.Equals("N", StringComparison.OrdinalIgnoreCase) && isMoreAPOD)
                             {
                                 return null;
                             }