Revert "合并"

This reverts commit febaec0da79cb2eed5761c317de2abcb1d509693, reversing
changes made to 08df4dbee807296741bdc8178f90f2f5ef9db68b.

Business/HisMainBusiness.cs

@@ -130,7 +130,6 @@ namespace PTMedicalInsurance.Business
             inf.areaCode = JsonHelper.getDestValue(joInpar, "AreaCode");
             inf.dllName = JsonHelper.getDestValue(joInpar, "DLLName");
             inf.hospitalNO = JsonHelper.getDestValue(joInpar, "HospitalNO");
-            inf.hospitalLevel = JsonHelper.getDestValue(joInpar, "HospitalLevel");
             inf.version = "v1.0";
             inf.signatureType = "SM2";
             inf.recivedSystem = "YBXT";
@@ -186,7 +185,6 @@ namespace PTMedicalInsurance.Business
             inf.areaCode = JsonHelper.getDestValue(joInpar, "areaCode");
             inf.dllName = JsonHelper.getDestValue(joInpar, "dLLName");
             inf.hospitalNO = JsonHelper.getDestValue(joInpar, "hospitalNO");
-            inf.hospitalLevel = JsonHelper.getDestValue(joInpar, "hospitalLevel");
             inf.version = "v1.0";
             inf.signatureType = "SM2";
             inf.recivedSystem = "YBXT";
@@ -1875,7 +1873,16 @@ namespace PTMedicalInsurance.Business
                         PreAndInProcessAnalysisForm paipaForm = new PreAndInProcessAnalysisForm(joRtn);
                         if (paipaForm.ShowDialog() == DialogResult.OK)
                         {
-                            return 0;
+                            //【3103】事前事中服务反馈服务
+                            if (PreAnalysisFeedBack("3101", paipaForm.JrID, out outparam) != 0)
+                            {
+                                outparam = "【3103】事前事中服务反馈服务" + outparam;
+                                return -1;
+                            }
+                            else
+                            {
+                                return 0;
+                            }
                         }
                         else
                         {
@@ -1962,10 +1969,6 @@ namespace PTMedicalInsurance.Business
             }
         }
 
-        
-
-        #endregion
-
         public void GetAgentFunHisInfo(string businessType, JObject joInparam, out Patients pat)
         {
             pat = new Patients();

Business/IrisServices.cs

@@ -2370,21 +2370,6 @@ namespace PTMedicalInsurance.Business
 
         }
 
