diff --git a/OpenAuth.App/ServiceApp/DroneCaseInfo/DroneCaseInfoSingleApp.cs b/OpenAuth.App/ServiceApp/DroneCaseInfo/DroneCaseInfoSingleApp.cs
index 8eafc97..8fc5db3 100644
--- a/OpenAuth.App/ServiceApp/DroneCaseInfo/DroneCaseInfoSingleApp.cs
+++ b/OpenAuth.App/ServiceApp/DroneCaseInfo/DroneCaseInfoSingleApp.cs
@@ -2787,14 +2787,14 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
         // schemeCode + "'  ";
 
         sql = $"select * from ((select   a.\"Id\" as taskId,a.\"UnitName\" as unitName,b.\"Title\" as title,c.synchronoustime as createDate," +
-            $"c.xiangmu_no as caseNo,c.countyname,c.streetname,c.communityname,\r\n a.\"ProcessCode\" as processcode,a.\"ProcessId\" as processid," +
+            $"c.xiangmu_no as caseNo,c.countyname,c.streetname,c.communityname,c.countyid,c.streetid,c.communityid,\r\n a.\"ProcessCode\" as processcode,a.\"ProcessId\" as processid,a.\"Type\" as type,a.\"ChildSchemeInfoCode\" as childSchemeInfoCode," +
             $"c.gengdi_area as gengdiArea,yongjiujibennongtian_area as yongjiujibennongtianArea ,nongyongdi_area as nongyongdiArea,c.geomid," +
             $"c.\"Id\" as caseid\r\n from wf_task a   LEFT JOIN wf_process  b on a.\"ProcessId\"=b.\"Id\"\r\nLEFT JOIN drone_ssnyd c  " +
-            $"on b.\"InstanceInfo\"->>'pkeyValue'=c.\"Id\"  where 1=1 and a.\"ProcessCode\"='004'  and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工 问题整改','日常监管','监管问题整改','现场复核','监管接收')" +
-            $" and  a.\"State\"=1  ) UNION \r\n\r\n(select   a.\"Id\" as taskId,a.\"UnitName\" as unitName,b.\"Title\" as title,c.synchronoustime as createDate,c.xiangmu_no as caseNo,c.countyname,c.streetname,c.communityname," +
-            $"\r\n a.\"ProcessCode\" as processcode,a.\"ProcessId\" as processid,c.gengdi_area as gengdiArea,yongjiujibennongtian_area as yongjiujibennongtianArea ,nongyongdi_area as nongyongdiArea,c.geomid,c.\"Id\" as caseid\r\n" +
+            $"on b.\"InstanceInfo\"->>'pkeyValue'=c.\"Id\"  where 1=1 and a.\"ProcessCode\"='004'  and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收')" +
+            $" and  a.\"State\"=1  ) UNION \r\n\r\n(select   a.\"Id\" as taskId,a.\"UnitName\" as unitName,b.\"Title\" as title,c.synchronoustime as createDate,c.xiangmu_no as caseNo,c.countyname,c.streetname,c.communityname,c.countyid,c.streetid,c.communityid," +
+            $"\r\n a.\"ProcessCode\" as processcode,a.\"ProcessId\" as processid,a.\"Type\" as type,a.\"ChildSchemeInfoCode\" as childSchemeInfoCode,c.gengdi_area as gengdiArea,yongjiujibennongtian_area as yongjiujibennongtianArea ,nongyongdi_area as nongyongdiArea,c.geomid,c.\"Id\" as caseid\r\n" +
             $" from wf_task a   LEFT JOIN wf_process  b on a.\"ProcessId\"=b.\"Id\"\r\nLEFT JOIN drone_ssnyd_rcjg d  on b.\"InstanceInfo\"->>'pkeyValue'=d.\"Id\" RIGHT  JOIN drone_ssnyd c on c.\"Id\"=d.ssnyd_id  where 1=1 " +
-            $" and a.\"ProcessCode\"='005' and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工 问题整改','日常监管','监管问题整改','现场复核','监管接收')   and a.\"State\"=1  )) e where 1=1 ";
+            $" and a.\"ProcessCode\"='005' and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收')   and a.\"State\"=1  )) e where 1=1 ";
 
 
         string sqlpart2 = sqlpart1 + $" and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收')  and a.\"State\"=1 ";
@@ -2963,14 +2963,14 @@ public partial class DroneCaseInfoSingleApp : SqlSugarBaseApp<DroneCaseInfoSingl
         // schemeCode + "'  ";
 
         sql = $"select * from ((select   a.\"Id\" as taskId,a.\"UnitName\" as unitName,b.\"Title\" as title,c.synchronoustime as createDate," +
