Merge remote-tracking branch 'remotes/origin/ChengDu_Base' into ChengDu_Base

# Conflicts:
#	Business/Outpatient/OPSettlementProcess.cs

Business/IrisServices.cs

@@ -1093,8 +1093,7 @@ namespace PTMedicalInsurance.Business
                 joTmp.Add("med_type", Global.pat.medType);
                 joTmp.Add("insu_type", Global.pat.insuType);
                 joTmp.Add("psn_no", Global.pat.psn_no);
-                joTmp.Add("HospitalDr", Global.inf.hospitalDr);
-                joTmp.Add("InterfaceDr", Global.inf.interfaceDr);
+
 
                 JObject joRtn = invoker.invokeInsuService(joTmp.ToString(), "根据HIS的费用明细获取对照关系");
                 if (JsonHelper.parseIrisRtnValue(joRtn, out errMsg) != 0)
@@ -1807,24 +1806,33 @@ namespace PTMedicalInsurance.Business
             }
         }
 
-        public JObject UpdateDirectoryBySelf(JObject joIn)
+        //查询已对照的数据
+        public JObject QueryMappedData(JObject joSqlStr, string desc)
         {
             try
             {
-                //查询区域通用目录 
-                MIIrisServices mIS = new MIIrisServices();
-                JObject joRtnTY = mIS.getInterface_TY(Global.inf.interfaceDr.ToString(), "");
-                string InsuCurrencyCataLogue = JsonHelper.getDestValue(joRtnTY, "InsuCurrencyCataLogue");  //通用目录编码 6
-                string InterfaceName_TY = JsonHelper.getDestValue(joRtnTY, "InterfaceName_TY");            //通用目录接口名称  
-                string HospName_TY = JsonHelper.getDestValue(joRtnTY, "HospitalName");                     //通用目录所属医院名称
-                string HospitalDr_TY = JsonHelper.getDestValue(joRtnTY, "HospitalDr_TY");                  //通用目录所属医院ID
+                InvokeHelper invoker = new InvokeHelper();
+                JObject joRtn = invoker.invokeInsuService(JsonHelper.setIrisInpar("09010081", joSqlStr).ToString(), desc);
+
+                return joRtn;
+            }
+            catch (Exception ex)
+            {
+                return JsonHelper.setExceptionJson(-1, "查询交易日志（冲正）异常：", ex.Message);
+            }
+
+        }
 
+        public JObject UpdateDirectoryBySelf(JObject joIn)
+        {
+            try
+            {
                 JObject joParam = (JObject)joIn.DeepClone();
-                if ((InsuCurrencyCataLogue != "") && (HospitalDr_TY != ""))
+                if ((Global.inf.InsuCurrencyCataLogue != "") && (Global.inf.HospitalDr_TY != ""))
                 {                    
                     joParam.Add("updateUserID", Global.user.ID);
-                    joParam.Add("HospitalDr", HospitalDr_TY);
-                    joParam.Add("InterfaceDr", InsuCurrencyCataLogue);
+                    joParam.Add("HospitalDr", Global.inf.HospitalDr_TY);
+                    joParam.Add("InterfaceDr", Global.inf.InsuCurrencyCataLogue);
                 }
                 else
                 {                    

Business/Outpatient/OPSettlementProcess.cs

@@ -55,6 +55,59 @@ namespace PTMedicalInsurance.Business
                 }
             }
         }
+<<<<<<< HEAD
         
+=======
+        /// <summary>
+        /// 根据是否需要使用共济支付重新计算结算数据
+        /// </summary>
+        /// <param name="setlInfo"></param>
+        /// <returns></returns>
+        private JObject MutualAidPay(string setlInfo)
+        {
+            JObject joRtn = JObject.Parse(setlInfo);
+            if (Global.pat.mutualAidFlag)
+            {
+                try
+                {
+                    decimal psnCashPay = decimal.Parse(JsonHelper.getDestValue(joRtn, "psn_cash_pay"));
+                    if (psnCashPay == 0)
+                    {
+                        MessageBox.Show("该患者自付金额为0，不需要进行共济支付！");
+                    }
+                    else
+                    {
+                       
+                        //开启自付界面，因涉及到多次自付
+                        MutualAid frmMA = new MutualAid(joRtn);
+                        if (frmMA.dtSettlInfo.Rows.Count != 0)
+                        {
+                            frmMA.WindowState = FormWindowState.Maximized;
+                            if (frmMA.ShowDialog() == DialogResult.OK)
+                            {
+                                joRtn = JObject.Parse(frmMA.finalSettlementInfo);
+
+                            }
+                            else
+                            {
+                                MessageBox.Show("开启共济支付失败，原因为收款员取消共济支付！");
+                            }
+
+                        }
+                        else
+                        {
+                            MessageBox.Show("开启共济支付失败，原因为未检测到有效的被共济人的医保结算数据！");
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show("共济支付失败:" + ex.Message);
+                }
+            }
+            return joRtn;
+
+        }
+>>>>>>> remotes/origin/ChengDu_Base
     }
 }

ChengDuMI.csproj

@@ -37,9 +37,9 @@
     <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
       <HintPath>packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
-    <Reference Include="FastReport, Version=2020.3.7.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
+    <Reference Include="FastReport, Version=2023.1.8.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\FastReport\FastReport.dll</HintPath>
+      <HintPath>F:\C#\普天云HIS\Git\ThirdDll\FastReport.dll</HintPath>
     </Reference>
     <Reference Include="FastReportFrom">
       <HintPath>..\..\原来的代码\FastReportFrom\bin\Debug\FastReportFrom.dll</HintPath>
@@ -189,6 +189,12 @@
     <Compile Include="Entity\Base\Settlement\Record\PersonFixedPointRecordCancel.cs" />
     <Compile Include="Entity\Base\Settlement\ReverseTransaction.cs" />
     <Compile Include="Entity\Local\ReadCardInitInfo.cs" />
+    <Compile Include="Forms\Form1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\Form1.Designer.cs">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\InpatientRegistration.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -411,6 +417,9 @@
     <EmbeddedResource Include="Forms\Clearing.resx">
       <DependentUpon>Clearing.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\Form1.resx">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\InpatientRegistration.resx">
       <DependentUpon>InpatientRegistration.cs</DependentUpon>
     </EmbeddedResource>

Forms/BasicData.cs

@@ -38,6 +38,16 @@ namespace PTMedicalInsurance.Forms
         public int idInfoIndex = 0;
         int currentPageIndex = 0;
         DataTable dtExport;
+        private frmProcessBar bar;
+        private int totalDataCount = 100; // 假设有100条数据
+        private int successfulCount = 0; // 成功处理的数据计数器
+        private int currentCount = 0; // 当前正在处理的数据计数器
+        public enum ProcessingType
+        {
+            AuxAndCellPrice,       // 默认值为0
+            Aux, // 默认值为1
+            CellPrice // 默认值为2
+        }
 
         public BasicData()
         {
@@ -60,9 +70,90 @@ namespace PTMedicalInsurance.Forms
             asc.controllInitializeSize(this);
             asc.controlAutoSize(this);
 
+            TexDate.Text = DateTime.Today.ToString("yyyy-MM-01");
         }
         #region  函数封装
