工单类型试剂 和 工单类型仪器 bug 修改

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

             //添加第一行标题
             //DataColumn dc1 = new DataColumn("");
             //dtNew.Columns.Add(dc1);
-            var sqlGDLY1 = "select F_CategoryId,F_CategoryName from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '试剂') and F_DeleteFlag = 0";
+            var sqlGDLY1 = "select F_CategoryId,F_CategoryName from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '试剂') and F_DeleteFlag = 0 ORDER BY F_ParentId ASC";
             var dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
             int dtGDLY1rowcount = dtGDLY1.Rows.Count;
             //列名
             //添加第一行标题
             //DataColumn dc1 = new DataColumn("");
             //dtNew.Columns.Add(dc1);
-            var sqlGDLY1 = "select F_CategoryId,F_CategoryName from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '试剂') and F_DeleteFlag = 0";
+            var sqlGDLY1 = "select F_CategoryId,F_CategoryName from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '试剂') and F_DeleteFlag = 0 ORDER BY F_ParentId ASC";
             var dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
             int dtGDLY1rowcount = dtGDLY1.Rows.Count;
             //列名
               "F_CategoryId",
               "*",
               sqlGDLY,
-              "ORDER BY F_ParentId asc",
+              "ORDER  BY F_ParentId ASC,F_Sort ASC",
               100,
               1,
               true,
             for (int i = 0; i < modelList.Count; i++)
             {
                 string colname = modelList[i].F_CategoryName;
-                if (colnames.Contains(colname))
-                    colname += "_" + i;
+                //if (colnames.Contains(colname))
+                //    colname += "_" + i;
+                //colname = "list" + i;
                 colnames.Add(colname);
             }
-            //dtNew.Columns.Add("总计");
             colnames.Add("");
+
+            #region 第二行标题 - 作为临时字段（解决返回字典重复问题）
+            List<string> colnames2 = new List<string>();
+            colnames2.Add("姓名");
+            for (int i = 0; i < modelList.Count; i++)
+            {
+                string colname2 = "";
+                colname2 = "list" + i;
+                colnames2.Add(colname2);
+            }
+            colnames2.Add("");
+            #endregion
+
             #endregion
             var obj = new
             {
                 linename = dtGDLY1_name,
                 linecount = dtGDLY1_count,
                 lineSeName = colnames,
+                lineSeName2 = colnames2,
                 dtlist = dtNew
             };
             res = Success("获取工单类型数据成功", obj);
               "F_CategoryId",
               "*",
               sqlGDLY,
-              "ORDER BY F_ParentId asc",
+              "ORDER  BY F_ParentId ASC,F_Sort ASC",
               100,
               1,
               true,
             for (int i = 0; i < modelList.Count; i++)
             {
                 string colname = modelList[i].F_CategoryName;
-                if (dtNew.Columns.Contains(colname))
-                    colname += "_" + i;
+                //if (dtNew.Columns.Contains(colname))
+                //    colname += "_" + i;
+                colname = "list" + i;
                 dtNew.Columns.Add(new DataColumn(colname));
                 cateid[i] = modelList[i].F_CategoryId;
             }
                 //添加第一行标题
                 //DataColumn dc1 = new DataColumn("");
                 //dtNew.Columns.Add(dc1);
-                var sqlGDLY1 = "select F_CategoryId,F_CategoryName from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '试剂') and F_DeleteFlag = 0";
+                var sqlGDLY1 = "select F_CategoryId,F_CategoryName from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '试剂') and F_DeleteFlag = 0 ORDER BY F_ParentId ASC";
                 var dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
                 int dtGDLY1rowcount = dtGDLY1.Rows.Count;
                 //每块占的列数
                   "F_CategoryId",
                   "*",
                   sqlGDLY,
-                  "ORDER BY F_ParentId asc",
+                  "ORDER  BY F_ParentId ASC,F_Sort ASC",
                   100,
                   1,
                   true,

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

             //添加第一行标题
             //DataColumn dc1 = new DataColumn("");
             //dtNew.Columns.Add(dc1);
-            var sqlGDLY1 = "select F_CategoryId,F_CategoryName from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '仪器') and F_DeleteFlag = 0";
+            var sqlGDLY1 = "select F_CategoryId,F_CategoryName from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '仪器') and F_DeleteFlag = 0 ORDER BY F_ParentId ASC";
             var dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
             int dtGDLY1rowcount = dtGDLY1.Rows.Count;
             //列名
             //添加第一行标题
             //DataColumn dc1 = new DataColumn("");
             //dtNew.Columns.Add(dc1);
-            var sqlGDLY1 = "select F_CategoryId,F_CategoryName from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '仪器') and F_DeleteFlag = 0";
+            var sqlGDLY1 = "select F_CategoryId,F_CategoryName from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '仪器') and F_DeleteFlag = 0 ORDER BY F_ParentId ASC";
             var dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
             int dtGDLY1rowcount = dtGDLY1.Rows.Count;
             //列名
               "F_CategoryId",
               "*",
               sqlGDLY,
-              "ORDER BY F_ParentId asc",
+              "ORDER  BY F_ParentId ASC,F_Sort ASC",
               100,
               1,
               true,
             }
             //dtNew.Columns.Add("总计");
             colnames.Add("");
+
+            #region 第二行标题 - 作为临时字段（解决返回字典重复问题）
+            List<string> colnames2 = new List<string>();
+            colnames2.Add("姓名");
+            for (int i = 0; i < modelList.Count; i++)
+            {
+                string colname2 = "";
+                colname2 = "list" + i;
+                colnames2.Add(colname2);
+            }
+            colnames2.Add("");
+            #endregion
             #endregion
             var obj = new
             {
                 linename = dtGDLY1_name,
                 linecount = dtGDLY1_count,
                 lineSeName = colnames,
+                lineSeName2 = colnames2,
                 dtlist = dtNew
             };
             res = Success("获取工单类型数据成功", obj);
               "F_CategoryId",
               "*",
               sqlGDLY,
-              "ORDER BY F_ParentId asc",
+              "ORDER  BY F_ParentId ASC,F_Sort ASC",
               100,
               1,
               true,
 
             for (int i = 0; i < modelList.Count; i++)
             {
-                string colname = modelList[i].F_CategoryName;
-                if (dtNew.Columns.Contains(colname))
-                    colname += "_" + i;
+                //string colname = modelList[i].F_CategoryName;
+                //if (dtNew.Columns.Contains(colname))
+                //    colname += "_" + i;
+                string colname = "";
+                colname = "list" + i;
                 dtNew.Columns.Add(new DataColumn(colname));
                 cateid[i] = modelList[i].F_CategoryId;
             }
                 //添加第一行标题
                 //DataColumn dc1 = new DataColumn("");
                 //dtNew.Columns.Add(dc1);
-                var sqlGDLY1 = "select F_CategoryId,F_CategoryName from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '仪器') and F_DeleteFlag = 0";
+                var sqlGDLY1 = "select F_CategoryId,F_CategoryName from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '仪器') and F_DeleteFlag = 0 ORDER BY F_ParentId ASC";
                 var dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
                 int dtGDLY1rowcount = dtGDLY1.Rows.Count;
                 //每块占的列数
                   "F_CategoryId",
                   "*",
                   sqlGDLY,
-                  "ORDER BY F_ParentId asc",
+                  "ORDER  BY F_ParentId ASC,F_Sort ASC",
                   100,
                   1,
                   true,