-        public JObject QueryMappedData(JObject joSqlStr, string desc)
-        {
-            try
-            {
-                InvokeHelper invoker = new InvokeHelper();
-                JObject joRtn = invoker.invokeInsuService(JsonHelper.setIrisInpar("09010081", joSqlStr).ToString(), desc);
-
-                return joRtn;
-            }
-            catch (Exception ex)
-            {
-                return JsonHelper.setExceptionJson(-1, "查询交易日志（冲正）异常：", ex.Message);
-            }
-
-        }
         public JObject ConvertPrescriptionDetail(JObject joInput)
         {
             try

Business/PreAndInProcessAnalysis.cs

@@ -289,12 +289,13 @@ namespace PTMedicalInsurance.Business
                 JObject joInpar = new JObject();
                 string mdtrtID = p.mdtrtID;
                 if (string.IsNullOrEmpty(mdtrtID)) mdtrtID = Global.pat.adm_Dr.ToString();
+                if (string.IsNullOrEmpty(Global.inf.HospitalLevel)) Global.inf.HospitalLevel = "2";
                 joInpar.Add("mdtrt_id", mdtrtID);  //就诊标识
                 joInpar.Add("medins_id", Global.inf.hospitalNO);  //医疗服务机构标识
                 joInpar.Add("medins_name", Global.inf.hospitalName);  //医疗机构名称
                 joInpar.Add("medins_admdvs", Global.inf.areaCode);  //医疗机构行政区划编码
-                joInpar.Add("medins_type", "A512");  //医疗服务机构类型
-                joInpar.Add("medins_lv", Global.inf.hospitalLevel);  //医疗机构等级
+                joInpar.Add("medins_type", "A");  //医疗服务机构类型
+                joInpar.Add("medins_lv", "03");  //医疗机构等级
                 joInpar.Add("wardarea_codg", JsonHelper.getDestValue(jofsi_encounter_dtos, "wardarea_codg"));  //病区标识
                 joInpar.Add("wardno", JsonHelper.getDestValue(jofsi_encounter_dtos, "wardno"));  //病房号
                 joInpar.Add("bedno", JsonHelper.getDestValue(jofsi_encounter_dtos, "bedno"));  //病床号
@@ -302,7 +303,7 @@ namespace PTMedicalInsurance.Business
                 joInpar.Add("dscg_date", JsonHelper.getDestValue(jofsi_encounter_dtos, "dscg_date"));  //出院日期
                 joInpar.Add("dscg_main_dise_codg", JsonHelper.getDestValue(jofsi_encounter_dtos, "dscg_main_dise_codg"));  //主诊断编码
                 joInpar.Add("dscg_main_dise_name", JsonHelper.getDestValue(jofsi_encounter_dtos, "dscg_main_dise_name"));  //主诊断名称
-                joInpar.Add("fsi_diagnose_dtos", GetFsi_diagnose__dtos(trig_scen, p));  //诊断信息DTO
+                joInpar.Add("fsi_diagnose_dtos", GetFsi_diagnose_dtos(trig_scen, p));  //诊断信息DTO
                 joInpar.Add("dr_codg", JsonHelper.getDestValue(jofsi_encounter_dtos, "dr_codg"));  //医师标识
                 joInpar.Add("adm_dept_codg", JsonHelper.getDestValue(jofsi_encounter_dtos, "adm_dept_codg"));  //入院科室标识
                 joInpar.Add("adm_dept_name", JsonHelper.getDestValue(jofsi_encounter_dtos, "adm_dept_name"));  //入院科室名称

Forms/BasicData.resx

@@ -129,9 +129,6 @@
   <metadata name="backgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>499, 17</value>
   </metadata>
-  <metadata name="uiContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1029, 17</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>63</value>
   </metadata>

Forms/Clearing.Designer.cs

@@ -212,10 +212,6 @@
             this.uiContextMenuStrip1 = new Sunny.UI.UIContextMenuStrip();
             this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
-            this.uiLabel20 = new Sunny.UI.UILabel();
-            this.uiLabel21 = new Sunny.UI.UILabel();
-            this.cbConfirmFlag = new Sunny.UI.UIComboBox();
-            this.cbReservelFlag = new Sunny.UI.UIComboBox();
             this.uiTabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             this.uiPanel2.SuspendLayout();
@@ -283,7 +279,7 @@
             this.uiTabControl1.MainPage = "";
             this.uiTabControl1.Name = "uiTabControl1";
             this.uiTabControl1.SelectedIndex = 0;
-            this.uiTabControl1.Size = new System.Drawing.Size(1200, 819);
+            this.uiTabControl1.Size = new System.Drawing.Size(1200, 792);
             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)));
@@ -295,7 +291,7 @@
             this.tabPage1.Controls.Add(this.uiPanel1);
             this.tabPage1.Location = new System.Drawing.Point(0, 30);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Size = new System.Drawing.Size(1200, 789);
+            this.tabPage1.Size = new System.Drawing.Size(1200, 762);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "本地对账";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -310,7 +306,7 @@
             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(972, 789);
+            this.uiPanel2.Size = new System.Drawing.Size(972, 762);
             this.uiPanel2.TabIndex = 3;
             this.uiPanel2.Text = null;
             this.uiPanel2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -329,7 +325,7 @@
             this.uiTabControl3.MainPage = "";
             this.uiTabControl3.Name = "uiTabControl3";
             this.uiTabControl3.SelectedIndex = 0;
-            this.uiTabControl3.Size = new System.Drawing.Size(972, 365);
+            this.uiTabControl3.Size = new System.Drawing.Size(972, 338);
             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)));
@@ -340,7 +336,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(972, 340);
+            this.tabPage6.Size = new System.Drawing.Size(972, 313);
             this.tabPage6.TabIndex = 0;
             this.tabPage6.Text = "HIS结算记录";
             this.tabPage6.UseVisualStyleBackColor = true;
@@ -394,7 +390,7 @@
             this.dgvHisSettlRec.SelectedIndex = -1;
             this.dgvHisSettlRec.ShowGridLine = false;
             this.dgvHisSettlRec.ShowRect = false;
