瀏覽代碼

门诊和住院正式结算返回医保钱包支付金额和钱包余额信息保存医保平台结算表

837390164@qq.com 7 月之前
父節點
當前提交
2cf62524f6

+ 14 - 11
Business/HisMainBusiness.cs

@@ -1104,16 +1104,6 @@ namespace PTMedicalInsurance.Business
                     }
                 }
 
-                //DataTable dtSettlWay = (DataTable)frmReg.dblkcbxSettelmentWay.DataSource;
-                //for (int i = 0; i < dtSettlWay.Rows.Count; i++)
-                //{
-                //    if (dtSettlWay.Rows[i]["Code"].ToString() == "01")
-                //    {
-                //        frmReg.dblkcbxSettelmentWay.Text = dtSettlWay.Rows[i]["Name"].ToString();
-                //        frmReg.psn_setlway = dtSettlWay.Rows[i]["Code"].ToString();
-                //    }
-                //}
-
                 DataTable DTdiseCodg = (DataTable)frmReg.dblkcbxDisease.DataSource;
                 for (int i = 0; i < DTdiseCodg.Rows.Count; i++)
                 {
@@ -1271,6 +1261,8 @@ namespace PTMedicalInsurance.Business
                     joSetlInpar.Add("dscgTime", Global.Set.hisDischargeTime);
 
                     joSetlInpar.Add("exp_content", ""); //11111
+                    joSetlInpar.Add("minpacunt_drug_trac_cnt", Global.Set.minpacunt_drug_trac_cnt); //本次结算应上传最小包装追溯码数量
+                    joSetlInpar.Add("mcs_trac_cnt", Global.Set.mcs_trac_cnt); //本次结算应上传耗材追溯码数量
 
                     JObject joOut = new JObject();
                     joOut.Add("DischargeRegister", joRegInpar);
@@ -1447,7 +1439,10 @@ namespace PTMedicalInsurance.Business
                     joSetlInpar.Add("acct_used_flag", frmReg.personAccountUsedFlag);//个人账户使用标志
                     joSetlInpar.Add("insutype", frmReg.insuType);//险种类型
                     joSetlInpar.Add("pub_hosp_rfom_flag", "");
-                    joSetlInpar.Add("exp_content", "");          
+                    joSetlInpar.Add("exp_content", "");
+
+                    joSetlInpar.Add("minpacunt_drug_trac_cnt", Global.Set.minpacunt_drug_trac_cnt); //本次结算应上传最小包装追溯码数量
+                    joSetlInpar.Add("mcs_trac_cnt", Global.Set.mcs_trac_cnt); //本次结算应上传耗材追溯码数量
 
                     joReg.Add("mdtrtinfo", joMdtrtinfo);
                     joReg.Add("diseinfo", jaDiagnoses);
@@ -1913,6 +1908,10 @@ namespace PTMedicalInsurance.Business
                         pat.adm_Dr = int.Parse(JsonHelper.getDestValue(joInparam, "params[0].admID"));
                         pat.recordID = JsonHelper.getDestValue(joInparam, "params[0].recordID");
                         pat.billID = JsonHelper.getDestValue(joInparam, "params[0].billID");
+
+                        Global.Set.minpacunt_drug_trac_cnt = JsonHelper.getDestValue(joInparam, "insuAdmObj.minpacunt_drug_trac_cnt");
+                        Global.Set.mcs_trac_cnt = JsonHelper.getDestValue(joInparam, "insuAdmObj.mcs_trac_cnt");
+
                         Global.pat.insuplc_admdvs = "";
                         if (string.IsNullOrEmpty(JsonHelper.getDestValue(joInparam, "insuAdmObj.inDays")))
                         {
@@ -2043,6 +2042,10 @@ namespace PTMedicalInsurance.Business
                         pat.name = JsonHelper.getDestValue(joInparam, "insuAdmObj.psn_name");
                         pat.billID = JsonHelper.getDestValue(joInparam, "params[0].billID");
                         Global.Set.hisDischargeTime = Convert.ToDateTime(JsonHelper.getDestValue(joInparam, "insuAdmObj.disDateTime")).ToString("yyyy-MM-dd HH:mm:ss");
+
+                        Global.Set.minpacunt_drug_trac_cnt = JsonHelper.getDestValue(joInparam, "insuAdmObj.minpacunt_drug_trac_cnt");
+                        Global.Set.mcs_trac_cnt = JsonHelper.getDestValue(joInparam, "insuAdmObj.mcs_trac_cnt");
+
                         if (string.IsNullOrEmpty(JsonHelper.getDestValue(joInparam, "insuAdmObj.inDays")))
                         {
                             Global.Set.hospitalizationsDays = 0;

+ 7 - 3
Business/IrisServices.cs

@@ -1573,7 +1573,9 @@ namespace PTMedicalInsurance.Business
             string errMsg = "";
             try
             {
-                JObject joSetlinfo = JObject.Parse(JsonHelper.getDestValue(joSettlement, "output.setlinfo"));
+                JObject joSetlinfo = JObject.Parse(JsonHelper.getDestValue(joSettlement, "output.setlinfo"));                           
+                joSetlinfo.Add("HospitalDr", Global.inf.hospitalDr);
+                joSetlinfo.Add("HospitalDr", Global.inf.hospitalDr);
                 joSetlinfo.Add("HospitalDr", Global.inf.hospitalDr);
                 joSetlinfo.Add("admID", Global.pat.adm_Dr);
                 joSetlinfo.Add("ValidFlag", 1);
@@ -1586,14 +1588,16 @@ namespace PTMedicalInsurance.Business
                 joSetlinfo.Add("interfaceDr", Global.inf.interfaceDr);
                 joSetlinfo.Add("admType", Global.pat.admType);
                 joSetlinfo.Add("insuplc_admdvs", Global.pat.insuplc_admdvs);
-
                 joSetlinfo.Add("HospitalizationsDays", Global.Set.hospitalizationsDays);
                 joSetlinfo.Add("HospitalizationsTimes", Global.Set.hospitalizationsTimes);
                 joSetlinfo.Add("HISAdmTime", Global.Set.hisAdmTime);
                 joSetlinfo.Add("HISDischargeTime", Global.Set.hisDischargeTime);
 
-                JObject joRtn = invoker.invokeInsuService(JsonHelper.setIrisInpar("09010051", joSetlinfo).ToString(), "插入结算信息");
+                JObject joExpContent = JObject.Parse(joSetlinfo["exp_content"].ToString());
+                joSetlinfo.Add("medIns_wallet_balance", JsonHelper.getDestValue(joExpContent, "medIns_wallet_balance")); //医保钱包余额
+                joSetlinfo.Add("medIns_wallet_pay", JsonHelper.getDestValue(joExpContent, "medIns_wallet_pay")); //医保钱包支付金额
 
+                JObject joRtn = invoker.invokeInsuService(JsonHelper.setIrisInpar("09010051", joSetlinfo).ToString(), "插入结算信息");
                 if (JsonHelper.parseIrisRtnValue(joRtn, out errMsg) != 0)
                 {
                     outParam = errMsg;

+ 11 - 2
Forms/ChooseCard.cs

@@ -59,7 +59,6 @@ namespace PTMedicalInsurance.Forms
             //电子凭证 
             if (rbgMdtrtCertType.SelectedIndex == 0)
             {
-
                 sL_CertCodeType= "01" + cbYMYWLX.Text.Trim().Substring(0,3);            //用码业务类型                
 
                 if (tbName.Text == "")
@@ -131,7 +130,7 @@ namespace PTMedicalInsurance.Forms
             {
                 rbgEcCertDecodeType.SelectedIndex = 0;
                 uiLabel4.Text = "凭证令牌";
-                rbgEcCertDecodeType.Enabled = false;
+                rbgEcCertDecodeType.Enabled = true;
                 cbYMYWLX.Enabled = true;
 
                 uiLabel3.Visible = true;
@@ -154,6 +153,16 @@ namespace PTMedicalInsurance.Forms
                 rbgEcCertDecodeType.Enabled = false;
                 cbYMYWLX.Enabled = false;
 
+                uiLabel3.Visible = false;
+                cbYMYWLX.Visible = false;
+            }
+            else if (rbgMdtrtCertType.SelectedIndex == 3)
+            {
+                uiLabel4.Text = "社保卡号";
+                cbCardType.SelectedIndex = 0;
+                rbgEcCertDecodeType.Enabled = false;
+                cbYMYWLX.Enabled = false;
+
                 uiLabel3.Visible = false;
                 cbYMYWLX.Visible = false;
             }

+ 5 - 4
Forms/ChooseCard.designer.cs

@@ -58,14 +58,15 @@
             // 
             // rbgMdtrtCertType
             // 
-            this.rbgMdtrtCertType.ColumnCount = 3;
+            this.rbgMdtrtCertType.ColumnCount = 4;
             this.rbgMdtrtCertType.Dock = System.Windows.Forms.DockStyle.Top;
             this.rbgMdtrtCertType.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.rbgMdtrtCertType.Items.AddRange(new object[] {
-            "电子凭证",
+            "医保电子凭证",
             "身份证",
-            "社保卡"});
-            this.rbgMdtrtCertType.ItemSize = new System.Drawing.Size(180, 35);
+            "社会保障卡",
+            "电子社保卡"});
+            this.rbgMdtrtCertType.ItemSize = new System.Drawing.Size(125, 35);
             this.rbgMdtrtCertType.Location = new System.Drawing.Point(0, 0);
             this.rbgMdtrtCertType.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.rbgMdtrtCertType.MinimumSize = new System.Drawing.Size(1, 1);

+ 3 - 9
Forms/OutpatientRegistration.cs

@@ -147,7 +147,7 @@ namespace PTMedicalInsurance.Forms
             //string insuranceTypeRtn = iris.Invoke(insuranceTypeParam);
             //dynamic insuranceTypeRtnRtnJson = JsonConvert.DeserializeObject(insuranceTypeRtn);
             //dtInsuranceType = (DataTable)insuranceTypeRtnRtnJson.ToObject(typeof(DataTable));
-            cbxAccountPay.Checked = true;
+            rbg_AccUseFalg.SelectedIndex = 1;
             personAccountUsedFlag = "1";
         }
 
@@ -229,6 +229,8 @@ namespace PTMedicalInsurance.Forms
         private void button1_Click(object sender, EventArgs e)
         {
             //DealFor2001("");
+            personAccountUsedFlag = rbg_AccUseFalg.SelectedIndex.ToString();
+
             this.DialogResult = DialogResult.OK;
         }
 
@@ -293,14 +295,6 @@ namespace PTMedicalInsurance.Forms
 
         private void cbxAccountPay_ValueChanged(object sender, bool value)
         {
-            if (cbxAccountPay.Checked)
-            {
-                personAccountUsedFlag = "1";
-            }
-            else
-            {
-                personAccountUsedFlag = "0";
-            }
         }
 
         public int DealFor2001(string funNO, out string OutMsg)

+ 44 - 38
Forms/OutpatientRegistration.designer.cs

@@ -30,8 +30,9 @@ namespace PTMedicalInsurance.Forms
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.rbg_AccUseFalg = new Sunny.UI.UIRadioButtonGroup();
             this.dblkcbxDiseaseType = new PTControl.DBLookupCombox();
             this.dblkcbxSettelmentWay = new PTControl.DBLookupCombox();
             this.dblkcbxOperation = new PTControl.DBLookupCombox();
@@ -58,7 +59,6 @@ namespace PTMedicalInsurance.Forms
             this.diag_time = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel3 = new System.Windows.Forms.Panel();
             this.uiButton1 = new Sunny.UI.UIButton();
-            this.cbxAccountPay = new Sunny.UI.UICheckBox();
             this.button2 = new System.Windows.Forms.Button();
             this.button1 = new System.Windows.Forms.Button();
             this.panel1.SuspendLayout();
@@ -70,6 +70,7 @@ namespace PTMedicalInsurance.Forms
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.SystemColors.Window;
+            this.panel1.Controls.Add(this.rbg_AccUseFalg);
             this.panel1.Controls.Add(this.dblkcbxDiseaseType);
             this.panel1.Controls.Add(this.dblkcbxSettelmentWay);
             this.panel1.Controls.Add(this.dblkcbxOperation);
@@ -89,10 +90,31 @@ namespace PTMedicalInsurance.Forms
             this.panel1.Size = new System.Drawing.Size(1197, 190);
             this.panel1.TabIndex = 12;
             // 
+            // rbg_AccUseFalg
+            // 
+            this.rbg_AccUseFalg.Dock = System.Windows.Forms.DockStyle.Right;
+            this.rbg_AccUseFalg.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.rbg_AccUseFalg.Items.AddRange(new object[] {
+            "0-不使用",
+            "1-使用",
+            "2-钱包支付",
+            "3-钱包个人账户都使用"});
+            this.rbg_AccUseFalg.ItemSize = new System.Drawing.Size(200, 40);
+            this.rbg_AccUseFalg.Location = new System.Drawing.Point(955, 0);
+            this.rbg_AccUseFalg.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.rbg_AccUseFalg.MinimumSize = new System.Drawing.Size(1, 1);
+            this.rbg_AccUseFalg.Name = "rbg_AccUseFalg";
+            this.rbg_AccUseFalg.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
+            this.rbg_AccUseFalg.Size = new System.Drawing.Size(242, 190);
+            this.rbg_AccUseFalg.TabIndex = 24;
+            this.rbg_AccUseFalg.Text = "医保个人账户使用标志";
+            this.rbg_AccUseFalg.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.rbg_AccUseFalg.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
             // dblkcbxDiseaseType
             // 
             this.dblkcbxDiseaseType.FormattingEnabled = true;
-            this.dblkcbxDiseaseType.Location = new System.Drawing.Point(733, 138);
+            this.dblkcbxDiseaseType.Location = new System.Drawing.Point(624, 139);
             this.dblkcbxDiseaseType.Name = "dblkcbxDiseaseType";
             this.dblkcbxDiseaseType.NullValue = "";
             this.dblkcbxDiseaseType.PopupGridAutoSize = false;
@@ -110,7 +132,7 @@ namespace PTMedicalInsurance.Forms
             // dblkcbxSettelmentWay
             // 
             this.dblkcbxSettelmentWay.FormattingEnabled = true;
-            this.dblkcbxSettelmentWay.Location = new System.Drawing.Point(274, 138);
+            this.dblkcbxSettelmentWay.Location = new System.Drawing.Point(184, 139);
             this.dblkcbxSettelmentWay.Name = "dblkcbxSettelmentWay";
             this.dblkcbxSettelmentWay.NullValue = "";
             this.dblkcbxSettelmentWay.PopupGridAutoSize = false;
@@ -128,7 +150,7 @@ namespace PTMedicalInsurance.Forms
             // dblkcbxOperation
             // 
             this.dblkcbxOperation.FormattingEnabled = true;
-            this.dblkcbxOperation.Location = new System.Drawing.Point(733, 83);
+            this.dblkcbxOperation.Location = new System.Drawing.Point(624, 84);
             this.dblkcbxOperation.Name = "dblkcbxOperation";
             this.dblkcbxOperation.NullValue = "";
             this.dblkcbxOperation.PopupGridAutoSize = false;
@@ -146,7 +168,7 @@ namespace PTMedicalInsurance.Forms
             // dblkcbxDisease
             // 
             this.dblkcbxDisease.FormattingEnabled = true;
-            this.dblkcbxDisease.Location = new System.Drawing.Point(274, 83);
+            this.dblkcbxDisease.Location = new System.Drawing.Point(184, 84);
             this.dblkcbxDisease.Name = "dblkcbxDisease";
             this.dblkcbxDisease.NullValue = "";
             this.dblkcbxDisease.PopupGridAutoSize = false;
@@ -164,7 +186,7 @@ namespace PTMedicalInsurance.Forms
             // dblkcbxMedicalType
             // 
             this.dblkcbxMedicalType.FormattingEnabled = true;
-            this.dblkcbxMedicalType.Location = new System.Drawing.Point(733, 28);
+            this.dblkcbxMedicalType.Location = new System.Drawing.Point(624, 29);
             this.dblkcbxMedicalType.Name = "dblkcbxMedicalType";
             this.dblkcbxMedicalType.NullValue = "";
             this.dblkcbxMedicalType.PopupGridAutoSize = false;
@@ -182,7 +204,7 @@ namespace PTMedicalInsurance.Forms
             // dblkcbxInsuranceType
             // 
             this.dblkcbxInsuranceType.FormattingEnabled = true;
-            this.dblkcbxInsuranceType.Location = new System.Drawing.Point(274, 28);
+            this.dblkcbxInsuranceType.Location = new System.Drawing.Point(184, 29);
             this.dblkcbxInsuranceType.Name = "dblkcbxInsuranceType";
             this.dblkcbxInsuranceType.NullValue = "";
             this.dblkcbxInsuranceType.PopupGridAutoSize = false;
@@ -201,7 +223,7 @@ namespace PTMedicalInsurance.Forms
             // 
             this.label6.AutoSize = true;
             this.label6.ForeColor = System.Drawing.SystemColors.InfoText;
-            this.label6.Location = new System.Drawing.Point(637, 141);
+            this.label6.Location = new System.Drawing.Point(528, 142);
             this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(71, 15);
@@ -212,7 +234,7 @@ namespace PTMedicalInsurance.Forms
             // 
             this.label5.AutoSize = true;
             this.label5.ForeColor = System.Drawing.SystemColors.InfoText;
-            this.label5.Location = new System.Drawing.Point(637, 86);
+            this.label5.Location = new System.Drawing.Point(528, 87);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(71, 15);
@@ -223,7 +245,7 @@ namespace PTMedicalInsurance.Forms
             // 
             this.label4.AutoSize = true;
             this.label4.ForeColor = System.Drawing.SystemColors.InfoText;
-            this.label4.Location = new System.Drawing.Point(637, 31);
+            this.label4.Location = new System.Drawing.Point(528, 32);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(71, 15);
@@ -234,7 +256,7 @@ namespace PTMedicalInsurance.Forms
             // 
             this.label3.AutoSize = true;
             this.label3.ForeColor = System.Drawing.SystemColors.InfoText;
-            this.label3.Location = new System.Drawing.Point(178, 141);
+            this.label3.Location = new System.Drawing.Point(88, 142);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(71, 15);
@@ -245,7 +267,7 @@ namespace PTMedicalInsurance.Forms
             // 
             this.label2.AutoSize = true;
             this.label2.ForeColor = System.Drawing.SystemColors.InfoText;
-            this.label2.Location = new System.Drawing.Point(178, 86);
+            this.label2.Location = new System.Drawing.Point(88, 87);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(71, 15);
@@ -256,7 +278,7 @@ namespace PTMedicalInsurance.Forms
             // 
             this.label1.AutoSize = true;
             this.label1.ForeColor = System.Drawing.SystemColors.InfoText;
-            this.label1.Location = new System.Drawing.Point(178, 31);
+            this.label1.Location = new System.Drawing.Point(88, 32);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(71, 15);
@@ -276,13 +298,13 @@ namespace PTMedicalInsurance.Forms
             // 
             this.dgvDiagnose.AllowUserToAddRows = false;
             this.dgvDiagnose.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.ButtonShadow;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("新宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDiagnose.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.ButtonShadow;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("新宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDiagnose.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
             this.dgvDiagnose.ColumnHeadersHeight = 40;
             this.dgvDiagnose.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvDiagnose.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -398,7 +420,6 @@ namespace PTMedicalInsurance.Forms
             // 
             this.panel3.BackColor = System.Drawing.SystemColors.Window;
             this.panel3.Controls.Add(this.uiButton1);
-            this.panel3.Controls.Add(this.cbxAccountPay);
             this.panel3.Controls.Add(this.button2);
             this.panel3.Controls.Add(this.button1);
             this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;
@@ -422,21 +443,6 @@ namespace PTMedicalInsurance.Forms
             this.uiButton1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             this.uiButton1.Click += new System.EventHandler(this.uiButton1_Click);
             // 
-            // cbxAccountPay
-            // 
-            this.cbxAccountPay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.cbxAccountPay.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.cbxAccountPay.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbxAccountPay.Location = new System.Drawing.Point(274, 21);
-            this.cbxAccountPay.MinimumSize = new System.Drawing.Size(1, 1);
-            this.cbxAccountPay.Name = "cbxAccountPay";
-            this.cbxAccountPay.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0);
-            this.cbxAccountPay.Size = new System.Drawing.Size(207, 29);
-            this.cbxAccountPay.TabIndex = 2;
-            this.cbxAccountPay.Text = "使用医保账户支付";
-            this.cbxAccountPay.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            this.cbxAccountPay.ValueChanged += new Sunny.UI.UICheckBox.OnValueChanged(this.cbxAccountPay_ValueChanged);
-            // 
             // button2
             // 
             this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@@ -517,7 +523,6 @@ namespace PTMedicalInsurance.Forms
         private System.Windows.Forms.Button button2;
         private System.Windows.Forms.Button button1;
         private System.Windows.Forms.DataGridView dgvDiagnose;
-        private Sunny.UI.UICheckBox cbxAccountPay;
         private Sunny.UI.UIButton uiButton1;
         public PTControl.DBLookupCombox dblkcbxDisease;
         private System.Windows.Forms.DataGridViewTextBoxColumn diag_type_name;
@@ -530,5 +535,6 @@ namespace PTMedicalInsurance.Forms
         private System.Windows.Forms.DataGridViewTextBoxColumn dise_dor_no;
         private System.Windows.Forms.DataGridViewTextBoxColumn dise_dor_name;
         private System.Windows.Forms.DataGridViewTextBoxColumn diag_time;
+        private Sunny.UI.UIRadioButtonGroup rbg_AccUseFalg;
     }
 }

+ 0 - 63
Forms/OutpatientRegistration.resx

@@ -117,51 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="panel1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dblkcbxDiseaseType.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dblkcbxSettelmentWay.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dblkcbxOperation.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dblkcbxDisease.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dblkcbxMedicalType.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dblkcbxInsuranceType.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="label6.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="label5.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="label4.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="label3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="label2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="label1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="panel2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dgvDiagnose.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="diag_type_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -192,22 +147,4 @@
   <metadata name="diag_time.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="panel3.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="uiButton1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="cbxAccountPay.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="button2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="button1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

+ 5 - 1
Forms/SettlementInfo.cs

@@ -10,6 +10,7 @@ using System.Windows.Forms;
 using Newtonsoft.Json.Linq;
 using PTMedicalInsurance.Variables;
 using PTMedicalInsurance.Business;
+using PTMedicalInsurance.Helper;
 
 namespace PTMedicalInsurance.Forms
 {
@@ -81,10 +82,13 @@ namespace PTMedicalInsurance.Forms
             this.tbCommercialReimamt.Text = joSettlmentInfo["commercial_reimamt"].ToString();
             this.tbCommercialRenflag.Text = joSettlmentInfo["commercial_renflag"].ToString();
 
+            JObject joExpContent = JObject.Parse(joSettlmentInfo["exp_content"].ToString());
+            tbMedInsWalletBalance.Text = JsonHelper.getDestValue(joExpContent, "medIns_wallet_balance");
+            tbMedInsWalletPay.Text = JsonHelper.getDestValue(joExpContent, "medIns_wallet_pay");
+
             Global.Set.acctPay = joSettlmentInfo["acct_pay"].ToString();
             setDgvSettlDetailHeader();
             dgvSetlDetail.DataSource = dtSettlmentDetail;           
-
         }
 
         private void AddDGVColumn(DataGridView dgv, string headerText, string dataPropertyName, int width = 120)

+ 165 - 72
Forms/SettlementInfo.designer.cs

@@ -43,17 +43,19 @@ namespace PTMedicalInsurance.Forms
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
             this.pnlBottom = new Sunny.UI.UIPanel();
             this.uiButton2 = new Sunny.UI.UIButton();
             this.uiButton1 = new Sunny.UI.UIButton();
             this.pnlClient = new Sunny.UI.UIPanel();
             this.gbSetlinfo = new Sunny.UI.UIGroupBox();
             this.pnlPayInfo = new Sunny.UI.UIPanel();
+            this.tbHifdmPay = new Sunny.UI.UITextBox();
+            this.uiLabel33 = new Sunny.UI.UILabel();
             this.tbCommercialReimamt = new Sunny.UI.UITextBox();
             this.uiLabel32 = new Sunny.UI.UILabel();
             this.tbCommercialRenflag = new Sunny.UI.UITextBox();
@@ -120,6 +122,10 @@ namespace PTMedicalInsurance.Forms
             this.uiLabel30 = new Sunny.UI.UILabel();
             this.gbSetldetail = new Sunny.UI.UIGroupBox();
             this.dgvSetlDetail = new Sunny.UI.UIDataGridView();
+            this.tbMedInsWalletPay = new Sunny.UI.UITextBox();
+            this.uiLabel34 = new Sunny.UI.UILabel();
+            this.tbMedInsWalletBalance = new Sunny.UI.UITextBox();
+            this.uiLabel35 = new Sunny.UI.UILabel();
             this.pnlBottom.SuspendLayout();
             this.pnlClient.SuspendLayout();
             this.gbSetlinfo.SuspendLayout();
@@ -135,7 +141,7 @@ namespace PTMedicalInsurance.Forms
             this.pnlBottom.Controls.Add(this.uiButton1);
             this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.pnlBottom.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pnlBottom.Location = new System.Drawing.Point(0, 544);
+            this.pnlBottom.Location = new System.Drawing.Point(0, 575);
             this.pnlBottom.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pnlBottom.MinimumSize = new System.Drawing.Size(1, 1);
             this.pnlBottom.Name = "pnlBottom";
@@ -150,12 +156,12 @@ namespace PTMedicalInsurance.Forms
             this.uiButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.uiButton2.Cursor = System.Windows.Forms.Cursors.Hand;
             this.uiButton2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton2.Location = new System.Drawing.Point(878, 16);
+            this.uiButton2.Location = new System.Drawing.Point(873, 6);
             this.uiButton2.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiButton2.Name = "uiButton2";
-            this.uiButton2.Size = new System.Drawing.Size(100, 38);
+            this.uiButton2.Size = new System.Drawing.Size(107, 52);
             this.uiButton2.TabIndex = 1;
-            this.uiButton2.Text = "放弃";
+            this.uiButton2.Text = "放  弃";
             this.uiButton2.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiButton2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             this.uiButton2.Click += new System.EventHandler(this.uiButton2_Click);
@@ -165,12 +171,12 @@ namespace PTMedicalInsurance.Forms
             this.uiButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.uiButton1.Cursor = System.Windows.Forms.Cursors.Hand;
             this.uiButton1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton1.Location = new System.Drawing.Point(753, 16);
+            this.uiButton1.Location = new System.Drawing.Point(757, 6);
             this.uiButton1.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiButton1.Name = "uiButton1";
-            this.uiButton1.Size = new System.Drawing.Size(100, 38);
+            this.uiButton1.Size = new System.Drawing.Size(107, 52);
             this.uiButton1.TabIndex = 0;
-            this.uiButton1.Text = "结算";
+            this.uiButton1.Text = "结  算";
             this.uiButton1.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiButton1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             this.uiButton1.Click += new System.EventHandler(this.uiButton1_Click);
@@ -185,7 +191,7 @@ namespace PTMedicalInsurance.Forms
             this.pnlClient.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pnlClient.MinimumSize = new System.Drawing.Size(1, 1);
             this.pnlClient.Name = "pnlClient";
-            this.pnlClient.Size = new System.Drawing.Size(988, 544);
+            this.pnlClient.Size = new System.Drawing.Size(988, 575);
             this.pnlClient.TabIndex = 1;
             this.pnlClient.Text = null;
             this.pnlClient.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -203,7 +209,7 @@ namespace PTMedicalInsurance.Forms
             this.gbSetlinfo.MinimumSize = new System.Drawing.Size(1, 1);
             this.gbSetlinfo.Name = "gbSetlinfo";
             this.gbSetlinfo.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.gbSetlinfo.Size = new System.Drawing.Size(988, 392);
+            this.gbSetlinfo.Size = new System.Drawing.Size(988, 437);
             this.gbSetlinfo.TabIndex = 2;
             this.gbSetlinfo.Text = "结算信息";
             this.gbSetlinfo.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -211,6 +217,12 @@ namespace PTMedicalInsurance.Forms
             // 
             // pnlPayInfo
             // 
+            this.pnlPayInfo.Controls.Add(this.tbMedInsWalletPay);
+            this.pnlPayInfo.Controls.Add(this.uiLabel34);
+            this.pnlPayInfo.Controls.Add(this.tbMedInsWalletBalance);
+            this.pnlPayInfo.Controls.Add(this.uiLabel35);
+            this.pnlPayInfo.Controls.Add(this.tbHifdmPay);
+            this.pnlPayInfo.Controls.Add(this.uiLabel33);
             this.pnlPayInfo.Controls.Add(this.tbCommercialReimamt);
             this.pnlPayInfo.Controls.Add(this.uiLabel32);
             this.pnlPayInfo.Controls.Add(this.tbCommercialRenflag);
@@ -263,12 +275,37 @@ namespace PTMedicalInsurance.Forms
             this.pnlPayInfo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pnlPayInfo.MinimumSize = new System.Drawing.Size(1, 1);
             this.pnlPayInfo.Name = "pnlPayInfo";
-            this.pnlPayInfo.Size = new System.Drawing.Size(988, 271);
+            this.pnlPayInfo.Size = new System.Drawing.Size(988, 316);
             this.pnlPayInfo.TabIndex = 1;
             this.pnlPayInfo.Text = null;
             this.pnlPayInfo.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.pnlPayInfo.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
+            // tbHifdmPay
+            // 
+            this.tbHifdmPay.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.tbHifdmPay.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbHifdmPay.Location = new System.Drawing.Point(877, 228);
+            this.tbHifdmPay.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbHifdmPay.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbHifdmPay.Name = "tbHifdmPay";
+            this.tbHifdmPay.ShowText = false;
+            this.tbHifdmPay.Size = new System.Drawing.Size(100, 27);
+            this.tbHifdmPay.TabIndex = 47;
+            this.tbHifdmPay.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.tbHifdmPay.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // uiLabel33
+            // 
+            this.uiLabel33.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel33.Location = new System.Drawing.Point(735, 228);
+            this.uiLabel33.Name = "uiLabel33";
+            this.uiLabel33.Size = new System.Drawing.Size(139, 23);
+            this.uiLabel33.TabIndex = 46;
+            this.uiLabel33.Text = "伤残人员医保基金支出";
+            this.uiLabel33.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.uiLabel33.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
             // tbCommercialReimamt
             // 
             this.tbCommercialReimamt.Cursor = System.Windows.Forms.Cursors.IBeam;
@@ -286,7 +323,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel32
             // 
             this.uiLabel32.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel32.Location = new System.Drawing.Point(501, 223);
+            this.uiLabel32.Location = new System.Drawing.Point(502, 228);
             this.uiLabel32.Name = "uiLabel32";
             this.uiLabel32.Size = new System.Drawing.Size(100, 23);
             this.uiLabel32.TabIndex = 44;
@@ -311,7 +348,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel31
             // 
             this.uiLabel31.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel31.Location = new System.Drawing.Point(253, 223);
+            this.uiLabel31.Location = new System.Drawing.Point(253, 228);
             this.uiLabel31.Name = "uiLabel31";
             this.uiLabel31.Size = new System.Drawing.Size(100, 23);
             this.uiLabel31.TabIndex = 42;
@@ -336,7 +373,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel22
             // 
             this.uiLabel22.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel22.Location = new System.Drawing.Point(730, 107);
+            this.uiLabel22.Location = new System.Drawing.Point(735, 105);
             this.uiLabel22.Name = "uiLabel22";
             this.uiLabel22.Size = new System.Drawing.Size(112, 23);
             this.uiLabel22.TabIndex = 40;
@@ -375,7 +412,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel23
             // 
             this.uiLabel23.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel23.Location = new System.Drawing.Point(730, 65);
+            this.uiLabel23.Location = new System.Drawing.Point(735, 64);
             this.uiLabel23.Name = "uiLabel23";
             this.uiLabel23.Size = new System.Drawing.Size(112, 23);
             this.uiLabel23.TabIndex = 37;
@@ -386,7 +423,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel24
             // 
             this.uiLabel24.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel24.Location = new System.Drawing.Point(730, 23);
+            this.uiLabel24.Location = new System.Drawing.Point(735, 23);
             this.uiLabel24.Name = "uiLabel24";
             this.uiLabel24.Size = new System.Drawing.Size(112, 23);
             this.uiLabel24.TabIndex = 36;
@@ -411,7 +448,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel13
             // 
             this.uiLabel13.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel13.Location = new System.Drawing.Point(502, 181);
+            this.uiLabel13.Location = new System.Drawing.Point(502, 187);
             this.uiLabel13.Name = "uiLabel13";
             this.uiLabel13.Size = new System.Drawing.Size(100, 23);
             this.uiLabel13.TabIndex = 34;
@@ -450,7 +487,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel14
             // 
             this.uiLabel14.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel14.Location = new System.Drawing.Point(502, 142);
+            this.uiLabel14.Location = new System.Drawing.Point(502, 146);
             this.uiLabel14.Name = "uiLabel14";
             this.uiLabel14.Size = new System.Drawing.Size(100, 23);
             this.uiLabel14.TabIndex = 31;
@@ -461,7 +498,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel15
             // 
             this.uiLabel15.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel15.Location = new System.Drawing.Point(502, 103);
+            this.uiLabel15.Location = new System.Drawing.Point(502, 105);
             this.uiLabel15.Name = "uiLabel15";
             this.uiLabel15.Size = new System.Drawing.Size(100, 23);
             this.uiLabel15.TabIndex = 30;
@@ -536,7 +573,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel18
             // 
             this.uiLabel18.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel18.Location = new System.Drawing.Point(502, 25);
+            this.uiLabel18.Location = new System.Drawing.Point(502, 23);
             this.uiLabel18.Name = "uiLabel18";
             this.uiLabel18.Size = new System.Drawing.Size(100, 23);
             this.uiLabel18.TabIndex = 24;
@@ -561,7 +598,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel7
             // 
             this.uiLabel7.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel7.Location = new System.Drawing.Point(253, 181);
+            this.uiLabel7.Location = new System.Drawing.Point(253, 187);
             this.uiLabel7.Name = "uiLabel7";
             this.uiLabel7.Size = new System.Drawing.Size(100, 23);
             this.uiLabel7.TabIndex = 22;
@@ -600,7 +637,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel8
             // 
             this.uiLabel8.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel8.Location = new System.Drawing.Point(253, 142);
+            this.uiLabel8.Location = new System.Drawing.Point(253, 146);
             this.uiLabel8.Name = "uiLabel8";
             this.uiLabel8.Size = new System.Drawing.Size(100, 23);
             this.uiLabel8.TabIndex = 19;
@@ -611,7 +648,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel9
             // 
             this.uiLabel9.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel9.Location = new System.Drawing.Point(253, 103);
+            this.uiLabel9.Location = new System.Drawing.Point(253, 105);
             this.uiLabel9.Name = "uiLabel9";
             this.uiLabel9.Size = new System.Drawing.Size(100, 23);
             this.uiLabel9.TabIndex = 18;
@@ -675,9 +712,9 @@ namespace PTMedicalInsurance.Forms
             // uiLabel11
             // 
             this.uiLabel11.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel11.Location = new System.Drawing.Point(730, 149);
+            this.uiLabel11.Location = new System.Drawing.Point(735, 146);
             this.uiLabel11.Name = "uiLabel11";
-            this.uiLabel11.Size = new System.Drawing.Size(146, 23);
+            this.uiLabel11.Size = new System.Drawing.Size(139, 23);
             this.uiLabel11.TabIndex = 13;
             this.uiLabel11.Text = "统筹基金支付比例";
             this.uiLabel11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -686,7 +723,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel12
             // 
             this.uiLabel12.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel12.Location = new System.Drawing.Point(253, 25);
+            this.uiLabel12.Location = new System.Drawing.Point(253, 23);
             this.uiLabel12.Name = "uiLabel12";
             this.uiLabel12.Size = new System.Drawing.Size(100, 23);
             this.uiLabel12.TabIndex = 12;
@@ -711,7 +748,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel4
             // 
             this.uiLabel4.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel4.Location = new System.Drawing.Point(21, 223);
+            this.uiLabel4.Location = new System.Drawing.Point(21, 228);
             this.uiLabel4.Name = "uiLabel4";
             this.uiLabel4.Size = new System.Drawing.Size(100, 23);
             this.uiLabel4.TabIndex = 10;
@@ -750,9 +787,9 @@ namespace PTMedicalInsurance.Forms
             // uiLabel5
             // 
             this.uiLabel5.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel5.Location = new System.Drawing.Point(730, 191);
+            this.uiLabel5.Location = new System.Drawing.Point(735, 187);
             this.uiLabel5.Name = "uiLabel5";
-            this.uiLabel5.Size = new System.Drawing.Size(146, 23);
+            this.uiLabel5.Size = new System.Drawing.Size(139, 23);
             this.uiLabel5.TabIndex = 7;
             this.uiLabel5.Text = "符合政策范围金额";
             this.uiLabel5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -761,7 +798,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel6
             // 
             this.uiLabel6.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel6.Location = new System.Drawing.Point(21, 143);
+            this.uiLabel6.Location = new System.Drawing.Point(21, 146);
             this.uiLabel6.Name = "uiLabel6";
             this.uiLabel6.Size = new System.Drawing.Size(100, 23);
             this.uiLabel6.TabIndex = 6;
@@ -786,7 +823,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel3
             // 
             this.uiLabel3.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel3.Location = new System.Drawing.Point(21, 103);
+            this.uiLabel3.Location = new System.Drawing.Point(21, 105);
             this.uiLabel3.Name = "uiLabel3";
             this.uiLabel3.Size = new System.Drawing.Size(100, 23);
             this.uiLabel3.TabIndex = 4;
@@ -825,7 +862,7 @@ namespace PTMedicalInsurance.Forms
             // uiLabel2
             // 
             this.uiLabel2.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiLabel2.Location = new System.Drawing.Point(21, 63);
+            this.uiLabel2.Location = new System.Drawing.Point(21, 64);
             this.uiLabel2.Name = "uiLabel2";
             this.uiLabel2.Size = new System.Drawing.Size(100, 23);
             this.uiLabel2.TabIndex = 1;
@@ -1090,12 +1127,12 @@ namespace PTMedicalInsurance.Forms
             this.gbSetldetail.Controls.Add(this.dgvSetlDetail);
             this.gbSetldetail.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.gbSetldetail.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.gbSetldetail.Location = new System.Drawing.Point(0, 392);
+            this.gbSetldetail.Location = new System.Drawing.Point(0, 437);
             this.gbSetldetail.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.gbSetldetail.MinimumSize = new System.Drawing.Size(1, 1);
             this.gbSetldetail.Name = "gbSetldetail";
             this.gbSetldetail.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.gbSetldetail.Size = new System.Drawing.Size(988, 152);
+            this.gbSetldetail.Size = new System.Drawing.Size(988, 138);
             this.gbSetldetail.TabIndex = 1;
             this.gbSetldetail.Text = "结算基金分项信息";
             this.gbSetldetail.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1104,59 +1141,109 @@ namespace PTMedicalInsurance.Forms
             // dgvSetlDetail
             // 
             this.dgvSetlDetail.AllowUserToAddRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
-            this.dgvSetlDetail.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
+            this.dgvSetlDetail.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
             this.dgvSetlDetail.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
             this.dgvSetlDetail.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvSetlDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvSetlDetail.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
             this.dgvSetlDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvSetlDetail.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle8.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvSetlDetail.DefaultCellStyle = dataGridViewCellStyle8;
             this.dgvSetlDetail.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvSetlDetail.EnableHeadersVisualStyles = false;
             this.dgvSetlDetail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvSetlDetail.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(104)))), ((int)(((byte)(173)))), ((int)(((byte)(255)))));
             this.dgvSetlDetail.Location = new System.Drawing.Point(0, 32);
             this.dgvSetlDetail.Name = "dgvSetlDetail";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvSetlDetail.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvSetlDetail.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;
             this.dgvSetlDetail.RowHeadersWidth = 51;
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.dgvSetlDetail.RowsDefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle10.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.dgvSetlDetail.RowsDefaultCellStyle = dataGridViewCellStyle10;
             this.dgvSetlDetail.RowTemplate.Height = 23;
             this.dgvSetlDetail.SelectedIndex = -1;