+        private void InitBackGroundWorker()
+        {
+            backgroundWorker = new BackgroundWorker();
+            backgroundWorker.WorkerReportsProgress = true;
+            backgroundWorker.WorkerSupportsCancellation = true;
+            backgroundWorker.DoWork += BackgroundWorker_DoWork;
+            backgroundWorker.ProgressChanged += BackgroundWorker_ProgressChanged;
+            backgroundWorker.RunWorkerCompleted += BackgroundWorker_RunWorkerCompleted;
+        }
+
+        private void ProcessData(int index)
+        {
+
+        }
+        private void BackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
+        {
+            var data = (dynamic)e.Argument;
+            int total = data.Total;
+            ProcessingType type = data.Type;
+
+            string sqlStr = $"select * from HB_MedInsuMapRelation where Interface_Dr='{Global.inf.interfaceDr}' and Hospital_Dr ='{Global.inf.hospitalDr}'";
+            JObject joSqlstr = new JObject();
+            joSqlstr.Add("sqlStr", sqlStr);
+            JObject joRtn = mIS.QueryMappedData(joSqlstr, "查询所有已对照数据");
 
+            DataTable dt = (DataTable)joRtn["result"]["data"].ToObject(typeof(DataTable));
+
+            for (int i = 0; i < total; i++)
+            {
+                switch (type)
+                {
+                    case ProcessingType.Aux:
+                        ProcessData(i);
+                        break;
+                    case ProcessingType.CellPrice:
+                        ProcessData(i);
+                        break;
+                    case ProcessingType.AuxAndCellPrice:
+                        ProcessData(i);
+                        break;
+                    default:
+                        throw new ArgumentException("Unsupported processing type.");
+                }
+
+                // 更新进度
+                int percent = (i + 1) * 100 / total;
+                backgroundWorker.ReportProgress(percent, new { Total = total, Current = i + 1, Success = successfulCount });
+
+                // 检查是否取消
+                if (backgroundWorker.CancellationPending)
+                {
+                    e.Cancel = true;
+                    break;
+                }
+            }
+        }
+
+        private void BackgroundWorker_ProgressChanged(object sender, ProgressChangedEventArgs e)
+        {
+            var data = (dynamic)e.UserState;
+            bar.UpdateProgress(e.ProgressPercentage, data.Total, data.Current, data.Success);
+        }
+
+        private void BackgroundWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
+        {
+            if (e.Cancelled)
+            {
+                MessageBox.Show("Processing was cancelled.");
+            }
+            else if (e.Error != null)
+            {
+                MessageBox.Show("An error occurred: " + e.Error.Message);
+            }
+            else
+            {
+                MessageBox.Show("Processing completed successfully.");
+            }
+
+            // 关闭进度条窗口
+            bar.Close();
+        }
         private void queryInsuDirectory(int currentPage, int pageSize, int directoryType, int interfaceDr, string code)
         {
             try
@@ -769,6 +860,14 @@ namespace PTMedicalInsurance.Forms
             rbgDirecType.ValueChanged += new Sunny.UI.UIRadioButtonGroup.OnValueChanged(rbgDirecType_ValueChanged);
 
             LabExplain.Visible = false;
+
+            //查询区域通用目录 
+            MIIrisServices mIS = new MIIrisServices();
+            JObject joRtnTY = mIS.getInterface_TY(Global.inf.interfaceDr.ToString(), "");
+            Global.inf.InsuCurrencyCataLogue = JsonHelper.getDestValue(joRtnTY, "InsuCurrencyCataLogue");  //通用目录编码 6
+            string InterfaceName_TY = JsonHelper.getDestValue(joRtnTY, "InterfaceName_TY");            //通用目录接口名称  
+            string HospName_TY = JsonHelper.getDestValue(joRtnTY, "HospitalName");                     //通用目录所属医院名称
+            Global.inf.HospitalDr_TY = JsonHelper.getDestValue(joRtnTY, "HospitalDr_TY");                  //通用目录所属医院ID
         }
         private void btnDownload_Click(object sender, EventArgs e)
         {
@@ -1324,26 +1423,11 @@ namespace PTMedicalInsurance.Forms
             return joData;
         }
 
-        private void chek_UporCancel_CheckedChanged(object sender, EventArgs e)
-        {
-  
-        }
-
         private void uiButton1_Click(object sender, EventArgs e)
         {
             Close();
         }
 
-        private void btnUpShip_Click(object sender, EventArgs e)
-        {
-            AllUpLoad();
-        }
-
-        private void btnCancelUpShip_Click(object sender, EventArgs e)
-        {
-            AllCancelUpload();
-        }
-
         /// <summary>
         /// 单条上传目录对照关系
         /// </summary>
@@ -1692,82 +1776,82 @@ namespace PTMedicalInsurance.Forms
             e.Row.HeaderCell.Value = string.Format("{0}", e.Row.Index + 1);
         }
 
-        private void btnExport_Click(object sender, EventArgs e)
-        {
-
-            this.pgHISDirect.PageChanged -= new Sunny.UI.UIPagination.OnPageChangeEventHandler(this.pgHISDirect_PageChanged);
-            if (queryHISDirectory(1, 5000, out string errMsg) != 0)
-            {
-                MessageBox.Show(errMsg);
-                return;
-            }
-            this.pgHISDirect.PageChanged += new Sunny.UI.UIPagination.OnPageChangeEventHandler(this.pgHISDirect_PageChanged);
-
-            if (dtExport.Rows.Count > 0)
-            {
-                string directoryType = string.Empty;
-                string sBZ = "";
-                switch (rbgDirecType_C.SelectedIndex)
-                {
-                    case 0:
-                        {
-                            directoryType = "药品";                            
-                            break;
-                        }
-                    case 1:
-                        {
-                            directoryType = "诊疗";
-                            break;
-                        }
-                    case 2:
-                        {
-                            directoryType = "材料";
-                            break;
-                        }
-                }
-
-                if (rbAll.Checked) sBZ = "全部";
-                else
-                    if (rbMaped.Checked) sBZ = "已对照";
-                else
-                    if (rbNoMaped.Checked) sBZ = "未对照";
-
-                string LSH = DateTime.Now.ToString("yyyy-MM-dd"); //DateTime.Now.ToString("MMddHHmmssffff");
-                string filename = LSH + "(" + directoryType + ")医保目录" + sBZ + "信息.xls";
-                string sFliePathName = Global.curEvt.path + "\\MapRelation\\" + filename;
-                //string sFliePathName = @"D:\" + LSH + "(" + directoryType + ")医保目录" + sBZ + "信息.xls";
-
-                //如果不存在目录，则创建目录
-                if (!Directory.Exists(Global.curEvt.path + "\\MapRelation"))
-                {
-                    //创建文件夹
-                    DirectoryInfo dirInfo = Directory.CreateDirectory(Global.curEvt.path + "\\MapRelation");
-                }
-                //判断文件是否存在，如果存在询问是覆盖还是重新下载
-                if (File.Exists(sFliePathName))
-                {
-                    DialogResult dr = MessageBox.Show("该路径已存在该目录文件，确定要覆盖并重新导入吗？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-                    if (dr == DialogResult.Yes)
-                    {
-                        File.Delete(sFliePathName);
-                    }
-                    else
-                    {
-                        return;
-                    }
-                }
-                string ReturnFileName = ExportToExcel.DataTabletoExcel(dtExport, sFliePathName);
-                if (ReturnFileName != "")
-                {
-                    MessageBox.Show("导出成功,文件保存路径：【" + ReturnFileName + "】");
-                    System.Diagnostics.Process.Start(ReturnFileName); //打开excel文件                
-                }
-                else
-                {
-                    MessageBox.Show("导出失败!");
-                }
-            }
-        }
+        //private void btnExport_Click(object sender, EventArgs e)
+        //{
+
+        //    this.pgHISDirect.PageChanged -= new Sunny.UI.UIPagination.OnPageChangeEventHandler(this.pgHISDirect_PageChanged);
+        //    if (queryHISDirectory(1, 5000, out string errMsg) != 0)
+        //    {
+        //        MessageBox.Show(errMsg);
+        //        return;
+        //    }
+        //    this.pgHISDirect.PageChanged += new Sunny.UI.UIPagination.OnPageChangeEventHandler(this.pgHISDirect_PageChanged);
+
+        //    if (dtExport.Rows.Count > 0)
+        //    {
+        //        string directoryType = string.Empty;
+        //        string sBZ = "";
+        //        switch (rbgDirecType_C.SelectedIndex)
+        //        {
+        //            case 0:
+        //                {
+        //                    directoryType = "药品";                            
+        //                    break;
+        //                }
+        //            case 1:
+        //                {
+        //                    directoryType = "诊疗";
+        //                    break;
+        //                }
+        //            case 2:
+        //                {
+        //                    directoryType = "材料";
+        //                    break;
+        //                }
+        //        }
+
+        //        if (rbAll.Checked) sBZ = "全部";
+        //        else
+        //            if (rbMaped.Checked) sBZ = "已对照";
+        //        else
+        //            if (rbNoMaped.Checked) sBZ = "未对照";
+
+        //        string LSH = DateTime.Now.ToString("yyyy-MM-dd"); //DateTime.Now.ToString("MMddHHmmssffff");
+        //        string filename = LSH + "(" + directoryType + ")医保目录" + sBZ + "信息.xls";
+        //        string sFliePathName = Global.curEvt.path + "\\MapRelation\\" + filename;
+        //        //string sFliePathName = @"D:\" + LSH + "(" + directoryType + ")医保目录" + sBZ + "信息.xls";
+
+        //        //如果不存在目录，则创建目录
+        //        if (!Directory.Exists(Global.curEvt.path + "\\MapRelation"))
+        //        {
+        //            //创建文件夹
+        //            DirectoryInfo dirInfo = Directory.CreateDirectory(Global.curEvt.path + "\\MapRelation");
+        //        }
+        //        //判断文件是否存在，如果存在询问是覆盖还是重新下载
+        //        if (File.Exists(sFliePathName))
+        //        {
+        //            DialogResult dr = MessageBox.Show("该路径已存在该目录文件，确定要覆盖并重新导入吗？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+        //            if (dr == DialogResult.Yes)
+        //            {
+        //                File.Delete(sFliePathName);
+        //            }
+        //            else
+        //            {
+        //                return;
+        //            }
+        //        }
+        //        string ReturnFileName = ExportToExcel.DataTabletoExcel(dtExport, sFliePathName);
+        //        if (ReturnFileName != "")
+        //        {
+        //            MessageBox.Show("导出成功,文件保存路径：【" + ReturnFileName + "】");
+        //            System.Diagnostics.Process.Start(ReturnFileName); //打开excel文件                
+        //        }
+        //        else
+        //        {
+        //            MessageBox.Show("导出失败!");
+        //        }
+        //    }
+        //}
         private void limitPriceUpdate_Click(object sender, EventArgs e)
         {
             SelfpayPercentForm selfpay = new SelfpayPercentForm();
@@ -1869,6 +1953,366 @@ namespace PTMedicalInsurance.Forms
             }
             MessageBox.Show("更新完成！");
         }
