Browse Source

更新门诊医保钱包支付结算入参

837390164@qq.com 2 weeks ago
parent
commit
73392ad225

+ 4 - 0
Business/HisMainBusiness.cs

@@ -131,6 +131,10 @@ namespace PTMedicalInsurance.Business
             inf.ecURL = JsonHelper.getDestValue(joCenterURL2, "core.ecURL");
             inf.cardURL = JsonHelper.getDestValue(joCenterURL2, "core.cardURL");
 
+            //西安医保移动支付测试环境
+            //Global.inf.mobilePayURL = @"http://10.37.128.40:8086";
+            //西安医保移动支付正式环境
+            //Global.inf.mobilePayURL = @"http://10.37.128.41:8086";
             inf.MobilePay.url = JsonHelper.getDestValue(joCenterURL2, "mobilePay.url");
             inf.MobilePay.appid = JsonHelper.getDestValue(joCenterURL2, "mobilePay.appid");
             inf.MobilePay.secretKey = JsonHelper.getDestValue(joCenterURL2, "mobilePay.secretKey");

+ 1 - 3
Business/IrisServices.cs

@@ -1573,9 +1573,7 @@ namespace PTMedicalInsurance.Business
             string errMsg = "";
             try
             {
-                JObject joSetlinfo = JObject.Parse(JsonHelper.getDestValue(joSettlement, "output.setlinfo"));                           
-                joSetlinfo.Add("HospitalDr", Global.inf.hospitalDr);
-                joSetlinfo.Add("HospitalDr", Global.inf.hospitalDr);
+                JObject joSetlinfo = JObject.Parse(JsonHelper.getDestValue(joSettlement, "output.setlinfo"));                                  
                 joSetlinfo.Add("HospitalDr", Global.inf.hospitalDr);
                 joSetlinfo.Add("admID", Global.pat.adm_Dr);
                 joSetlinfo.Add("ValidFlag", 1);

+ 3 - 3
Business/MobilePay.cs

@@ -770,8 +770,8 @@ namespace PTMedicalInsurance.Business
                     ((JObject)jaFeedetailList[i]).Property("prdDays").Remove();
                     ((JObject)jaFeedetailList[i]).Property("medcWayDscr").Remove();
 
-                    //((JObject)jaFeedetailList[i]).Property("bilgDeptCodg").Remove();
-                    jaFeedetailList[i]["bilgDeptCodg"] = "100106";
+                    ((JObject)jaFeedetailList[i]).Property("bilgDeptCodg").Remove();
+                    //jaFeedetailList[i]["bilgDeptCodg"] = "100106";
 
                     ((JObject)jaFeedetailList[i]).Property("acordDeptCodg").Remove();
                     ((JObject)jaFeedetailList[i]).Property("acordDeptName").Remove();
@@ -815,7 +815,7 @@ namespace PTMedicalInsurance.Business
                 joInpar.Add("iptOtpNo", JsonHelper.getDestValue(joMdtrtinfo, "ipt_no"));//住院/门诊号
                 joInpar.Add("atddrNo", JsonHelper.getDestValue(joMdtrtinfo, "atddr_no"));//医师编码
                 joInpar.Add("drName", JsonHelper.getDestValue(joMdtrtinfo, "chfpdr_name"));//医师姓名
-                joInpar.Add("deptCode","100106" );//科室编码 JsonHelper.getDestValue(joMdtrtinfo, "adm_dept_codg")
+                joInpar.Add("deptCode", JsonHelper.getDestValue(joMdtrtinfo, "adm_dept_codg"));//科室编码100106 
                 joInpar.Add("deptName", JsonHelper.getDestValue(joMdtrtinfo, "adm_dept_name"));//科室名称
                 joInpar.Add("caty", "A10");//科别
                 joInpar.Add("mdtrtId", JsonHelper.getDestValue(joMdtrtinfo, "mdtrtId"));//就诊ID

+ 64 - 0
FormSetter/GridViewSetter.cs

@@ -828,6 +828,7 @@ namespace PTMedicalInsurance.FormSetter
             AddDGVColumn(dgv, "截止时间", "Enddate");
             AddDGVColumn(dgv, "有效标志", "ValidFlag");
             AddDGVColumn(dgv, "经办人", "Operator");
+            AddDGVColumn(dgv, "交易码", "InsuBusinessID");
         }
 
         /// <summary>
