医保对账清算查询HIS本地数据增加过滤条件冲正标志

Forms/Clearing.Designer.cs

@@ -272,10 +272,9 @@
             this.uiTabControl1.ItemSize = new System.Drawing.Size(150, 30);
             this.uiTabControl1.Location = new System.Drawing.Point(0, 0);
             this.uiTabControl1.MainPage = "";
-            this.uiTabControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiTabControl1.Name = "uiTabControl1";
             this.uiTabControl1.SelectedIndex = 0;
-            this.uiTabControl1.Size = new System.Drawing.Size(1800, 1194);
+            this.uiTabControl1.Size = new System.Drawing.Size(1200, 810);
             this.uiTabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.uiTabControl1.TabIndex = 0;
             this.uiTabControl1.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -286,9 +285,8 @@
             this.tabPage1.Controls.Add(this.uiPanel2);
             this.tabPage1.Controls.Add(this.uiPanel1);
             this.tabPage1.Location = new System.Drawing.Point(0, 30);
-            this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Size = new System.Drawing.Size(1800, 1164);
+            this.tabPage1.Size = new System.Drawing.Size(1200, 780);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "本地对账";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -299,11 +297,11 @@
             this.uiPanel2.Controls.Add(this.uiTabControl2);
             this.uiPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.uiPanel2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiPanel2.Location = new System.Drawing.Point(342, 0);
-            this.uiPanel2.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
+            this.uiPanel2.Location = new System.Drawing.Point(228, 0);
+            this.uiPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiPanel2.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiPanel2.Name = "uiPanel2";
-            this.uiPanel2.Size = new System.Drawing.Size(1458, 1164);
+            this.uiPanel2.Size = new System.Drawing.Size(972, 780);
             this.uiPanel2.TabIndex = 3;
             this.uiPanel2.Text = null;
             this.uiPanel2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -322,7 +320,7 @@
             this.uiTabControl3.MainPage = "";
             this.uiTabControl3.Name = "uiTabControl3";
             this.uiTabControl3.SelectedIndex = 0;
-            this.uiTabControl3.Size = new System.Drawing.Size(1458, 740);
+            this.uiTabControl3.Size = new System.Drawing.Size(972, 356);
             this.uiTabControl3.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.uiTabControl3.TabIndex = 1;
             this.uiTabControl3.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -333,7 +331,7 @@
             this.tabPage6.Controls.Add(this.dgvHisSettlRec);
             this.tabPage6.Location = new System.Drawing.Point(0, 25);
             this.tabPage6.Name = "tabPage6";
-            this.tabPage6.Size = new System.Drawing.Size(1458, 715);
+            this.tabPage6.Size = new System.Drawing.Size(972, 331);
             this.tabPage6.TabIndex = 0;
             this.tabPage6.Text = "HIS结算记录";
             this.tabPage6.UseVisualStyleBackColor = true;
@@ -383,7 +381,7 @@
             this.dgvHisSettlRec.RowsDefaultCellStyle = dataGridViewCellStyle5;
             this.dgvHisSettlRec.RowTemplate.Height = 23;
             this.dgvHisSettlRec.SelectedIndex = -1;
-            this.dgvHisSettlRec.Size = new System.Drawing.Size(1458, 715);
+            this.dgvHisSettlRec.Size = new System.Drawing.Size(972, 331);
             this.dgvHisSettlRec.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
             this.dgvHisSettlRec.TabIndex = 1;
             this.dgvHisSettlRec.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -487,7 +485,7 @@
             this.uiTabControl2.MainPage = "";
             this.uiTabControl2.Name = "uiTabControl2";
             this.uiTabControl2.SelectedIndex = 0;
-            this.uiTabControl2.Size = new System.Drawing.Size(1458, 424);
+            this.uiTabControl2.Size = new System.Drawing.Size(972, 424);
             this.uiTabControl2.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.uiTabControl2.TabIndex = 0;
             this.uiTabControl2.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -498,7 +496,7 @@
             this.tabPage4.Controls.Add(this.dgvSettlSummary);
             this.tabPage4.Location = new System.Drawing.Point(0, 25);
             this.tabPage4.Name = "tabPage4";
-            this.tabPage4.Size = new System.Drawing.Size(1458, 399);
+            this.tabPage4.Size = new System.Drawing.Size(972, 399);
             this.tabPage4.TabIndex = 0;
             this.tabPage4.Text = "结算汇总数据";
             this.tabPage4.UseVisualStyleBackColor = true;
@@ -550,7 +548,7 @@
             this.dgvSettlSummary.RowsDefaultCellStyle = dataGridViewCellStyle15;
             this.dgvSettlSummary.RowTemplate.Height = 30;
             this.dgvSettlSummary.SelectedIndex = -1;
-            this.dgvSettlSummary.Size = new System.Drawing.Size(1458, 399);
+            this.dgvSettlSummary.Size = new System.Drawing.Size(972, 399);
             this.dgvSettlSummary.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
             this.dgvSettlSummary.TabIndex = 0;
             this.dgvSettlSummary.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -570,48 +568,48 @@
             this.tsmAICheck,
             this.导出TXTToolStripMenuItem});
             this.cmsCheck.Name = "cmsCheck";
