Revert "1"

This reverts commit 31632a35a174694ffb94ee454151f4a10f56f285.

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

@@ -792,28 +792,38 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
         {
             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_Result='正常接通' and b.F_MYD='满意' group by a.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_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 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 = sflist.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[0].ToString() ?? "";
+                var zl = tlist.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[0].ToString() ?? "";
                 if (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 + "%";
@@ -821,7 +831,7 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
                 }
                 dt.Rows.Add(drnew);
             }
-                var dtnew = dt.Select("1=1", "rate desc").CopyToDataTable();
+                var dtnew = dt.Select("1=1").CopyToDataTable();
                 dtnew.Columns.Remove("rate");
 
                 return dtnew;
@@ -855,16 +865,23 @@ 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_Result='正常接通' and b.F_MYD='满意' group by a.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_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 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++)
                 {
+                    //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 = sflist.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[0].ToString() ?? "";
+                    var zl = tlist.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[0].ToString() ?? "";
                     if (zl != "")
                     {
                         var sfl = sflist.Select("CYKS='" + cyks + "'").FirstOrDefault()?.ItemArray[1].ToString() ?? "0";