Forms/Clearing.cs

@@ -181,16 +181,16 @@ namespace PTMedicalInsurance.Forms
             joCheck.insutype = dt.Rows[i]["insutype"].ToString();                       //险种类型
             joCheck.clr_type = dt.Rows[i]["clr_type"].ToString();                       //清算类别            
 
-            //if (tbSettlOption.Text != "")
-            //{
-            //    joCheck.setl_optins = tbSettlOption.Text; //dt.Rows[i]["setl_optins"].ToString();  //结算经办机构
-            //    setlOptins = tbSettlOption.Text;
-            //}
-            //else
-            //{
+            if (tbSettlOption.Text != "")
+            {
+                joCheck.setl_optins = tbSettlOption.Text; //dt.Rows[i]["setl_optins"].ToString();  //结算经办机构
+                setlOptins = tbSettlOption.Text;
+            }
+            else
+            {
                 joCheck.setl_optins = dt.Rows[i]["setl_optins"].ToString();             //结算经办机构
                 setlOptins = dt.Rows[i]["setl_optins"].ToString();
-            //}
+            }
 
             joCheck.medfee_sumamt = dt.Rows[i]["medfee_sumamt"].ToString();             //医疗费总额
             joCheck.fund_pay_sumamt = dt.Rows[i]["fund_pay_sumamt"].ToString();         //基金支付总额
@@ -1883,7 +1883,7 @@ namespace PTMedicalInsurance.Forms
             //过滤总金额与现金相等的数据 1.门诊 2 总金额 = 现金支付 3账户支付=0 4.医保支付=0
             if (ckbFilterSumEqualCash.Checked)
             {
-                sqlStr = sqlStr + " and (ClearingType ='11' and Sumamt<>PersonCashPay )";
+                sqlStr = sqlStr + " and (ClearingType in '11' and Sumamt<>PersonCashPay )";
             }
             //if (Global.inf.interfaceDr == 1)
             //{