-            this.dgvHisSettlRec.Size = new System.Drawing.Size(972, 340);
+            this.dgvHisSettlRec.Size = new System.Drawing.Size(972, 313);
             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);
@@ -420,7 +416,7 @@
             this.tabPage7.Controls.Add(this.dgvCenterSettlRec);
             this.tabPage7.Location = new System.Drawing.Point(0, 25);
             this.tabPage7.Name = "tabPage7";
-            this.tabPage7.Size = new System.Drawing.Size(972, 313);
+            this.tabPage7.Size = new System.Drawing.Size(972, 228);
             this.tabPage7.TabIndex = 1;
             this.tabPage7.Text = "中心结算记录";
             this.tabPage7.UseVisualStyleBackColor = true;
@@ -472,7 +468,7 @@
             this.dgvCenterSettlRec.SelectedIndex = -1;
             this.dgvCenterSettlRec.ShowGridLine = false;
             this.dgvCenterSettlRec.ShowRect = false;
-            this.dgvCenterSettlRec.Size = new System.Drawing.Size(972, 313);
+            this.dgvCenterSettlRec.Size = new System.Drawing.Size(972, 228);
             this.dgvCenterSettlRec.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
             this.dgvCenterSettlRec.TabIndex = 1;
             this.dgvCenterSettlRec.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -482,7 +478,7 @@
             this.tabPage8.Controls.Add(this.rtbCheckDetailLog);
             this.tabPage8.Location = new System.Drawing.Point(0, 25);
             this.tabPage8.Name = "tabPage8";
-            this.tabPage8.Size = new System.Drawing.Size(972, 313);
+            this.tabPage8.Size = new System.Drawing.Size(972, 228);
             this.tabPage8.TabIndex = 2;
             this.tabPage8.Text = "对明细账结果记录";
             this.tabPage8.UseVisualStyleBackColor = true;
@@ -498,7 +494,7 @@
             this.rtbCheckDetailLog.Name = "rtbCheckDetailLog";
             this.rtbCheckDetailLog.Padding = new System.Windows.Forms.Padding(2);
             this.rtbCheckDetailLog.ShowText = false;
-            this.rtbCheckDetailLog.Size = new System.Drawing.Size(972, 313);
+            this.rtbCheckDetailLog.Size = new System.Drawing.Size(972, 228);
             this.rtbCheckDetailLog.Style = Sunny.UI.UIStyle.Custom;
             this.rtbCheckDetailLog.TabIndex = 0;
             this.rtbCheckDetailLog.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -774,7 +770,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(228, 789);
+            this.uiPanel1.Size = new System.Drawing.Size(228, 762);
             this.uiPanel1.TabIndex = 2;
             this.uiPanel1.Text = null;
             this.uiPanel1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -783,18 +779,14 @@
             // tbTmp
             // 
             this.tbTmp.Dock = System.Windows.Forms.DockStyle.Top;
-            this.tbTmp.Location = new System.Drawing.Point(0, 568);
+            this.tbTmp.Location = new System.Drawing.Point(0, 493);
             this.tbTmp.Name = "tbTmp";
-            this.tbTmp.Size = new System.Drawing.Size(228, 104);
+            this.tbTmp.Size = new System.Drawing.Size(228, 146);
             this.tbTmp.TabIndex = 31;
             this.tbTmp.Text = "";
             // 
             // gbConditionSet
             // 
-            this.gbConditionSet.Controls.Add(this.cbReservelFlag);
-            this.gbConditionSet.Controls.Add(this.cbConfirmFlag);
-            this.gbConditionSet.Controls.Add(this.uiLabel21);
-            this.gbConditionSet.Controls.Add(this.uiLabel20);
             this.gbConditionSet.Controls.Add(this.cbxInterface);
             this.gbConditionSet.Controls.Add(this.tbSettlOption);
             this.gbConditionSet.Controls.Add(this.cbxValid);
@@ -812,7 +804,7 @@
             this.gbConditionSet.MinimumSize = new System.Drawing.Size(1, 1);
             this.gbConditionSet.Name = "gbConditionSet";
             this.gbConditionSet.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.gbConditionSet.Size = new System.Drawing.Size(228, 301);