+
+
+
+        private void tsmiSingleUpdateAuxInfo_Click_1(object sender, EventArgs e)
+        {
+            string error;
+            int iDir = dgvDirectoy.CurrentRow.Index;
+            if (dgvDirectoy.CurrentRow == null)
+            {
+                MessageBox.Show("请查询中心目录");
+                return;
+            }
+            JObject jo = new JObject();
+            jo.Add("code", dgvDirectoy.Rows[iDir].Cells["code"].Value.ToString());
+            jo.Add("HisType", rbgDirecType.SelectedIndex + 1);
+            if (updateAuxInfo(jo, out error) != 0)
+            {
+                MessageBox.Show(error);
+            }
+            else
+            {
+                MessageBox.Show(error);
+            }
+        }
+
+        //更新目录信息(附属信息)
+        private int updateAuxInfo(JObject jo, out string err)
+        {
+            err = "";
+            tbDirectoryCode.Text = JsonHelper.getDestValue(jo, "code");
+            dynamic joData = GetInput(15, out TradeEnum trade);
+            JObject joRtn = cBus.InvokeMedicalInsuranceInquiry(trade, joData);
+
+            if (joRtn["infcode"].ToString() == "0")
+            {
+                DataTable dtAuxInfo = (DataTable)joRtn["output"]["data"].ToObject(typeof(DataTable));
+
+                DateTime dtToday = DateTime.Today;
+                string chrgitm_lv = "";
+                string begndate = "";
+                string enddate = "";
+                string list_type = "";
+                string med_chrgitm_type = "";
+
+                int iAdpater = 0;
+
+                foreach (DataRow dr in dtAuxInfo.Rows)
+                {
+                    DateTime dtBegin = getDataRowValue(dr, "begndate") == "" ? Convert.ToDateTime("2000-01-01 00:00:00") : Convert.ToDateTime(getDataRowValue(dr, "begndate"));
+                    DateTime dtEnd = getDataRowValue(dr, "enddate") == "" ? Convert.ToDateTime("2099-01-01 00:00:00") : Convert.ToDateTime(getDataRowValue(dr, "enddate"));
+
+                    if ((dtBegin < dtToday) && (dtToday < dtEnd))
+                    {
+                        iAdpater++;
+                        chrgitm_lv = dr["chrgitm_lv"].ToString();
+                        begndate = dr["begndate"].ToString();
+                        enddate = dr["enddate"].ToString();
+                        list_type = dr["list_type"].ToString();
+                        med_chrgitm_type = dr["med_chrgitm_type"].ToString();
+                    }
+                }
+
+                //有且只能有一条数据符合
+                if (iAdpater == 1)
+                {
+                    JObject joPamam = new JObject();
+                    joPamam.Add("Code", JsonHelper.getDestValue(jo, "code"));
+                    joPamam.Add("HisType", JsonHelper.getDestValue(jo, "HisType"));
+                    joPamam.Add("StartDate", begndate);
+                    joPamam.Add("EndDate", enddate);
+                    joPamam.Add("ChargeItemLevel", chrgitm_lv);
+                    joPamam.Add("ListType", list_type);
+                    joPamam.Add("ChargeItemType", med_chrgitm_type);
+
+                    JObject joUpdateRtn = mIS.UpdateDirectoryBySelf(joPamam);
+                    string error = "";
+                    if (JsonHelper.parseIrisRtnValue(joUpdateRtn, out error) != 0)
+                    {
+                        err = "修改失败：" + error;
+                        return -1;
+                    }
+                    else
+                    {
+                        err = "修改成功";
+                        return 0;
+                    }
+                }
+                else
+                {
+                    err = "中心返回符合条数的记录不唯一或者为空,请检查！";
+                    return -1;
+                }
+            }
+            else
+            {
+                err = "查询中心数据出错,请检查！";
+                return -1;
+            }
+        }
+        public string getDataRowValue(DataRow dr, string columnName)
+        {
+            if (!dr.Table.Columns.Contains(columnName))
+            {
+                return "";
+            }
+            else
+            {
+                return dr[columnName].ToString();
+            }
+        }
+        //更新目录信息(附属信息)
+        private int updateCellingPrice(JObject jo, out string err)
+        {
+            err = "";
+            tbDirectoryCode.Text = JsonHelper.getDestValue(jo, "code");
+            dynamic joData = GetInput(18, out TradeEnum trade);
+            JObject joRtn = cBus.InvokeMedicalInsuranceInquiry(trade, joData);
+
+            if (joRtn["infcode"].ToString() == "0")
+            {
+                DataTable dtAuxInfo = (DataTable)joRtn["output"]["data"].ToObject(typeof(DataTable));
+
+                DateTime dtToday = DateTime.Today;
+                string cellingPrice = "";
+                string begndate = "";
+                string enddate = "";
+
+
+                int iAdpater = 0;
+
+                foreach (DataRow dr in dtAuxInfo.Rows)
+                {
+                    DateTime dtBegin = getDataRowValue(dr, "begndate") == "" ? Convert.ToDateTime("2000-01-01 00:00:00") : Convert.ToDateTime(getDataRowValue(dr, "begndate"));
+                    DateTime dtEnd = getDataRowValue(dr, "enddate") == "" ? Convert.ToDateTime("2099-01-01 00:00:00") : Convert.ToDateTime(getDataRowValue(dr, "enddate"));
+
+                    if ((dtBegin < dtToday) && (dtToday < dtEnd))
+                    {
+                        iAdpater++;
+                        cellingPrice = dr["hilist_pric_uplmt_amt"].ToString();
+                        begndate = dr["begndate"].ToString();
+                        enddate = dr["enddate"].ToString();
+
+                    }
+                }
+
+                //有且只能有一条数据符合
+                if (iAdpater == 1)
+                {
+                    JObject joPamam = new JObject();
+                    joPamam.Add("Code", JsonHelper.getDestValue(jo, "code"));
+                    joPamam.Add("HisType", JsonHelper.getDestValue(jo, "HisType"));
+                    joPamam.Add("StartDate", begndate);
+                    joPamam.Add("EndDate", enddate);
+                    joPamam.Add("CeilingPrice", cellingPrice);
+
+
+                    JObject joUpdateRtn = mIS.UpdateDirectoryBySelf(joPamam);
+                    string error = "";
+                    if (JsonHelper.parseIrisRtnValue(joUpdateRtn, out error) != 0)
+                    {
+                        err = "修改失败：" + error;
+                        return -1;
+                    }
+                    else
+                    {
+                        err = "修改成功";
+                        return 0;
+                    }
+                }
+                else
+                {
+                    err = "中心返回符合条数的记录不唯一或者为空,请检查！";
+                    return -1;
+                }
+            }
+            else
+            {
+                err = "查询中心数据出错,请检查！";
+                return -1;
+            }
+        }
+
+        private void btTripMenu_Click(object sender, EventArgs e)
+        {
+            uiContextMenuStrip1.Show(((Sunny.UI.UIButton)sender), new Point(0, btTripMenu.Height));
+        }
+
+        private void tsmExportAllMappedData_Click(object sender, EventArgs e)
+        {
+            if (queryHISDirectory(1, 1000, out string errMsg) != 0)
+            {
+                MessageBox.Show(errMsg);
+                return;
+            }
+
+            if (dtExport.Rows.Count > 0)
+            {
+                string directoryType = string.Empty;
+                string sBZ = "";
+                switch (rbgDirecType_C.SelectedIndex)
+                {
+                    case 0:
+                        {
+                            directoryType = "药品";
+                            break;
+                        }
+                    case 1:
+                        {
+                            directoryType = "诊疗";
+                            break;
+                        }
+                    case 2:
+                        {
+                            directoryType = "材料";
+                            break;
+                        }
+                }
+
+                if (rbAll.Checked) sBZ = "全部";
+                else
+                    if (rbMaped.Checked) sBZ = "已对照";
+                else
+                    if (rbNoMaped.Checked) sBZ = "未对照";
+
+                string LSH = DateTime.Now.ToString("yyyy-MM-dd"); //DateTime.Now.ToString("MMddHHmmssffff");
+                string sFliePathName = @"D:\" + LSH + "(" + directoryType + ")医保目录" + sBZ + "信息.xls";
+                string ReturnFileName = ExportToExcel.DataTabletoExcel(dtExport, sFliePathName);
+                if (ReturnFileName != "")
+                {
+                    MessageBox.Show("导出成功,文件保存路径：【" + ReturnFileName + "】");
+                    System.Diagnostics.Process.Start(ReturnFileName); //打开excel文件                
+                }
+                else
+                {
+                    MessageBox.Show("导出失败!");
+                }
+            }
+        }
+
+        private void tsmExportMappedDataByLeft_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void tsmUploadAllMappedData_Click(object sender, EventArgs e)
+        {
+            AllUpLoad();
+        }
+
+        private void tsmCancelAllUploadedData_Click(object sender, EventArgs e)
+        {
+            AllCancelUpload();
+        }
+
+        private void tsmUpdateAllMapped_Click(object sender, EventArgs e)
+        {
+            updateMappedInsuInfo(updateAuxAndCellPriceWrapper);
+        }
+
+        private void updateMappedInsuInfo(Func<JObject, OutParamWrapper, int> action)
+        {
+            string sqlStr = $"select * from HB_MedInsuMapRelation where Interface_Dr='{Global.inf.interfaceDr}' and Hospital_Dr ='{Global.inf.hospitalDr}'";
+            JObject joSqlstr = new JObject();
+            joSqlstr.Add("sqlStr", sqlStr);
+            JObject joRtn = mIS.QueryMappedData(joSqlstr, "查询所有已对照数据");
+
+            DataTable dt = (DataTable)joRtn["result"]["data"].ToObject(typeof(DataTable));
+
+            int iFalse = 0;
+            int iCount = 0;
+            frmProcessBar bar = new frmProcessBar(dt.Rows.Count);
+            tools.ShowAppDiaglog(bar);
+            foreach (DataRow dr in dt.Rows)
+            {
+                JObject jo = new JObject();
+                jo.Add("code", dr["InsuCode"].ToString());
+                jo.Add("HisType", dr["HisType"].ToString());
+                OutParamWrapper outParWarp = new OutParamWrapper();
+                if (action(jo, outParWarp) != 0)
+                {
+                    iFalse++;
+                    Global.writeLog(outParWarp.Value);
+                }
+            }
+
+            if (iFalse != 0)
+            {
+                MessageBox.Show($"总共{iCount}条数据更新完成，但有{iFalse}条更新发生错误！");
+
+            }
+            else
+            {
+                MessageBox.Show("全部数据更新完成");
+            }
+        }
+
+        private int updateAuxAndCellPriceWrapper(JObject jo, OutParamWrapper outParamWrapper)
+        {
+            string err;
+            int iresult = updateAuxAndCellPrice(jo, out err);
+            outParamWrapper.Value = err;
+            return iresult;
+        }
+
+        private int updateCellPriceWrapper(JObject jo, OutParamWrapper outParamWrapper)
+        {
+            string err;
+            int iresult = updateCellingPrice(jo, out err);
+            outParamWrapper.Value = err;
+            return iresult;
+        }
+
+        private int updateAuxInfoWrapper(JObject jo, OutParamWrapper outParamWrapper)
+        {
+            string err;
+            int iresult = updateAuxInfo(jo, out err);
+            outParamWrapper.Value = err;
+            return iresult;
+        }
+
+
+        private int updateAuxAndCellPrice(JObject jo, out string error)
+        {
+            string err = "";
+            int iResult = 0;
+            error = "";
+            if (updateAuxInfo(jo, out err) != 0)
+            {
+                error = $"更新目录信息失败{err}";
+                iResult--;
+            }
+
+            err = "";
+            if (updateCellingPrice(jo, out err) != 0)
+            {
+                error = $"{error};更新限价信息失败{err}";
+                iResult--;
+            }
+
+            return iResult;
+        }
+
+        private void tsmUpdateCellPriceOfAllMapped_Click(object sender, EventArgs e)
+        {
+            updateMappedInsuInfo(updateCellPriceWrapper);
+        }
+
+        private void tsmUpdateLevelTypeOfAllMappedData_Click(object sender, EventArgs e)
+        {
+            updateMappedInsuInfo(updateAuxInfoWrapper);
+        }
+
+        private void backgroundWorker_DoWork(object sender, DoWorkEventArgs e)
+        {
+
+        }
+    }
+
+    public class OutParamWrapper
+    {
+        public string Value { get; set; }
     }