-            $"c.xiangmu_no as caseNo,c.countyname,c.streetname,c.communityname,\r\n a.\"ProcessCode\" as processcode,a.\"ProcessId\" as processid," +
+            $"c.xiangmu_no as caseNo,c.countyname,c.streetname,c.communityname,c.countyid,c.streetid,c.communityid,\r\n a.\"ProcessCode\" as processcode,a.\"ProcessId\" as processid,a.\"Type\" as type,a.\"ChildSchemeInfoCode\" as childSchemeInfoCode," +
             $"c.gengdi_area as gengdiArea,yongjiujibennongtian_area as yongjiujibennongtianArea ,nongyongdi_area as nongyongdiArea,c.geomid," +
             $"c.\"Id\" as caseid\r\n from wf_task a   LEFT JOIN wf_process  b on a.\"ProcessId\"=b.\"Id\"\r\nLEFT JOIN drone_ssnyd c  " +
-            $"on b.\"InstanceInfo\"->>'pkeyValue'=c.\"Id\"  where 1=1 and a.\"ProcessCode\"='004'  and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工 问题整改','日常监管','监管问题整改','现场复核','监管接收')" +
-            $"  ) UNION \r\n\r\n(select   a.\"Id\" as taskId,a.\"UnitName\" as unitName,b.\"Title\" as title,c.synchronoustime as createDate,c.xiangmu_no as caseNo,c.countyname,c.streetname,c.communityname," +
-            $"\r\n a.\"ProcessCode\" as processcode,a.\"ProcessId\" as processid,c.gengdi_area as gengdiArea,yongjiujibennongtian_area as yongjiujibennongtianArea ,nongyongdi_area as nongyongdiArea,c.geomid,c.\"Id\" as caseid\r\n" +
+            $"on b.\"InstanceInfo\"->>'pkeyValue'=c.\"Id\"  where 1=1 and a.\"ProcessCode\"='004'  and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收')" +
+            $"  ) UNION \r\n\r\n(select   a.\"Id\" as taskId,a.\"UnitName\" as unitName,b.\"Title\" as title,c.synchronoustime as createDate,c.xiangmu_no as caseNo,c.countyname,c.streetname,c.communityname,c.countyid,c.streetid,c.communityid," +
+            $"\r\n a.\"ProcessCode\" as processcode,a.\"ProcessId\" as processid,a.\"Type\" as type,a.\"ChildSchemeInfoCode\" as childSchemeInfoCode,c.gengdi_area as gengdiArea,yongjiujibennongtian_area as yongjiujibennongtianArea ,nongyongdi_area as nongyongdiArea,c.geomid,c.\"Id\" as caseid\r\n" +
             $" from wf_task a   LEFT JOIN wf_process  b on a.\"ProcessId\"=b.\"Id\"\r\nLEFT JOIN drone_ssnyd_rcjg d  on b.\"InstanceInfo\"->>'pkeyValue'=d.\"Id\" RIGHT  JOIN drone_ssnyd c on c.\"Id\"=d.ssnyd_id  where 1=1 " +
-            $" and a.\"ProcessCode\"='005' and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工 问题整改','日常监管','监管问题整改','现场复核','监管接收'))) e where 1=1 ";
+            $" and a.\"ProcessCode\"='005' and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收'))) e where 1=1 ";
 
 
         string sqlpart2 = sqlpart1 + $" and a.\"UnitName\" in ('开工核查','开工问题整改','建中核查','建中问题整改','完工核查','完工问题整改','日常监管','监管问题整改','现场复核','监管接收')";
diff --git a/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs
index c28f35a..4b4d323 100644
--- a/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs
+++ b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs
@@ -47,7 +47,8 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
             else if (orgIds.Any(r => r.Level == 2))
             {
                 //县区数据
-                org = Repository.ChangeRepository<SugarRepositiry<SysOrg>>().AsQueryable().Where(r => r.Level == 3 && orgIds.Select(a => a.Id).Contains(r.ParentId)).ToList();
+                //org = Repository.ChangeRepository<SugarRepositiry<SysOrg>>().AsQueryable().Where(r => r.Level == 2 && orgIds.Select(a => a.Id).Contains(r.ParentId)).ToList();
+                org = Repository.ChangeRepository<SugarRepositiry<SysOrg>>().AsQueryable().Where(r => r.Level == 2 && orgIds.Select(a => a.Id).Contains(r.Id)).ToList();
                 caseList = Repository.AsQueryable().WhereIF(!string.IsNullOrEmpty(xiangmu_yt), (a) => a.xiangmu_yt == xiangmu_yt).ToList();
             }
             //caseList = Repository.AsQueryable().WhereIF(!string.IsNullOrEmpty(xiangmu_yt), (a) => a.xiangmu_yt == xiangmu_yt).ToList();