fix: table支持小数点

feat: 增加对账的基础统筹计算

FormSetter/GridViewSetter.cs

@@ -730,8 +730,8 @@ namespace PTMedicalInsurance.FormSetter
             AddDGVColumn(dgv, "医疗费总额", "medfee_sumamt", 150);
             AddDGVColumn(dgv, "统筹基金支付总额", "fund_pay_sumamt", 200);
             AddDGVColumn(dgv, "个人账户支付金额", "acct_pay", 200);
-            AddDGVColumn(dgv, "定点医药机构结算笔数", "fixmedins_setl_cnt", 280);
-
+            AddDGVColumn(dgv, "结算笔数", "fixmedins_setl_cnt", 80);
+            AddDGVColumn(dgv, "基础统筹金额（对账）", "BaseFundPay", 150);
             AddDGVColumn(dgv, "公务员补助金额", "CivilserviceAllowancePay", 150);
             AddDGVColumn(dgv, "医疗救助金额", "MedicalAssistPay", 150);
             AddDGVColumn(dgv, "共济账户支付金额", "AccountMutualAidAmount", 150);

Forms/Clearing.cs

@@ -664,8 +664,10 @@ namespace PTMedicalInsurance.Forms
                 JObject joRtn = invoker.invokeInsuService(joSettlQuery.ToString(), "查询结算信息");
 
                 //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)));
+                //JArray ja = JArray.Parse(JsonHelper.getDestValue(joRtn, "result.data"));
+                //DataTable dt = (DataTable)JsonConvert.DeserializeObject(JsonHelper.getDestValue(joRtn, "result.data"), (typeof(DataTable)));
+
+                DataTable dt = JsonConvert.DeserializeObject<DataTable>(joRtn["result"]["data"].ToString(), new ReadDataTableConverter());
                 dgvHisSettlRec.DataSource = dt;
                 //dt.Columns[7].DataType = typeof(float);//不允许
                 //dgvHisSettlRecFooter.DataGridView = dgvHisSettlRec;
@@ -1771,7 +1773,7 @@ namespace PTMedicalInsurance.Forms
             sqlStr = sqlStr + " SUM(billType*AccountPaySumamt) AS acct_pay,SUM(BillType*FundPaySumamt) AS fund_pay_sumamt ";
             //sqlStr = sqlStr + " Interface_dr,clearingWay AS clr_way,clearingType AS clr_type ";
             // 增加先行自付金额、医疗救助基金、公务员医疗补助、个人账户共济支付、企业补充、职工大额
-            sqlStr += ",Sum(BillType*PreSelfPayAmount) as PreSelfPayAmount,sum(BillType*MedicalAssistPay) as MedicalAssistPay,sum(BillType*CivilserviceAllowancePay) as CivilserviceAllowancePay,sum(BillType*AccountMutualAidAmount) as AccountMutualAidAmount ,sum(BillType*LargeExpensesSupplementPay) as LargeExpensesSupplementPay,sum(BillType*EnterpriseSupplementPay) as EnterpriseSupplementPay,sum(BillType*SeriousIllnessPay) as SeriousIllnessPay ";
+            sqlStr += ",Sum(BillType*PreSelfPayAmount) as PreSelfPayAmount,sum(BillType*MedicalAssistPay) as MedicalAssistPay,sum(BillType*CivilserviceAllowancePay) as CivilserviceAllowancePay,sum(BillType*AccountMutualAidAmount) as AccountMutualAidAmount ,sum(BillType*LargeExpensesSupplementPay) as LargeExpensesSupplementPay,sum(BillType*EnterpriseSupplementPay) as EnterpriseSupplementPay,sum(BillType*SeriousIllnessPay) as SeriousIllnessPay,sum(billType *(FundPaySumamt-MedicalAssistPay-CivilserviceAllowancePay-LargeExpensesSupplementPay-EnterpriseSupplementPay-SeriousIllnessPay)) as BaseFundPay,sum(BillType*OtherPay) as OtherPay ";
 
             string conditionStr = " Group By";
             if (cbgGroupSet.GetItemCheckState(0))