-            this.cmsCheck.Size = new System.Drawing.Size(280, 303);
+            this.cmsCheck.Size = new System.Drawing.Size(208, 186);
             this.cmsCheck.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             this.cmsCheck.Opening += new System.ComponentModel.CancelEventHandler(this.cmsCheck_Opening);
             // 
             // tsmCheck_Single
             // 
             this.tsmCheck_Single.Name = "tsmCheck_Single";
-            this.tsmCheck_Single.Size = new System.Drawing.Size(279, 38);
+            this.tsmCheck_Single.Size = new System.Drawing.Size(207, 26);
             this.tsmCheck_Single.Text = "单条对总账";
             this.tsmCheck_Single.Click += new System.EventHandler(this.tsmCheck_Single_Click);
             // 
             // tsmCheckDetail_Single
             // 
             this.tsmCheckDetail_Single.Name = "tsmCheckDetail_Single";
-            this.tsmCheckDetail_Single.Size = new System.Drawing.Size(279, 38);
+            this.tsmCheckDetail_Single.Size = new System.Drawing.Size(207, 26);
             this.tsmCheckDetail_Single.Text = "单条对明细账";
             this.tsmCheckDetail_Single.Click += new System.EventHandler(this.tsmCheckDetail_Single_Click);
             // 
             // tsmCheck_Batch
             // 
             this.tsmCheck_Batch.Name = "tsmCheck_Batch";
-            this.tsmCheck_Batch.Size = new System.Drawing.Size(279, 38);
+            this.tsmCheck_Batch.Size = new System.Drawing.Size(207, 26);
             this.tsmCheck_Batch.Text = "批量对总账";
             this.tsmCheck_Batch.Click += new System.EventHandler(this.tsmCheck_Batch_Click);
             // 
             // tsmCheckDetail_Batch
             // 
             this.tsmCheckDetail_Batch.Name = "tsmCheckDetail_Batch";
-            this.tsmCheckDetail_Batch.Size = new System.Drawing.Size(279, 38);
+            this.tsmCheckDetail_Batch.Size = new System.Drawing.Size(207, 26);
             this.tsmCheckDetail_Batch.Text = "批量对明细账";
             // 
             // tsmHisRecord
             // 
             this.tsmHisRecord.Name = "tsmHisRecord";
-            this.tsmHisRecord.Size = new System.Drawing.Size(279, 38);
+            this.tsmHisRecord.Size = new System.Drawing.Size(207, 26);
             this.tsmHisRecord.Text = "查看HIS记录明细 ";
             this.tsmHisRecord.Click += new System.EventHandler(this.tsmHisRecord_Click);
             // 
             // tsmAICheck
             // 
             this.tsmAICheck.Name = "tsmAICheck";
-            this.tsmAICheck.Size = new System.Drawing.Size(279, 38);
+            this.tsmAICheck.Size = new System.Drawing.Size(207, 26);
             this.tsmAICheck.Text = "智能比对";
             this.tsmAICheck.Click += new System.EventHandler(this.tsmAICheck_Click);
             // 
@@ -628,69 +626,69 @@
             this.tsmImport,
             this.tsmHandCheck});
             this.导出TXTToolStripMenuItem.Name = "导出TXTToolStripMenuItem";
-            this.导出TXTToolStripMenuItem.Size = new System.Drawing.Size(279, 38);
+            this.导出TXTToolStripMenuItem.Size = new System.Drawing.Size(207, 26);
             this.导出TXTToolStripMenuItem.Text = "附属功能";
             // 
             // tsmExport
             // 
             this.tsmExport.Name = "tsmExport";
-            this.tsmExport.Size = new System.Drawing.Size(323, 40);
+            this.tsmExport.Size = new System.Drawing.Size(217, 26);
             this.tsmExport.Text = "导出TXT";
             this.tsmExport.Click += new System.EventHandler(this.tsmExport_Click);
             // 
             // tsmCompress
             // 
             this.tsmCompress.Name = "tsmCompress";
-            this.tsmCompress.Size = new System.Drawing.Size(323, 40);
+            this.tsmCompress.Size = new System.Drawing.Size(217, 26);
             this.tsmCompress.Text = "TXT压缩为ZIP";
             this.tsmCompress.Click += new System.EventHandler(this.tsmCompress_Click);
             // 
             // tsmZIPToSDec
             // 
             this.tsmZIPToSDec.Name = "tsmZIPToSDec";
-            this.tsmZIPToSDec.Size = new System.Drawing.Size(323, 40);
+            this.tsmZIPToSDec.Size = new System.Drawing.Size(217, 26);
             this.tsmZIPToSDec.Text = "ZIP转为有符号整数";
             this.tsmZIPToSDec.Click += new System.EventHandler(this.tsmZIPToSDec_Click);
             // 
             // tsmUploadZIP
             // 
             this.tsmUploadZIP.Name = "tsmUploadZIP";
-            this.tsmUploadZIP.Size = new System.Drawing.Size(323, 40);
+            this.tsmUploadZIP.Size = new System.Drawing.Size(217, 26);
             this.tsmUploadZIP.Text = "上传ZIP";
             this.tsmUploadZIP.Click += new System.EventHandler(this.tsmUploadZIP_Click);
             // 
             // tsm3202
             // 
             this.tsm3202.Name = "tsm3202";
