工单类型仪器和工单类型试剂接口修改

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

             for (int v = 0; v < dtGDLY1rowcount; v++)
             {
                 string catename = dtGDLY1.Rows[v]["F_CategoryName"].ToString();
-                var count_sub = int.Parse(DbHelperSQL.GetSingle("select count(*) from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId=" + int.Parse(dtGDLY1.Rows[v]["F_CategoryId"].ToString()) + "").ToString());
+                var count_sub = int.Parse(DbHelperSQL.GetSingle("select count(*) from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_DeleteFlag = 0 and F_ParentId=" + int.Parse(dtGDLY1.Rows[v]["F_CategoryId"].ToString()) + "").ToString());
                 dtGDLY1_name[v + 1] = catename;
                 dtGDLY1_count[v + 1] = count_sub;
             }
             //添加第一行标题
             //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 = '试剂')";
+            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 dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
             int dtGDLY1rowcount = dtGDLY1.Rows.Count;
             //列名
             for (int v = 0; v < dtGDLY1rowcount; v++)
             {
                 string catename = dtGDLY1.Rows[v]["F_CategoryName"].ToString();
-                var count_sub = int.Parse(DbHelperSQL.GetSingle("select count(*) from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId=" + int.Parse(dtGDLY1.Rows[v]["F_CategoryId"].ToString()) + "").ToString());
+                var count_sub = int.Parse(DbHelperSQL.GetSingle("select count(*) from T_RepositoryCategory where 1=1 and F_DeleteFlag = 0 and F_CategoryType = 1 and F_ParentId=" + int.Parse(dtGDLY1.Rows[v]["F_CategoryId"].ToString()) + "").ToString());
                 dtGDLY1_name[v + 1] = catename;
                 dtGDLY1_count[v + 1] = count_sub;
             }
             //dtNew.Columns.Add(dc);
             List<string> colnames = new List<string>();
             colnames.Add("姓名");
-            var sqlGDLY = " and F_CategoryType=1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '试剂'))";
+            var sqlGDLY = " and F_CategoryType=1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where 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) and F_DeleteFlag = 0";
             var recordCount = 0;
             var dtGDLY = BLL.PagerBLL.GetListPager(
               "T_RepositoryCategory",
             //添加第二行标题
             DataColumn dc = new DataColumn("姓名");
             dtNew.Columns.Add(dc);
-            var sqlGDLY = " and F_CategoryType=1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '试剂'))";
+            var sqlGDLY = " and F_CategoryType=1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where 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 ) and F_DeleteFlag = 0";
             var recordCount = 0;
             var dtGDLY = BLL.PagerBLL.GetListPager(
               "T_RepositoryCategory",
                 //添加第一行标题
                 //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 = '试剂')";
+                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 dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
                 int dtGDLY1rowcount = dtGDLY1.Rows.Count;
                 //每块占的列数
                 for (int v = 0; v < dtGDLY1rowcount; v++)
                 {
                     string catename = dtGDLY1.Rows[v]["F_CategoryName"].ToString();
-                    var count_sub = int.Parse(DbHelperSQL.GetSingle("select count(*) from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId=" + int.Parse(dtGDLY1.Rows[v]["F_CategoryId"].ToString()) + "").ToString());
+                    var count_sub = int.Parse(DbHelperSQL.GetSingle("select count(*) from T_RepositoryCategory where 1=1 and F_DeleteFlag = 0 and F_CategoryType = 1 and F_ParentId=" + int.Parse(dtGDLY1.Rows[v]["F_CategoryId"].ToString()) + "").ToString());
                     dtGDLY1_name[v + 1] = catename;
                     dtGDLY1_count[v + 1] = count_sub;
                     colpos[v + 1] = count_sub;

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 = '仪器')";
+            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 dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
             int dtGDLY1rowcount = dtGDLY1.Rows.Count;
             //列名
             for (int v = 0; v < dtGDLY1rowcount; v++)
             {
                 string catename = dtGDLY1.Rows[v]["F_CategoryName"].ToString();
-                var count_sub = int.Parse(DbHelperSQL.GetSingle("select count(*) from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId=" + int.Parse(dtGDLY1.Rows[v]["F_CategoryId"].ToString()) + "").ToString());
+                var count_sub = int.Parse(DbHelperSQL.GetSingle("select count(*) from T_RepositoryCategory where 1=1 and F_DeleteFlag = 0 and F_CategoryType = 1 and F_ParentId=" + int.Parse(dtGDLY1.Rows[v]["F_CategoryId"].ToString()) + "").ToString());
                 dtGDLY1_name[v + 1] = catename;
                 dtGDLY1_count[v + 1] = count_sub;
             }
             //添加第一行标题
             //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 = '仪器')";
+            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 dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
             int dtGDLY1rowcount = dtGDLY1.Rows.Count;
             //列名
             for (int v = 0; v < dtGDLY1rowcount; v++)
             {
                 string catename = dtGDLY1.Rows[v]["F_CategoryName"].ToString();
-                var count_sub = int.Parse(DbHelperSQL.GetSingle("select count(*) from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId=" + int.Parse(dtGDLY1.Rows[v]["F_CategoryId"].ToString()) + "").ToString());
+                var count_sub = int.Parse(DbHelperSQL.GetSingle("select count(*) from T_RepositoryCategory where 1=1 and F_DeleteFlag = 0 and F_CategoryType = 1 and F_ParentId=" + int.Parse(dtGDLY1.Rows[v]["F_CategoryId"].ToString()) + "").ToString());
                 dtGDLY1_name[v + 1] = catename;
                 dtGDLY1_count[v + 1] = count_sub;
             }
             //dtNew.Columns.Add(dc);
             List<string> colnames = new List<string>();
             colnames.Add("姓名");
-            var sqlGDLY = " and F_CategoryType=1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '仪器'))";
+            var sqlGDLY = " and F_CategoryType=1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where 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) and F_DeleteFlag = 0";
             var recordCount = 0;
             var dtGDLY = BLL.PagerBLL.GetListPager(
               "T_RepositoryCategory",
             //添加第二行标题
             DataColumn dc = new DataColumn("姓名");
             dtNew.Columns.Add(dc);
-            var sqlGDLY = " and F_CategoryType=1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '仪器'))";
+            var sqlGDLY = " and F_CategoryType=1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where 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) and F_DeleteFlag = 0";
             var recordCount = 0;
             var dtGDLY = BLL.PagerBLL.GetListPager(
               "T_RepositoryCategory",
                 //添加第一行标题
                 //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 = '仪器')";
+                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 dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
                 int dtGDLY1rowcount = dtGDLY1.Rows.Count;
                 //每块占的列数
                 for (int v = 0; v < dtGDLY1rowcount; v++)
                 {
                     string catename = dtGDLY1.Rows[v]["F_CategoryName"].ToString();
-                    var count_sub = int.Parse(DbHelperSQL.GetSingle("select count(*) from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId=" + int.Parse(dtGDLY1.Rows[v]["F_CategoryId"].ToString()) + "").ToString());
+                    var count_sub = int.Parse(DbHelperSQL.GetSingle("select count(*) from T_RepositoryCategory where 1=1 and F_DeleteFlag = 0 and F_CategoryType = 1 and F_ParentId=" + int.Parse(dtGDLY1.Rows[v]["F_CategoryId"].ToString()) + "").ToString());
                     dtGDLY1_name[v + 1] = catename;
                     dtGDLY1_count[v + 1] = count_sub;
                     colpos[v + 1] = count_sub;