-    
 }

Forms/BasicData.designer.cs

@@ -28,25 +28,28 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.panel1 = new System.Windows.Forms.Panel();
             this.dgvDirectoy = new Sunny.UI.UIDataGridView();
+            this.cmsUpdateAuxInfo = new Sunny.UI.UIContextMenuStrip();
+            this.tsmiSingleUpdateAuxInfo = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsmiUpdateCellingPrice = new System.Windows.Forms.ToolStripMenuItem();
             this.pgDownload = new Sunny.UI.UIPagination();
             this.panel2 = new System.Windows.Forms.Panel();
             this.rbgDirecType = new Sunny.UI.UIRadioButtonGroup();
@@ -84,9 +87,15 @@
             this.panel3 = new System.Windows.Forms.Panel();
             this.dgvHISDirectory = new Sunny.UI.UIDataGridView();
             this.panel5 = new System.Windows.Forms.Panel();
-            this.btnExport = new Sunny.UI.UIButton();
-            this.btnCancelUpShip = new Sunny.UI.UIButton();
-            this.btnUpShip = new Sunny.UI.UIButton();
+            this.btTripMenu = new Sunny.UI.UIButton();
+            this.uiContextMenuStrip1 = new Sunny.UI.UIContextMenuStrip();
+            this.tsmExportAllMappedData = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsmExportMappedDataByLeft = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsmUploadAllMappedData = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsmCancelAllUploadedData = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsmUpdateAllMapped = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsmUpdateCellPriceOfAllMapped = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsmUpdateLevelTypeOfAllMappedData = new System.Windows.Forms.ToolStripMenuItem();
             this.uiTextBox1 = new Sunny.UI.UITextBox();
             this.rbAll = new Sunny.UI.UIRadioButton();
             this.rbNoMaped = new Sunny.UI.UIRadioButton();
@@ -119,14 +128,12 @@
             this.cmsUpdateInsuDir = new Sunny.UI.UIContextMenuStrip();
             this.limitPriceUpdate = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-            this.cmsUpdateAuxInfo = new Sunny.UI.UIContextMenuStrip();
-            this.tsmiSingleUpdateAuxInfo = new System.Windows.Forms.ToolStripMenuItem();
-            this.tsmiUpdateAllAuxInfo = new System.Windows.Forms.ToolStripMenuItem();
             this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvDirectoy)).BeginInit();
+            this.cmsUpdateAuxInfo.SuspendLayout();
             this.panel2.SuspendLayout();
             this.cmsMapping.SuspendLayout();
             this.uiGroupBox3.SuspendLayout();
@@ -142,6 +149,7 @@
             this.panel3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvHISDirectory)).BeginInit();
             this.panel5.SuspendLayout();
+            this.uiContextMenuStrip1.SuspendLayout();
             this.pgHISDirect.SuspendLayout();
             this.panel4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvCenterDirectory)).BeginInit();
@@ -154,7 +162,6 @@
             this.pgCenterDirect.SuspendLayout();
             this.uiPanel3.SuspendLayout();
             this.cmsUpdateInsuDir.SuspendLayout();
-            this.cmsUpdateAuxInfo.SuspendLayout();
             this.SuspendLayout();
             // 
             // tabControl1
@@ -167,7 +174,7 @@
             this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1378, 583);
+            this.tabControl1.Size = new System.Drawing.Size(1630, 537);
             this.tabControl1.TabIndex = 0;
             // 
             // tabPage1
@@ -177,7 +184,7 @@
             this.tabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.tabPage1.Size = new System.Drawing.Size(1370, 548);
+            this.tabPage1.Size = new System.Drawing.Size(1622, 502);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "数据下载";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -191,34 +198,35 @@
             this.panel1.Location = new System.Drawing.Point(3, 2);
             this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1364, 544);
+            this.panel1.Size = new System.Drawing.Size(1616, 498);
             this.panel1.TabIndex = 0;
             // 
             // dgvDirectoy
             // 
             this.dgvDirectoy.AllowUserToAddRows = false;
             this.dgvDirectoy.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            this.dgvDirectoy.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            this.dgvDirectoy.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle26;
             this.dgvDirectoy.BackgroundColor = System.Drawing.Color.White;
             this.dgvDirectoy.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDirectoy.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle27.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle27.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDirectoy.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27;
             this.dgvDirectoy.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvDirectoy.DefaultCellStyle = dataGridViewCellStyle3;
+            this.dgvDirectoy.ContextMenuStrip = this.cmsUpdateAuxInfo;
+            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle28.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvDirectoy.DefaultCellStyle = dataGridViewCellStyle28;
             this.dgvDirectoy.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvDirectoy.EnableHeadersVisualStyles = false;
             this.dgvDirectoy.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -226,31 +234,56 @@
             this.dgvDirectoy.Location = new System.Drawing.Point(0, 0);
             this.dgvDirectoy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.dgvDirectoy.Name = "dgvDirectoy";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDirectoy.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle29.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle29.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle29.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle29.SelectionForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDirectoy.RowHeadersDefaultCellStyle = dataGridViewCellStyle29;
             this.dgvDirectoy.RowHeadersWidth = 51;
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvDirectoy.RowsDefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle30.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle30.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvDirectoy.RowsDefaultCellStyle = dataGridViewCellStyle30;
             this.dgvDirectoy.RowTemplate.Height = 23;
             this.dgvDirectoy.SelectedIndex = -1;
-            this.dgvDirectoy.Size = new System.Drawing.Size(1364, 264);
+            this.dgvDirectoy.Size = new System.Drawing.Size(1616, 218);
             this.dgvDirectoy.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
             this.dgvDirectoy.TabIndex = 3;
             this.dgvDirectoy.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             this.dgvDirectoy.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dgvDirectoy_RowPostPaint);
             // 