+            this.gbConditionSet.Size = new System.Drawing.Size(228, 226);
             this.gbConditionSet.TabIndex = 24;
             this.gbConditionSet.TabStop = false;
             this.gbConditionSet.Text = "条件设置";
@@ -1010,7 +1002,7 @@
             this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
             this.uiGroupBox1.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
             this.uiGroupBox1.RectSize = 2;
-            this.uiGroupBox1.Size = new System.Drawing.Size(228, 677);
+            this.uiGroupBox1.Size = new System.Drawing.Size(228, 650);
             this.uiGroupBox1.TabIndex = 22;
             this.uiGroupBox1.Text = null;
             this.uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1023,7 +1015,7 @@
             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, 564);
+            this.uiGroupBox10.Location = new System.Drawing.Point(0, 537);
             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";
@@ -1088,7 +1080,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, 742);
+            this.btnQuerySettlSummary.Location = new System.Drawing.Point(34, 715);
             this.btnQuerySettlSummary.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnQuerySettlSummary.Name = "btnQuerySettlSummary";
             this.btnQuerySettlSummary.Size = new System.Drawing.Size(168, 27);
@@ -1102,7 +1094,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, 851);
+            this.btnClose.Location = new System.Drawing.Point(34, 824);
             this.btnClose.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnClose.Name = "btnClose";
             this.btnClose.Size = new System.Drawing.Size(168, 27);
@@ -1117,7 +1109,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, 802);
+            this.btnBatchCheck.Location = new System.Drawing.Point(34, 775);
             this.btnBatchCheck.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnBatchCheck.Name = "btnBatchCheck";
             this.btnBatchCheck.Size = new System.Drawing.Size(168, 27);
@@ -1218,7 +1210,7 @@
             this.tabPage10.Controls.Add(this.uiPanel6);
             this.tabPage10.Location = new System.Drawing.Point(0, 30);
             this.tabPage10.Name = "tabPage10";
-            this.tabPage10.Size = new System.Drawing.Size(1200, 762);
+            this.tabPage10.Size = new System.Drawing.Size(1200, 677);
             this.tabPage10.TabIndex = 3;
             this.tabPage10.Text = "异地对账";
             this.tabPage10.UseVisualStyleBackColor = true;
@@ -1233,7 +1225,7 @@
             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(983, 762);
+            this.uiPanel7.Size = new System.Drawing.Size(983, 677);
             this.uiPanel7.TabIndex = 4;
             this.uiPanel7.Text = null;
             this.uiPanel7.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1250,7 +1242,7 @@
             this.uiTabControl6.MainPage = "";
             this.uiTabControl6.Name = "uiTabControl6";
             this.uiTabControl6.SelectedIndex = 0;
-            this.uiTabControl6.Size = new System.Drawing.Size(983, 338);
+            this.uiTabControl6.Size = new System.Drawing.Size(983, 253);
             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)));
@@ -1261,7 +1253,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(983, 313);
+            this.tabPage14.Size = new System.Drawing.Size(983, 228);
             this.tabPage14.TabIndex = 2;
             this.tabPage14.Text = "对账结果记录";
             this.tabPage14.UseVisualStyleBackColor = true;
@@ -1277,7 +1269,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(983, 313);
+            this.rtbOthCheckResultRecord.Size = new System.Drawing.Size(983, 228);
             this.rtbOthCheckResultRecord.Style = Sunny.UI.UIStyle.Custom;
             this.rtbOthCheckResultRecord.TabIndex = 0;
             this.rtbOthCheckResultRecord.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1394,7 +1386,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(217, 762);
+            this.uiPanel6.Size = new System.Drawing.Size(217, 677);
             this.uiPanel6.TabIndex = 3;
             this.uiPanel6.Text = null;
             this.uiPanel6.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1551,7 +1543,7 @@
             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, 625);
+            this.uiGroupBox8.Location = new System.Drawing.Point(0, 540);
             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";
@@ -1696,7 +1688,7 @@
             this.tabPage2.Controls.Add(this.uiPanel3);
             this.tabPage2.Location = new System.Drawing.Point(0, 30);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Size = new System.Drawing.Size(1200, 762);
+            this.tabPage2.Size = new System.Drawing.Size(1200, 677);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "清算汇总";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -1711,7 +1703,7 @@
             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(978, 762);
