医保结算费用明细查询菜单更新

FormSetter/GridViewSetter.cs

@@ -994,22 +994,25 @@ namespace PTMedicalInsurance.FormSetter
         public void SetHeaderTextOfSettltMentFeelDetailInfo(DataGridView dgv)
         {
             dgv.Columns.Clear();
-            dgv.AutoGenerateColumns = false;            
-            AddDGVColumn(dgv, "HIS就诊号", "AdmDr");
-            AddDGVColumn(dgv, "患者姓名", "Name");
+            dgv.AutoGenerateColumns = false;
             AddDGVColumn(dgv, "HIS目录编码", "HISCode");
+            AddDGVColumn(dgv, "HIS目录名称", "HISName");
             AddDGVColumn(dgv, "医保目录编码", "MedInsuNO");
             AddDGVColumn(dgv, "超限价金额", "OverLimitAmount", 350);
             AddDGVColumn(dgv, "全自费金额", "FullOwnPayAmount", 400);
+            AddDGVColumn(dgv, "数量", "Count");
             AddDGVColumn(dgv, "单价", "Price");
             AddDGVColumn(dgv, "总金额", "Sumamt");
-            //AddDGVColumn(dgv, "目录等级", "ChargeItemLevel", 350);
+            //AddDGVColumn(dgv, "目录等级", "ChargeItemLevel", 350); MedicalChargeItemType
+            AddDGVColumn(dgv, "医保目录类别", "MedicalChargeItemType", 350);
             AddDGVColumn(dgv, "目录等级名称", "ChargeItemLevelName", 500);
             AddDGVColumn(dgv, "自付比例", "SelfPayProp", 500);
             AddDGVColumn(dgv, "定价上限金额", "UpLimitAmount", 300);
             AddDGVColumn(dgv, "符合政策范围金额", "InScopeAmount", 120);
             AddDGVColumn(dgv, "先行自付金额", "PreSelfPayAmount", 350);
-            AddDGVColumn(dgv, "限制使用标志", "LimitUsedFlag", 350);          
+            AddDGVColumn(dgv, "限制使用标志", "LimitUsedFlag", 350);
+            AddDGVColumn(dgv, "患者姓名", "Name");
+            AddDGVColumn(dgv, "HIS就诊号", "AdmDr");
         }
         #endregion
 

Forms/Clearing.Designer.cs

@@ -3042,7 +3042,7 @@
             this.toolStripMenuItem2,
             this.toolStripMenuItem3});
             this.uiContextMenuStrip1.Name = "cmsClearing";
-            this.uiContextMenuStrip1.Size = new System.Drawing.Size(203, 56);
+            this.uiContextMenuStrip1.Size = new System.Drawing.Size(203, 78);
             this.uiContextMenuStrip1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // toolStripMenuItem2
@@ -3050,6 +3050,7 @@
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
             this.toolStripMenuItem2.Size = new System.Drawing.Size(202, 26);
             this.toolStripMenuItem2.Text = "单条清算";
+            this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
             // 
             // toolStripMenuItem3
             // 

Forms/Clearing.cs

@@ -97,7 +97,7 @@ namespace PTMedicalInsurance.Forms
             }
             else
             {
-                Global.pat.insuplc_admdvs = "530199";
+                Global.pat.insuplc_admdvs = "610199";
             }
             Global.inf.hospitalNO = dtInteface.Rows[i]["HospitalNO"].ToString();
             Global.inf.hospitalName = dtInteface.Rows[i]["HospitalName"].ToString();
@@ -1982,9 +1982,9 @@ namespace PTMedicalInsurance.Forms
                     sqlStr = sqlStr + " and ValidFlag =0 and BillType=-1";
             }
 
-            if (Global.inf.interfaceDr == 1)
+            if (Global.inf.interfaceDr == 1) //本地
             {
-                sqlStr = sqlStr + " and (left(InsuranceAreaCode,4)='4101' or left(InsuranceAreaCode,4)='4199')";
+                sqlStr = sqlStr + " and (left(InsuranceAreaCode,4)='6101' or left(InsuranceAreaCode,4)='6199')";
             }
 
             sqlStr = sqlStr + " AND ReversalFlag<>1 ";
@@ -2157,5 +2157,10 @@ namespace PTMedicalInsurance.Forms
                 }          
             }
         }
+
+        private void toolStripMenuItem2_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }

Forms/MedInsuQuery.cs

@@ -165,11 +165,12 @@ namespace PTMedicalInsurance.Forms
         private void btnOK_Click(object sender, EventArgs e)
         {
             string sqlStr;
-            sqlStr = " SELECT a.Adm_Dr,c.Name, b.HISCode, b.MedInsuNO, b.Price,b.Sumamt,b.ChargeItemLevel,c.ChargeItemLevelName,b.SelfPayProp, ";
-            sqlStr = sqlStr + " b.UpLimitAmount,b.OverLimitAmount,b.InScopeAmount,b.FullOwnPayAmount,b.PreSelfPayAmount,b.LimitUsedFlag ";
+            sqlStr = " SELECT a.Adm_Dr,c.InsuName as HISName,a.PatientName Name, b.HISCode, b.MedInsuNO, b.Price,b.Sumamt,";
+            sqlStr = sqlStr + " b.ChargeItemLevel,'' ChargeItemLevelName,b.SelfPayProp, b.UpLimitAmount,b.OverLimitAmount, ";
+            sqlStr = sqlStr + " b.InScopeAmount,b.FullOwnPayAmount,b.PreSelfPayAmount,b.LimitUsedFlag, b.MedicalChargeItemType,\"Count\" ";
             sqlStr = sqlStr + " FROM BS_MedInsuSettlement a LEFT JOIN BS_MedInsuFeeUploadRecord b ";
             sqlStr = sqlStr + " ON a.Hospital_Dr=b.Hospital_Dr AND a.MdtrtID=b.MdtrtID AND a.PersonnelNO=b.PersonnelNO ";
-            sqlStr = sqlStr + " LEFT JOIN HB_MedInsuDirectory c ON b.MedInsuNO=c.Code AND a.Interface_Dr=c.Interface_Dr AND a.Hospital_Dr=c.Hospital_Dr ";
+            sqlStr = sqlStr + " LEFT JOIN HB_MedInsuMapRelation c ON b.MedInsuNO=c.InsuCode AND a.Interface_Dr=c.Interface_Dr AND a.Hospital_Dr=c.Hospital_Dr ";
             sqlStr = sqlStr + " WHERE b.MedInsuNO<>'' and a.ValidFlag=1 AND a.BillType=1 AND a.AdmType=2 ";
             sqlStr = sqlStr + " AND a.Interface_Dr=" + Global.inf.interfaceDr;
             sqlStr = sqlStr + " AND a.Hospital_Dr= " + Global.inf.hospitalDr;