fix: 对账

Forms/Clearing.cs

@@ -622,11 +622,15 @@ namespace PTMedicalInsurance.Forms
                         sqlStr = sqlStr + " and ValidFlag =0 and BillType=-1";
                 }
 
+                string interfaceDr = dtInteface.Rows[i]["ID"].ToString();
+
+                Global.writeLog("当前interface："+Global.inf.interfaceDr+",选择:"+interfaceDr); 
+
                 //省医保和市医保对账一样，异地对账需要用到另外的对账交易
-                //if (Global.inf.interfaceDr == 1)
-                //{
-                //    sqlStr = sqlStr + " and (InsuranceAreaCode='539900' or InsuranceAreaCode='530100')";
-                //}
+                if (interfaceDr == "38")
+                {
+                    sqlStr = sqlStr + " and (InsuranceAreaCode='519900' or InsuranceAreaCode='510000') ";
+                }
 
                 //conditionStr = conditionStr.Substring(0,conditionStr.Length -1 );
                 //conditionStr = conditionStr.Remove(conditionStr.Length - 1, 1);
@@ -644,7 +648,8 @@ namespace PTMedicalInsurance.Forms
 
                 //DataTable dt = (DataTable)joRtn["result"]["data"].ToObject(typeof(DataTable));
                 JArray ja = JArray.Parse(JsonHelper.getDestValue(joRtn, "result.data"));
-                DataTable dt = (DataTable)JsonConvert.DeserializeObject(JsonHelper.getDestValue(joRtn, "result.data"), (typeof(DataTable)));
+                ReadDataTableConverter converter = new ReadDataTableConverter();
+                DataTable dt = JsonConvert.DeserializeObject<DataTable>(JsonHelper.getDestValue(joRtn, "result.data"),new ReadDataTableConverter());
                 dgvHisSettlRec.DataSource = dt;
                 //dt.Columns[7].DataType = typeof(float);//不允许
                 //dgvHisSettlRecFooter.DataGridView = dgvHisSettlRec;
@@ -1395,17 +1400,17 @@ namespace PTMedicalInsurance.Forms
                     sqlStr = sqlStr + " and ValidFlag =-1";
             }
 
-            //省医保本地            
-            //if ((Global.inf.interfaceDr == 10) && (cbOtherPlaceFlag.SelectedIndex == 2))
-            //{
-            //    sqlStr = sqlStr + " and (left(InsuranceAreaCode,4)='4101' or left(InsuranceAreaCode,4)='4199')";
-            //}
-            ////省医保异地
-            //if ((Global.inf.interfaceDr == 10) && (cbOtherPlaceFlag.SelectedIndex == 1))
-            //{
-            //    sqlStr = sqlStr + " and (left(InsuranceAreaCode,4)<>'4199' and left(InsuranceAreaCode,4)<>'4101')";
-            //}
-            
+            //省医保本地
+            if ((Global.inf.interfaceDr == 38) && (cbOtherPlaceFlag.SelectedIndex == 2))
+            {
+                sqlStr = sqlStr + " and (InsuranceAreaCode='519900' or InsuranceAreaCode='510000')";
+            }
+            //省医保异地
+            if ((Global.inf.interfaceDr == 38) && (cbOtherPlaceFlag.SelectedIndex == 1))
+            {
+                sqlStr = sqlStr + " and (InsuranceAreaCode<>'519900' and InsuranceAreaCode<>'510000')";
+            }
+
             sqlStr = sqlStr + " Group By Interface_Dr,ClearingType,ClearingWay,ClearingOrgan";
             JObject joSqlstr = new JObject();
 
@@ -1802,10 +1807,10 @@ namespace PTMedicalInsurance.Forms
                     sqlStr = sqlStr + " and ValidFlag =0 and BillType=-1";
             }
 
-            //if (Global.inf.interfaceDr == 1)
-            //{
-            //    sqlStr = sqlStr + " and (left(InsuranceAreaCode,4)='6201' or left(InsuranceAreaCode,4)='6299')";
-            //}
+            if (Global.inf.interfaceDr == 38)
+            {
+                sqlStr = sqlStr + " and (InsuranceAreaCode='519900' or InsuranceAreaCode='510000')";
+            }
 
             //conditionStr = conditionStr.Substring(0,conditionStr.Length -1 );
             conditionStr = conditionStr.Remove(conditionStr.Length - 1, 1);