+            this.uiPanel4.Size = new System.Drawing.Size(978, 677);
             this.uiPanel4.TabIndex = 4;
             this.uiPanel4.Text = null;
             this.uiPanel4.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1728,7 +1720,7 @@
             this.uiTabControl4.MainPage = "";
             this.uiTabControl4.Name = "uiTabControl4";
             this.uiTabControl4.SelectedIndex = 0;
-            this.uiTabControl4.Size = new System.Drawing.Size(978, 338);
+            this.uiTabControl4.Size = new System.Drawing.Size(978, 253);
             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)));
@@ -1739,7 +1731,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(978, 313);
+            this.tabPage9.Size = new System.Drawing.Size(978, 228);
             this.tabPage9.TabIndex = 0;
             this.tabPage9.Text = "HIS结算记录";
             this.tabPage9.UseVisualStyleBackColor = true;
@@ -1792,7 +1784,7 @@
             this.dgvHisSettlRec_2.SelectedIndex = -1;
             this.dgvHisSettlRec_2.ShowGridLine = false;
             this.dgvHisSettlRec_2.ShowRect = false;
-            this.dgvHisSettlRec_2.Size = new System.Drawing.Size(978, 313);
+            this.dgvHisSettlRec_2.Size = new System.Drawing.Size(978, 228);
             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);
@@ -1915,7 +1907,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(222, 762);
+            this.uiPanel3.Size = new System.Drawing.Size(222, 677);
             this.uiPanel3.TabIndex = 3;
             this.uiPanel3.Text = null;
             this.uiPanel3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2201,7 +2193,7 @@
             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, 628);
+            this.uiGroupBox3.Location = new System.Drawing.Point(0, 543);
             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";
@@ -2346,7 +2338,7 @@
             this.tabPage3.Controls.Add(this.uiPanel5);
             this.tabPage3.Location = new System.Drawing.Point(0, 30);
             this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(1200, 762);
+            this.tabPage3.Size = new System.Drawing.Size(1200, 677);
             this.tabPage3.TabIndex = 2;
             this.tabPage3.Text = "清算撤销";
             this.tabPage3.UseVisualStyleBackColor = true;
@@ -2398,7 +2390,7 @@
             this.dgvClearingData.SelectedIndex = -1;
             this.dgvClearingData.ShowGridLine = false;
             this.dgvClearingData.ShowRect = false;
-            this.dgvClearingData.Size = new System.Drawing.Size(1200, 655);
+            this.dgvClearingData.Size = new System.Drawing.Size(1200, 570);
             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);
@@ -2413,7 +2405,7 @@
             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, 655);
+            this.uiPanel5.Location = new System.Drawing.Point(0, 570);
             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";
@@ -2648,75 +2640,11 @@
             this.toolStripMenuItem3.Size = new System.Drawing.Size(202, 26);
             this.toolStripMenuItem3.Text = "查看HIS结算记录";
             // 
