Add merged particle statistics to the report overview.

OTSIncAReportApp/3-ServiceCenter/DataOperation/DataAccess/FieldData.cs

@@ -30,7 +30,7 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
             string sql = "select fieldid,fieldposx,fieldposy from field ";//select fieldid,fieldposx,fieldposy from field
             DataTable DT = dbHelper.ExecuteDataTable(sql, null);
 
-            string sqlp = "select * from IncAData ";
+            string sqlp = "select * from IncAData where SubParticles is not 'IsSubParticle'";
             DataTable DTP = dbHelper.ExecuteDataTable(sqlp, null);
             //获取Segment信息
 
@@ -119,7 +119,7 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
             //存放查询数据的数据表
             DataTable DT = null;
 
-            string sql = "select 1 from IncAData";
+            string sql = "select 1 from IncAData  where SubParticles is not 'IsSubParticle'";
             DT = dbHelper.ExecuteDataTable(sql, null);
             return DT.Rows.Count;
 
@@ -132,7 +132,7 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
         public DataTable GetAllParticle_DataTable()
         {
             DataTable DT = null;
-            string sql = "select * from IncAData where typeid > 9 and FieldId > -1";
+            string sql = "select * from IncAData where typeid > 9 and SubParticles is not 'IsSubParticle'";
             DT = dbHelper.ExecuteDataTable(sql, null);
             return DT;
         }
@@ -145,7 +145,7 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
         public double GetparticleArea()
         {
             DataTable DT = null;
-            string sql = "select sum(Area) from IncAData where FieldId > -1";
+            string sql = "select sum(Area) from IncAData where SubParticles is not 'IsSubParticle'";
             DT = dbHelper.ExecuteDataTable(sql, null);
             if (DT == null) return 0;
             double particleArea = 0;