diff --git a/SensorHub.Methane/Methane.cs b/SensorHub.Methane/Methane.cs
index 0730f4e..09c064d 100644
--- a/SensorHub.Methane/Methane.cs
+++ b/SensorHub.Methane/Methane.cs
@@ -223,38 +223,50 @@
 
         private String changeTimeToBinForXT(String devcode, String colltime)
         {
-            String retCollTime = "";
-            String xtMin = System.Configuration.ConfigurationManager.AppSettings["xtMin"];
-            String xtMax = System.Configuration.ConfigurationManager.AppSettings["xtMax"];
-            String hnMin1 = System.Configuration.ConfigurationManager.AppSettings["hnMin1"];
-            String hnMax1 = System.Configuration.ConfigurationManager.AppSettings["hnMax1"];
-            String hnMin2 = System.Configuration.ConfigurationManager.AppSettings["hnMin2"];
-            String hnMax2 = System.Configuration.ConfigurationManager.AppSettings["hnMax2"];
+            String retCollTime = colltime;
+            int xtMin = Int32.Parse(System.Configuration.ConfigurationManager.AppSettings["xtMin"]);
+            int xtMax = Int32.Parse(System.Configuration.ConfigurationManager.AppSettings["xtMax"]);
+            int hnMin1 = Int32.Parse(System.Configuration.ConfigurationManager.AppSettings["hnMin1"]);
+            int hnMax1 = Int32.Parse(System.Configuration.ConfigurationManager.AppSettings["hnMax1"]);
+            int hnMin2 = Int32.Parse(System.Configuration.ConfigurationManager.AppSettings["hnMin2"]);
+            int hnMax2 = Int32.Parse(System.Configuration.ConfigurationManager.AppSettings["hnMax2"]);
 
-            if (String.Compare(devcode, xtMax) > 0 && String.Compare(devcode, hnMax1) > 0 && String.Compare(devcode, hnMax2) > 0)
+            String devPrefix = devcode.Substring(0, 4);
+            int devCodeInt = Int32.Parse(devcode.Substring(4));
+            if (devPrefix.Equals("3111"))
             {
-                return colltime;
-            }
-            else if (String.Compare(devcode, xtMin) < 0 && String.Compare(devcode, hnMin1) < 0 && String.Compare(devcode, hnMin2) < 0)
+                if (devCodeInt <= xtMax && devCodeInt >= xtMin)
+                {
+                    String[] timeArray = colltime.Split('-');
+
+                    int yearValue = int.Parse(timeArray[0].Substring(2));
+                    String yearStr = "20" + yearValue.ToString("X2");
+
+                    int monthValue = int.Parse(timeArray[1]);
+                    String monthStr = monthValue.ToString("X2");
+
+                    int dateValue = int.Parse(timeArray[2]);
+                    String dateStr = dateValue.ToString("X2");
+
+                    retCollTime = yearStr + "-" + monthStr + "-" + dateStr;
+                }
+            } else if (devPrefix.Equals("3112"))
             {
-                return colltime;
-            }
-            else
-            {
-                Console.WriteLine(devcode);
-                Console.WriteLine(colltime);
-                String[] timeArray = colltime.Split('-');
+                if ((devCodeInt <= hnMax1 && devCodeInt >= hnMin1) || (devCodeInt <= hnMax2 && devCodeInt >= hnMin2))
+                {
+                    String[] timeArray = colltime.Split('-');
 
-                int yearValue = int.Parse(timeArray[0].Substring(2));
-                String yearStr = "20" + yearValue.ToString("X2");
+                    int yearValue = int.Parse(timeArray[0].Substring(2));
+                    String yearStr = "20" + yearValue.ToString("X2");
 
-                int monthValue = int.Parse(timeArray[1]);
-                String monthStr = monthValue.ToString("X2");
+                    int monthValue = int.Parse(timeArray[1]);
+                    String monthStr = monthValue.ToString("X2");
 
-                int dateValue = int.Parse(timeArray[2]);
-                String dateStr = dateValue.ToString("X2");
+                    int dateValue = int.Parse(timeArray[2]);
+                    String dateStr = dateValue.ToString("X2");
 
-                retCollTime = yearStr + "-" + monthStr + "-" + dateStr;
+                    retCollTime = yearStr + "-" + monthStr + "-" + dateStr;
+                }
             }
 
             return retCollTime;