diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/ServiceMaintain_QryService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/ServiceMaintain_QryService.cs
index 5eaada1..305a451 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/ServiceMaintain_QryService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/ServiceMaintain_QryService.cs
@@ -158,7 +158,6 @@ namespace EasyBL.WEBAPP.ShowEasy
 
         #endregion 服務管理（分頁查詢）
 
-
         #region 其他訂單問題（分頁查詢）
 
         /// <summary>
@@ -222,11 +221,10 @@ namespace EasyBL.WEBAPP.ShowEasy
 
         #endregion 服務管理（分頁查詢）
 
-
-        #region 其他訂單問題（分頁查詢）
+        #region 區域列表（分頁查詢）
 
         /// <summary>
-        /// 其他訂單問題（分頁查詢）
+        /// 區域列表（分頁查詢）
         /// </summary>
         /// <param name="i_crm"></param>
         /// <returns></returns>
@@ -303,7 +301,6 @@ namespace EasyBL.WEBAPP.ShowEasy
 
         #endregion 服務管理（分頁查詢）
 
-
         #region 方案問題（分頁查詢）
 
         /// <summary>
@@ -460,6 +457,52 @@ namespace EasyBL.WEBAPP.ShowEasy
 
         #endregion 供應商列表（多筆）
 
+        #region 問卷管理-問卷類別查詢（List 查詢類別）
+
+        /// <summary>
+        /// 問卷管理-類別查詢（List 查詢類別）
+        /// </summary>
+        /// <param name="i_crm"></param>
+        /// <returns></returns>
+        public ResponseMessage QuerySurveyTypeList(RequestMessage i_crm)
+        {
+            ResponseMessage rm = null;
+            string sMsg = null;
+            var db = SugarBase.GetIntance();
+
+            var sArgumentClassID = "SurveyType";
+
+            try
+            {
+                do
+                {
+                    var saSurveyTypeList = db.Queryable<OTB_SYS_Arguments>()
+                        //搜尋條件
+                        .Where(x => x.OrgID == i_crm.ORIGID && x.Effective == "Y" && x.DelStatus == "N")
+                        .Where(x => x.ArgumentClassID == sArgumentClassID)
+                        .ToList();
+
+                    rm = new SuccessResponseMessage(null, i_crm);
+                    rm.DATA.Add(BLWording.REL, saSurveyTypeList);
+                } while (false);
+            }
+            catch (Exception ex)
+            {
+                sMsg = Util.GetLastExceptionMsg(ex);
+                LogAndSendEmail(sMsg + "Params：" + JsonToString(i_crm), ex, i_crm.ORIGID, i_crm.USERID, nameof(ServiceMaintain_QryService), "", "QuerySurveyList 問卷管理-問卷類別查詢（List 查詢類別）", "", "", "");
+            }
+            finally
+            {
+                if (null != sMsg)
+                {
+                    rm = new ErrorResponseMessage(sMsg, i_crm);
+                }
+            }
+            return rm;
+        }
+
+        #endregion 問卷管理-問卷類別查詢（List 查詢類別）
+
         #region 服務子類別列表（多筆）
 
         /// <summary>
diff --git a/EuroTran/WebApp/Scripts/pages/ShowEasy/ServiceMaintain_Upd.js b/EuroTran/WebApp/Scripts/pages/ShowEasy/ServiceMaintain_Upd.js
index d168548..e0bfbc4 100644
--- a/EuroTran/WebApp/Scripts/pages/ShowEasy/ServiceMaintain_Upd.js
+++ b/EuroTran/WebApp/Scripts/pages/ShowEasy/ServiceMaintain_Upd.js
@@ -1439,7 +1439,7 @@ var fnPageInit = function () {
                 if (res.RESULT) {
                     let saSubCategory = res.DATA.rel;
                     if (saSubCategory.length > 0) {
-                        $('#ExhibitionID').append(createOptions(saSubCategory, 'CategoryID', 'CategoryName', true)).select2();
+                        $('#ExhibitionID').append(createOptions(saSubCategory, 'CategoryID', 'CategoryName', false)).select2();
                     }
                 }
             });
@@ -1865,7 +1865,7 @@ var fnPageInit = function () {
         },
        //幣別列表
         setCurrencyDrop2 = function () {
-        return g_api.ConnectLite("SurveyMaintain_Qry", "QuerySurveyTypeList", {}, function (res) {
+         return g_api.ConnectLite(canDo.QueryPrgId, "QuerySurveyTypeList", {}, function (res) {
             if (res.RESULT) {
                 let saState = res.DATA.rel;
                 if (saState.length > 0) {
@@ -1876,7 +1876,7 @@ var fnPageInit = function () {
     },
        //設置服務子類別
         setSubCategoryDrop1 = function () {
-            return g_api.ConnectLite("SurveyMaintain_Qry", "QueryCategoryList", {}, function (res) {
+            return g_api.ConnectLite(canDo.QueryPrgId, "QuerySubCategoryList", { LangID: $('#LangID').val() || sLang }, function (res) {
                 if (res.RESULT) {
                     let saSubCategory = res.DATA.rel;
                     if (saSubCategory.length > 0) {
@@ -1888,7 +1888,7 @@ var fnPageInit = function () {
 
         fnGetHistory = function () {
 
-            return g_api.ConnectLite("ServiceMaintain_Qry", "QueryQuestion", {
+            return g_api.ConnectLite(canDo.QueryPrgId, "QueryQuestion", {
 
                 SurveyType: $("#SurveyTypePop").val(),
                 CategoryID: $("#CategoryIDPop").val()