diff --git a/BackEnd/Main.Master.cs b/BackEnd/Main.Master.cs
index 097a326..0b44f5c 100644
--- a/BackEnd/Main.Master.cs
+++ b/BackEnd/Main.Master.cs
@@ -91,7 +91,7 @@ namespace abbott_2024_event.BackEnd
 
                 
 
-                Response.Redirect("Login.html?isLogout=true");
+                Response.Redirect("Login.aspx?isLogout=true");
                 return;
             }
         }
diff --git a/BackEnd/api/exportBabyRec.ashx.cs b/BackEnd/api/exportBabyRec.ashx.cs
index 8510498..96e84f3 100644
--- a/BackEnd/api/exportBabyRec.ashx.cs
+++ b/BackEnd/api/exportBabyRec.ashx.cs
@@ -76,7 +76,7 @@ namespace abbott_2024_event.BackEnd.api
             row.CreateCell(3);
             sheet.AddMergedRegion(new NPOI.SS.Util.CellRangeAddress(0, 0, 0, 3));
 
-            row.CreateCell(0).SetCellValue("Line 名稱：" + lineUser.line_displayName + "  ,Line UID:" + lineUser.line_uid);
+            row.CreateCell(0).SetCellValue("媽媽姓名：" + lineUser.line_displayName + "  ,Line UID:" + lineUser.line_uid);
 
             HSSFRow babyRow = (HSSFRow)sheet.CreateRow(1);
             babyRow.CreateCell(0);