@@ -848,6 +849,69 @@ namespace PTMedicalInsurance.FormSetter
             AddDGVColumn(dgv, "结算流水号", "SettlementID", 200);
         }
 
+        /// <summary>
+        /// 设置即时结算申请查询列标题
+        /// </summary>
+        public void SetHeaderTextOfQueryClearApply(DataGridView dgv)
+        {
+            dgv.AutoGenerateColumns = false;
+            dgv.Columns.Clear();
+            AddDGVColumn(dgv, "机构费用清算 ID", "fee_clr_id", 120);
+            AddDGVColumn(dgv, "机构清算申请事件 ID", "clr_appy_evt_id", 200);
+            AddDGVColumn(dgv, "定点医药机构编号", "fixmedins_code", 180);
+            AddDGVColumn(dgv, "定点医药机构名称", "fixmedins_name", 200);
+            AddDGVColumn(dgv, "定点医疗服务机构类型", "fixmedins_type", 200);
+            AddDGVColumn(dgv, "定点归属医保区划", "fix_blng_admdvs", 300);
+            AddDGVColumn(dgv, "财务经办机构", "fin_optins", 100);
+            AddDGVColumn(dgv, "清算经办机构", "clr_optins", 200);
+            AddDGVColumn(dgv, "险种类型", "insutype", 200);
+            AddDGVColumn(dgv, "清算类别", "clr_type", 200);
+            AddDGVColumn(dgv, "清算类别二级分类", "clr_type_lv2", 200);
+            AddDGVColumn(dgv, "清算年月", "clr_ym", 200);
+            AddDGVColumn(dgv, "清算人次", "clr_psntime", 200);
+            AddDGVColumn(dgv, "医疗费总额", "medfee_sumamt", 200);
+            AddDGVColumn(dgv, "医保认可费用总额", "hi_agre_sumfee", 200);
+            AddDGVColumn(dgv, "基金申报总额", "fund_appy_sum", 200);
+            AddDGVColumn(dgv, "应拨付金额", "dfr_amt", 200);
+            AddDGVColumn(dgv, "扣款总金额", "det_sumamt", 200);
+            AddDGVColumn(dgv, "预留保证金总额", "dpst_sumamt", 200);
+            AddDGVColumn(dgv, "总控扣款总金额", "Sumamt_det_sumamt", 200);
+            AddDGVColumn(dgv, "实际拨付金额", "act_dfr_amt", 200);
+            AddDGVColumn(dgv, "现金支付金额", "cash_payamt", 200);
+            AddDGVColumn(dgv, "个人账户支出", "acct_pay", 200);
+            AddDGVColumn(dgv, "开始日期", "begndate", 200);
+            AddDGVColumn(dgv, "结束日期", "enddate", 200);
+            AddDGVColumn(dgv, "有效标志", "vali_flag", 200);
+            AddDGVColumn(dgv, "数据唯一记录号", "rid", 200);
+            AddDGVColumn(dgv, "数据更新时间", "updt_time", 200);
+            AddDGVColumn(dgv, "创建人 ID", "crter_id", 200);
+            AddDGVColumn(dgv, "创建人姓名", "crter_name", 200);
+            AddDGVColumn(dgv, "数据创建时间", "crte_time", 200);
+            AddDGVColumn(dgv, "创建机构编号", "crte_optins_no", 200);
+            AddDGVColumn(dgv, "经办人ID", "opter_id", 200);
+            AddDGVColumn(dgv, "经办人姓名", "opter_name", 200);
+            AddDGVColumn(dgv, "经办时间", "opt_time", 200);
+            AddDGVColumn(dgv, "经办机构编号", "optins_no", 200);
+            AddDGVColumn(dgv, "统筹区编号", "poolarea_no", 200);
+            AddDGVColumn(dgv, "清算状态", "clr_stas", 200);
+            AddDGVColumn(dgv, "复核状态", "rchk_flag", 200);
+            AddDGVColumn(dgv, "周期类型", "cycl_type", 200);
+            AddDGVColumn(dgv, "周期段", "cycl_seg", 200);
+        }
+
+        /// <summary>
+        /// 即时结算模式查询
+        /// </summary>
+        /// <param name="dgv"></param>
+        public void SetHeaderTextOfClearMode(DataGridView dgv)
+        {
+            dgv.AutoGenerateColumns = false;
+            dgv.Columns.Clear();
+            AddDGVColumn(dgv, "定点医疗归属地区划", "admdvs", 80);
+            AddDGVColumn(dgv, "清算年月", "clr_ym", 200);
+            AddDGVColumn(dgv, "周期类型", "cycl_type", 200);
+        }
+
         /// <summary>
         /// 设置HIS结算明细标题
         /// </summary>