-            // uiLabel20
-            // 
-            this.uiLabel20.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel20.Location = new System.Drawing.Point(4, 227);
-            this.uiLabel20.Name = "uiLabel20";
-            this.uiLabel20.Size = new System.Drawing.Size(78, 23);
-            this.uiLabel20.TabIndex = 12;
-            this.uiLabel20.Text = "确认标志";
-            this.uiLabel20.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.uiLabel20.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
-            // uiLabel21
-            // 
-            this.uiLabel21.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel21.Location = new System.Drawing.Point(4, 263);
-            this.uiLabel21.Name = "uiLabel21";
-            this.uiLabel21.Size = new System.Drawing.Size(78, 23);
-            this.uiLabel21.TabIndex = 13;
-            this.uiLabel21.Text = "冲正标志";
-            this.uiLabel21.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.uiLabel21.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
-            // cbConfirmFlag
-            // 
-            this.cbConfirmFlag.DataSource = null;
-            this.cbConfirmFlag.FillColor = System.Drawing.Color.White;
-            this.cbConfirmFlag.FilterMaxCount = 50;
-            this.cbConfirmFlag.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbConfirmFlag.ItemHeight = 20;
-            this.cbConfirmFlag.Items.AddRange(new object[] {
-            "全部",
-            "包含已确认",
-            "所有未确认"});
-            this.cbConfirmFlag.Location = new System.Drawing.Point(67, 225);
-            this.cbConfirmFlag.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.cbConfirmFlag.MinimumSize = new System.Drawing.Size(63, 0);
-            this.cbConfirmFlag.Name = "cbConfirmFlag";
-            this.cbConfirmFlag.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
-            this.cbConfirmFlag.Size = new System.Drawing.Size(153, 25);
-            this.cbConfirmFlag.TabIndex = 15;
-            this.cbConfirmFlag.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.cbConfirmFlag.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
-            // cbReservelFlag
-            // 
-            this.cbReservelFlag.DataSource = null;
-            this.cbReservelFlag.FillColor = System.Drawing.Color.White;
-            this.cbReservelFlag.FilterMaxCount = 50;
-            this.cbReservelFlag.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbReservelFlag.ItemHeight = 20;
-            this.cbReservelFlag.Items.AddRange(new object[] {
-            "全部",
-            "已冲正",
-            "未冲正"});
-            this.cbReservelFlag.Location = new System.Drawing.Point(67, 263);
-            this.cbReservelFlag.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.cbReservelFlag.MinimumSize = new System.Drawing.Size(63, 0);
-            this.cbReservelFlag.Name = "cbReservelFlag";
-            this.cbReservelFlag.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
-            this.cbReservelFlag.Size = new System.Drawing.Size(153, 25);
-            this.cbReservelFlag.TabIndex = 17;
-            this.cbReservelFlag.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.cbReservelFlag.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
             // Clearing
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1200, 819);
+            this.ClientSize = new System.Drawing.Size(1200, 792);
             this.Controls.Add(this.uiTabControl1);
             this.Name = "Clearing";
             this.Text = "对账与清算";
@@ -2925,9 +2853,5 @@
         private Sunny.UI.UILabel uiLabel10;
         private System.Windows.Forms.ContextMenuStrip contextTable;
         private System.Windows.Forms.ToolStripMenuItem exportToExcel;
-        private Sunny.UI.UIComboBox cbReservelFlag;
-        private Sunny.UI.UIComboBox cbConfirmFlag;
-        private Sunny.UI.UILabel uiLabel21;
-        private Sunny.UI.UILabel uiLabel20;
     }
 }

Forms/Clearing.cs

@@ -1853,23 +1853,7 @@ namespace PTMedicalInsurance.Forms
                     sqlStr = sqlStr + " and ValidFlag =0 and BillType=-1";
             }
 
-            //确认标志
-            if (cbConfirmFlag.SelectedIndex != 0)
-            {
-                if (cbConfirmFlag.SelectedIndex == 1)
-                    sqlStr = sqlStr + " and ((ConfirmFlag = 1 and AdmType = 3) or (AdmType in ('1','2'))) ";
-                else
-                    sqlStr = sqlStr + " and ConfirmFlag <> 1";
-            }
-
-            // ReversalFlag = 1  表示数据已冲正，ReversalFlag =0 表示 正常未冲正数据
-            if (cbReservelFlag.SelectedIndex != 0)
-            {
-                if (cbReservelFlag.SelectedIndex == 1)
-                    sqlStr = sqlStr + " and ReversalFlag =1 ";
-                else
-                    sqlStr = sqlStr + " and ReversalFlag <> 1 ";
-            }
+            sqlStr = sqlStr + " AND ReversalFlag<>1 ";
 
             //if (Global.inf.interfaceDr == 1)
             //{

InsuBusiness.cs

@@ -998,7 +998,7 @@ namespace PTMedicalInsurance
                             //    rtnResult = JsonHelper.setExceptionJson(-1, "查询结算信息失败！", errMsg).ToString();
                             //    return rtnResult;
                             //}
-                            Global.pat.insuplc_admdvs = JsonHelper.getDestValue(joSettlInfo, "result.data[0].insuplc_admdvs");
+                            Global.pat.insuplc_admdvs = JsonHelper.getDestValue(joSettlInfo, "result.data[0].SpecialType");
 
                             if (JsonHelper.getDestValue(joSettlInfo, "result.data[0].SpecialType") == "GGS")
                             {

Variables/Struct.cs

@@ -38,7 +38,6 @@ namespace PTMedicalInsurance.Variables
         public int hisHospitalDr;
         public int hospitalDr;
         public string hospitalName;
-        public string HospitalLevel;
         public string hospitalNO;
         public string hospitalLevel;
         public string centerURL;