三房通话

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/ConversationController.cs

@@ -25,63 +25,35 @@ namespace CallCenterApi.Interface.Controllers
         /// 获取内外线列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetList()
+        public ActionResult GetList(string keyword, string tel, string department, string section, string physician
+            , int  type=1, int pageindex = 1, int pagesize = 10)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 string sql = " and F_IsDelete=0";
                 DataTable dt = new DataTable();
-
-                string keyword = RequestString.GetQueryString("keyword");
-                //电话
-                string strtel = RequestString.GetQueryString("tel");
-                ////部门
-               string department = RequestString.GetQueryString("department");
-                ////科室
-                string section = RequestString.GetQueryString("section");
-                ////医师
-                string physician = RequestString.GetQueryString("physician");
-                string stringtype = RequestString.GetQueryString("type");
-                int type = 0;
-                string strpageindex = RequestString.GetQueryString("pageindex");
-                int pageindex = 1;
-                string strpagesize = RequestString.GetQueryString("pagesize");
-                int pagesize = 10;
-
-                if (keyword.Trim() != "" && keyword != "undefined")
+                if (!string .IsNullOrEmpty (keyword))
                 {
                     sql += $"  and F_Telephone like '%" + keyword.Trim() + "%' or F_Department like '%" + keyword.Trim() + "%'or F_Section like '%" + keyword.Trim() + "%'  or F_Physician like '%" + keyword.Trim() + "%' or F_Title like '%" + keyword.Trim() + "%'";
                 }
-                if (strtel.Trim() != "" && strtel != "undefined")
-                {
-                    sql += "and  F_Telephone=" + strtel;
-                }
-                if (department.Trim() != "" && department != "undefined")
-                {
-                    sql += "and  F_Department=" + department;
-                }
-                if (section.Trim() != "" && section != "undefined")
-                {
-                    sql += "and  F_Section=" + section;
-                }
-                if (physician.Trim() != "" && physician != "undefined")
+                if (!string.IsNullOrEmpty(tel))
                 {
-                    sql += "and  F_Physician=" + physician;
+                    sql += "and  F_Telephone='" + tel+"'";
                 }
-                if (strpageindex.Trim() != "")
+                if (!string.IsNullOrEmpty(department))
                 {
-                    pageindex = Convert.ToInt32(strpageindex);
+                    sql += "and  F_Department='" + department+"'";
                 }
-                if (strpagesize.Trim() != "")
+                if (!string.IsNullOrEmpty(section))
                 {
-                    pagesize = Convert.ToInt32(strpagesize);
+                    sql += "and  F_Section='" + section+"'";
                 }
-                if (stringtype .Trim() != "")
+                if (!string.IsNullOrEmpty(physician))
                 {
-                    type  = Convert.ToInt32(stringtype);
-                    sql += "and  F_Type=" + type;
+                    sql += "and  F_Physician='" + physician+"'";
                 }
+                sql += "and  F_Type=" + type;
                 int recordCount = 0;
                 dt = BLL.PagerBLL.GetListPager(
                         "T_Con_Conversation",
@@ -337,11 +309,11 @@ namespace CallCenterApi.Interface.Controllers
                                     {
                                         dModel.F_Physician = dr["医师"].ToString();
                                         dModel.F_Title = dr["职称"].ToString();
-                                        var res = bll.Add(dModel);
-                                        if (res <= 0)
-                                        {
-                                            msg = msg + "第" + headrow + "行，导入失败<br>";
-                                        }
+                                    }
+                                    var res = bll.Add(dModel);
+                                    if (res <= 0)
+                                    {
+                                        msg = msg + "第" + headrow + "行，导入失败<br>";
                                     }
                                 }
                                 else