File diff suppressed because it is too large
+ 308 - 246
Forms/Clearing.Designer.cs


+ 278 - 33
Forms/Clearing.cs

@@ -29,12 +29,13 @@ namespace PTMedicalInsurance.Forms
         private UIDataGridViewFooter dgvHisSettlRecFooter = new Sunny.UI.UIDataGridViewFooter();
         JObject jo9102Rtn = new JObject();
 
+        InvokeHelper invoker = new InvokeHelper();
+
         public Clearing()
         {
             InitializeComponent();
 
             this.StartPosition = FormStartPosition.CenterParent;
-
         }
 
         private void Clearing_Load(object sender, EventArgs e)
@@ -59,6 +60,12 @@ namespace PTMedicalInsurance.Forms
             grdSetter.SetHeaderTextOfClearingData(dgvClearingData);
             grdSetter.SetHeaderTextOfOthPlcCheck(dgvOthCheck);
 
+            grdSetter.SetHeaderTextOfQueryClearApply(dgv_2804_A);
+            grdSetter.SetHeaderTextOfClearMode(dgv_2803_A);
+
+            grdSetter.DatagridviewColumnWidthAdaptation(dgv_2804_A);
+            grdSetter.DatagridviewColumnWidthAdaptation(dgv_2803_A);
+
             cbgGroupSet.SelectAll();
             cbgGroupSet.SetItemCheckState(4, false);
 
@@ -358,6 +365,7 @@ namespace PTMedicalInsurance.Forms
                 joTmp.Add("OthPlcFlag", 0);
                 joTmp.Add("ValidFlag", 1);
                 joTmp.Add("Operator", "0");
+                joTmp.Add("InsuBusinessID", "2701_A");
 
                 JArray jaParam = new JArray();
                 jaParam.Add(joTmp);
@@ -379,6 +387,93 @@ namespace PTMedicalInsurance.Forms
             }
         }
 