-            this.dgvSetlDetail.Size = new System.Drawing.Size(988, 120);
+            this.dgvSetlDetail.Size = new System.Drawing.Size(988, 106);
             this.dgvSetlDetail.TabIndex = 1;
             this.dgvSetlDetail.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
+            // tbMedInsWalletPay
+            // 
+            this.tbMedInsWalletPay.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.tbMedInsWalletPay.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbMedInsWalletPay.Location = new System.Drawing.Point(361, 266);
+            this.tbMedInsWalletPay.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbMedInsWalletPay.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbMedInsWalletPay.Name = "tbMedInsWalletPay";
+            this.tbMedInsWalletPay.ShowText = false;
+            this.tbMedInsWalletPay.Size = new System.Drawing.Size(100, 29);
+            this.tbMedInsWalletPay.TabIndex = 51;
+            this.tbMedInsWalletPay.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.tbMedInsWalletPay.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // uiLabel34
+            // 
+            this.uiLabel34.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel34.Location = new System.Drawing.Point(253, 270);
+            this.uiLabel34.Name = "uiLabel34";
+            this.uiLabel34.Size = new System.Drawing.Size(100, 23);
+            this.uiLabel34.TabIndex = 50;
+            this.uiLabel34.Text = "钱包支付金额";
+            this.uiLabel34.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.uiLabel34.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // tbMedInsWalletBalance
+            // 
+            this.tbMedInsWalletBalance.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.tbMedInsWalletBalance.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbMedInsWalletBalance.Location = new System.Drawing.Point(128, 266);
+            this.tbMedInsWalletBalance.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbMedInsWalletBalance.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbMedInsWalletBalance.Name = "tbMedInsWalletBalance";
+            this.tbMedInsWalletBalance.ShowText = false;
+            this.tbMedInsWalletBalance.Size = new System.Drawing.Size(100, 29);
+            this.tbMedInsWalletBalance.TabIndex = 49;
+            this.tbMedInsWalletBalance.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.tbMedInsWalletBalance.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // uiLabel35
+            // 
+            this.uiLabel35.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel35.Location = new System.Drawing.Point(21, 270);
+            this.uiLabel35.Name = "uiLabel35";
+            this.uiLabel35.Size = new System.Drawing.Size(100, 23);
+            this.uiLabel35.TabIndex = 48;
+            this.uiLabel35.Text = "钱包余额";
+            this.uiLabel35.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.uiLabel35.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
             // SettlementInfo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(988, 609);