-            this.tsm3202.Size = new System.Drawing.Size(323, 40);
+            this.tsm3202.Size = new System.Drawing.Size(217, 26);
             this.tsm3202.Text = "明细对账(3202)";
             this.tsm3202.Click += new System.EventHandler(this.tsm3202_Click);
             // 
             // tsmDownload
             // 
             this.tsmDownload.Name = "tsmDownload";
-            this.tsmDownload.Size = new System.Drawing.Size(323, 40);
+            this.tsmDownload.Size = new System.Drawing.Size(217, 26);
             this.tsmDownload.Text = "下载文件";
             this.tsmDownload.Click += new System.EventHandler(this.tsmDownload_Click);
             // 
             // tsmUnCompress
             // 
             this.tsmUnCompress.Name = "tsmUnCompress";
-            this.tsmUnCompress.Size = new System.Drawing.Size(323, 40);
+            this.tsmUnCompress.Size = new System.Drawing.Size(217, 26);
             this.tsmUnCompress.Text = "解压文件";
             this.tsmUnCompress.Click += new System.EventHandler(this.tsmUnCompress_Click);
             // 
             // tsmImport
             // 
             this.tsmImport.Name = "tsmImport";
-            this.tsmImport.Size = new System.Drawing.Size(323, 40);
+            this.tsmImport.Size = new System.Drawing.Size(217, 26);
             this.tsmImport.Text = "导入文件";
             this.tsmImport.Click += new System.EventHandler(this.tsmImport_Click);
             // 
             // tsmHandCheck
             // 
             this.tsmHandCheck.Name = "tsmHandCheck";
-            this.tsmHandCheck.Size = new System.Drawing.Size(323, 40);
+            this.tsmHandCheck.Size = new System.Drawing.Size(217, 26);
             this.tsmHandCheck.Text = "手工对账";
             this.tsmHandCheck.Click += new System.EventHandler(this.tsmHandCheck_Click);
             // 
@@ -731,10 +729,10 @@
             this.uiPanel1.Dock = System.Windows.Forms.DockStyle.Left;
             this.uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiPanel1.Location = new System.Drawing.Point(0, 0);
-            this.uiPanel1.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
+            this.uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiPanel1.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiPanel1.Name = "uiPanel1";
-            this.uiPanel1.Size = new System.Drawing.Size(342, 1164);
+            this.uiPanel1.Size = new System.Drawing.Size(228, 780);
             this.uiPanel1.TabIndex = 2;
             this.uiPanel1.Text = null;
             this.uiPanel1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -745,7 +743,7 @@
             this.tbTmp.Dock = System.Windows.Forms.DockStyle.Top;
             this.tbTmp.Location = new System.Drawing.Point(0, 493);
             this.tbTmp.Name = "tbTmp";
-            this.tbTmp.Size = new System.Drawing.Size(342, 146);
+            this.tbTmp.Size = new System.Drawing.Size(228, 146);
             this.tbTmp.TabIndex = 31;
             this.tbTmp.Text = "";
             // 
@@ -768,7 +766,7 @@
             this.gbConditionSet.MinimumSize = new System.Drawing.Size(1, 1);
             this.gbConditionSet.Name = "gbConditionSet";
             this.gbConditionSet.Padding = new System.Windows.Forms.Padding(0, 26, 0, 0);
-            this.gbConditionSet.Size = new System.Drawing.Size(342, 226);
+            this.gbConditionSet.Size = new System.Drawing.Size(228, 226);
             this.gbConditionSet.TabIndex = 24;
             this.gbConditionSet.TabStop = false;
             this.gbConditionSet.Text = "条件设置";
@@ -944,7 +942,7 @@
             this.cbgGroupSet.Padding = new System.Windows.Forms.Padding(0, 26, 0, 0);
             this.cbgGroupSet.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Top;
             this.cbgGroupSet.SelectedIndexes = ((System.Collections.Generic.List<int>)(resources.GetObject("cbgGroupSet.SelectedIndexes")));
-            this.cbgGroupSet.Size = new System.Drawing.Size(342, 155);
+            this.cbgGroupSet.Size = new System.Drawing.Size(228, 155);
             this.cbgGroupSet.TabIndex = 25;
             this.cbgGroupSet.Text = "分组设置";
             this.cbgGroupSet.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -966,7 +964,7 @@
             this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0);
             this.uiGroupBox1.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
             this.uiGroupBox1.RectSize = 2;
-            this.uiGroupBox1.Size = new System.Drawing.Size(342, 1052);
+            this.uiGroupBox1.Size = new System.Drawing.Size(228, 668);
             this.uiGroupBox1.TabIndex = 22;
             this.uiGroupBox1.Text = null;
             this.uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -979,14 +977,14 @@
             this.uiGroupBox10.Controls.Add(this.Btn_Query);
             this.uiGroupBox10.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.uiGroupBox10.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiGroupBox10.Location = new System.Drawing.Point(0, 939);
+            this.uiGroupBox10.Location = new System.Drawing.Point(0, 555);
             this.uiGroupBox10.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiGroupBox10.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox10.Name = "uiGroupBox10";
             this.uiGroupBox10.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0);
             this.uiGroupBox10.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
             this.uiGroupBox10.RectSize = 2;