+        private int Clearing_2801_A(out string error)
+        {
+            error = "";
+            DataTable dt = (DataTable)dgvClearingSum.DataSource;
+            int i = dgvClearingSum.CurrentRow.Index;
+            dynamic joClearing = new JObject();
+
+            //双定点必须分开申请,通过报文头中insuplc_admdvs参保地行政区划区分。比如郑州省直双定点,向郑州申请时insuplc_admdvs传410100,向省直申请时insuplc_admdvs传419900。
+            //异地申请:清算类别传9909,报文头中参保地行政区划省内传410000,跨省不需要清算申请
+
+            Global.pat.insuplc_admdvs = dt.Rows[i]["clr_optins"].ToString();
+
+            //清算类别
+            if (dt.Rows[i]["clr_optins"].ToString() == "610000")
+                joClearing.clr_type = "9909";
+            else
+                joClearing.clr_type = dt.Rows[i]["clr_type"].ToString();
+
+            joClearing.clr_way = dt.Rows[i]["clr_way"].ToString(); //清算方式
+            joClearing.clr_type_lv2 = "";  //二级清算类别
+            joClearing.begndate = dpST_2.Value.ToString("yyyy-MM-dd"); //开始日期
+            joClearing.enddate = dpED_2.Value.ToString("yyyy-MM-dd");  //结束日期
+            joClearing.clr_optins = dt.Rows[i]["clr_optins"].ToString(); //清算经办机构
+            joClearing.setlym = dpST_2.Value.ToString("yyyyMM");  //即时结算年月
+            joClearing.psntime = dt.Rows[i]["psntime"].ToString(); //即时结算人次
+            joClearing.medfee_sumamt = dt.Rows[i]["medfee_sumamt"].ToString(); //医疗费总额
+            joClearing.med_sumfee = dt.Rows[i]["med_sumfee"].ToString();  //医保认可费用总额
+            joClearing.fund_appy_sum = dt.Rows[i]["fund_appy_sum"].ToString();  //基金申报总额
+
+            //先签到
+            //CenterBusiness cBus = new CenterBusiness();
+            //JObject jo9001Rtn = new JObject();
+            //cBus.signIn(out jo9001Rtn);
+
+            JObject joData = new JObject();
+            joData.Add("data", joClearing);
+         
+            string input = JsonHelper.setCenterInpar("2801_A", joData.ToString());
+            JObject joRtn = invoker.invokeCenterService("2801_A", input);
+            if (JsonHelper.parseCenterReturnJson(joRtn, out error) != 0)
+            {
+                return -1;
+            }
+            else
+            {
+                //保存到医保平台
+                JObject joTmp = new JObject();
+                joTmp.Add("HospitalDr", Global.inf.hospitalDr);
+                joTmp.Add("InterfaceDr", Global.inf.interfaceDr);
+                joTmp.Add("ApplyID", JsonHelper.getDestValue(joRtn, "output.result.clr_appy_evt_id"));
+                joTmp.Add("OccurTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                joTmp.Add("ClrWay", dt.Rows[i]["clr_way"].ToString());
+                joTmp.Add("ClrType", dt.Rows[i]["clr_type"].ToString());
+                joTmp.Add("ClearYearMonth", dpST_2.Value.ToString("yyyyMM"));
+                joTmp.Add("PersonTime", dt.Rows[i]["psntime"].ToString());
+                joTmp.Add("Sumamt", dt.Rows[i]["med_sumfee"].ToString());
+                joTmp.Add("MedAcceptSumamt", dt.Rows[i]["med_sumfee"].ToString());
+                joTmp.Add("FundPay", dt.Rows[i]["fund_appy_sum"].ToString());
+                joTmp.Add("CashPay", dt.Rows[i]["cash_payamt"].ToString());
+                joTmp.Add("AccountPay", dt.Rows[i]["acct_pay"].ToString());
+                joTmp.Add("Begndate", dpST_2.Value.ToString("yyyy-MM-dd 00:00:00"));
+                joTmp.Add("Enddate", dpED_2.Value.ToString("yyyy-MM-dd 23:59:59"));
+                joTmp.Add("OthPlcFlag", 0);
+                joTmp.Add("ValidFlag", 1);
+                joTmp.Add("Operator", "0");
+                joTmp.Add("InsuBusinessID", "2801_A");
+
+                JArray jaParam = new JArray();
+                jaParam.Add(joTmp);
+                JObject joUpdate = new JObject();
+                joUpdate.Add("params", jaParam);
+                joUpdate.Add("updateUserID", "0");
+                joUpdate.Add("HospitalDr", Global.inf.hospitalDr);
+                joUpdate.Add("InterfaceDr", Global.inf.interfaceDr);
+                joUpdate.Add("code", "09010067");
+                invoker = new InvokeHelper();
+                joRtn = invoker.invokeInsuService(joUpdate.ToString(), "插入即时结算(2801_A)记录");
+
+                if (JsonHelper.parseIrisRtnValue(joRtn, out error) != 0)
+                {
+                    return -1;
+                }
+                else
+                    return 0;
+            }
+        }
+
         private int OthPlcClearing_Single(out string error)
         {
             if (tbInsuPlc.Text != "")
@@ -455,7 +550,6 @@ namespace PTMedicalInsurance.Forms
 
         private int CancleClearing_Single(out string error)
         {
-
             error = "";
             DataTable dt = (DataTable)dgvClearingData.DataSource;
             int i = dgvClearingData.CurrentRow.Index;
@@ -520,6 +614,60 @@ namespace PTMedicalInsurance.Forms
             }
         }
 
+        private int CancleClearing_2802_A(out string error)
+        {
+            error = "";
+            DataTable dt = (DataTable)dgvClearingData.DataSource;
+            int i = dgvClearingData.CurrentRow.Index;
+
+            dynamic joCancleClearing = new JObject();
+            joCancleClearing.clr_appy_evt_id = dt.Rows[i]["ApplyID"].ToString();
+
+            JObject joData = new JObject();
+            joData.Add("data", joCancleClearing);
+            //上传给中心
+            //先签到
+            CenterBusiness cBus = new CenterBusiness();
+            JObject jo9001Rtn = new JObject();
+            cBus.signIn(out jo9001Rtn);
+
+            InvokeHelper invoker = new InvokeHelper();
+            JObject joRtn = invoker.invokeCenterService("2802_A", joData.ToString());
+            if (JsonHelper.parseCenterReturnJson(joRtn, out error) != 0)
+            {
+                return -1;
+            }
+            else
+            {
+                //保存到医保平台
+                JObject joTmp = new JObject();
+                joTmp.Add("HospitalDr", Global.inf.hospitalDr);
+                joTmp.Add("InterfaceDr", Global.inf.interfaceDr);
+                joTmp.Add("ApplyID", dt.Rows[i]["ApplyID"].ToString());
+                joTmp.Add("ClrType", dt.Rows[i]["ClrType"].ToString());
+                joTmp.Add("ValidFlag", -1);
+                joTmp.Add("updateUserID", "0");
+   
+                JArray jaParam = new JArray();
+                jaParam.Add(joTmp);
+                JObject joUpdate = new JObject();
+                joUpdate.Add("params", jaParam);
+                joUpdate.Add("updateUserID", "0");
+                joUpdate.Add("HospitalDr", Global.inf.hospitalDr);
+                joUpdate.Add("InterfaceDr", Global.inf.interfaceDr);
+                joUpdate.Add("code", "09010067");
+                invoker = new InvokeHelper();
+                joRtn = invoker.invokeInsuService(joUpdate.ToString(), "更新即时结算记录");
+
+                if (JsonHelper.parseIrisRtnValue(joRtn, out error) != 0)
+                {
+                    return -1;
+                }
+                else
+                    return 0;
+            }
+        }
+
         private int CancleOthPlcClearing_Single(out string error)
         {
 
@@ -1279,7 +1427,6 @@ namespace PTMedicalInsurance.Forms
                 outParam = "CheckDetail_Single:" + ex.Message;
                 return -1;
             }
-
         }
 
         private void dgvRowStateChanged(object sender, DataGridViewRowStateChangedEventArgs e)
