|
@@ -207,6 +207,8 @@ namespace PTMedicalInsurance.Forms
|
|
|
joCheck.fund_pay_sumamt = dt.Rows[i]["fund_pay_sumamt"].ToString(); //基金支付总额
|
|
|
joCheck.acct_pay = dt.Rows[i]["acct_pay"].ToString(); //个人账户支付金额
|
|
|
|
|
|
+ joCheck.exp_content = dt.Rows[i]["WalletPay"].ToString(); //钱包支付金额
|
|
|
+
|
|
|
if (tbCnt.Text!="")
|
|
|
joCheck.fixmedins_setl_cnt = tbCnt.Text; //定点医药机构结算笔数
|
|
|
else
|
|
@@ -1122,6 +1124,9 @@ namespace PTMedicalInsurance.Forms
|
|
|
joCheck.medfee_sumamt = dt.Rows[i]["medfee_sumamt"].ToString();
|
|
|
joCheck.fund_pay_sumamt = dt.Rows[i]["fund_pay_sumamt"].ToString();
|
|
|
joCheck.cash_payamt = dt.Rows[i]["cash_payamt"].ToString();
|
|
|
+
|
|
|
+ joCheck.exp_content = dt.Rows[i]["WalletPay"].ToString();
|
|
|
+
|
|
|
joCheck.fixmedins_setl_cnt = dt.Rows[i]["fixmedins_setl_cnt"].ToString();
|
|
|
|
|
|
JObject joData = new JObject();
|
|
@@ -1799,7 +1804,7 @@ namespace PTMedicalInsurance.Forms
|
|
|
//sqlStr = sqlStr + " SUM(BillType*AccountPaySumamt) AS acct_pay,SUM(BillType*FundPaySumamt) AS fund_pay_sumamt ";
|
|
|
|
|
|
string sqlStr = "SELECT SUM(BillType*Sumamt) AS medfee_sumamt,sum(BillType) AS fixmedins_setl_cnt,SUM(BillType*PersonCashPay) AS cash_payamt, ";
|
|
|
- sqlStr = sqlStr + " SUM(billType*AccountPaySumamt) AS acct_pay,SUM(BillType*FundPaySumamt) AS fund_pay_sumamt ";
|
|
|
+ sqlStr = sqlStr + " SUM(billType*AccountPaySumamt) AS acct_pay,SUM(BillType*FundPaySumamt) AS fund_pay_sumamt,SUM(BillType*WalletPay) AS WalletPay ";
|
|
|
//sqlStr = sqlStr + " Interface_dr,clearingWay AS clr_way,clearingType AS clr_type ";
|
|
|
string conditionStr = " Group By";
|
|
|
if (cbgGroupSet.GetItemCheckState(0))
|