+            this.ClientSize = new System.Drawing.Size(988, 640);
             this.Controls.Add(this.pnlClient);
             this.Controls.Add(this.pnlBottom);
             this.Name = "SettlementInfo";
@@ -1247,5 +1334,11 @@ namespace PTMedicalInsurance.Forms
         private Sunny.UI.UILabel uiLabel32;
         private Sunny.UI.UITextBox tbCommercialRenflag;
         private Sunny.UI.UILabel uiLabel31;
+        private Sunny.UI.UITextBox tbHifdmPay;
+        private Sunny.UI.UILabel uiLabel33;
+        private Sunny.UI.UITextBox tbMedInsWalletPay;
+        private Sunny.UI.UILabel uiLabel34;
+        private Sunny.UI.UITextBox tbMedInsWalletBalance;
+        private Sunny.UI.UILabel uiLabel35;
     }
 }

+ 4 - 4
Helper/JsonHelper.cs

@@ -167,7 +167,7 @@ namespace PTMedicalInsurance.Helper
                 Global.pat.insuplc_admdvs = "";
 
             Jo.insuplc_admdvs = Global.pat.insuplc_admdvs;
-            Jo.mdtrtarea_admvs = "610199";   //陕西 市医保、省内异地、跨省异地就医地都传419900
+            Jo.mdtrtarea_admvs = "610199";   //陕西 市医保、省内异地、跨省异地就医地都传619900
             Global.pat.mdtrtarea_admvs = "610199";
             Jo.recer_sys_code = "XiAn";
             Jo.dev_no = Global.curEvt.mac;