+            // cmsUpdateAuxInfo
+            // 
+            this.cmsUpdateAuxInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
+            this.cmsUpdateAuxInfo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cmsUpdateAuxInfo.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.cmsUpdateAuxInfo.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsmiSingleUpdateAuxInfo,
+            this.tsmiUpdateCellingPrice});
+            this.cmsUpdateAuxInfo.Name = "cmsUpdateAuxInfo";
+            this.cmsUpdateAuxInfo.Size = new System.Drawing.Size(209, 56);
+            this.cmsUpdateAuxInfo.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // tsmiSingleUpdateAuxInfo
+            // 
+            this.tsmiSingleUpdateAuxInfo.Name = "tsmiSingleUpdateAuxInfo";
+            this.tsmiSingleUpdateAuxInfo.Size = new System.Drawing.Size(208, 26);
+            this.tsmiSingleUpdateAuxInfo.Text = "更新目录附属信息";
+            this.tsmiSingleUpdateAuxInfo.Click += new System.EventHandler(this.tsmiSingleUpdateAuxInfo_Click_1);
+            // 
+            // tsmiUpdateCellingPrice
+            // 
+            this.tsmiUpdateCellingPrice.Name = "tsmiUpdateCellingPrice";
+            this.tsmiUpdateCellingPrice.Size = new System.Drawing.Size(208, 26);
+            this.tsmiUpdateCellingPrice.Text = "更新最高限价信息";
+            // 
             // pgDownload
             // 
             this.pgDownload.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.pgDownload.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pgDownload.Location = new System.Drawing.Point(0, 264);
+            this.pgDownload.Location = new System.Drawing.Point(0, 218);
             this.pgDownload.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
             this.pgDownload.MinimumSize = new System.Drawing.Size(2, 2);
             this.pgDownload.Name = "pgDownload";
@@ -258,7 +291,7 @@
             this.pgDownload.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
             this.pgDownload.ShowJumpButton = false;
             this.pgDownload.ShowText = false;
