diff --git a/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMTestDetail.cs b/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMTestDetail.cs
index 7221df9..d311004 100644
--- a/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMTestDetail.cs	
+++ b/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMTestDetail.cs	
@@ -81,18 +81,25 @@ namespace SystemX.Product.TRA.DataManager
 
         private SqlCommand SQLCmd { get; set; }
 
+        private IDataBaseController DBControllers { get; set; }
+
+        public eSelectDataView NgHistorySelectView { get; set; }
+
         public DMTestDetail(eSelectDataView SelectView, IDataBaseController getDBController, DateTime dtStart)
         {
+            DBControllers = getDBController;
             DBConn = getDBController.GetMainConn();
 
             if (SelectView == eSelectDataView.DataDocumentViewC1)
             {
+                NgHistorySelectView = eSelectDataView.DataDocumentViewC1;
                 ShortTermDBConn = getDBController.GetShortTermConn1();
 
                 LongTermDBConn = getDBController.GetLongTermConn1().Where(x=>x.Key.Contains(dtStart.Year.ToString())).First().Value;
             }
             else if (SelectView == eSelectDataView.DataDocumentViewC2)
             {
+                NgHistorySelectView = eSelectDataView.DataDocumentViewC2;
                 ShortTermDBConn = getDBController.GetShortTermConn2();
 
                 LongTermDBConn = getDBController.GetLongTermConn2().Where(x => x.Key.Contains(dtStart.Year.ToString())).First().Value;
@@ -223,6 +230,19 @@ namespace SystemX.Product.TRA.DataManager
 
         public DataTable SearchTestHistory(DetailTestDataCollection data)
         {
+            if (NgHistorySelectView == eSelectDataView.DataDocumentViewC1)
+            {
+                ShortTermDBConn = DBControllers.GetShortTermConn1();
+
+                LongTermDBConn = DBControllers.GetLongTermConn1().Where(x => x.Key.Contains(data.StartTime.Year.ToString())).First().Value;
+            }
+            else if (NgHistorySelectView == eSelectDataView.DataDocumentViewC2)
+            {
+                ShortTermDBConn = DBControllers.GetShortTermConn2();
+
+                LongTermDBConn = DBControllers.GetLongTermConn2().Where(x => x.Key.Contains(data.StartTime.Year.ToString())).First().Value;
+            }
+
             DataTable dtResult = new DataTable();
             List<CPXV2Log.Tables.HIST_TestResult> list = new List<CPXV2Log.Tables.HIST_TestResult>();
             StringBuilder strQuery = new StringBuilder();                      
diff --git a/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMTestNgHistory.cs b/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMTestNgHistory.cs
index b0222e1..28cddd8 100644
--- a/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMTestNgHistory.cs	
+++ b/CPXV2 TRA V2/SystemX.Product.CP.TRA/DataManager/DMTestNgHistory.cs	
@@ -49,24 +49,30 @@ namespace SystemX.Product.TRA.DataManager
 
         private SqlCommand SQLCmd { get; set; }
 
+        private IDataBaseController DBControllers { get; set; }
 
-        public DMTestNgHistory(eSelectDataView SelectView, IDataBaseController getDBController)
+        public eSelectDataView NgHistorySelectView { get; set; }
+
+        public DMTestNgHistory(eSelectDataView SelectView, IDataBaseController getDBController, DateTime dtStart)
         {
+            DBControllers = getDBController;
             DBConn = getDBController.GetMainConn();
 
             if (SelectView == eSelectDataView.DataDocumentViewC1)
             {
+                NgHistorySelectView = eSelectDataView.DataDocumentViewC1;
                 ShortTermDBConn = getDBController.GetShortTermConn1();
 
-                LongTermDBConn = getDBController.GetLongTermConn1().First().Value;
+                LongTermDBConn = getDBController.GetLongTermConn1().Where(x=>x.Key.Contains(dtStart.Year.ToString())).First().Value;
             }
             else if (SelectView == eSelectDataView.DataDocumentViewC2)
             {
+                NgHistorySelectView = eSelectDataView.DataDocumentViewC2;
                 ShortTermDBConn = getDBController.GetShortTermConn2();
 
-                LongTermDBConn = getDBController.GetLongTermConn2().First().Value;
+                LongTermDBConn = getDBController.GetLongTermConn2().Where(x => x.Key.Contains(dtStart.Year.ToString())).First().Value;
             }
-        }
+        }           
 
         public DataTable SearchTestNgHistory(SelectedDataCollection data, TestHistorySearchOption option, int nReqIdPos = int.MaxValue)
         {
@@ -146,6 +152,19 @@ namespace SystemX.Product.TRA.DataManager
 
         DataTable GetRawResult(SelectedDataCollection data, TestHistorySearchOption option, int nReqIdPos = int.MaxValue)
         {
+            if (NgHistorySelectView == eSelectDataView.DataDocumentViewC1)
+            {               
+                ShortTermDBConn = DBControllers.GetShortTermConn1();
+
+                LongTermDBConn = DBControllers.GetLongTermConn1().Where(x => x.Key.Contains(data.SearchRangeStart.Year.ToString())).First().Value;
+            }
+            else if (NgHistorySelectView == eSelectDataView.DataDocumentViewC2)
+            {                
+                ShortTermDBConn = DBControllers.GetShortTermConn2();
+
+                LongTermDBConn = DBControllers.GetLongTermConn2().Where(x => x.Key.Contains(data.SearchRangeStart.Year.ToString())).First().Value;
+            }
+
             DataTable dtResult = new DataTable();
             //string strQuery = string.Empty;
             StringBuilder strQuery = new StringBuilder();
@@ -244,6 +263,8 @@ namespace SystemX.Product.TRA.DataManager
             strQuery.Append($"{DMCommon.SummaryLogTable}.TestDT");
             strQuery.Append(";");
 
+            var query = strQuery.ToString();
+
             if (DatabaseConnControl.ScanLongTermLog) SQLCmd = new SqlCommand(strQuery.ToString(), LongTermDBConn);
             else SQLCmd = new SqlCommand(strQuery.ToString(), ShortTermDBConn);
             SQLCmd.CommandTimeout = DMCommon.nDefaultScanTime;
diff --git a/CPXV2 TRA V2/SystemX.Product.CP.TRA/UIControl/UcTRATestNgHist.cs b/CPXV2 TRA V2/SystemX.Product.CP.TRA/UIControl/UcTRATestNgHist.cs
index 774ec53..4b5427a 100644
--- a/CPXV2 TRA V2/SystemX.Product.CP.TRA/UIControl/UcTRATestNgHist.cs	
+++ b/CPXV2 TRA V2/SystemX.Product.CP.TRA/UIControl/UcTRATestNgHist.cs	
@@ -80,7 +80,7 @@ namespace SystemX.Product.TRA.UIControl
 
         public void SetSQLConnection(eSelectDataView SelectView, IDataBaseController getDBController, DateTime dtStart)
         {
-            DataManager = new DMTestNgHistory(SelectView, getDBController);
+            DataManager = new DMTestNgHistory(SelectView, getDBController, dtStart);
 
             DetailDataManager = new DMTestDetail(SelectView, getDBController, dtStart);
         }
@@ -536,8 +536,9 @@ namespace SystemX.Product.TRA.UIControl
 
                         bool bIsGlobal = (Convert.ToInt32(GetTLRow["IsGlobal"])) > 0 ? true : false;
 
-                        nAccessKey = Int64.Parse(drNgInfo["AccessKey"].ToString());
-                        drNgs[i][9] = drNgInfo["AccessKey"];
+                        //nAccessKey = Int64.Parse(drNgInfo["AccessKey"].ToString());
+                        //drNgs[i][9] = drNgInfo["AccessKey"];
+                        drNgs[i][9] = drNgs[i][0];
 
                         drNgs[i][10] = (GetTLRow != null) ? GetTLRow[8] : "";
                         drNgs[i][11] = drNgInfo["StepID"];