pref: 对账界面优化

FormSetter/GridViewSetter.cs

@@ -799,6 +799,10 @@ namespace PTMedicalInsurance.FormSetter
             dgv.Columns.Clear();
             AddDGVColumn(dgv, "人员姓名", "PatientName", 120);
             AddDGVColumn(dgv, "人员编号", "PersonnelNO", 200);
+
+            AddDGVColumn(dgv, "险种", "InsuranceType",120);
+            AddDGVColumn(dgv, "人员类别", "PersonType",120);
+
             AddDGVColumn(dgv, "医疗费总额", "Sumamt", 180);
             AddDGVColumn(dgv, "基金支付总额", "FundPaySumamt", 200);
             AddDGVColumn(dgv, "个人账户支付", "AccountPaySumamt", 200);
@@ -806,6 +810,8 @@ namespace PTMedicalInsurance.FormSetter
             AddDGVColumn(dgv, "交易类型", "BillType", 100);
             AddDGVColumn(dgv, "就诊顺序号", "MdtrtID", 200);
             AddDGVColumn(dgv, "结算流水号", "SettlementID", 200);
+            AddDGVColumn(dgv, "参保地", "insuplc_admdvs");
+
         }
 
         /// <summary>
@@ -834,6 +840,7 @@ namespace PTMedicalInsurance.FormSetter
             AddDGVColumn(dgv, "序号", "sn", 50);
             AddDGVColumn(dgv, "个人编号", "psn_no", 200);
             AddDGVColumn(dgv, "医保就诊号", "mdtrt_id", 200);
+
             AddDGVColumn(dgv, "结算ID", "setl_id", 200);
             AddDGVColumn(dgv, "报文ID", "msgid", 200);
             AddDGVColumn(dgv, "结果", "stmt_rslt", 50);

Forms/Clearing.cs

@@ -1571,10 +1571,10 @@ namespace PTMedicalInsurance.Forms
         {
             string sqlStr = "SELECT * ";
 
-            sqlStr = sqlStr + " FROM  BS_MedInsuSettlement WHERE Hospital_Dr=" + Global.inf.interfaceDr;
+            sqlStr = sqlStr + " FROM  BS_MedInsuSettlement WHERE Hospital_Dr=" + Global.inf.hospitalDr;
             sqlStr = sqlStr + " and OccurTime>'" + dpST_O.Text + "'";
             sqlStr = sqlStr + " and OccurTime<'" + dpED_O.Text + "'";
-            sqlStr = sqlStr + " and Interface_dr =1";
+            sqlStr = sqlStr + " and Interface_dr =" + +Global.inf.interfaceDr;
             sqlStr = sqlStr + " and (left(InsuranceAreaCode,2)<>'50')";
 
             //if (cbxInsuType.Text != "")

Helper/JsonHelper.cs

@@ -98,7 +98,6 @@ namespace PTMedicalInsurance.Helper
                         return lists[0].ToObject<T>();
                     }
                 }
-
             }
 
             return default;