-            this.pgDownload.Size = new System.Drawing.Size(1364, 30);
+            this.pgDownload.Size = new System.Drawing.Size(1616, 30);
             this.pgDownload.TabIndex = 2;
             this.pgDownload.Text = "uiPagination1";
             this.pgDownload.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -279,10 +312,10 @@
             this.panel2.Controls.Add(this.uiProcessBar1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.panel2.Font = new System.Drawing.Font("华文隶书", 9.749999F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.panel2.Location = new System.Drawing.Point(0, 294);
+            this.panel2.Location = new System.Drawing.Point(0, 248);
             this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1364, 250);
+            this.panel2.Size = new System.Drawing.Size(1616, 250);
             this.panel2.TabIndex = 1;
             // 
             // rbgDirecType
@@ -332,7 +365,7 @@
             this.btnExit.ContextMenuStrip = this.cmsMapping;
             this.btnExit.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnExit.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnExit.Location = new System.Drawing.Point(1206, 202);
+            this.btnExit.Location = new System.Drawing.Point(1458, 202);
             this.btnExit.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnExit.MinimumSize = new System.Drawing.Size(2, 2);
             this.btnExit.Name = "btnExit";
@@ -439,7 +472,9 @@
             // 
             this.TexBYSJL.AutoSize = true;
             this.TexBYSJL.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.TexBYSJL.DoubleValue = 10D;
             this.TexBYSJL.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.TexBYSJL.IntValue = 10;
             this.TexBYSJL.Location = new System.Drawing.Point(9, 111);
             this.TexBYSJL.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.TexBYSJL.MinimumSize = new System.Drawing.Size(1, 16);
@@ -447,6 +482,7 @@
             this.TexBYSJL.ShowText = false;
             this.TexBYSJL.Size = new System.Drawing.Size(158, 27);
             this.TexBYSJL.TabIndex = 6;
+            this.TexBYSJL.Text = "10";
             this.TexBYSJL.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.TexBYSJL.Watermark = "本页数据量";
             this.TexBYSJL.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -455,7 +491,9 @@
             // 
             this.TexDQYS.AutoSize = true;
             this.TexDQYS.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.TexDQYS.DoubleValue = 1D;
             this.TexDQYS.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.TexDQYS.IntValue = 1;
             this.TexDQYS.Location = new System.Drawing.Point(9, 72);
             this.TexDQYS.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.TexDQYS.MinimumSize = new System.Drawing.Size(1, 16);
@@ -463,6 +501,7 @@
             this.TexDQYS.ShowText = false;
             this.TexDQYS.Size = new System.Drawing.Size(158, 27);
             this.TexDQYS.TabIndex = 5;
+            this.TexDQYS.Text = "1";
             this.TexDQYS.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.TexDQYS.Watermark = "当前页数";
             this.TexDQYS.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -489,7 +528,7 @@
             this.btEditDir.ContextMenuStrip = this.cmsMapping;
             this.btEditDir.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btEditDir.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btEditDir.Location = new System.Drawing.Point(1280, 108);
+            this.btEditDir.Location = new System.Drawing.Point(1532, 108);
             this.btEditDir.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btEditDir.MinimumSize = new System.Drawing.Size(2, 2);
             this.btEditDir.Name = "btEditDir";
@@ -506,7 +545,7 @@
             this.btAddDir.ContextMenuStrip = this.cmsMapping;
             this.btAddDir.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btAddDir.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btAddDir.Location = new System.Drawing.Point(1280, 38);
+            this.btAddDir.Location = new System.Drawing.Point(1532, 38);
             this.btAddDir.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btAddDir.MinimumSize = new System.Drawing.Size(2, 2);
             this.btAddDir.Name = "btAddDir";
@@ -694,7 +733,7 @@
             this.btnQuery.ContextMenuStrip = this.cmsMapping;
             this.btnQuery.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnQuery.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnQuery.Location = new System.Drawing.Point(1206, 38);
+            this.btnQuery.Location = new System.Drawing.Point(1458, 38);
             this.btnQuery.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnQuery.MinimumSize = new System.Drawing.Size(2, 2);
             this.btnQuery.Name = "btnQuery";
@@ -711,7 +750,7 @@
             this.btnDownload.ContextMenuStrip = this.cmsMapping;
             this.btnDownload.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnDownload.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnDownload.Location = new System.Drawing.Point(1206, 108);
+            this.btnDownload.Location = new System.Drawing.Point(1458, 108);
             this.btnDownload.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnDownload.MinimumSize = new System.Drawing.Size(2, 2);
             this.btnDownload.Name = "btnDownload";
@@ -744,7 +783,7 @@
             this.tabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabPage2.Name = "tabPage2";
             this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.tabPage2.Size = new System.Drawing.Size(1370, 548);
+            this.tabPage2.Size = new System.Drawing.Size(1622, 502);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "数据对照";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -756,7 +795,7 @@
             this.panel7.Location = new System.Drawing.Point(181, 2);
             this.panel7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel7.Name = "panel7";
-            this.panel7.Size = new System.Drawing.Size(1186, 544);
+            this.panel7.Size = new System.Drawing.Size(1438, 498);
             this.panel7.TabIndex = 3;
             // 
             // uiSplitContainer1
@@ -777,8 +816,8 @@
             // uiSplitContainer1.Panel2
             // 
             this.uiSplitContainer1.Panel2.Controls.Add(this.panel4);
-            this.uiSplitContainer1.Size = new System.Drawing.Size(1186, 544);
-            this.uiSplitContainer1.SplitterDistance = 273;
+            this.uiSplitContainer1.Size = new System.Drawing.Size(1438, 498);
+            this.uiSplitContainer1.SplitterDistance = 249;
             this.uiSplitContainer1.SplitterWidth = 11;
             this.uiSplitContainer1.TabIndex = 3;
             this.uiSplitContainer1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -792,35 +831,35 @@
             this.panel3.Location = new System.Drawing.Point(0, 0);
             this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(1186, 273);
+            this.panel3.Size = new System.Drawing.Size(1438, 249);
             this.panel3.TabIndex = 2;
             // 
             // dgvHISDirectory
             // 
             this.dgvHISDirectory.AllowUserToAddRows = false;
             this.dgvHISDirectory.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            this.dgvHISDirectory.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            this.dgvHISDirectory.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21;
             this.dgvHISDirectory.BackgroundColor = System.Drawing.Color.White;
             this.dgvHISDirectory.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvHISDirectory.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle22.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle22.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvHISDirectory.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22;
             this.dgvHISDirectory.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvHISDirectory.ContextMenuStrip = this.cmsMapping;
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvHISDirectory.DefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle23.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvHISDirectory.DefaultCellStyle = dataGridViewCellStyle23;
             this.dgvHISDirectory.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvHISDirectory.EnableHeadersVisualStyles = false;
             this.dgvHISDirectory.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -828,22 +867,22 @@
             this.dgvHISDirectory.Location = new System.Drawing.Point(0, 46);
             this.dgvHISDirectory.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.dgvHISDirectory.Name = "dgvHISDirectory";
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvHISDirectory.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle24.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle24.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle24.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle24.SelectionForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvHISDirectory.RowHeadersDefaultCellStyle = dataGridViewCellStyle24;
             this.dgvHISDirectory.RowHeadersWidth = 51;
             this.dgvHISDirectory.RowHeight = 25;
-            dataGridViewCellStyle10.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvHISDirectory.RowsDefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle25.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle25.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvHISDirectory.RowsDefaultCellStyle = dataGridViewCellStyle25;
             this.dgvHISDirectory.RowTemplate.Height = 25;
             this.dgvHISDirectory.SelectedIndex = -1;
-            this.dgvHISDirectory.Size = new System.Drawing.Size(1186, 193);
+            this.dgvHISDirectory.Size = new System.Drawing.Size(1438, 169);
             this.dgvHISDirectory.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
             this.dgvHISDirectory.TabIndex = 4;
             this.dgvHISDirectory.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -852,9 +891,7 @@
             // 
             // panel5
             // 
-            this.panel5.Controls.Add(this.btnExport);
-            this.panel5.Controls.Add(this.btnCancelUpShip);
-            this.panel5.Controls.Add(this.btnUpShip);
+            this.panel5.Controls.Add(this.btTripMenu);
             this.panel5.Controls.Add(this.uiTextBox1);
             this.panel5.Controls.Add(this.rbAll);
             this.panel5.Controls.Add(this.rbNoMaped);
@@ -866,55 +903,92 @@
             this.panel5.Location = new System.Drawing.Point(0, 0);
             this.panel5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel5.Name = "panel5";
-            this.panel5.Size = new System.Drawing.Size(1186, 46);
+            this.panel5.Size = new System.Drawing.Size(1438, 46);
             this.panel5.TabIndex = 1;
             // 
-            // btnExport
-            // 
-            this.btnExport.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnExport.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnExport.Location = new System.Drawing.Point(820, 8);
-            this.btnExport.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.btnExport.MinimumSize = new System.Drawing.Size(2, 2);
-            this.btnExport.Name = "btnExport";
-            this.btnExport.Size = new System.Drawing.Size(100, 28);
-            this.btnExport.TabIndex = 13;
-            this.btnExport.Text = "导  出";
-            this.btnExport.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnExport.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            this.btnExport.Click += new System.EventHandler(this.btnExport_Click);
-            // 
-            // btnCancelUpShip
-            // 
-            this.btnCancelUpShip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnCancelUpShip.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnCancelUpShip.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnCancelUpShip.Location = new System.Drawing.Point(1038, 8);
-            this.btnCancelUpShip.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.btnCancelUpShip.MinimumSize = new System.Drawing.Size(2, 2);
-            this.btnCancelUpShip.Name = "btnCancelUpShip";
-            this.btnCancelUpShip.Size = new System.Drawing.Size(140, 28);
-            this.btnCancelUpShip.TabIndex = 11;
-            this.btnCancelUpShip.Text = "撤销目录对照上传";
-            this.btnCancelUpShip.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnCancelUpShip.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            this.btnCancelUpShip.Click += new System.EventHandler(this.btnCancelUpShip_Click);
-            // 
-            // btnUpShip
-            // 
-            this.btnUpShip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnUpShip.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnUpShip.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnUpShip.Location = new System.Drawing.Point(924, 8);
-            this.btnUpShip.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.btnUpShip.MinimumSize = new System.Drawing.Size(2, 2);
-            this.btnUpShip.Name = "btnUpShip";
-            this.btnUpShip.Size = new System.Drawing.Size(110, 28);
-            this.btnUpShip.TabIndex = 10;
-            this.btnUpShip.Text = "目录对照上传";
-            this.btnUpShip.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnUpShip.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            this.btnUpShip.Click += new System.EventHandler(this.btnUpShip_Click);
+            // btTripMenu
+            // 
+            this.btTripMenu.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.btTripMenu.ContextMenuStrip = this.uiContextMenuStrip1;
+            this.btTripMenu.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btTripMenu.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btTripMenu.Location = new System.Drawing.Point(1157, 8);
+            this.btTripMenu.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btTripMenu.MinimumSize = new System.Drawing.Size(2, 2);
+            this.btTripMenu.Name = "btTripMenu";
+            this.btTripMenu.Size = new System.Drawing.Size(259, 28);
+            this.btTripMenu.TabIndex = 15;
+            this.btTripMenu.Text = "集成菜单";
+            this.btTripMenu.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btTripMenu.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.btTripMenu.Click += new System.EventHandler(this.btTripMenu_Click);
+            // 
+            // uiContextMenuStrip1
+            // 
+            this.uiContextMenuStrip1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
+            this.uiContextMenuStrip1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiContextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsmExportAllMappedData,
+            this.tsmExportMappedDataByLeft,
+            this.tsmUploadAllMappedData,
+            this.tsmCancelAllUploadedData,
+            this.tsmUpdateAllMapped,
+            this.tsmUpdateCellPriceOfAllMapped,
+            this.tsmUpdateLevelTypeOfAllMappedData});
+            this.uiContextMenuStrip1.Name = "uiContextMenuStrip1";
+            this.uiContextMenuStrip1.Size = new System.Drawing.Size(459, 186);
+            this.uiContextMenuStrip1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // tsmExportAllMappedData
+            // 
+            this.tsmExportAllMappedData.Name = "tsmExportAllMappedData";
+            this.tsmExportAllMappedData.Size = new System.Drawing.Size(458, 26);
+            this.tsmExportAllMappedData.Text = "导出全部已对照数据";
+            this.tsmExportAllMappedData.Click += new System.EventHandler(this.tsmExportAllMappedData_Click);
+            // 
+            // tsmExportMappedDataByLeft
+            // 
+            this.tsmExportMappedDataByLeft.Name = "tsmExportMappedDataByLeft";
+            this.tsmExportMappedDataByLeft.Size = new System.Drawing.Size(458, 26);
+            this.tsmExportMappedDataByLeft.Text = "按左侧类别导出已对照数据";
+            this.tsmExportMappedDataByLeft.Click += new System.EventHandler(this.tsmExportMappedDataByLeft_Click);
+            // 
+            // tsmUploadAllMappedData
+            // 
+            this.tsmUploadAllMappedData.Name = "tsmUploadAllMappedData";
+            this.tsmUploadAllMappedData.Size = new System.Drawing.Size(458, 26);
+            this.tsmUploadAllMappedData.Text = "上传全部对照数据";
+            this.tsmUploadAllMappedData.Click += new System.EventHandler(this.tsmUploadAllMappedData_Click);
+            // 
+            // tsmCancelAllUploadedData
+            // 
+            this.tsmCancelAllUploadedData.Name = "tsmCancelAllUploadedData";
+            this.tsmCancelAllUploadedData.Size = new System.Drawing.Size(458, 26);
+            this.tsmCancelAllUploadedData.Text = "撤销上传所有对照数据";
+            this.tsmCancelAllUploadedData.Click += new System.EventHandler(this.tsmCancelAllUploadedData_Click);
+            // 
+            // tsmUpdateAllMapped
+            // 
+            this.tsmUpdateAllMapped.Name = "tsmUpdateAllMapped";
+            this.tsmUpdateAllMapped.Size = new System.Drawing.Size(458, 26);
+            this.tsmUpdateAllMapped.Text = "更新所有对照数据目录信息(包括限价，类别，等级等)";
+            this.tsmUpdateAllMapped.Click += new System.EventHandler(this.tsmUpdateAllMapped_Click);
+            // 
+            // tsmUpdateCellPriceOfAllMapped
+            // 
+            this.tsmUpdateCellPriceOfAllMapped.Name = "tsmUpdateCellPriceOfAllMapped";
+            this.tsmUpdateCellPriceOfAllMapped.Size = new System.Drawing.Size(458, 26);
+            this.tsmUpdateCellPriceOfAllMapped.Text = "更新所有对照数据的限价信息";
+            this.tsmUpdateCellPriceOfAllMapped.Click += new System.EventHandler(this.tsmUpdateCellPriceOfAllMapped_Click);
+            // 
+            // tsmUpdateLevelTypeOfAllMappedData
+            // 
+            this.tsmUpdateLevelTypeOfAllMappedData.Name = "tsmUpdateLevelTypeOfAllMappedData";
+            this.tsmUpdateLevelTypeOfAllMappedData.Size = new System.Drawing.Size(458, 26);
+            this.tsmUpdateLevelTypeOfAllMappedData.Text = "更新所有对照数据的类别等级信息";
+            this.tsmUpdateLevelTypeOfAllMappedData.Click += new System.EventHandler(this.tsmUpdateLevelTypeOfAllMappedData_Click);
             // 
             // uiTextBox1
             // 
@@ -1026,14 +1100,14 @@
             this.pgHISDirect.Controls.Add(this.LabExplain);
             this.pgHISDirect.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.pgHISDirect.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pgHISDirect.Location = new System.Drawing.Point(0, 239);