-            this.uiGroupBox10.Size = new System.Drawing.Size(342, 113);
+            this.uiGroupBox10.Size = new System.Drawing.Size(228, 113);
             this.uiGroupBox10.TabIndex = 34;
             this.uiGroupBox10.Text = null;
             this.uiGroupBox10.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1001,7 +999,7 @@
             this.uiButton4.Location = new System.Drawing.Point(23, 73);
             this.uiButton4.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiButton4.Name = "uiButton4";
-            this.uiButton4.Size = new System.Drawing.Size(299, 35);
+            this.uiButton4.Size = new System.Drawing.Size(185, 35);
             this.uiButton4.TabIndex = 2;
             this.uiButton4.Text = "退出";
             this.uiButton4.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1017,7 +1015,7 @@
             this.uiButton5.Location = new System.Drawing.Point(23, 37);
             this.uiButton5.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiButton5.Name = "uiButton5";
-            this.uiButton5.Size = new System.Drawing.Size(299, 35);
+            this.uiButton5.Size = new System.Drawing.Size(185, 35);
             this.uiButton5.TabIndex = 1;
             this.uiButton5.Text = "批量对总账";
             this.uiButton5.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1032,7 +1030,7 @@
             this.Btn_Query.Location = new System.Drawing.Point(23, 1);
             this.Btn_Query.MinimumSize = new System.Drawing.Size(1, 1);
             this.Btn_Query.Name = "Btn_Query";
-            this.Btn_Query.Size = new System.Drawing.Size(299, 35);
+            this.Btn_Query.Size = new System.Drawing.Size(185, 35);
             this.Btn_Query.TabIndex = 0;
             this.Btn_Query.Text = "查询汇总数据";
             this.Btn_Query.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1044,7 +1042,7 @@
             this.btnQuerySettlSummary.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnQuerySettlSummary.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnQuerySettlSummary.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnQuerySettlSummary.Location = new System.Drawing.Point(34, 1117);
+            this.btnQuerySettlSummary.Location = new System.Drawing.Point(34, 733);
             this.btnQuerySettlSummary.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnQuerySettlSummary.Name = "btnQuerySettlSummary";
             this.btnQuerySettlSummary.Size = new System.Drawing.Size(168, 27);
@@ -1058,7 +1056,7 @@
             this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnClose.Location = new System.Drawing.Point(34, 1226);
+            this.btnClose.Location = new System.Drawing.Point(34, 842);
             this.btnClose.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnClose.Name = "btnClose";
             this.btnClose.Size = new System.Drawing.Size(168, 27);
@@ -1073,7 +1071,7 @@
             this.btnBatchCheck.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnBatchCheck.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnBatchCheck.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnBatchCheck.Location = new System.Drawing.Point(34, 1177);
+            this.btnBatchCheck.Location = new System.Drawing.Point(34, 793);
             this.btnBatchCheck.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnBatchCheck.Name = "btnBatchCheck";
             this.btnBatchCheck.Size = new System.Drawing.Size(168, 27);
@@ -1096,7 +1094,7 @@
             this.gbDateTime.MinimumSize = new System.Drawing.Size(1, 1);
             this.gbDateTime.Name = "gbDateTime";
             this.gbDateTime.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.gbDateTime.Size = new System.Drawing.Size(342, 112);
+            this.gbDateTime.Size = new System.Drawing.Size(228, 112);
             this.gbDateTime.TabIndex = 21;
             this.gbDateTime.Text = "起止时间";
             this.gbDateTime.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1173,9 +1171,8 @@
             this.tabPage10.Controls.Add(this.uiPanel7);
             this.tabPage10.Controls.Add(this.uiPanel6);
             this.tabPage10.Location = new System.Drawing.Point(0, 30);
-            this.tabPage10.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.tabPage10.Name = "tabPage10";
-            this.tabPage10.Size = new System.Drawing.Size(1800, 1164);
+            this.tabPage10.Size = new System.Drawing.Size(1200, 780);
             this.tabPage10.TabIndex = 3;
             this.tabPage10.Text = "异地对账";
             this.tabPage10.UseVisualStyleBackColor = true;
@@ -1186,11 +1183,11 @@
             this.uiPanel7.Controls.Add(this.uiTabControl7);
             this.uiPanel7.Dock = System.Windows.Forms.DockStyle.Fill;
             this.uiPanel7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiPanel7.Location = new System.Drawing.Point(325, 0);
-            this.uiPanel7.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
+            this.uiPanel7.Location = new System.Drawing.Point(217, 0);
+            this.uiPanel7.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiPanel7.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiPanel7.Name = "uiPanel7";
-            this.uiPanel7.Size = new System.Drawing.Size(1475, 1164);
+            this.uiPanel7.Size = new System.Drawing.Size(983, 780);
             this.uiPanel7.TabIndex = 4;
             this.uiPanel7.Text = null;
             this.uiPanel7.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1207,7 +1204,7 @@
             this.uiTabControl6.MainPage = "";
             this.uiTabControl6.Name = "uiTabControl6";
             this.uiTabControl6.SelectedIndex = 0;
