diff --git a/AMESCoreStudio.Web/Views/REP/REP013.cshtml b/AMESCoreStudio.Web/Views/REP/REP013.cshtml
index c54229b3..5821664e 100644
--- a/AMESCoreStudio.Web/Views/REP/REP013.cshtml
+++ b/AMESCoreStudio.Web/Views/REP/REP013.cshtml
@@ -279,7 +279,7 @@
             },
             {
                 field: 'tat',
-                title: 'TAT(Hour)',
+                title: 'TAT(天)',
                 width: 160,
                 sort: true
             },
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs
index e9e191ac..fb50f22a 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs
@@ -128,7 +128,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         RepairUserName = y.UserName,
                         //RepairUserName = helper.GetUserName(y.UserID).Result,
                         q2.StationId,
-                        CreateDate = (x.CreateDate == null ? DateTime.MaxValue : x.CreateDate),
+                        CreateDate = (x.CreateDate == null ? null : x.CreateDate),
                         StateDesc = (x.CreateDate != null ? "出站" : "進站")
                     };
             //StateDesc= (q7.UserName == "" ? "進站" : (q7.UserName != "" ? "出站":""))
@@ -218,7 +218,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     join qf in _context.UserInfoes on q8.ReplyUserID equals qf.UserID
                     join qg in _context.RMAReasons on q1.RepairNo equals qg.RMAReasonNo
                     join qh in _context.QATypes on qg.QATypeId equals qh.QATypeID
-                    join qi in _context.CalendarTables on q1.CreateDate.Date equals qi.TimeID
+                    join qi in _context.CalendarTables on q1.CreateDate.Value.Date equals qi.TimeID
                     select new
                     {
                         q4.UnitNO,
@@ -395,13 +395,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     from z in repair_reason.DefaultIfEmpty()
                     join qh in _context.QATypes on z.QATypeId equals qh.QATypeID into repair_qa
                     from a in repair_qa.DefaultIfEmpty()
-                    join qi in _context.CalendarTables on x.CreateDate.Date equals qi.TimeID into repair_date
+                    join qi in _context.CalendarTables on x.CreateDate.Value.Date equals qi.TimeID into repair_date
                     from c in repair_date.DefaultIfEmpty()
                     select new
                     {
                         q4.UnitNO,
                         q6.LineDesc,
-                        CreateDate = (x.CreateDate == null ? DateTime.MaxValue : x.CreateDate),
+                        CreateDate = (x.CreateDate == null ? null : x.CreateDate),
                         c.Month,
                         WeekOfYearISO = (c.WeekOfYearISO == null ? 0 : c.WeekOfYearISO),
                         q7.StationName,
@@ -454,8 +454,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         CheckInUserName = helper.GetUserName(q2.CreateUserID).Result,
                         CheckOutUserNo = helper.GetUserNo(x.CreateUserID).Result,
                         CheckOutUserName = helper.GetUserName(x.CreateUserID).Result,
-                        CheckOutDate = (x.CreateDate == null ? DateTime.MaxValue : x.CreateDate),
-                        TAT = EF.Functions.DateDiffHour(q2.CreateDate, x.CreateDate == null ? DateTime.MaxValue : x.CreateDate),
+                        CheckOutDate = (x.CreateDate == null ? null : x.CreateDate),
+                        TAT = EF.Functions.DateDiffDay(q2.CreateDate, x.CreateDate == null ? DateTime.Now : x.CreateDate),
                         StateDesc = (x.CreateDate != null ? "出站" : "進站")
                     };
 
diff --git a/AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs b/AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs
index 347a5e40..a04ba839 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/NgRepair.cs
@@ -146,7 +146,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("CREATE_DATE")]
         [DataMember]
-        public DateTime CreateDate { get; set; } = System.DateTime.Now;
+        public DateTime? CreateDate { get; set; } = System.DateTime.Now;
 
         /// <summary>
         /// 更新者ID