+            this.pgHISDirect.Location = new System.Drawing.Point(0, 215);
             this.pgHISDirect.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
             this.pgHISDirect.MinimumSize = new System.Drawing.Size(2, 2);
             this.pgHISDirect.Name = "pgHISDirect";
             this.pgHISDirect.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
             this.pgHISDirect.ShowJumpButton = false;
             this.pgHISDirect.ShowText = false;
-            this.pgHISDirect.Size = new System.Drawing.Size(1186, 34);
+            this.pgHISDirect.Size = new System.Drawing.Size(1438, 34);
             this.pgHISDirect.TabIndex = 6;
             this.pgHISDirect.Text = "uiPagination2";
             this.pgHISDirect.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1047,7 +1121,7 @@
             this.LabExplain.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.LabExplain.Location = new System.Drawing.Point(741, 3);
             this.LabExplain.Name = "LabExplain";
-            this.LabExplain.Size = new System.Drawing.Size(414, 30);
+            this.LabExplain.Size = new System.Drawing.Size(666, 30);
             this.LabExplain.TabIndex = 26;
             this.LabExplain.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.LabExplain.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -1061,34 +1135,34 @@
             this.panel4.Location = new System.Drawing.Point(0, 0);
             this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(1186, 260);
+            this.panel4.Size = new System.Drawing.Size(1438, 238);
             this.panel4.TabIndex = 3;
             // 
             // dgvCenterDirectory
             // 
             this.dgvCenterDirectory.AllowUserToAddRows = false;
             this.dgvCenterDirectory.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            this.dgvCenterDirectory.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            this.dgvCenterDirectory.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle16;
             this.dgvCenterDirectory.BackgroundColor = System.Drawing.Color.White;
             this.dgvCenterDirectory.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvCenterDirectory.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle17.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle17.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvCenterDirectory.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17;
             this.dgvCenterDirectory.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvCenterDirectory.DefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvCenterDirectory.DefaultCellStyle = dataGridViewCellStyle18;
             this.dgvCenterDirectory.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvCenterDirectory.EnableHeadersVisualStyles = false;
             this.dgvCenterDirectory.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1096,21 +1170,21 @@
             this.dgvCenterDirectory.Location = new System.Drawing.Point(0, 40);
             this.dgvCenterDirectory.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.dgvCenterDirectory.Name = "dgvCenterDirectory";
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle14.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle14.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvCenterDirectory.RowHeadersDefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle19.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle19.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle19.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle19.SelectionForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvCenterDirectory.RowHeadersDefaultCellStyle = dataGridViewCellStyle19;
             this.dgvCenterDirectory.RowHeadersWidth = 51;
-            dataGridViewCellStyle15.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvCenterDirectory.RowsDefaultCellStyle = dataGridViewCellStyle15;
+            dataGridViewCellStyle20.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle20.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvCenterDirectory.RowsDefaultCellStyle = dataGridViewCellStyle20;
             this.dgvCenterDirectory.RowTemplate.Height = 23;
             this.dgvCenterDirectory.SelectedIndex = -1;
-            this.dgvCenterDirectory.Size = new System.Drawing.Size(1186, 186);
+            this.dgvCenterDirectory.Size = new System.Drawing.Size(1438, 164);
             this.dgvCenterDirectory.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
             this.dgvCenterDirectory.TabIndex = 3;
             this.dgvCenterDirectory.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -1129,7 +1203,7 @@
             this.panel6.Location = new System.Drawing.Point(0, 0);
             this.panel6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel6.Name = "panel6";
-            this.panel6.Size = new System.Drawing.Size(1186, 40);
+            this.panel6.Size = new System.Drawing.Size(1438, 40);
             this.panel6.TabIndex = 2;
             // 
             // tbManufacturer
@@ -1338,14 +1412,14 @@
             this.pgCenterDirect.Controls.Add(this.uiButton1);
             this.pgCenterDirect.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.pgCenterDirect.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pgCenterDirect.Location = new System.Drawing.Point(0, 226);
+            this.pgCenterDirect.Location = new System.Drawing.Point(0, 204);
             this.pgCenterDirect.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
             this.pgCenterDirect.MinimumSize = new System.Drawing.Size(2, 2);
             this.pgCenterDirect.Name = "pgCenterDirect";
             this.pgCenterDirect.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
             this.pgCenterDirect.ShowJumpButton = false;
             this.pgCenterDirect.ShowText = false;
-            this.pgCenterDirect.Size = new System.Drawing.Size(1186, 34);
+            this.pgCenterDirect.Size = new System.Drawing.Size(1438, 34);
             this.pgCenterDirect.TabIndex = 0;
             this.pgCenterDirect.Text = "uiPagination3";
             this.pgCenterDirect.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1357,7 +1431,7 @@
             this.uiButton1.ContextMenuStrip = this.cmsMapping;
             this.uiButton1.Cursor = System.Windows.Forms.Cursors.Hand;
             this.uiButton1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton1.Location = new System.Drawing.Point(1358, 4);
+            this.uiButton1.Location = new System.Drawing.Point(1610, 4);
             this.uiButton1.Margin = new System.Windows.Forms.Padding(4);
             this.uiButton1.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiButton1.Name = "uiButton1";
@@ -1377,7 +1451,7 @@
             this.uiPanel3.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
             this.uiPanel3.MinimumSize = new System.Drawing.Size(2, 2);
             this.uiPanel3.Name = "uiPanel3";
-            this.uiPanel3.Size = new System.Drawing.Size(178, 544);
+            this.uiPanel3.Size = new System.Drawing.Size(178, 498);
             this.uiPanel3.TabIndex = 5;
             this.uiPanel3.Text = null;
             this.uiPanel3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1396,7 +1470,7 @@
             this.rbgDirecType_C.MinimumSize = new System.Drawing.Size(1, 1);
             this.rbgDirecType_C.Name = "rbgDirecType_C";
             this.rbgDirecType_C.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.rbgDirecType_C.Size = new System.Drawing.Size(178, 544);
+            this.rbgDirecType_C.Size = new System.Drawing.Size(178, 498);
             this.rbgDirecType_C.TabIndex = 6;
             this.rbgDirecType_C.Text = "目录类型";
             this.rbgDirecType_C.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1427,37 +1501,13 @@
             this.toolStripSeparator2.Name = "toolStripSeparator2";
             this.toolStripSeparator2.Size = new System.Drawing.Size(205, 6);
             // 
-            // cmsUpdateAuxInfo
-            // 
-            this.cmsUpdateAuxInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
-            this.cmsUpdateAuxInfo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cmsUpdateAuxInfo.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.cmsUpdateAuxInfo.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.tsmiSingleUpdateAuxInfo,
-            this.tsmiUpdateAllAuxInfo});
-            this.cmsUpdateAuxInfo.Name = "cmsUpdateAuxInfo";
-            this.cmsUpdateAuxInfo.Size = new System.Drawing.Size(241, 56);
-            this.cmsUpdateAuxInfo.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
-            // tsmiSingleUpdateAuxInfo
-            // 
-            this.tsmiSingleUpdateAuxInfo.Name = "tsmiSingleUpdateAuxInfo";
-            this.tsmiSingleUpdateAuxInfo.Size = new System.Drawing.Size(240, 26);
-            this.tsmiSingleUpdateAuxInfo.Text = "单新单条目录附属信息";
-            // 
-            // tsmiUpdateAllAuxInfo
-            // 
-            this.tsmiUpdateAllAuxInfo.Name = "tsmiUpdateAllAuxInfo";
-            this.tsmiUpdateAllAuxInfo.Size = new System.Drawing.Size(240, 26);
-            this.tsmiUpdateAllAuxInfo.Text = "更新所有目录附属信息";
-            // 
             // BasicData
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoSize = true;
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.ClientSize = new System.Drawing.Size(1378, 583);
+            this.ClientSize = new System.Drawing.Size(1630, 537);
             this.Controls.Add(this.tabControl1);
             this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "BasicData";
@@ -1467,6 +1517,7 @@
             this.tabPage1.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvDirectoy)).EndInit();
+            this.cmsUpdateAuxInfo.ResumeLayout(false);
             this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
             this.cmsMapping.ResumeLayout(false);
@@ -1487,6 +1538,7 @@
             this.panel3.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvHISDirectory)).EndInit();
             this.panel5.ResumeLayout(false);
+            this.uiContextMenuStrip1.ResumeLayout(false);
             this.pgHISDirect.ResumeLayout(false);
             this.panel4.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvCenterDirectory)).EndInit();
@@ -1499,7 +1551,6 @@
             this.pgCenterDirect.ResumeLayout(false);
             this.uiPanel3.ResumeLayout(false);
             this.cmsUpdateInsuDir.ResumeLayout(false);
-            this.cmsUpdateAuxInfo.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -1552,9 +1603,6 @@
         private Sunny.UI.UITextBox tbDicType;
         private Sunny.UI.UITextBox tbDicDate;
         private Sunny.UI.UIButton btAddDir;
-        private Sunny.UI.UIContextMenuStrip cmsUpdateAuxInfo;
-        private System.Windows.Forms.ToolStripMenuItem tsmiSingleUpdateAuxInfo;
-        private System.Windows.Forms.ToolStripMenuItem tsmiUpdateAllAuxInfo;
         private Sunny.UI.UIButton btEditDir;
         private Sunny.UI.UITextBox tbApprovalNO;
         private Sunny.UI.UITextBox uiTextBox1;