-            this.uiTabControl6.Size = new System.Drawing.Size(1475, 740);
+            this.uiTabControl6.Size = new System.Drawing.Size(983, 356);
             this.uiTabControl6.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.uiTabControl6.TabIndex = 1;
             this.uiTabControl6.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1218,7 +1215,7 @@
             this.tabPage14.Controls.Add(this.rtbOthCheckResultRecord);
             this.tabPage14.Location = new System.Drawing.Point(0, 25);
             this.tabPage14.Name = "tabPage14";
-            this.tabPage14.Size = new System.Drawing.Size(1475, 715);
+            this.tabPage14.Size = new System.Drawing.Size(983, 331);
             this.tabPage14.TabIndex = 2;
             this.tabPage14.Text = "对账结果记录";
             this.tabPage14.UseVisualStyleBackColor = true;
@@ -1234,7 +1231,7 @@
             this.rtbOthCheckResultRecord.Name = "rtbOthCheckResultRecord";
             this.rtbOthCheckResultRecord.Padding = new System.Windows.Forms.Padding(2);
             this.rtbOthCheckResultRecord.ShowText = false;
-            this.rtbOthCheckResultRecord.Size = new System.Drawing.Size(1475, 715);
+            this.rtbOthCheckResultRecord.Size = new System.Drawing.Size(983, 331);
             this.rtbOthCheckResultRecord.Style = Sunny.UI.UIStyle.Custom;
             this.rtbOthCheckResultRecord.TabIndex = 0;
             this.rtbOthCheckResultRecord.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1251,7 +1248,7 @@
             this.uiTabControl7.MainPage = "";
             this.uiTabControl7.Name = "uiTabControl7";
             this.uiTabControl7.SelectedIndex = 0;
-            this.uiTabControl7.Size = new System.Drawing.Size(1475, 424);
+            this.uiTabControl7.Size = new System.Drawing.Size(983, 424);
             this.uiTabControl7.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.uiTabControl7.TabIndex = 0;
             this.uiTabControl7.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1262,7 +1259,7 @@
             this.tabPage15.Controls.Add(this.dgvOthCheck);
             this.tabPage15.Location = new System.Drawing.Point(0, 25);
             this.tabPage15.Name = "tabPage15";
-            this.tabPage15.Size = new System.Drawing.Size(1475, 399);
+            this.tabPage15.Size = new System.Drawing.Size(983, 399);
             this.tabPage15.TabIndex = 0;
             this.tabPage15.Text = "结算汇总数据";
             this.tabPage15.UseVisualStyleBackColor = true;
@@ -1314,7 +1311,7 @@
             this.dgvOthCheck.RowsDefaultCellStyle = dataGridViewCellStyle20;
             this.dgvOthCheck.RowTemplate.Height = 30;
             this.dgvOthCheck.SelectedIndex = -1;
-            this.dgvOthCheck.Size = new System.Drawing.Size(1475, 399);
+            this.dgvOthCheck.Size = new System.Drawing.Size(983, 399);
             this.dgvOthCheck.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
             this.dgvOthCheck.TabIndex = 0;
             this.dgvOthCheck.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -1328,13 +1325,13 @@
             this.cmdOthPlcCheck.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsmOthPlcCheck});
             this.cmdOthPlcCheck.Name = "cmsCheck";
-            this.cmdOthPlcCheck.Size = new System.Drawing.Size(249, 42);
+            this.cmdOthPlcCheck.Size = new System.Drawing.Size(187, 30);
             this.cmdOthPlcCheck.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // tsmOthPlcCheck
             // 
             this.tsmOthPlcCheck.Name = "tsmOthPlcCheck";
-            this.tsmOthPlcCheck.Size = new System.Drawing.Size(248, 38);
+            this.tsmOthPlcCheck.Size = new System.Drawing.Size(186, 26);
             this.tsmOthPlcCheck.Text = "单条对账(异地)";
             this.tsmOthPlcCheck.Click += new System.EventHandler(this.tsmOthPlcCheck_Click);
             // 
@@ -1346,10 +1343,10 @@
             this.uiPanel6.Dock = System.Windows.Forms.DockStyle.Left;
             this.uiPanel6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiPanel6.Location = new System.Drawing.Point(0, 0);
-            this.uiPanel6.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
+            this.uiPanel6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiPanel6.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiPanel6.Name = "uiPanel6";
-            this.uiPanel6.Size = new System.Drawing.Size(325, 1164);
+            this.uiPanel6.Size = new System.Drawing.Size(217, 780);
             this.uiPanel6.TabIndex = 3;
             this.uiPanel6.Text = null;
             this.uiPanel6.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1372,7 +1369,7 @@
             this.uiGroupBox7.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox7.Name = "uiGroupBox7";
             this.uiGroupBox7.Padding = new System.Windows.Forms.Padding(0, 26, 0, 0);
-            this.uiGroupBox7.Size = new System.Drawing.Size(325, 198);
+            this.uiGroupBox7.Size = new System.Drawing.Size(217, 198);
             this.uiGroupBox7.TabIndex = 24;
             this.uiGroupBox7.TabStop = false;
             this.uiGroupBox7.Text = "条件设置";
