禅道bug修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/MedicalFollowup/FollowUpController.cs

@@ -59,6 +59,8 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
             string strejwwc = HttpUtility.UrlDecode(RequestString.GetQueryString("secondlevel"));
             //满意度
             string strsatisfy = HttpUtility.UrlDecode(RequestString.GetQueryString("satisfied"));
+            //类型
+            string strtype = HttpUtility.UrlDecode(RequestString.GetQueryString("type"));
 
             string strpageindex = RequestString.GetQueryString("page");
             int pageindex = 1;
@@ -133,7 +135,10 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
             {
                 sql += " and F_Satisfied = '"+strsatisfy +"' ";//随访完成状态
             }
-
+            if (strtype.Trim() != "" && strtype != "undefined")
+            {
+                sql += " and F_Type = '" + strtype.Trim() + "' ";
+            }
             if (strpageindex.Trim() != "")
             {
                 pageindex = Convert.ToInt32(strpageindex);
@@ -388,7 +393,95 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
 
 
         #region 科室随访率统计
+        //获取数据
+        public ActionResult GetSFDataList(string ks,string stime,string etime)
+        {
+            ActionResult res = NoToken("未知错误，请重新登录");
+            DataTable dtNew = new DataTable();
+            dtNew = GetData(ks,  stime,  etime);
+            res = Success("获取科室随访率统计数据成功", dtNew);
+
+            return res;
+        }
+
+        //获取数据源
+        private DataTable GetData(string ks, string stime, string etime)
+        {
+            DataTable dtNew = new DataTable();
+            #region 编辑表头
+            /*DataColumn dc1 = new DataColumn("科室名称", Type.GetType("System.String"));
+            DataColumn dc2 = new DataColumn("科室代码", Type.GetType("System.String"));
+            DataColumn dc3 = new DataColumn("时间", Type.GetType("System.String"));
+            DataColumn dc4 = new DataColumn("需要随访病人数", Type.GetType("System.String"));
+            DataColumn dc5 = new DataColumn("随访完成人数", Type.GetType("System.String"));
+            DataColumn dc6 = new DataColumn("科室随访率", Type.GetType("System.String"));
+            DataColumn dc7 = new DataColumn("满意人数", Type.GetType("System.String"));
+            DataColumn dc8 = new DataColumn("不满意人数", Type.GetType("System.String"));
+            DataColumn dc9 = new DataColumn("随访满意率", Type.GetType("System.String"));
+
+            dtNew.Columns.Add(dc1);
+            dtNew.Columns.Add(dc2);
+            dtNew.Columns.Add(dc3);
+            dtNew.Columns.Add(dc4);
+            dtNew.Columns.Add(dc5);
+            dtNew.Columns.Add(dc6);
+            #endregion
+
+            string sql = " ";
+            var list = bllCall.DataTableToList(bllCall.GetList($" 1=1 {sql} and UserCode is not null ").Tables[0]);
+            int callInCount = 0, callOutCount = 0, calledCount = 0, nocalledCount = 0;
+            //一天24小时
+            for (int i = 0; i < 24; i++)
+            {
+                DateTime stimes = Convert.ToDateTime(stime + " 00:00:00").AddHours(i);
+                DateTime etimes = Convert.ToDateTime(stime + " 00:59:59").AddHours(i);
+                DataRow drNew = dtNew.NewRow();
+                //SELECT BeginTime, * FROM T_Call_CallRecords WHERE DATEPART(hh,BeginTime) = DATEPART(hh, DATEADD(hh,-2,GETDATE())) and DATEPART(dd,BeginTime) = DATEPART(dd, GETDATE()) and DATEPART(mm, BeginTime) = DATEPART(mm, GETDATE()) and DATEPART(yy, BeginTime) = DATEPART(yy, GETDATE())
+                //CallType
+                //CallState呼叫状态,0:未接通电话1已接通电话
+                var callInTimes = list.Where(x => x.CallType == 0 && x.BeginTime >= stimes && x.BeginTime <= etimes).Count();   //呼入量
+                var callOutTimes = list.Where(x => x.CallType == 1 && x.BeginTime >= stimes && x.BeginTime <= etimes).Count();  //呼出量
+                var calledTimes = list.Where(x => x.CallState == 1 && x.BeginTime >= stimes && x.BeginTime <= etimes).Count();  //接通量
+                var nocalledTimes = list.Where(x => x.CallState == 0 && x.BeginTime >= stimes && x.BeginTime <= etimes).Count();//未接通量
 
+                //var calledRate = list.Where(x => x.CallType == 1 && x.BeginTime >= stimes && x.BeginTime <= etimes).Count();
+                drNew["时间"] = (i + 1).ToString();
+                drNew["呼入量"] = callInTimes.ToString();
+                drNew["呼出量"] = callOutTimes.ToString();
+                drNew["接通量"] = calledTimes.ToString();
+                drNew["未接通量"] = nocalledTimes.ToString();
+                //计算未结案率
+                var calledTotal = calledTimes + nocalledTimes;
+                Double notRate = 0.00;
+                if (calledTotal > 0)
+                    notRate = (double)calledTimes / (double)calledTotal;
+                drNew["接通率"] = (notRate * 100).ToString("0.00") + "%";
+                ////统计结案，未结案数
+                callInCount += callInTimes;
+                callOutCount += callOutTimes;
+                calledCount += calledTimes;
+                nocalledCount += nocalledTimes;
+                dtNew.Rows.Add(drNew);
+            }
+            #region 获取一条统计信息
+            DataRow drzj = dtNew.NewRow();
+            drzj["时间"] = "总计";
+            drzj["呼入量"] = callInCount.ToString();
+            drzj["呼出量"] = callOutCount.ToString();
+            drzj["接通量"] = calledCount.ToString();
+            drzj["未接通量"] = nocalledCount.ToString();
+            //计算未结案率
+            int totalAllCount = calledCount + nocalledCount;
+            Double calledAllRate = 0.00;
+            if (totalAllCount > 0)
+                calledAllRate = (double)calledCount / (double)totalAllCount;
+            drzj["接通率"] = (calledAllRate * 100).ToString("0.00") + "%";
+            dtNew.Rows.Add(drzj);*/
+            #endregion
+            return dtNew;
+        }
         #endregion
+
+        
     }
 }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SeatGroupController.cs