@@ -1569,11 +1617,8 @@
         private Sunny.UI.UIButton btnExit;
         private Sunny.UI.UIButton uiButton1;
         private System.ComponentModel.BackgroundWorker backgroundWorker1;
-        private Sunny.UI.UIButton btnCancelUpShip;
-        private Sunny.UI.UIButton btnUpShip;
         private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem_CancelUpload;
         private Sunny.UI.UIRadioButtonGroup rbgDirecType;
-        private Sunny.UI.UIButton btnExport;
         private Sunny.UI.UITextBox uiTextBox2;
         private Sunny.UI.UITextBox tbSpecifications;
         private Sunny.UI.UITextBox uiTextBox6;
@@ -1586,6 +1631,19 @@
         private Sunny.UI.UILabel LabExplain;
         private Sunny.UI.UITextBox txtSpecFilter;
         private System.Windows.Forms.ToolStripMenuItem batchUpdateCategory;
+        private Sunny.UI.UIContextMenuStrip cmsUpdateAuxInfo;
+        private System.Windows.Forms.ToolStripMenuItem tsmiSingleUpdateAuxInfo;
+        private System.Windows.Forms.ToolStripMenuItem tsmiUpdateCellingPrice;
+        private Sunny.UI.UIButton btTripMenu;
+        private Sunny.UI.UIContextMenuStrip uiContextMenuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem tsmExportAllMappedData;
+        private System.Windows.Forms.ToolStripMenuItem tsmExportMappedDataByLeft;
+        private System.Windows.Forms.ToolStripMenuItem tsmUploadAllMappedData;
+        private System.Windows.Forms.ToolStripMenuItem tsmCancelAllUploadedData;
+        private System.Windows.Forms.ToolStripMenuItem tsmUpdateAllMapped;
+        private System.Windows.Forms.ToolStripMenuItem tsmUpdateCellPriceOfAllMapped;
+        private System.Windows.Forms.ToolStripMenuItem tsmUpdateLevelTypeOfAllMappedData;
+        private System.ComponentModel.BackgroundWorker backgroundWorker;
     }
 }
 

Forms/BasicData.resx

@@ -117,15 +117,18 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="cmsUpdateAuxInfo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>673, 17</value>
+  </metadata>
   <metadata name="cmsMapping.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="uiContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>851, 17</value>
+  </metadata>
   <metadata name="cmsUpdateInsuDir.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>310, 17</value>
   </metadata>
-  <metadata name="cmsUpdateAuxInfo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>146, 17</value>
-  </metadata>
   <metadata name="backgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>499, 17</value>
   </metadata>

Forms/ChooseCard.designer.cs

@@ -306,7 +306,8 @@
             "302 取药 ",
             "303 取报告",
             "304 打印票据和清单",
-            "305 病历材料复印"});
+            "305 病历材料复印",
+            "306 诊间核验身份"});
             this.cbBusinessType.Location = new System.Drawing.Point(167, 176);
             this.cbBusinessType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.cbBusinessType.MinimumSize = new System.Drawing.Size(63, 0);

Forms/Form1.Designer.cs

@@ -0,0 +1,70 @@
+
+namespace PTMedicalInsurance.Forms
+{
+    partial class frmProcessBar
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.progressBar1 = new System.Windows.Forms.ProgressBar();
+            this.progressBar = new System.Windows.Forms.ProgressBar();
+            this.SuspendLayout();
+            // 
+            // progressBar1
+            // 
+            this.progressBar1.Location = new System.Drawing.Point(324, 25);
+            this.progressBar1.Name = "progressBar1";
+            this.progressBar1.Size = new System.Drawing.Size(100, 23);
+            this.progressBar1.TabIndex = 0;
+            // 
+            // progressBar
+            // 
+            this.progressBar.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.progressBar.Location = new System.Drawing.Point(0, 0);
+            this.progressBar.Name = "progressBar";
+            this.progressBar.Size = new System.Drawing.Size(740, 37);
+            this.progressBar.TabIndex = 1;
+
+            // 
+            // frmProcessBar
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(740, 37);
+            this.Controls.Add(this.progressBar);
+            this.Controls.Add(this.progressBar1);
+            this.Name = "frmProcessBar";
+            this.Text = "进度展示";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.ProgressBar progressBar1;
+        private System.Windows.Forms.ProgressBar progressBar;
+    }
+}

Forms/Form1.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace PTMedicalInsurance.Forms
+{
+    public partial class frmProcessBar : Form
+    {
+        public int totalDataCount;
+        public int currentCount;
+        public int successfulCount;
+
+
+        public frmProcessBar(int maximum)
+        {
+            InitializeComponent();
+            // 设置进度条的最大值
+            progressBar.Maximum = maximum;
+        }
+
+        public void UpdateProgress(int percent, int total, int current, int success)
+        {
+            progressBar.Value = percent;
+            this.Text = $"Total data: {total}\nCurrent data: {current}\nSuccessful data: {success}";
+        }
+
+    }
+}

Forms/Form1.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Forms/MutualAid.cs

@@ -171,7 +171,7 @@ namespace MedicalInsurance.Forms
                 mPsnNO = joBaseInfo["psn_no"].ToString();
                 mCertType = joComInfo["mdtrt_cert_type"].ToString();
                 mCertNO = joComInfo["mdtrt_cert_no"].ToString();
-                mInsutype = joSelectedInsuInfo["insutypeNo"].ToString();
+                mInsutype = joSelectedInsuInfo["insutype"].ToString();
 
                 Global.pat.insuplc_admdvs = JsonHelper.getDestValue(joSelectedInsuInfo, "insuplc_admdvs");
 
@@ -597,12 +597,20 @@ namespace MedicalInsurance.Forms
                     joConvertCode.Add("params", jaConvertCode);
                     InvokeHelper invoker = new InvokeHelper();
                     JObject joConvertCodeRtn = invoker.invokeInsuService(joConvertCode.ToString(), "患者信息编码转换");
+
+                    // insuinfo保持转换之前的
+                    JArray jaInsuInfo = JArray.Parse(JsonHelper.getDestValue(joOutput, "insuinfo"));
+                    JArray jaIdInfo = JArray.Parse(JsonHelper.getDestValue(joConvertCodeRtn, "idetinfo"));
+                    JObject jaBaseInfo = JObject.Parse(JsonHelper.getDestValue(joConvertCodeRtn, "baseinfo"));
+                    joOutput["baseinfo"] = jaBaseInfo;
                     PatientInsuInfo frmPatientInfo = new PatientInsuInfo(joConvertCodeRtn);
                     //相关信息转换到登记面板
                     if (frmPatientInfo.ShowDialog() == DialogResult.OK)
                     {
-                        joCenterServiceRtn.Property("output").AddBeforeSelf(new JProperty("selectedInsuInfo", frmPatientInfo.joSelectedInsuInfo));
+                        JObject joSelectedInsuInfo = (JObject)jaInsuInfo[frmPatientInfo.insuInfoIndex];
+                        joCenterServiceRtn.Property("output").AddBeforeSelf(new JProperty("selectedInsuInfo", joSelectedInsuInfo));
                         joCenterServiceRtn.Property("output").AddBeforeSelf(new JProperty("comInfo", jodata));
+                        Global.writeLog("joCenterServiceRtn:" + joCenterServiceRtn.ToString());
                     }
                     else
                     {

Helper/JsonHelper.cs

@@ -408,6 +408,14 @@ namespace PTMedicalInsurance.Helper
                 // 去掉包装
                 JObject joInput = Utils.removeWrapper(joParam);
                 jaParam.Add(joInput);
+                if (!joInparam.ContainsKey("HospitalDr"))
+                {
+                    joInparam.Add("HospitalDr", Global.inf.hospitalDr);
+                }
+                if (!joInparam.ContainsKey("InterfaceDr"))
+                {
+                    joInparam.Add("InterfaceDr", Global.inf.interfaceDr);
+                }
 
                 joInparam.Add("params", JArray.FromObject(jaParam));
                 joInparam.Add("session", Global.curEvt.jaSession);
@@ -432,7 +440,8 @@ namespace PTMedicalInsurance.Helper
             {
                 dynamic joInparam = new JObject();
                 joInparam.code = code;
-                dynamic joTmp = new JObject();
+                joInparam.Add("HospitalDr", Global.inf.hospitalDr);
+                joInparam.Add("InterfaceDr", Global.inf.interfaceDr);
                 joInparam.Add("params", jaParams);
                 joInparam.Add("session", Global.curEvt.jaSession);
                 return joInparam;

Variables/Struct.cs

@@ -36,6 +36,9 @@ namespace PTMedicalInsurance.Variables
         public int hisHospitalDr;
         public int hospitalDr;
         public string hospitalName;
+        public string HospitalDr_TY;
+        public string InsuCurrencyCataLogue;
+        
         public string hospitalNO;
         public string centerURL;
         public string uploadURL;