@@ -131,42 +131,42 @@ namespace abbott_2024_event.BackEnd.api
                 {
                     case 3:
                         {
-                            inpercent = "0%~3%";
+                            inpercent = "低於3%";
                             break;
                         }
                     case 15:
                         {
-                            inpercent = "3%~15%";
+                            inpercent = "3~14%";
                             break;
                         }
                     case 25:
                         {
-                            inpercent = "15%~25%";
+                            inpercent = "15~49%";
                             break;
                         }
                     case 50:
                         {
-                            inpercent = "25%~50%";
+                            inpercent = "15~49%";
                             break;
                         }
                     case 75:
                         {
-                            inpercent = "50%~75%";
+                            inpercent = "50%以上 ";
                             break;
                         }
                     case 85:
                         {
-                            inpercent = "75%~85%";
+                            inpercent = "50%以上 ";
                             break;
                         }
                     case 97:
                         {
-                            inpercent = "85%~97%";
+                            inpercent = "50%以上 ";
                             break;
                         }
                     case 100:
                         {
-                            inpercent = "97%~100%";
+                            inpercent = "50%以上 ";
                             break;
                         }
 
diff --git a/BackEnd/api/exportExcel.ashx.cs b/BackEnd/api/exportExcel.ashx.cs
index c518baf..537ece4 100644
--- a/BackEnd/api/exportExcel.ashx.cs
+++ b/BackEnd/api/exportExcel.ashx.cs
@@ -86,7 +86,7 @@ namespace abbott_2024_event.BackEnd.api
             HSSFRow headerRow = (HSSFRow)sheet.CreateRow(0);
 
             headerRow.CreateCell(0).SetCellValue("Line Uid");
-            headerRow.CreateCell(1).SetCellValue("Line 名稱");
+            headerRow.CreateCell(1).SetCellValue("媽媽姓名");
             headerRow.CreateCell(2).SetCellValue("電話");
             headerRow.CreateCell(3).SetCellValue("寶寶姓名");
             headerRow.CreateCell(4).SetCellValue("寶寶性別");
diff --git a/BackEnd/assets/javascript/custom/userList.js b/BackEnd/assets/javascript/custom/userList.js
index d1d5a74..f794e54 100644
--- a/BackEnd/assets/javascript/custom/userList.js
+++ b/BackEnd/assets/javascript/custom/userList.js
@@ -26,6 +26,10 @@ $(document).ready(function () {
     var min_age = $("#age_start").val();
     var max_age = $("#age_end").val();
 
+    $('#search_btn').click(function () {
+        $('#myTable').DataTable().ajax.reload();
+    });
+
     $('#export_btn').click(function () {
         var start = $("#startDate").val();
         var end = $("#endDate").val();
@@ -241,16 +245,11 @@ function loadDataTable() {
                 searching: true,
                 columns: [
                     { data: 'line_displayName', className: 'align-middle text-left', orderable: true, searchable: true },
-                    { data: 'line_uid', className: 'align-middle text-left', orderable: false, searchable: true },
+                    { data: 'line_uid', className: 'align-middle text-left', orderable: false, searchable: true, visible: false },
                     { data: 'line_phone', className: 'align-middle text-left', orderable: false, searchable: true },
                     { data: 'testdate', className: 'align-top text-center', orderable: false, searchable: false, visible: false },
-                    { data: 'line_uid', className: 'align-middle text-left', orderable: false, searchable: false },
                     { data: 'line_uid', className: 'align-middle text-center', orderable: false, searchable: false },
-                    { data: 'utm_source', className: 'align-middle text-center', orderable: false, searchable: true },
-                    { data: 'utm_medium', className: 'align-middle text-center', orderable: false, searchable: true },
-                    { data: 'utm_campaign', className: 'align-middle text-center', orderable: false, searchable: true },
-                    { data: 'utm_content', className: 'align-middle text-center', orderable: false, searchable: true },
-                    { data: 'utm_term', className: 'align-middle text-center', orderable: false, searchable: true }
+                    { data: 'line_uid', className: 'align-middle text-center', orderable: false, searchable: false }
                 ],
                 columnDefs: [
                     {
@@ -283,42 +282,42 @@ function loadDataTable() {
                                 switch (item.baby_percent) {
                                     case 3:
                                         {
-                                            inpercent = '0%~3%';
+                                            inpercent = '低於3%';
                                             break;
                                         }
                                     case 15:
                                         {
-                                            inpercent = '3%~15%';
+                                            inpercent = '3~14%';
                                             break;
                                         }
                                     case 25:
                                         {
-                                            inpercent = '15%~25%';
+                                            inpercent = '15~49%';
                                             break;
                                         }
                                     case 50:
                                         {
-                                            inpercent = '25%~50%';
+                                            inpercent = '15~49%';
                                             break;
                                         }
                                     case 75:
                                         {
-                                            inpercent = '50%~75%';
+                                            inpercent = '50%以上';
                                             break;
                                         }
                                     case 85:
                                         {
-                                            inpercent = '75%~85%';
+                                            inpercent = '50%以上';
                                             break;
                                         }
                                     case 97:
                                         {
-                                            inpercent = '85%~97%';
+                                            inpercent = '50%以上';
                                             break;
                                         }
                                     case 100:
                                         {
-                                            inpercent = '97%~100%';
+                                            inpercent = '50%以上';
                                             break;
                                         }
 
@@ -344,7 +343,7 @@ function loadDataTable() {
                         }
                     },
                     {
-                        targets: 10,
+                        targets: 5,
                         orderable: false,
                         searchable: false,
                         render: function render(data, type, row, meta) {
@@ -447,42 +446,42 @@ function initSubTable() {
                     switch (row.babyRec_inpercent) {
                         case 3:
                             {
-                                inpercent = '0%~3%';
+                                inpercent = '低於3%';
                                 break;
                             }
                         case 15:
                             {
-                                inpercent = '3%~15%';
+                                inpercent = '3~14%';
                                 break;
                             }
                         case 25:
                             {
-                                inpercent = '15%~25%';
+                                inpercent = '15~49%';
                                 break;
                             }
                         case 50:
                             {
-                                inpercent = '25%~50%';
+                                inpercent = '15~49%';
                                 break;
                             }
                         case 75:
                             {
-                                inpercent = '50%~75%';
+                                inpercent = '50%以上';
                                 break;
                             }
                         case 85:
                             {
-                                inpercent = '75%~85%';
+                                inpercent = '50%以上';
                                 break;
                             }
                         case 97:
                             {
-                                inpercent = '85%~97%';
+                                inpercent = '50%以上';
                                 break;
                             }
                         case 100:
                             {
-                                inpercent = '97%~100%';
+                                inpercent = '50%以上';
                                 break;
                             }
 
diff --git a/BackEnd/userList.aspx b/BackEnd/userList.aspx
index 53a786e..93fbe1f 100644
--- a/BackEnd/userList.aspx
+++ b/BackEnd/userList.aspx
@@ -14,10 +14,11 @@
                     </ol>
                 </nav>
                 <!-- /.breadcrumb -->
-                
+               
                 <!-- title and toolbar -->
                 <div class="d-md-flex align-items-md-start">
                     <h1 class="page-title mr-sm-auto">測驗者資料總覽 </h1>
+                   
                     <!-- .btn-toolbar -->
                     <div id="dt-buttons" class="btn-toolbar"></div>
                     <!-- /.btn-toolbar -->
@@ -99,16 +100,12 @@
                             <thead>
                                 <tr>
                                    
-                                    <th>Line名稱 </th>
-                                    <th>Line UID </th>
+                                    <th>媽媽名字</th>
+                                    <th style="display:none;">Line UID </th>
                                     <th>電話 </th>
                                     <th style="display:none;">測驗日期 </th>
-                                    <th style="min-width: 50%;">寶寶資料</th>
-                                    <th>source </th>
-                                    <th>medium </th>
-                                    <th>campaign</th>
-                                    <th>content</th>
-                                    <th>term</th>
+                                    <th style="min-width: 40%;">寶寶資料</th>
+                                    
                                     <th style="min-width: 60px;">&nbsp; </th>
                                 </tr>
                             </thead>
@@ -203,5 +200,5 @@
         </form><!-- /.modal -->
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="head" runat="server">
-    <script src="assets/javascript/custom/userList.js?v=8"></script>
+    <script src="assets/javascript/custom/userList.js?v=14"></script>
 </asp:Content>
diff --git a/bin/abbott_2024_event.dll b/bin/abbott_2024_event.dll
index 0a48b0f..bbbad90 100644
Binary files a/bin/abbott_2024_event.dll and b/bin/abbott_2024_event.dll differ
diff --git a/bin/app.publish/BackEnd/assets/javascript/custom/userList.js b/bin/app.publish/BackEnd/assets/javascript/custom/userList.js
index d1d5a74..f794e54 100644
--- a/bin/app.publish/BackEnd/assets/javascript/custom/userList.js
+++ b/bin/app.publish/BackEnd/assets/javascript/custom/userList.js
@@ -26,6 +26,10 @@ $(document).ready(function () {
     var min_age = $("#age_start").val();
     var max_age = $("#age_end").val();
 
+    $('#search_btn').click(function () {
+        $('#myTable').DataTable().ajax.reload();
+    });
+
     $('#export_btn').click(function () {
         var start = $("#startDate").val();
         var end = $("#endDate").val();
@@ -241,16 +245,11 @@ function loadDataTable() {
                 searching: true,
                 columns: [
                     { data: 'line_displayName', className: 'align-middle text-left', orderable: true, searchable: true },
-                    { data: 'line_uid', className: 'align-middle text-left', orderable: false, searchable: true },
+                    { data: 'line_uid', className: 'align-middle text-left', orderable: false, searchable: true, visible: false },
                     { data: 'line_phone', className: 'align-middle text-left', orderable: false, searchable: true },
                     { data: 'testdate', className: 'align-top text-center', orderable: false, searchable: false, visible: false },
-                    { data: 'line_uid', className: 'align-middle text-left', orderable: false, searchable: false },
                     { data: 'line_uid', className: 'align-middle text-center', orderable: false, searchable: false },
-                    { data: 'utm_source', className: 'align-middle text-center', orderable: false, searchable: true },
-                    { data: 'utm_medium', className: 'align-middle text-center', orderable: false, searchable: true },
-                    { data: 'utm_campaign', className: 'align-middle text-center', orderable: false, searchable: true },
-                    { data: 'utm_content', className: 'align-middle text-center', orderable: false, searchable: true },
-                    { data: 'utm_term', className: 'align-middle text-center', orderable: false, searchable: true }
+                    { data: 'line_uid', className: 'align-middle text-center', orderable: false, searchable: false }
                 ],
                 columnDefs: [
                     {
@@ -283,42 +282,42 @@ function loadDataTable() {
                                 switch (item.baby_percent) {
                                     case 3:
                                         {
-                                            inpercent = '0%~3%';
+                                            inpercent = '低於3%';
                                             break;
                                         }
                                     case 15:
                                         {
-                                            inpercent = '3%~15%';
+                                            inpercent = '3~14%';
                                             break;
                                         }
                                     case 25:
                                         {
-                                            inpercent = '15%~25%';
+                                            inpercent = '15~49%';
                                             break;
                                         }
                                     case 50:
                                         {
-                                            inpercent = '25%~50%';
+                                            inpercent = '15~49%';
                                             break;
                                         }
                                     case 75:
                                         {
-                                            inpercent = '50%~75%';
+                                            inpercent = '50%以上';
                                             break;
                                         }
                                     case 85:
                                         {
-                                            inpercent = '75%~85%';
+                                            inpercent = '50%以上';
                                             break;
                                         }
                                     case 97:
                                         {
-                                            inpercent = '85%~97%';
+                                            inpercent = '50%以上';
                                             break;
                                         }
                                     case 100:
                                         {
-                                            inpercent = '97%~100%';
+                                            inpercent = '50%以上';
                                             break;
                                         }
 
@@ -344,7 +343,7 @@ function loadDataTable() {
                         }
                     },
                     {
-                        targets: 10,
+                        targets: 5,
                         orderable: false,
                         searchable: false,
                         render: function render(data, type, row, meta) {
@@ -447,42 +446,42 @@ function initSubTable() {
                     switch (row.babyRec_inpercent) {
                         case 3:
                             {
-                                inpercent = '0%~3%';
+                                inpercent = '低於3%';
                                 break;
                             }
                         case 15:
                             {
-                                inpercent = '3%~15%';
+                                inpercent = '3~14%';
                                 break;
                             }
                         case 25:
                             {
-                                inpercent = '15%~25%';
+                                inpercent = '15~49%';
                                 break;
                             }
                         case 50:
                             {
-                                inpercent = '25%~50%';
+                                inpercent = '15~49%';
                                 break;
                             }
                         case 75:
                             {
-                                inpercent = '50%~75%';
+                                inpercent = '50%以上';
                                 break;
                             }
                         case 85:
                             {
-                                inpercent = '75%~85%';
+                                inpercent = '50%以上';
                                 break;
                             }
                         case 97:
                             {
-                                inpercent = '85%~97%';
+                                inpercent = '50%以上';
                                 break;
                             }
                         case 100:
                             {
-                                inpercent = '97%~100%';
+                                inpercent = '50%以上';
                                 break;
                             }
 
diff --git a/bin/app.publish/BackEnd/userList.aspx b/bin/app.publish/BackEnd/userList.aspx
index 53a786e..93fbe1f 100644
--- a/bin/app.publish/BackEnd/userList.aspx
+++ b/bin/app.publish/BackEnd/userList.aspx
@@ -14,10 +14,11 @@
                     </ol>
                 </nav>
                 <!-- /.breadcrumb -->
-                
+               
                 <!-- title and toolbar -->
                 <div class="d-md-flex align-items-md-start">
                     <h1 class="page-title mr-sm-auto">測驗者資料總覽 </h1>
+                   
                     <!-- .btn-toolbar -->
                     <div id="dt-buttons" class="btn-toolbar"></div>
                     <!-- /.btn-toolbar -->
@@ -99,16 +100,12 @@
                             <thead>
                                 <tr>
                                    
-                                    <th>Line名稱 </th>
-                                    <th>Line UID </th>
+                                    <th>媽媽名字</th>
+                                    <th style="display:none;">Line UID </th>
                                     <th>電話 </th>
                                     <th style="display:none;">測驗日期 </th>
-                                    <th style="min-width: 50%;">寶寶資料</th>
-                                    <th>source </th>
-                                    <th>medium </th>
-                                    <th>campaign</th>
-                                    <th>content</th>
-                                    <th>term</th>
+                                    <th style="min-width: 40%;">寶寶資料</th>
+                                    
                                     <th style="min-width: 60px;">&nbsp; </th>
                                 </tr>
                             </thead>
@@ -203,5 +200,5 @@
         </form><!-- /.modal -->
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="head" runat="server">
-    <script src="assets/javascript/custom/userList.js?v=8"></script>
+    <script src="assets/javascript/custom/userList.js?v=14"></script>
 </asp:Content>
diff --git a/bin/app.publish/bin/abbott_2024_event.dll b/bin/app.publish/bin/abbott_2024_event.dll
index 0a48b0f..a455e08 100644
Binary files a/bin/app.publish/bin/abbott_2024_event.dll and b/bin/app.publish/bin/abbott_2024_event.dll differ
diff --git a/webapi/babyData.ashx.cs b/webapi/babyData.ashx.cs
index d4a7ddd..45e2b09 100644
--- a/webapi/babyData.ashx.cs
+++ b/webapi/babyData.ashx.cs
@@ -210,7 +210,7 @@ namespace abbott_2024_event.webapi
 
 
 
-            lenHeiTable objLenHei = conn.QueryFirstOrDefault<lenHeiTable>("select * from lenHeiTable where lenHeiTable_sexual = @gender and lenHeiTable_month = @month and lenHeiTable_minVal < @height1 and lenHeiTable_maxVal >= @height2 ", new { gender = newBaby.babyData_sexual, month = newRec.babyRec_months, height1 = height, height2 = height});
+            lenHeiTable objLenHei = conn.QueryFirstOrDefault<lenHeiTable>("select * from lenHeiTable where lenHeiTable_sexual = @gender and lenHeiTable_month = @month and lenHeiTable_minVal <= @height1 and lenHeiTable_maxVal > @height2 ", new { gender = newBaby.babyData_sexual, month = newRec.babyRec_months, height1 = height, height2 = height});
             lenHeiTable objMidHei = conn.QueryFirstOrDefault<lenHeiTable>("select * from lenHeiTable where lenHeiTable_sexual = @gender and lenHeiTable_month = @month and lenHeiTable_percent = 50", new { gender = newBaby.babyData_sexual, month=newRec.babyRec_months });
             
             if (objLenHei == null) {