@@ -1506,14 +1503,14 @@
             this.uiGroupBox8.Controls.Add(this.uiButton3);
             this.uiGroupBox8.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.uiGroupBox8.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiGroupBox8.Location = new System.Drawing.Point(0, 1027);
+            this.uiGroupBox8.Location = new System.Drawing.Point(0, 643);
             this.uiGroupBox8.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiGroupBox8.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox8.Name = "uiGroupBox8";
             this.uiGroupBox8.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0);
             this.uiGroupBox8.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
             this.uiGroupBox8.RectSize = 2;
-            this.uiGroupBox8.Size = new System.Drawing.Size(325, 137);
+            this.uiGroupBox8.Size = new System.Drawing.Size(217, 137);
             this.uiGroupBox8.TabIndex = 22;
             this.uiGroupBox8.Text = null;
             this.uiGroupBox8.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1574,7 +1571,7 @@
             this.uiGroupBox9.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox9.Name = "uiGroupBox9";
             this.uiGroupBox9.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.uiGroupBox9.Size = new System.Drawing.Size(325, 112);
+            this.uiGroupBox9.Size = new System.Drawing.Size(217, 112);
             this.uiGroupBox9.TabIndex = 21;
             this.uiGroupBox9.Text = "起止时间";
             this.uiGroupBox9.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1650,9 +1647,8 @@
             this.tabPage2.Controls.Add(this.uiPanel4);
             this.tabPage2.Controls.Add(this.uiPanel3);
             this.tabPage2.Location = new System.Drawing.Point(0, 30);
-            this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Size = new System.Drawing.Size(1800, 1164);
+            this.tabPage2.Size = new System.Drawing.Size(1200, 780);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "清算汇总";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -1663,11 +1659,11 @@
             this.uiPanel4.Controls.Add(this.uiTabControl5);
             this.uiPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.uiPanel4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiPanel4.Location = new System.Drawing.Point(333, 0);
-            this.uiPanel4.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
+            this.uiPanel4.Location = new System.Drawing.Point(222, 0);
+            this.uiPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiPanel4.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiPanel4.Name = "uiPanel4";
-            this.uiPanel4.Size = new System.Drawing.Size(1467, 1164);
+            this.uiPanel4.Size = new System.Drawing.Size(978, 780);
             this.uiPanel4.TabIndex = 4;
             this.uiPanel4.Text = null;
             this.uiPanel4.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1684,7 +1680,7 @@
             this.uiTabControl4.MainPage = "";
             this.uiTabControl4.Name = "uiTabControl4";
             this.uiTabControl4.SelectedIndex = 0;
-            this.uiTabControl4.Size = new System.Drawing.Size(1467, 740);
+            this.uiTabControl4.Size = new System.Drawing.Size(978, 356);
             this.uiTabControl4.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.uiTabControl4.TabIndex = 1;
             this.uiTabControl4.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1695,7 +1691,7 @@
             this.tabPage9.Controls.Add(this.dgvHisSettlRec_2);
             this.tabPage9.Location = new System.Drawing.Point(0, 25);
             this.tabPage9.Name = "tabPage9";
-            this.tabPage9.Size = new System.Drawing.Size(1467, 715);
+            this.tabPage9.Size = new System.Drawing.Size(978, 331);
             this.tabPage9.TabIndex = 0;
             this.tabPage9.Text = "HIS结算记录";
             this.tabPage9.UseVisualStyleBackColor = true;
@@ -1745,7 +1741,7 @@
             this.dgvHisSettlRec_2.RowsDefaultCellStyle = dataGridViewCellStyle25;
             this.dgvHisSettlRec_2.RowTemplate.Height = 23;
             this.dgvHisSettlRec_2.SelectedIndex = -1;
-            this.dgvHisSettlRec_2.Size = new System.Drawing.Size(1467, 715);
+            this.dgvHisSettlRec_2.Size = new System.Drawing.Size(978, 331);
             this.dgvHisSettlRec_2.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
             this.dgvHisSettlRec_2.TabIndex = 1;
             this.dgvHisSettlRec_2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -1761,7 +1757,7 @@
             this.uiTabControl5.MainPage = "";
             this.uiTabControl5.Name = "uiTabControl5";
             this.uiTabControl5.SelectedIndex = 0;
-            this.uiTabControl5.Size = new System.Drawing.Size(1467, 424);
+            this.uiTabControl5.Size = new System.Drawing.Size(978, 424);
             this.uiTabControl5.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.uiTabControl5.TabIndex = 0;
             this.uiTabControl5.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1772,7 +1768,7 @@
             this.tabPage12.Controls.Add(this.dgvClearingSum);
             this.tabPage12.Location = new System.Drawing.Point(0, 25);
             this.tabPage12.Name = "tabPage12";
-            this.tabPage12.Size = new System.Drawing.Size(1467, 399);
+            this.tabPage12.Size = new System.Drawing.Size(978, 399);
             this.tabPage12.TabIndex = 0;
             this.tabPage12.Text = "结算汇总数据";
             this.tabPage12.UseVisualStyleBackColor = true;
@@ -1824,7 +1820,7 @@
             this.dgvClearingSum.RowsDefaultCellStyle = dataGridViewCellStyle30;
             this.dgvClearingSum.RowTemplate.Height = 30;
             this.dgvClearingSum.SelectedIndex = -1;
