Merge branch 'NanChang_Base' of http://172.20.2.8:9091//INSU/MedicalInsurance into NanChang_Base

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();         //基金支付总额