Merge branch 'master' of http://192.168.1.222:3000/duhongyu/YHSF_API

# Conflicts:
#	codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/ConversationController.cs

codegit/CallCenterApi/CallCenterApi.DAL/T_Con_Conversation.cs

                 {
                     model.F_Type = int.Parse(row["F_Type"].ToString());
                 }
-                if (row["F_Department"] != null)
+                if (row["F_Department"] != null && row["F_Department"].ToString() != "")
                 {
-                    model.F_Department = row["F_Department"].ToString();
+                    model.F_Department = int.Parse(row["F_Department"].ToString());
                 }
-                if (row["F_Section"] != null)
+                if (row["F_Section"] != null && row["F_Section"].ToString() != "")
                 {
-                    model.F_Section = row["F_Section"].ToString();
+                    model.F_Section = int.Parse(row["F_Section"].ToString());
                 }
                 if (row["F_Telephone"] != null)
                 {

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

     public class ConversationController : BaseController
     {
         BLL.T_Con_Conversation bll = new BLL.T_Con_Conversation();
+        BLL.T_Sys_Department bll_Dep = new BLL.T_Sys_Department();
         /// <summary>
         /// 获取内外线列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetList(string keyword, string tel, string department, string section, string physician
-            , int  type=1, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetList()
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 string sql = " and F_IsDelete=0";
                 DataTable dt = new DataTable();
-                if (!string .IsNullOrEmpty (keyword))
+
+                string keyword = RequestString.GetQueryString("keyword");
+                //电话
+                string strtel = RequestString.GetQueryString("tel");
+                //部门id
+                int department = RequestString.GetInt("department", 0);
+                //科室id
+                int section = RequestString.GetInt("section", 0);
+                //医师
+                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")
+                {
+                    sql += $" and (F_Telephone 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 > 0)
+                {
+                    sql += " and F_Department=" + department;
+                }
+                if (section > 0)
                 {
-                    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() + "%'";
+                    sql += " and F_Section=" + section;
                 }
-                if (!string.IsNullOrEmpty(tel))
+                if (physician.Trim() != "" && physician != "undefined")
                 {
-                    sql += "and  F_Telephone='" + tel+"'";
+                    sql += " and F_Physician=" + physician;
                 }
-                if (!string.IsNullOrEmpty(department))
+                if (strpageindex.Trim() != "")
                 {
-                    sql += "and  F_Department='" + department+"'";
+                    pageindex = Convert.ToInt32(strpageindex);
                 }
-                if (!string.IsNullOrEmpty(section))
+                if (strpagesize.Trim() != "")
                 {
-                    sql += "and  F_Section='" + section+"'";
+                    pagesize = Convert.ToInt32(strpagesize);
                 }
-                if (!string.IsNullOrEmpty(physician))
+                if (stringtype .Trim() != "")
                 {
-                    sql += "and  F_Physician='" + physician+"'";
+                    type  = Convert.ToInt32(stringtype);
+                    sql += " and F_Type=" + type;
                 }
-                sql += "and  F_Type=" + type;
                 int recordCount = 0;
                 dt = BLL.PagerBLL.GetListPager(
                         "T_Con_Conversation",
                         "T_Con_Conversation.ID",
-                        "*",
+                        "*,(SELECT F_DeptName FROM dbo.T_Sys_Department WHERE F_DeptId = dbo.T_Con_Conversation.F_Department) AS Department_Name,(SELECT F_DeptName FROM dbo.T_Sys_Department WHERE F_DeptId = dbo.T_Con_Conversation.F_Section) AS Section_Name ",
                         sql,
                        "ORDER BY T_Con_Conversation.ID desc",
                         pagesize,
                         pageindex,
                         true,
                         out recordCount);
-                List<Model.T_Con_Conversation> modlelist = new BLL.T_Con_Conversation().DataTableToList(dt);
+                //List<Model.T_Con_Conversation> modlelist = new BLL.T_Con_Conversation().DataTableToList(dt);
                 var obj = new
                 {
                     state = "success",
                     message = "成功",
-                    rows = modlelist,
+                    rows = dt,
                     total = recordCount
                 };
                 res = Content(obj.ToJson());
         {
             public int ID { get; set; }
             public int  F_Type { get; set; }// 1内线2外线
-            public string F_Department { get; set; }// 部门
-            public string F_Section { get; set; }//科室
+            public int F_Department { get; set; }// 部门
+            public int F_Section { get; set; }//科室
             public string F_Telephone { get; set; }//电话
             public string F_Physician { get; set; }//医师
             public string F_Title { get; set; }//职称
         /// <returns></returns>
         public ActionResult Add(Conversation input)
         {
+            #region 获取部门id by 科室id
+            var model_Dep = new Model.T_Sys_Department();
+            int dep_Sectionid = input.F_Section;
+            if (dep_Sectionid > 0)
+                model_Dep = bll_Dep.GetModel(dep_Sectionid);
+            #endregion
+
             #region 添加验证判断
             if (string.IsNullOrEmpty(input.F_Telephone))
                 return Error("电话不能为空！");
             #endregion
             var model = new Model.T_Con_Conversation();
             model.F_Type = input.F_Type;    //1内线2外线
-            model.F_Department = input.F_Department;    //部门
-            model.F_Section = input.F_Section;    // 科室
+            model.F_Department = model_Dep != null ? model_Dep.F_ParentId : input.F_Department;    //部门id
+            model.F_Section = input.F_Section;    // 科室id
             model.F_Telephone = input.F_Telephone;  // 电话
             model.F_Physician = input.F_Physician;      //医师
             model.F_Title = input.F_Title;//职称
         {
             int userId = CurrentUser.UserData.F_UserId;
 
+            #region 获取部门id by 科室id
+            var model_Dep = new Model.T_Sys_Department();
+            int dep_Sectionid = input.F_Section;
+            if(dep_Sectionid > 0)
+                model_Dep = bll_Dep.GetModel(dep_Sectionid);
+            #endregion
+
             #region 添加验证判断
             if (input.ID <= 0)
                 return Error("参数错误！");
             if (input.F_Type <= 0)
                 return Error("请选择电话类别");
             #endregion
-            var model = bll.GetModel(input.ID );
+            var model = bll.GetModel(input.ID);
             model.F_Type = input.F_Type;    //1内线2外线
-            model.F_Department = input.F_Department;    //部门
-            model.F_Section = input.F_Section;    // 科室
+            model.F_Department = model_Dep != null ? model_Dep.F_ParentId : input.F_Department;    //部门id
+            model.F_Section = input.F_Section;    // 科室id
             model.F_Telephone = input.F_Telephone;  // 电话
             model.F_Physician = input.F_Physician;      //医师
             model.F_Title = input.F_Title;//职称
                         dModel.F_IsDelete  = 0;
                         dModel.F_FileId = fid;
                         dModel.F_Type  = type ;
+
+                        //获取之前所有客户档案信息
+                        var list_Dep = bll_Dep.DataTableToList(bll_Dep.GetList(" 1=1 and F_DeleteFlag = 0 ").Tables[0]).ToList();
                         foreach (DataRow dr in dt.Rows)
                         {
                           
                             {
                                 if (!getunphone(0, dr["电话"].ToString()))
                                 {
-                                    dModel.F_Department = dr["部门"].ToString();
-                                    dModel.F_Section = dr["科室"].ToString();
+                                    var model_Dept = list_Dep.SingleOrDefault(x => x.F_DeptName.Equals(dr["部门"].ToString()));
+                                    var model_Sec = list_Dep.SingleOrDefault(x => x.F_DeptName.Equals(dr["科室"].ToString()));
+                                    dModel.F_Department = model_Dept != null ? model_Dept.F_DeptId : 0;     //dr["部门"].ToString();
+                                    dModel.F_Section = model_Sec != null ? model_Sec.F_DeptId : 0;    //dr["科室"].ToString();
                                     dModel.F_Telephone = dr["电话"].ToString();
 
                                     if (type == 2)
                                     {
                                         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

codegit/CallCenterApi/CallCenterApi.Model/T_Con_Conversation.cs

         #region Model
         private long? _id;
         private int? _f_type;
-        private string _f_department;
-        private string _f_section;
+        private int _f_department = 0;
+        private int _f_section = 0;
         private string _f_telephone;
         private string _f_physician;
         private string _f_title;
             get { return _f_type; }
         }
         /// <summary>
-        /// 部门
+        /// 部门id
         /// </summary>
-        public string F_Department
+        public int F_Department
         {
             set { _f_department = value; }
             get { return _f_department; }
         }
         /// <summary>
-        /// 科室
+        /// 科室id
         /// </summary>
-        public string F_Section
+        public int F_Section
         {
             set { _f_section = value; }
             get { return _f_section; }