@@ -1461,7 +1608,6 @@ namespace PTMedicalInsurance.Forms
             dgvClearingSum.DataSource = dt;
         }
 
-
         private void tmsClearing_2_Click(object sender, EventArgs e)
         {
             string error = "";
@@ -1487,7 +1633,6 @@ namespace PTMedicalInsurance.Forms
                     MessageBox.Show("清算成功");
                 }
             }
-
         }
 
         private void btnClose_3_Click(object sender, EventArgs e)
@@ -1500,7 +1645,7 @@ namespace PTMedicalInsurance.Forms
             DataTable dtInteface = (DataTable)cbInterface_3.DataSource;
             int i = cbInterface_3.SelectedIndex;
 
-            string sqlStr = "SELECT * from  BS_MedInsuClearingRecord where Hosp_Dr=" + dtInteface.Rows[i]["HospitalDr"].ToString(); ;
+            string sqlStr = "SELECT * from BS_MedInsuClearingRecord where Hosp_Dr=" + dtInteface.Rows[i]["HospitalDr"].ToString(); ;
             sqlStr = sqlStr + " and interface_Dr =" + dtInteface.Rows[i]["ID"].ToString();
             if (rbgTimeWay.SelectedIndex == 0)
             {
@@ -1538,27 +1683,23 @@ namespace PTMedicalInsurance.Forms
         private void btnCancleClearing_Click(object sender, EventArgs e)
         {
             string error = "";
-            if (1 == 1)
+            DataTable dt = (DataTable)dgvClearingSum.DataSource;
+            int i = dgvClearingSum.CurrentRow.Index;
+            string FunNo = dt.Rows[i]["InsuBusinessID"].ToString(); //交易码
+
+            if (FunNo == "2801_A")
             {
-                if (CancleClearing_Single(out error) != 0)
-                {
-                    MessageBox.Show("撤销清算失败:" + error);
-                }
+                if (CancleClearing_2802_A(out error) != 0)
+                    MessageBox.Show("撤销即时结算申报失败:" + error);
                 else
-                {
-                    MessageBox.Show("撤销清算成功");
-                }
+                    MessageBox.Show("撤销即时结算申报成功");
             }
             else
             {
-                if (CancleOthPlcClearing_Single(out error) != 0)
-                {
-                    MessageBox.Show("异地撤销清算失败:" + error);
-                }
+                if (CancleClearing_Single(out error) != 0)
+                    MessageBox.Show("撤销清算失败:" + error);
                 else
-                {
-                    MessageBox.Show("异地撤销清算成功");
-                }
+                    MessageBox.Show("撤销清算成功");
             }
         }
 
@@ -1869,44 +2010,148 @@ namespace PTMedicalInsurance.Forms
 
         }
 
