fix: 异地对账

Forms/Clearing.cs

@@ -76,6 +76,9 @@ namespace PTMedicalInsurance.Forms
             dpST_2.Text = DateTime.Now.ToString("yyyy-MM-01");
             dpED_2.Value = DateTime.Now.AddDays(1 - DateTime.Now.Day).AddMonths(1).AddDays(-1);
 
+            dpST_O.Text = DateTime.Now.ToString("yyyy-MM-01");
+            dpED_O.Value = DateTime.Now.AddDays(1 - DateTime.Now.Day).AddMonths(1).AddDays(-1);
+
             dpED_3.Value = DateTime.Now;
             WindowState = FormWindowState.Maximized;
 
@@ -256,7 +259,8 @@ namespace PTMedicalInsurance.Forms
             CenterBusiness cBus = new CenterBusiness();
             JObject jo9001Rtn = new JObject();
             cBus.signIn(out jo9001Rtn);
-
+            Global.pat.insuplc_admdvs = "510300"; //异地
+            Global.inf.areaCode = "519900";
             InvokeHelper invoker = new InvokeHelper();
             JObject joRtn = invoker.invokeCenterService(TradeEnum.FeeSummaryCheckOther, joData);
             if (JsonHelper.parseCenterReturnJson(joRtn, out error) != 0)
@@ -366,6 +370,8 @@ namespace PTMedicalInsurance.Forms
             JObject joData = new JObject();
             joData.Add("data", joClearing);
             //上传给中心
+            Global.pat.insuplc_admdvs = "510300"; //异地
+            Global.inf.areaCode = "519900";
 
             InvokeHelper invoker = new InvokeHelper();
             JObject joRtn = invoker.invokeCenterService(TradeEnum.ClearingOtherApply, joData);
@@ -563,14 +569,12 @@ namespace PTMedicalInsurance.Forms
                 DataTable dtInteface = (DataTable)cbxInterface.DataSource;
                 int i = cbxInterface.SelectedIndex;
 
-                string sqlStr = "SELECT SUM(BillType*Sumamt) AS medfee_sumamt,count(*) AS fixmedins_setl_cnt, ";
-                sqlStr = sqlStr + " SUM(BillType*AccountPaySumamt) AS acct_pay,SUM(BillType*HealthInsurancePay) AS fund_pay_sumamt ";
-                //sqlStr = sqlStr + " Interface_dr,clearingWay AS clr_way,clearingType AS clr_type ";
+                string sqlStr = "SELECT * FROM  BS_MedInsuSettlement WHERE Hospital_Dr=" + dtInteface.Rows[i]["HospitalDr"].ToString();
+
                 string conditionStr = " ";
                 DataTable dtSettlSummary = (DataTable)dgvSettlSummary.DataSource;
                 int iCurRow = dgvSettlSummary.CurrentRow.Index;
 
-                //DataTable dtInteface = (DataTable)cbxInterface.DataSource;
                 if (cbgGroupSet.GetItemCheckState(0))
                 {
                     conditionStr = conditionStr + " and Interface_Dr ='" + dtSettlSummary.Rows[iCurRow]["Interface_dr"].ToString() + "'";
@@ -593,7 +597,6 @@ namespace PTMedicalInsurance.Forms
                     conditionStr = conditionStr + " and BillType ='" + dtSettlSummary.Rows[iCurRow]["BillType"].ToString() + "'";
                 }
 
-                sqlStr = "select *  FROM  BS_MedInsuSettlement WHERE Hospital_Dr=" + dtInteface.Rows[i]["HospitalDr"].ToString();
                 sqlStr = sqlStr + " and OccurTime>'" + dpST.Text + " 00:00:00'";
                 sqlStr = sqlStr + " and OccurTime<'" + dpED.Text + " 23:59:59'";
 
@@ -1541,13 +1544,11 @@ namespace PTMedicalInsurance.Forms
 
         private void uiButton3_Click(object sender, EventArgs e)
         {
-            string sqlStr = "SELECT * ";
-
-            sqlStr = sqlStr + " FROM  BS_MedInsuSettlement WHERE Hospital_Dr=" + Global.inf.hospitalDr;
+            string sqlStr = "SELECT * FROM  BS_MedInsuSettlement WHERE Hospital_Dr=" + Global.inf.hospitalDr;
             sqlStr = sqlStr + " and OccurTime>'" + dpST_O.Text + "'";
             sqlStr = sqlStr + " and OccurTime<'" + dpED_O.Text + "'";
             sqlStr = sqlStr + " and Interface_dr =" + +Global.inf.interfaceDr;
-            sqlStr = sqlStr + " and (left(InsuranceAreaCode,2)<>'50')";
+            sqlStr = sqlStr + " and (InsuranceAreaCode<>'519900')";
 
             //if (cbxInsuType.Text != "")
             //{
@@ -1582,8 +1583,8 @@ namespace PTMedicalInsurance.Forms
             InvokeHelper invoker = new InvokeHelper();
             JObject joRtn = invoker.invokeInsuService(joSettlQuery.ToString(), "查询结算信息");
 
-            //DataTable dt = (DataTable)joRtn["result"]["data"].ToObject(typeof(DataTable));
-            DataTable dt = (DataTable)JsonConvert.DeserializeObject(joRtn["result"]["data"].ToString(), (typeof(DataTable)));
+            //DataTable dt = (DataTable)JsonConvert.DeserializeObject(joRtn["result"]["data"].ToString(), (typeof(DataTable)));
+            DataTable dt = JsonConvert.DeserializeObject<DataTable>(JsonHelper.getDestValue(joRtn, "result.data"), new ReadDataTableConverter());
             //DataTable dtResult = new DataTable();
             ////克隆表结构
             //dtResult = dt.Clone();
@@ -1826,8 +1827,8 @@ namespace PTMedicalInsurance.Forms
             joSettlQuery.Add("code", "09010061");
             InvokeHelper invoker = new InvokeHelper();
             JObject joRtn = invoker.invokeInsuService(joSettlQuery.ToString(), "查询汇总结算信息");
-
-            DataTable dt = (DataTable)joRtn["result"]["data"].ToObject(typeof(DataTable));
+            DataTable dt = JsonConvert.DeserializeObject<DataTable>(JsonHelper.getDestValue(joRtn, "result.data"),new ReadDataTableConverter());
+            //DataTable dt = (DataTable)joRtn["result"]["data"].ToObject(typeof(DataTable));
             dgvSettlSummary.DataSource = dt;
 
             //初始化HIS结算明细View数据