fix: 清算

Forms/Clearing.cs

@@ -278,26 +278,17 @@ namespace PTMedicalInsurance.Forms
             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() == "410000")
-                joClearing.clr_type = "9909";
-            else
-                joClearing.clr_type = dt.Rows[i]["clr_type"].ToString();
 
+            dynamic joClearing = new JObject();
+            joClearing.clr_type = dt.Rows[i]["clr_type"].ToString();
             joClearing.clr_way = dt.Rows[i]["clr_way"].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.medfee_sumamt = dt.Rows[i]["medfee_sumamt"].ToString();
             joClearing.fund_appy_sum = dt.Rows[i]["fund_appy_sum"].ToString();
+            joClearing.acct_pay = dt.Rows[i]["acct_pay"].ToString();
             joClearing.cash_payamt = dt.Rows[i]["cash_payamt"].ToString();
-            joClearing.acct_pay = dt.Rows[i]["acct_pay"].ToString();                       
+            joClearing.psntime = dt.Rows[i]["psntime"].ToString();
             joClearing.begndate = dpST_2.Value.ToString("yyyy-MM-dd");
             joClearing.enddate = dpED_2.Value.ToString("yyyy-MM-dd");
 
@@ -384,7 +375,7 @@ namespace PTMedicalInsurance.Forms
             cBus.signIn(out jo9001Rtn);
 
             InvokeHelper invoker = new InvokeHelper();
-            JObject joRtn = invoker.invokeCenterService(TradeEnum.ClearingApply, joData);
+            JObject joRtn = invoker.invokeCenterService(TradeEnum.ClearingOtherApply, joData);
             if (JsonHelper.parseCenterReturnJson(joRtn, out error) != 0)
             {
                 return -1;
@@ -1359,17 +1350,17 @@ namespace PTMedicalInsurance.Forms
             DataTable dtInteface = (DataTable)cbInterface_2.DataSource;
             int i = cbInterface_2.SelectedIndex;
 
-            string sqlStr = " SELECT SUM(Billtype*Sumamt) AS medfee_sumamt,SUM(Billtype*(0.00+FundPaySumamt+AccountPaySumamt+PersonCashPay)) AS med_sumfee, "
-                          + " SUM(billtype*PersonCashPay) AS cash_payamt,count(*) AS psntime, ";            
-            sqlStr = sqlStr + " SUM(billtype*AccountPaySumamt) AS acct_pay,SUM(Billtype*(0.00+FundPaySumamt+AccountPaySumamt)) AS fund_appy_sum, ";
+            string sqlStr = "SELECT SUM(billtype*Sumamt) AS medfee_sumamt,SUM(billtype*(0.00+FundPaySumamt+AccountPaySumamt+PersonCashPay)) AS med_sumfee,   SUM(billtype*PersonCashPay) AS cash_payamt, ";
+            sqlStr = sqlStr + " count(*) AS psntime,";
+            sqlStr = sqlStr + " SUM(billtype*AccountPaySumamt) AS acct_pay,SUM(billtype*FundPaySumamt) AS fund_appy_sum, ";
             sqlStr = sqlStr + " ClearingType as clr_type,ClearingWay as clr_way,Interface_Dr,ClearingOrgan as clr_optins ";
             sqlStr = sqlStr + " FROM  BS_MedInsuSettlement WHERE Hospital_Dr=" + dtInteface.Rows[i]["HospitalDr"].ToString();
-            sqlStr = sqlStr + " and OccurTime>'" + dpST_2.Text + "'";
-            sqlStr = sqlStr + " and OccurTime<'" + dpED_2.Text + "'";
+            sqlStr = sqlStr + " and OccurTime>='" + dpST_2.Text + " 00:00:00'";
+            sqlStr = sqlStr + " and OccurTime<='" + dpED_2.Text + " 23:59:59'";
 
             if (cbInterface_2.Text != "")
             {
-                sqlStr = sqlStr + " and Interface_dr =" + dtInteface.Rows[i]["ID"].ToString();
+                sqlStr = sqlStr + " and interface_dr =" + dtInteface.Rows[i]["ID"].ToString();
             }
 
             if (cbInsutype_2.Text != "")
@@ -1423,7 +1414,9 @@ namespace PTMedicalInsurance.Forms
             InvokeHelper invoker = new InvokeHelper();
             JObject joRtn = invoker.invokeInsuService(joSettlQuery.ToString(), "查询汇总结算信息(清算)");
 
-            DataTable dt = (DataTable)joRtn["result"]["data"].ToObject(typeof(DataTable));
+            DataTable dt = JsonConvert.DeserializeObject<DataTable>(joRtn["result"]["data"].ToString(), new ReadDataTableConverter());
+
+
             dgvClearingSum.DataSource = dt;
         }
 

Variables/TradeEnum.cs

@@ -374,9 +374,15 @@ namespace PTMedicalInsurance
         ReverseTransaction,
 
         /// <summary>
-        /// 3203，清算申请
+        /// 3203，异地清算申请
         /// </summary>
         [Trade("S3203", "清算申请")]
+        ClearingOtherApply,
+
+        /// <summary>
+        /// 3203，本地清算申请
+        /// </summary>
+        [Trade("3203", "清算申请")]
         ClearingApply,
 
         /// <summary>