-        private void uiButton1_Click_1(object sender, EventArgs e)
+        private void btnBatchCheck_Click(object sender, EventArgs e)
         {
 
         }
 
-        private void btnBatchCheck_Click(object sender, EventArgs e)
+        private void cmsClearing_Opening(object sender, CancelEventArgs e)
         {
 
         }
 
-        private void btnPatchClr_Click(object sender, EventArgs e)
+        private void dgvSettlSummary_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
         {
-
+            string error;
+            if (queryHisSettlementInfo(out error) != 0)
+            {
+                MessageBox.Show(error);
+            }
         }
 
-        private void cmsClearing_Opening(object sender, CancelEventArgs e)
+        private void tms_Clearing2801A_Click(object sender, EventArgs e)
         {
+            string error = "";
+            if (Clearing_2801_A(out error) != 0)
+            {
+                MessageBox.Show("即时结算失败:" + error);
+            }
+            else
+            {
+                MessageBox.Show("即时结算成功");
+            }
+        }
 
+        private void rbg_QueryType_ValueChanged(object sender, int index, string text)
+        {
+            if (index == 0)
+                tbQueryData.SelectedIndex = 0;
+            else
+                tbQueryData.SelectedIndex = 1;
         }
 
-        private void dgvSettlSummary_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
+        /// <summary>
+        /// 即时结算模式查询
+        /// </summary>
+        /// <param name="error"></param>
+        /// <returns></returns>
+        private int Query_2803_A(out JObject joRtn,out string error)
         {
-            string error;
-            if (queryHisSettlementInfo(out error) != 0)
+            error = "";
+
+            dynamic joClearing = new JObject();
+            joClearing.admdvs = tb_Admdvs.Text; //清算经办机构
+            joClearing.clr_ym = dt_DateYM.Value.ToString("yyyyMM");  //即时结算年月
+
+            //先签到
+            //CenterBusiness cBus = new CenterBusiness();
+            //JObject jo9001Rtn = new JObject();
+            //cBus.signIn(out jo9001Rtn);
+
+            JObject joData = new JObject();
+            joData.Add("data", joClearing);
+
+            string input = JsonHelper.setCenterInpar("2803_A", joData.ToString());
+            joRtn = invoker.invokeCenterService("2803_A", input);
+            if (JsonHelper.parseCenterReturnJson(joRtn, out error) != 0)
             {
-                MessageBox.Show(error);
+                return -1;
             }
+
+            return 0;
         }
 
