diff --git a/HSUCO_Cargo_Garage_Operation_Program/Database.cs b/HSUCO_Cargo_Garage_Operation_Program/Database.cs
index d48661a..1b9eb09 100644
--- a/HSUCO_Cargo_Garage_Operation_Program/Database.cs
+++ b/HSUCO_Cargo_Garage_Operation_Program/Database.cs
@@ -245,7 +245,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program
         public static List<User> GetUserList()
         {
             var userList = new List<User>();
-            var query = "SELECT * From UserList";
+            const string query = "SELECT * From UserList";
 
             using (var command = _sqLiteConnection.CreateCommand())
             {
@@ -255,17 +255,20 @@ namespace HSUCO_Cargo_Garage_Operation_Program
                 {
                     while (reader.Read())
                     {
-                        var user = new User();
-                        user.RegistrationNumberTruck = reader["RegistrationNumberTruck"].ToString();
-                        user.RegistrationNumberPassenger = reader["RegistrationNumberPassenger"].ToString();
-                        user.Name = reader["Name"].ToString();
-                        user.Phone = reader["Phone"].ToString();
-                        user.Address = reader["Address"].ToString();
-                        user.DateOfApplicant = DateTime.Parse(reader["DateOfApplicant"].ToString());
-                        user.DateStart = DateTime.Parse(reader["DateStart"].ToString());
-                        user.DateEnd = DateTime.Parse(reader["DateEnd"].ToString());
-                        user.Extended = reader["Extended"].ToString() == "1";
-                        user.RefundCheck = reader["RefundCheck"].ToString() == "1";
+                        var user = new User
+                        {
+                            No = int.Parse(reader["No"].ToString()),
+                            RegistrationNumberTruck = reader["RegistrationNumberTruck"].ToString(),
+                            RegistrationNumberPassenger = reader["RegistrationNumberPassenger"].ToString(),
+                            Name = reader["Name"].ToString(),
+                            Phone = reader["Phone"].ToString(),
+                            Address = reader["Address"].ToString(),
+                            DateOfApplicant = DateTime.Parse(reader["DateOfApplicant"].ToString()),
+                            DateStart = DateTime.Parse(reader["DateStart"].ToString()),
+                            DateEnd = DateTime.Parse(reader["DateEnd"].ToString()),
+                            Extended = reader["Extended"].ToString() == "1",
+                            RefundCheck = reader["RefundCheck"].ToString() == "1"
+                        };
 
                         userList.Add(user);
                     }
@@ -449,7 +452,9 @@ namespace HSUCO_Cargo_Garage_Operation_Program
                         certificateData.RegistrationNumberPassenger = reader["RegistrationNumberPassenger"].ToString();
                         certificateData.Name = reader["Name"].ToString();
                         certificateData.IssueNumber = reader["IssueNumber"].ToString();
-                        certificateData.Date = DateTime.Parse(reader["Date"].ToString());
+                        certificateData.IssueDate = DateTime.Parse(reader["IssueDate"].ToString());
+                        certificateData.StartDate = DateTime.Parse(reader["StartDate"].ToString());
+                        certificateData.EndDate = DateTime.Parse(reader["EndDate"].ToString());
                         certificateDatas.Add(certificateData);
                     }
                 }