修改

codegit/CallCenterApi/CallCenterApi.DAL/T_Med_FollowUp.cs

@@ -409,7 +409,7 @@ namespace CallCenterApi.DAL
         public DataSet GetBLList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select distinct a.BINGRENZYID,BRXM,XB,NL,RYKS,ZZYSXM  FROM SF_BINGRENQK a,SF_ZHENDUAN b");
+            strSql.Append("select distinct a.BINGRENZYID,BRXM,XB,NL,RYKS,ZZYSXM  FROM SF_BINGRENQK a left join SF_ZHENDUAN b on a.BAH=b.BINGANHAO");
             if (strWhere.Trim() != "")
             {
                 strSql.Append(" where " + strWhere);

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

@@ -73,7 +73,7 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
             //建档日期
             string strjdrq = "";
             //病例分类
-            string blfl = "";
+            string blfl = RequestString.GetQueryString("blfl");
             string strpageindex = RequestString.GetQueryString("page");
             int pageindex = 1;
             string strpagesize = RequestString.GetQueryString("pagesize");
@@ -397,16 +397,9 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
         public ActionResult GetxinxiList(string dal)
         {
             DataTable dt = new DataTable();
+            dt = mfBLL.GetBLList(" a.XZZDH='" + dal + "'").Tables[0];
 
-            dt = mfBLL.GetBLList(" XZZDH='"+ dal + "'").Tables[0];
-            var obj = new
-            {
-                state = "success",
-                message = "成功",
-                rows = dt,
-                total = 1
-            };
-            return Content(obj.ToJson());
+            return Success("成功", dt);
         }
 
         #endregion
@@ -725,6 +718,13 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
             {
                 NPOIHelper npoi = new NPOIHelper();
                 DataTable dt = GetSFData();
+                dt.Columns.Add("序号").SetOrdinal(0);
+
+                for (int i = 0; i < dt.Rows.Count; i++)
+                {
+                    dt.Rows[i]["序号"] = i + 1;
+                }
+
                 if (npoi.ExportToExcel("科室随访率数据", dt) == "")
                 {
                     return Success("导出成功");
@@ -777,53 +777,42 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
 
         #region 满意度
 
-        public ActionResult GetMYDList(string mydys)
+        public ActionResult GetMYDList()
         {
-            
+
             if (Request.IsAuthenticated)
             {
-                return Success("获取满意度成功", GetDataMYD(mydys));
+                return Success("获取满意度成功", GetDataMYD());
             }
             return NoToken("未知错误，请重新登录");
         }
 
 
-        private DataTable GetDataMYD(string mydys)
+        private DataTable GetDataMYD()
         {
             DataTable dt = new DataTable();
             dt.Columns.Add("科室");
-            dt.Columns.Add("总量");
             dt.Columns.Add("随访量");
+            dt.Columns.Add("满意量");
             dt.Columns.Add("满意度");
             dt.Columns.Add("rate", typeof(double));
 
             var kslist = DbHelperSQL.Query("select distinct CYKS FROM SF_BINGRENQK").Tables[0];
-            var myd = DbHelperSQL.Query("select distinct a.CYKS,COUNT(b.F_MYD) from SF_BINGRENQK a,SF_Result b where a.BINGRENZYID=b.F_Id and b.F_MYD='满意' group by a.CYKS ").Tables[0];
-            var tlist = DbHelperSQL.Query("select count(1) Num,CYKS FROM SF_BINGRENQK group by CYKS").Tables[0];
+            var myd = DbHelperSQL.Query("select distinct a.CYKS,COUNT(b.F_MYD) from SF_BINGRENQK a,SF_Result b where a.BINGRENZYID=b.F_Id and b.F_Result='正常接通' and b.F_MYD='满意' group by a.CYKS ").Tables[0];
             var sflist = DbHelperSQL.Query("select CYKS,COUNT(1) Num from SF_BINGRENQK a,SF_Result b where a.BINGRENZYID=b.F_Id and b.F_Result='正常接通' group by CYKS").Tables[0];
 
             foreach (DataRow dr in kslist.Rows)
             {
-                //var drnew = dt.NewRow();
-                //var cyks = dr["CYKS"].ToString();
-                //drnew["科室"] = cyks;
-                //var my = myd.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[0].ToString() ?? "";
-                //if (my != "")
-                //{
-                //    var myl = myd.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[1].ToString() ?? "0";
-                //    drnew["满意度"] = myl;
-                //}
-                //dt.Rows.Add(drnew);
                 var drnew = dt.NewRow();
                 var cyks = dr["CYKS"].ToString();
                 drnew["科室"] = cyks;
-                var zl = tlist.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[0].ToString() ?? "";
+                var zl = sflist.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[1].ToString() ?? "";
                 if (zl != "")
                 {
-                    drnew["总量"] = zl;
+                    drnew["随访量"] = zl;
                     var sfl = sflist.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[1].ToString() ?? "0";
-                    drnew["随访量"] = sfl;
                     var my = myd.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[1].ToString() ?? "0";
+                    drnew["满意量"] = my;
                     var Rate = Math.Round(double.Parse(my) * 100 / double.Parse(sfl), 2);
                     drnew["rate"] = Rate;
                     drnew["满意度"] = Rate + "%";
@@ -831,21 +820,28 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
                 }
                 dt.Rows.Add(drnew);
             }
-                var dtnew = dt.Select("1=1").CopyToDataTable();
-                dtnew.Columns.Remove("rate");
+            var dtnew = dt.Select("1=1", "rate desc").CopyToDataTable();
+            dtnew.Columns.Remove("rate");
 
-                return dtnew;
+            return dtnew;
         }
         /// <summary>
         /// 导出
         /// </summary>
-        public ActionResult ExportExcelMYD(string mydys)
+        public ActionResult ExportExcelMYD()
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 NPOIHelper npoi = new NPOIHelper();
-                DataTable dt = GetDataMYD(mydys);
+                DataTable dt = GetDataMYD();
+                dt.Columns.Add("序号").SetOrdinal(0);
+
+                for (int i = 0; i < dt.Rows.Count; i++)
+                {
+                    dt.Rows[i]["序号"] = i + 1;
+                }
+
                 if (npoi.ExportToExcel("满意度数据", dt) == "")
                 {
                     return Success("导出成功");
@@ -865,26 +861,18 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
             if (Request.IsAuthenticated)
             {
                 var kslist = DbHelperSQL.Query("select distinct CYKS FROM SF_BINGRENQK").Tables[0];
-                var myd = DbHelperSQL.Query("select distinct a.CYKS,COUNT(b.F_MYD) from SF_BINGRENQK a,SF_Result b where a.BINGRENZYID=b.F_Id and b.F_MYD='满意' group by a.CYKS ").Tables[0];
-                var tlist = DbHelperSQL.Query("select count(1) Num,CYKS FROM SF_BINGRENQK group by CYKS").Tables[0];
+                var myd = DbHelperSQL.Query("select distinct a.CYKS,COUNT(b.F_MYD) from SF_BINGRENQK a,SF_Result b where a.BINGRENZYID=b.F_Id and b.F_Result='正常接通' and b.F_MYD='满意' group by a.CYKS ").Tables[0];
                 var sflist = DbHelperSQL.Query("select CYKS,COUNT(1) Num from SF_BINGRENQK a,SF_Result b where a.BINGRENZYID=b.F_Id and b.F_Result='正常接通' group by CYKS").Tables[0];
-                var ksc = kslist.Rows.Count;
 
                 Dictionary<string, double> dics = new Dictionary<string, double>();
-                for (int i = 0; i < ksc; i++)
+                for (int i = 0; i < kslist.Rows.Count; i++)
                 {
-                    //var cyks = kslist.Rows[i]["CYKS"].ToString();
-
-                    //var myl = myd.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[1].ToString() ?? "0";
-                    //var Rate = Math.Round(double.Parse(myl));
-                    //dics.Add(cyks, Rate);
 
                     var cyks = kslist.Rows[i]["CYKS"].ToString();
 
-                    var zl = tlist.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[0].ToString() ?? "";
-                    if (zl != "")
+                    var sfl = sflist.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[1].ToString() ?? "";
+                    if (sfl != "")
                     {
-                        var sfl = sflist.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[1].ToString() ?? "0";
                         var my = myd.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[1].ToString() ?? "0";
                         var Rate = Math.Round(double.Parse(my) * 100 / double.Parse(sfl), 2);
                         dics.Add(cyks, Rate);
@@ -906,7 +894,7 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
 
 
 
-        
+
 
         #endregion
     }