-            this.dgvClearingSum.Size = new System.Drawing.Size(1467, 399);
+            this.dgvClearingSum.Size = new System.Drawing.Size(978, 399);
             this.dgvClearingSum.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
             this.dgvClearingSum.TabIndex = 0;
             this.dgvClearingSum.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -1838,21 +1834,21 @@
             this.tmsClearing_2,
             this.tmsHisSettlRecord_2});
             this.cmsClearing.Name = "cmsClearing";
-            this.cmsClearing.Size = new System.Drawing.Size(273, 80);
+            this.cmsClearing.Size = new System.Drawing.Size(203, 56);
             this.cmsClearing.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             this.cmsClearing.Opening += new System.ComponentModel.CancelEventHandler(this.cmsClearing_Opening);
             // 
             // tmsClearing_2
             // 
             this.tmsClearing_2.Name = "tmsClearing_2";
-            this.tmsClearing_2.Size = new System.Drawing.Size(272, 38);
+            this.tmsClearing_2.Size = new System.Drawing.Size(202, 26);
             this.tmsClearing_2.Text = "单条清算";
             this.tmsClearing_2.Click += new System.EventHandler(this.tmsClearing_2_Click);
             // 
             // tmsHisSettlRecord_2
             // 
             this.tmsHisSettlRecord_2.Name = "tmsHisSettlRecord_2";
-            this.tmsHisSettlRecord_2.Size = new System.Drawing.Size(272, 38);
+            this.tmsHisSettlRecord_2.Size = new System.Drawing.Size(202, 26);
             this.tmsHisSettlRecord_2.Text = "查看HIS结算记录";
             // 
             // uiPanel3
@@ -1863,10 +1859,10 @@
             this.uiPanel3.Dock = System.Windows.Forms.DockStyle.Left;
             this.uiPanel3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiPanel3.Location = new System.Drawing.Point(0, 0);
-            this.uiPanel3.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
+            this.uiPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiPanel3.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiPanel3.Name = "uiPanel3";
-            this.uiPanel3.Size = new System.Drawing.Size(333, 1164);
+            this.uiPanel3.Size = new System.Drawing.Size(222, 780);
             this.uiPanel3.TabIndex = 3;
             this.uiPanel3.Text = null;
             this.uiPanel3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1897,7 +1893,7 @@
             this.uiGroupBox2.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox2.Name = "uiGroupBox2";
             this.uiGroupBox2.Padding = new System.Windows.Forms.Padding(0, 26, 0, 0);
-            this.uiGroupBox2.Size = new System.Drawing.Size(333, 288);
+            this.uiGroupBox2.Size = new System.Drawing.Size(222, 288);
             this.uiGroupBox2.TabIndex = 27;
             this.uiGroupBox2.TabStop = false;
             this.uiGroupBox2.Text = "条件设置";
@@ -2152,14 +2148,14 @@
             this.uiGroupBox3.Controls.Add(this.btnQueryClrSum);
             this.uiGroupBox3.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.uiGroupBox3.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiGroupBox3.Location = new System.Drawing.Point(0, 1030);
+            this.uiGroupBox3.Location = new System.Drawing.Point(0, 646);
             this.uiGroupBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiGroupBox3.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox3.Name = "uiGroupBox3";
             this.uiGroupBox3.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0);
             this.uiGroupBox3.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
             this.uiGroupBox3.RectSize = 2;
-            this.uiGroupBox3.Size = new System.Drawing.Size(333, 134);
+            this.uiGroupBox3.Size = new System.Drawing.Size(222, 134);
             this.uiGroupBox3.TabIndex = 25;
             this.uiGroupBox3.Text = null;
             this.uiGroupBox3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2219,7 +2215,7 @@
             this.uiGroupBox4.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox4.Name = "uiGroupBox4";
             this.uiGroupBox4.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.uiGroupBox4.Size = new System.Drawing.Size(333, 112);
+            this.uiGroupBox4.Size = new System.Drawing.Size(222, 112);
             this.uiGroupBox4.TabIndex = 21;
             this.uiGroupBox4.Text = "起止时间";
             this.uiGroupBox4.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2296,9 +2292,8 @@
             this.tabPage3.Controls.Add(this.dgvClearingData);
             this.tabPage3.Controls.Add(this.uiPanel5);
             this.tabPage3.Location = new System.Drawing.Point(0, 30);
-            this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(1800, 1164);
+            this.tabPage3.Size = new System.Drawing.Size(1200, 780);
             this.tabPage3.TabIndex = 2;
             this.tabPage3.Text = "清算撤销";
             this.tabPage3.UseVisualStyleBackColor = true;
@@ -2332,7 +2327,6 @@
             this.dgvClearingData.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvClearingData.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
             this.dgvClearingData.Location = new System.Drawing.Point(0, 0);
-            this.dgvClearingData.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.dgvClearingData.Name = "dgvClearingData";
             dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
             dataGridViewCellStyle34.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
@@ -2348,7 +2342,7 @@
             this.dgvClearingData.RowsDefaultCellStyle = dataGridViewCellStyle35;
             this.dgvClearingData.RowTemplate.Height = 23;
             this.dgvClearingData.SelectedIndex = -1;