@@ -270,7 +270,7 @@ namespace PTMedicalInsurance.Helper
 
             if (Global.inf.areaCode == "")
             {
-                Global.inf.areaCode = "610100";
+                Global.inf.areaCode = "610199";
             }
 
             if (Global.pat.insuplc_admdvs == "")
@@ -279,8 +279,8 @@ namespace PTMedicalInsurance.Helper
             }          
 
             Jo.insuplc_admdvs = Global.pat.insuplc_admdvs;
-            Jo.mdtrtarea_admvs = "610100";   //郑州 市医保、省内异地、跨省异地就医地都传419900  
-            Global.pat.mdtrtarea_admvs = "610100";
+            Jo.mdtrtarea_admvs = "610199"; 
+            Global.pat.mdtrtarea_admvs = "610199";
             Jo.recer_sys_code = "XiAn";
             Jo.dev_no = Global.curEvt.mac;
             Jo.dev_safe_info = Global.inf.dev_safe_info; //设备编号

+ 3 - 0
Variables/Struct.cs

@@ -262,6 +262,9 @@ namespace PTMedicalInsurance.Variables
         public int confirmFlag; //确认标志
         public string onlineYBFalg; //线上线下标志  Y  N
         public string payOrdId; //订单编号
+
+        public string minpacunt_drug_trac_cnt; //本次结算应上传最小包装追溯码数量
+        public string mcs_trac_cnt; //本次结算应上传耗材追溯码数量
     }
 
     //当前环境实时信息