diff --git a/BO/Content/file/documentspast.xlsx b/BO/Content/file/documentspast.xlsx
index c0b322c..660c605 100644
Binary files a/BO/Content/file/documentspast.xlsx and b/BO/Content/file/documentspast.xlsx differ
diff --git a/Base/Controller/ACommon.cs b/Base/Controller/ACommon.cs
index aa8e2c2..6564336 100644
--- a/Base/Controller/ACommon.cs
+++ b/Base/Controller/ACommon.cs
@@ -1444,28 +1444,17 @@ namespace NP.Base.Controllers
                                 {
                                     long tryParseResult = 0;
                                     d.userpno = d.userpno.Replace("-", "");
-                                    if (!String.IsNullOrEmpty(d.ssdatestring))
-                                    {
-                                        int index = d.ssdatestring.IndexOf(" ");
-                                        if (index > -1)
-                                        {
-                                            d.ssdate = Convert.ToDateTime(d.ssdatestring.Substring(0, index + 1));
-                                        }
-                                        else { 
-                                            d.ssdate = Convert.ToDateTime(d.ssdatestring.Substring(0, 10));
-                                        }
+                                    d.ssdatestring = d.ssdatestring.Replace("-", "").Trim();
+                                    d.sedatestring = d.sedatestring.Replace("-", "").Trim();
+                                    if (!String.IsNullOrEmpty(d.ssdatestring) && d.ssdatestring.Length == 8)
+                                    {   
+                                        d.ssdatestring = string.Format("{0}-{1}-{2}", d.ssdatestring.Substring(0,4), d.ssdatestring.Substring(4, 2), d.ssdatestring.Substring(6, 2));
+                                        d.ssdate = Convert.ToDateTime(d.ssdatestring);
                                     }
-                                    if (!String.IsNullOrEmpty(d.sedatestring))
+                                    if (!String.IsNullOrEmpty(d.sedatestring) && d.sedatestring.Length == 8 )
                                     {
-                                        int index = d.sedatestring.IndexOf(" ");
-                                        if (index > -1)
-                                        {
-                                            d.sedate = Convert.ToDateTime(d.sedatestring.Substring(0, index + 1));
-                                        }
-                                        else
-                                        {
-                                            d.sedate = Convert.ToDateTime(d.sedatestring.Substring(0, 10));
-                                        }
+                                        d.sedatestring = string.Format("{0}-{1}-{2}", d.sedatestring.Substring(0, 4), d.sedatestring.Substring(4, 2), d.sedatestring.Substring(6, 2));
+                                        d.sedate = Convert.ToDateTime(d.sedatestring);
                                     }
                                     if (string.IsNullOrEmpty(d.username.Trim()))
                                     {