-            this.dgvClearingData.Size = new System.Drawing.Size(1800, 1003);
+            this.dgvClearingData.Size = new System.Drawing.Size(1200, 673);
             this.dgvClearingData.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
             this.dgvClearingData.TabIndex = 1;
             this.dgvClearingData.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -2363,11 +2357,11 @@
             this.uiPanel5.Controls.Add(this.uiGroupBox5);
             this.uiPanel5.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.uiPanel5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiPanel5.Location = new System.Drawing.Point(0, 1003);
-            this.uiPanel5.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
+            this.uiPanel5.Location = new System.Drawing.Point(0, 673);
+            this.uiPanel5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiPanel5.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiPanel5.Name = "uiPanel5";
-            this.uiPanel5.Size = new System.Drawing.Size(1800, 161);
+            this.uiPanel5.Size = new System.Drawing.Size(1200, 107);
             this.uiPanel5.TabIndex = 0;
             this.uiPanel5.Text = null;
             this.uiPanel5.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2400,7 +2394,7 @@
             this.uiGroupBox6.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox6.Name = "uiGroupBox6";
             this.uiGroupBox6.Padding = new System.Windows.Forms.Padding(0, 26, 0, 0);
-            this.uiGroupBox6.Size = new System.Drawing.Size(236, 161);
+            this.uiGroupBox6.Size = new System.Drawing.Size(236, 107);
             this.uiGroupBox6.TabIndex = 26;
             this.uiGroupBox6.TabStop = false;
             this.uiGroupBox6.Text = null;
@@ -2483,7 +2477,7 @@
             this.rbgTimeWay.MinimumSize = new System.Drawing.Size(1, 1);
             this.rbgTimeWay.Name = "rbgTimeWay";
             this.rbgTimeWay.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.rbgTimeWay.Size = new System.Drawing.Size(176, 161);
+            this.rbgTimeWay.Size = new System.Drawing.Size(176, 107);
             this.rbgTimeWay.TabIndex = 25;
             this.rbgTimeWay.Text = null;
             this.rbgTimeWay.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2528,7 +2522,7 @@
             this.uiGroupBox5.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox5.Name = "uiGroupBox5";
             this.uiGroupBox5.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.uiGroupBox5.Size = new System.Drawing.Size(178, 161);
+            this.uiGroupBox5.Size = new System.Drawing.Size(178, 107);
             this.uiGroupBox5.TabIndex = 22;
             this.uiGroupBox5.Text = null;
             this.uiGroupBox5.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2583,28 +2577,27 @@
             this.toolStripMenuItem2,
             this.toolStripMenuItem3});
             this.uiContextMenuStrip1.Name = "cmsClearing";
-            this.uiContextMenuStrip1.Size = new System.Drawing.Size(273, 80);
+            this.uiContextMenuStrip1.Size = new System.Drawing.Size(203, 56);
             this.uiContextMenuStrip1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // toolStripMenuItem2
             // 
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(272, 38);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(202, 26);
             this.toolStripMenuItem2.Text = "单条清算";
             // 
             // toolStripMenuItem3
             // 
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(272, 38);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(202, 26);
             this.toolStripMenuItem3.Text = "查看HIS结算记录";
             // 
             // Clearing
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1800, 1194);
+            this.ClientSize = new System.Drawing.Size(1200, 810);
             this.Controls.Add(this.uiTabControl1);
-            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Name = "Clearing";
             this.Text = "对账与清算";
             this.Load += new System.EventHandler(this.Clearing_Load);

Forms/Clearing.cs

@@ -1415,6 +1415,8 @@ namespace PTMedicalInsurance.Forms
                     sqlStr = sqlStr + " and ValidFlag =-1";
             }
 
+            sqlStr = sqlStr + " and ReversalFlag <>1 ";
+
             //省医保本地            
             //if ((Global.inf.interfaceDr == 10) && (cbOtherPlaceFlag.SelectedIndex == 2))
             //{
@@ -1425,7 +1427,7 @@ namespace PTMedicalInsurance.Forms
             //{
             //    sqlStr = sqlStr + " and (left(InsuranceAreaCode,4)<>'4199' and left(InsuranceAreaCode,4)<>'4101')";
             //}
-            
+
             sqlStr = sqlStr + " Group By Interface_Dr,ClearingType,ClearingWay,ClearingOrgan";
             JObject joSqlstr = new JObject();
 
@@ -1588,6 +1590,8 @@ namespace PTMedicalInsurance.Forms
                     sqlStr = sqlStr + " and ValidFlag =-1";
             }
 
+            sqlStr = sqlStr + " and ReversalFlag <>1 ";
+
             JObject joSqlstr = new JObject();
             joSqlstr.Add("sqlStr", sqlStr);
             JArray jaParam = new JArray();
@@ -1821,6 +1825,8 @@ namespace PTMedicalInsurance.Forms
                     sqlStr = sqlStr + " and ValidFlag =0 and BillType=-1";
             }
 
+            sqlStr = sqlStr + " and ReversalFlag <>1 ";
+
             //if (Global.inf.interfaceDr == 1)
             //{
             //    sqlStr = sqlStr + " and (left(InsuranceAreaCode,4)='6201' or left(InsuranceAreaCode,4)='6299')";