@@ -32,7 +32,7 @@ namespace CallCenterApi.Interface.Controllers
             string sql = "";
             if (strcontent!=null&&strcontent != "")
             {
-                sql = " and( F_ZXZCode like '" + strcontent + "' or F_ZXZName  like '" + strcontent + "'  or F_WHBDKey like '" + strcontent + "%'  or F_WHWDKey  like '" + strcontent + "%'  or F_ZXAtt like '" + strcontent + "'  or F_Des like '" + strcontent + "')";
+                sql = " and( F_ZXZCode like '%" + strcontent + "%' or F_ZXZName  like '%" + strcontent + "%'  or F_WHBDKey like '%" + strcontent + "%'  or F_WHWDKey  like '%" + strcontent + "%'  or F_ZXAtt like '%" + strcontent + "%'  or F_Des like '%" + strcontent + "%')";
             }
                 if (strpageindex.Trim() != "")
                 {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallOutPlanController.cs

@@ -669,7 +669,7 @@ namespace CallCenterApi.Interface.Controllers.callout
             var sql = "";
             if (!string.IsNullOrWhiteSpace(key))
             {
-                sql += " and F_Phone='" + key + "' or  F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%'";
+                sql += " and F_Phone like'%" + key + "%' or  F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%'";
             }
             sb.Append(" and F_Taskid in (select F_TaskID from T_Call_OutTask where  F_IsStart=1 and F_DeleteFlag=0 "+sql+" ) ");
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

@@ -412,7 +412,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                     sql += " and (F_Content like '%" + keywords.Trim() + "%' or F_Title like '%"
                         + keywords.Trim() + "%' or F_KeyWords like '%" + keywords.Trim() + "%')";
                 }
-                string str = "SELECT  F_Expand1 AS '所属分类',F_Title AS '标题',F_Description AS '关键字',F_Content AS '内容' FROM dbo.T_RepositoryInformation where 1=1 " + sql + " ORDER BY F_RepositoryId desc";
+                string str = "SELECT  F_Expand1 AS '所属分类',F_Title AS '标题',F_Content AS '内容',F_KeyWords AS '关键字' FROM dbo.T_RepositoryInformation where 1=1 " + sql + " ORDER BY F_RepositoryId desc";
                 dt = DbHelperSQL.Query(str).Tables[0];
                 foreach (DataRow dr in dt.Rows)
                 {
@@ -421,7 +421,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             }
             #endregion
             NPOIHelper npoi = new NPOIHelper();