-        private void btnQueryClrSum_Click_1(object sender, EventArgs e)
+        /// <summary>
+        /// 即时结算申请查询
+        /// </summary>
+        /// <param name="error"></param>
+        /// <returns></returns>
+        private int Query_2804_A(out JObject joRtn,out string error)
         {
-          
+            error = "";
+
+            dynamic joClearing = new JObject();
+            joClearing.clr_stas = ""; //清算状态
+            joClearing.clr_type = "";  //清算类别
+
+            joClearing.clr_way = cbb_ClrWay.Text.Substring(0, 2);  //清算方式
+
+            joClearing.clr_type_lv2 = "";  //二级清算类别
+            joClearing.clr_optins = tb_Admdvs.Text; //清算经办机构
 
+            joClearing.clr_ym = dt_DateYM.Value.ToString("yyyyMM"); ;  //清算年月
+
+            joClearing.page_num = "1"; //当前页数
+            joClearing.page_size = "100";  //每页显示数量
+
+            //先签到
+            //CenterBusiness cBus = new CenterBusiness();
+            //JObject jo9001Rtn = new JObject();
+            //cBus.signIn(out jo9001Rtn);
+
+            JObject joData = new JObject();
+            joData.Add("data", joClearing);
+
+            string input = JsonHelper.setCenterInpar("2804_A", joData.ToString());
+            joRtn = invoker.invokeCenterService("2804_A", input);
+            if (JsonHelper.parseCenterReturnJson(joRtn, out error) != 0)
+            {
+                return -1;
+            }
+
+            return 0;        
         }
 
-        private void toolStripMenuItem2_Click(object sender, EventArgs e)
+        private void btbQuery_Click(object sender, EventArgs e)
         {
 
+
+            string error = "";
+            JObject joRtn = new JObject();
+            if (rbg_QueryType.SelectedIndex == 0)
+            {
+                if (Query_2803_A(out joRtn, out error) != 0)
+                    MessageBox.Show("即时结算模式查询失败:" + error);
+                else
+                {
+                    DataTable dt = (DataTable)joRtn["output"]["data"].ToObject(typeof(DataTable));
+                    dgv_2803_A.DataSource = dt;
+
+                    MessageBox.Show("即时结算模式查询成功");
+                }                
+            }
+            else
+            {
+                if (Query_2804_A(out joRtn, out error) != 0)
+                    MessageBox.Show("即时结算申请查询失败:" + error);
+                else
+                {
+                    DataTable dt = (DataTable)joRtn["output"]["data"].ToObject(typeof(DataTable));
+                    dgv_2804_A.DataSource = dt;
+
+                    MessageBox.Show("即时结算申请查询成功");
+                }          
+            }
         }
     }
 }

+ 1 - 1
Forms/Clearing.resx

@@ -139,6 +139,6 @@
     <value>408, 25</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>38</value>
+    <value>70</value>
   </metadata>
 </root>

+ 7 - 2
Helper/InvokeHelper.cs

@@ -732,10 +732,14 @@ namespace PTMedicalInsurance.Helper
                         break;
                 }
                 EncryptHelper encrypt = new EncryptHelper();
+
+                Global.inf.mobilePayURL = Global.inf.MobilePay.url;
+
                 //西安医保移动支付测试环境
-                Global.inf.mobilePayURL = @"http://10.37.128.40:8086";
+                //Global.inf.mobilePayURL = @"http://10.37.128.40:8086";
                 //西安医保移动支付正式环境
                 //Global.inf.mobilePayURL = @"http://10.37.128.41:8086";
+
                 string data = JsonHelper.setMPCenterInpar(funNO, joInput);
                 // 移动支付地址
                 Global.curEvt.URL = Global.inf.mobilePayURL + url;
@@ -785,12 +789,13 @@ namespace PTMedicalInsurance.Helper
                         }
                         else
                         {
+                            joRtn = JObject.Parse(decData);
+                            joRtn.Add("success", "False");
                             Global.writeLog("验签失败,请核查!");
                         }
                     }
 
                     return joRtn;
-
                 }
                 finally
                 {

Some files were not shown because too many files changed in this diff