-            if (npoi.ExportToExcel("工单列表", dt) == "")
+            if (npoi.ExportToExcel("知识库列表", dt) == "")
             {
                 return Success("导出成功");
             }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/HourCallTotalController.cs

@@ -129,7 +129,7 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 NPOIHelper npoi = new NPOIHelper();
                 DataTable dt = GetData(stime);
-                if (npoi.ExportToExcel("通话时长数据", dt) == "")
+                if (npoi.ExportToExcel("每日呼叫数据", dt) == "")
                 {
                     return Success("导出成功");
                 }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/YearContrastController.cs

@@ -136,10 +136,10 @@ namespace CallCenterApi.Interface.Controllers.report
                     drNew["月份"] = (i + 1).ToString() + "月";
                     drNew[beginyear + "年客户呼叫数"] = bkhcall[i];
                     drNew[beginyear + "年坐席接听数"] = bzxjt[i];
-                    drNew[beginyear + "年坐席接听率"] = bjtl[i];
+                    drNew[beginyear + "年接通率"] = bjtl[i];
                     drNew[endyear + "年客户呼叫数"] = ekhcall[i];
                     drNew[endyear + "年坐席接听数"] = ezxjt[i];
-                    drNew[endyear + "年坐席接听率"] = ejtl[i];
+                    drNew[endyear + "年接通率"] = ejtl[i];
                     dtNew.Rows.Add(drNew);
                 }
             }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallblackController.cs

@@ -31,7 +31,7 @@ namespace CallCenterApi.Interface.Controllers.tel
 
                     if (strtelnum != null && strtelnum.Trim() != "")
                     {
-                        sql += " and F_TelPhone= '" + strtelnum.Trim() + "' ";
+                        sql += " and F_TelPhone like '%" + strtelnum.Trim() + "%' ";
                     }
                     if (strsettime.Trim() != "" && strsettime != "undefined")
                     {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -295,31 +295,31 @@ namespace CallCenterApi.Interface.Controllers.tel
                 //else
                 //    sql += " and UserCode='" + usercode + "' ";
 
-                if (usercode != null && usercode.Trim() != "")
+                if (usercode != null && usercode.Trim() != ""&& usercode.Trim() != "undefined") 
                 {
                     sql += " and UserCode='" + usercode + "'";
                 }
-                if (dept != null && dept.Trim() != "")
+                if (dept != null && dept.Trim() != "" && dept.Trim() != "undefined")
                 {
                     sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId=" + dept.Trim() + ")";
                 }
-                if (phone != null && phone.Trim() != "")
+                if (phone != null && phone.Trim() != "" && phone.Trim() != "undefined")
                 {
                     sql += " and CallNumber like '%" + phone + "%'";
                 }
-                if (callstate.Trim() != "")
+                if (callstate.Trim() != "" && callstate.Trim() != "undefined")
                 {
                     sql += " and CallState='" + callstate + "'";
                 }
-                if (calltype.Trim() != "")
+                if (calltype.Trim() != "" && calltype.Trim() != "undefined")
                 {
                     sql += " and CallType='" + calltype + "'";
                 }
-                if (starttime.Trim() != "")
+                if (starttime.Trim() != "" && starttime.Trim() != "undefined")
                 {
                     sql += " and datediff(day,BeginTime,'" + starttime + "')<=0 ";
                 }
-                if (endtime.Trim() != "")
+                if (endtime.Trim() != "" && endtime.Trim() != "undefined")
                 {
                     sql += " and datediff(day,BeginTime,'" + endtime + "')>=0 ";
                 }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/MobiledataController.cs

@@ -29,7 +29,7 @@ namespace CallCenterApi.Interface.Controllers.tel
 
                 if (strtelnum != null && strtelnum.Trim() != "")
                 {
-                    sql += " and (F_MobileNum= '" + strtelnum.Trim() + "' or F_ZipCode like '%" + strtelnum.Trim()
+                    sql += " and (F_MobileNum= '%" + strtelnum.Trim() + "%' or F_ZipCode like '%" + strtelnum.Trim()
                         + "%' or F_CityDes like '%" + strtelnum.Trim() + "%'or F_CardDes like '%" + strtelnum.Trim() + "%')";
                 }