1.医疗类别门诊慢特病14选择调用人员门诊慢特病查询接口

2.优化预结算页面展示，调整取值方法，加入非空判断，处理返回结节点值部分可能不存在问题
3.增加医保辅助交易查询，新增人员慢病用药记录调用查询
4.调整就医地问题，去除别省遗留的异地医保就医地区划 areacode固定赋值，默认取医保接口配置

Business/HisMainBusiness.cs

@@ -305,6 +305,14 @@ namespace PTMedicalInsurance.Business
                         //【社保卡读卡成功返回】
                         //发卡地区行政区划代码（卡识别码前 6 位）、社会保障号码、卡号、卡识别码、姓名、卡复位信息（仅取历史字节）、规范版本、发卡日期、卡有效期、终端机编号、终端设备号
                         Global.pat.insuplc_admdvs = tools.getDestPosStrBySpliter(sOutPar, 1);    //参保地
+                        if ((Global.inf.interfaceDr == 12) && (Global.pat.insuplc_admdvs == "340001"))
+                        {
+                            Global.pat.insuplc_admdvs = "349900";
+                        }
+                        if ((Global.inf.interfaceDr == 15) && (Global.pat.insuplc_admdvs == "340001"))
+                        {
+                            Global.pat.insuplc_admdvs = "349900";
+                        }
                         Global.pat.card.NO = tools.getDestPosStrBySpliter(sOutPar, 2);           //社会保障号码
                         Global.pat.certNO = tools.getDestPosStrBySpliter(sOutPar, 3);            //卡号
                         Global.pat.card.SN = tools.getDestPosStrBySpliter(sOutPar, 4);           //卡识别码                                                
@@ -377,6 +385,7 @@ namespace PTMedicalInsurance.Business
                     
                     outParam = joRtn.ToString();
                     Global.pat.insuplc_admdvs = JsonHelper.getDestValue(JObject.Parse(outParam), "output.insuinfo.insuplc_admdvs"); //参保地
+                    Global.pat.psn_no = JsonHelper.getDestValue(JObject.Parse(outParam), "output.baseinfo.psn_no"); //人员编号
 
                     return 0;
                 }
@@ -594,6 +603,7 @@ namespace PTMedicalInsurance.Business
                 }
             }
             JObject OutIDInfo= new JObject();
+            JArray joDic;
             if (joIDInfo.Count > 0)
             {  for(int i = 0;i< joIDInfo.Count; i++)
                 {
@@ -601,7 +611,11 @@ namespace PTMedicalInsurance.Business
                     Utils.convertTimestamp((JObject)joIDInfo[i], "endtime");
 
                     OutIDInfo= rIS.getSpecDictionaryValue(Global.inf.interfaceDr.ToString(), "psn_idet_type", joIDInfo[i]["psn_idet_type"].ToString());
-                    joIDInfo[i]["psn_idet_type"] = OutIDInfo["result"]["data"][1]["name"].ToString();
+                    joDic= JArray.Parse(JsonHelper.getDestValue(OutIDInfo, "result.data"));
+                    if (joDic.Count > 1)
+                    {
+                        joIDInfo[i]["psn_idet_type"] = joDic[1]["name"].ToString();
+                    }
 
                 }
             }
@@ -1363,16 +1377,17 @@ namespace PTMedicalInsurance.Business
                 //展示登记面板
                 if (frmReg.ShowDialog() == DialogResult.OK)
                 {
-                    string diseCodg = "", diseName = "";
-                    //哈尔滨要求必须传病种。普通疾病传主诊断
-                    if (string.IsNullOrEmpty(frmReg.diseCodg))
-                    {
-                        diseCodg = JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.dscg_maindiag_code");
-                    };
-                    if (string.IsNullOrEmpty(frmReg.diseName))
-                    {
-                        diseName = JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.dscg_maindiag_name");
-                    };
+                    
+                    //string diseCodg = "", diseName = "";
+                    ////哈尔滨要求必须传病种。普通疾病传主诊断
+                    //if (string.IsNullOrEmpty(frmReg.diseCodg))
+                    //{
+                    //    diseCodg = JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.dscg_maindiag_code");
+                    //};
+                    //if (string.IsNullOrEmpty(frmReg.diseName))
+                    //{
+                    //    diseName = JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.dscg_maindiag_name");
+                    //};
                     //组织挂号入参
                     JObject joRegInpar = new JObject();
                     string occurTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -1403,8 +1418,8 @@ namespace PTMedicalInsurance.Business
                     joMdtrtinfo.Add("med_type", frmReg.med_type);          //医疗类别
                     joMdtrtinfo.Add("begntime", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.begntime"));          //开始时间
                     joMdtrtinfo.Add("main_cond_dscr", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.main_cond_dscr"));          //主要病情描述
-                    joMdtrtinfo.Add("dise_codg", diseCodg);          //病种编码
-                    joMdtrtinfo.Add("dise_name", diseName);          //病种名称
+                    joMdtrtinfo.Add("dise_codg", frmReg.diseCodg);          //病种编码
+                    joMdtrtinfo.Add("dise_name", frmReg.diseName);          //病种名称
                     joMdtrtinfo.Add("birctrl_type", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.birctrl_type"));          //计划生育手术类别
                     //joMdtrtinfo.Add("birctrl_matn_date", "");          //计划生育手术或生育日期 JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.birctrl_matn_date") 20230228医保中心校验传正确时间或空
                     joMdtrtinfo.Add("matn_type", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.matn_type"));          //生育类别
@@ -1494,6 +1509,7 @@ namespace PTMedicalInsurance.Business
                     jaFeeDetail[i]["chrg_bchno"] = Global.pat.adm_Dr.ToString();
                     jaFeeDetail[i]["med_type"] = Global.pat.medType;
                     if (jaFeeDetail[i]["validFlag"].ToString() == "N") continue;
+                    if (jaFeeDetail[i]["det_item_fee_sumamt"].ToString() == "0.00") continue;
                     jaTmp.Add(jaFeeDetail[i]);
                     if (((i + 1) % singleCount == 0) || ((i + 1) == jaFeeDetail.Count))
                     {
@@ -1668,14 +1684,14 @@ namespace PTMedicalInsurance.Business
                         }
 
                 }
-                //如果患者异地的则就医地需要该为369900
-                if (Global.pat.insuplc_admdvs != "")
-                {
-                    if (Global.pat.insuplc_admdvs.Substring(0, 4) != Global.inf.areaCode.Substring(0, 4))
-                    {
-                        Global.inf.areaCode = "369900";
-                    }
-                }
+                ////如果患者异地的则就医地需要该为369900
+                //if (Global.pat.insuplc_admdvs != "")
+                //{
+                //    if (Global.pat.insuplc_admdvs.Substring(0, 4) != Global.inf.areaCode.Substring(0, 4))
+                //    {
+                //        Global.inf.areaCode = "369900";
+                //    }
+                //}
             }
             catch (Exception ex)
             {

FormSetter/GridViewSetter.cs

@@ -675,6 +675,7 @@ namespace PTMedicalInsurance.FormSetter
             AddDGVColumn(dgv, "对照状态", "flag", 80);
             AddDGVColumn(dgv, "规格", "spec", 200);
             AddDGVColumn(dgv, "单位", "itemUnitDesc",70);
+            AddDGVColumn(dgv, "价格", "itemPrice", 80);
             AddDGVColumn(dgv, "批准文号", "pprovalNo", 200);
             AddDGVColumn(dgv, "厂家", "manfDesc", 200);
         }
@@ -878,6 +879,56 @@ namespace PTMedicalInsurance.FormSetter
         #endregion
 
 
+
+        #endregion
+
+        #region【设置医保辅助查询标题】
+        public void SetMbMedicationHistory(DataGridView dgv)
+        {            
+            dgv.Columns.Clear();
+            dgv.AutoGenerateColumns = false;
+
+            AddDGVColumn(dgv, "费用明细流水号", "feedetl_sn", 200);
+            AddDGVColumn(dgv, "处方号", "rx_drord_no", 150);
+            AddDGVColumn(dgv, "医院编码", "fixmedins_code", 100);
+            AddDGVColumn(dgv, "医院名称", "fixmedins_name", 150);
+            AddDGVColumn(dgv, "人员编号", "psn_no", 150);
+
+            AddDGVColumn(dgv, "医疗类别", "med_type", 150);
+            AddDGVColumn(dgv, "费用发生时间", "fee_ocur_time", 150);
+            AddDGVColumn(dgv, "数量", "cnt", 150);
+            AddDGVColumn(dgv, "单价", "pric", 150);
+            AddDGVColumn(dgv, "收费项目等级", "chrgitm_lv", 150);
+
+            AddDGVColumn(dgv, "医保目录编码", "hilist_code", 150);
+            AddDGVColumn(dgv, "医保目录名称", "hilist_name", 150);
+            AddDGVColumn(dgv, "目录类别", "list_type", 150);
+            AddDGVColumn(dgv, "医疗目录编码", "med_list_codg", 150);
+            AddDGVColumn(dgv, "医药机构目录编码", "medins_list_codg", 150);
+
+            AddDGVColumn(dgv, "医药机构目录名称", "medins_list_name", 150);
+            AddDGVColumn(dgv, "医疗收费项目类别", "med_chrgitm_type", 150);
+            AddDGVColumn(dgv, "商品名", "prodname", 150);
+            AddDGVColumn(dgv, "规格", "spec", 150);
+            AddDGVColumn(dgv, "剂型", "dosform_name", 150);
+
+            AddDGVColumn(dgv, "限制使用标志", "lmt_used_flag", 150);
+            AddDGVColumn(dgv, "医院制剂标志", "hosp_prep_flag", 150);
+            AddDGVColumn(dgv, "医院审批标志", "hosp_appr_flag", 150);
+            AddDGVColumn(dgv, "中药使用方式", "tcmdrug_used_way", 150);
+            AddDGVColumn(dgv, "生产地类别", "prodplac_type", 150);
+
+            AddDGVColumn(dgv, "基本药物标志", "bas_medn_flag", 150);
+            AddDGVColumn(dgv, "医保谈判药物标志", "hi_nego_drug_flag", 150);
+            AddDGVColumn(dgv, "儿童用药标志", "chld_medc_flag", 150);
+            AddDGVColumn(dgv, "外检标志", "etip_flag", 150);
+            AddDGVColumn(dgv, "外检医院编码", "etip_hosp_code", 150);
+
+            AddDGVColumn(dgv, "出院带药编码", "dscg_tkdrug_flag", 150);
+            AddDGVColumn(dgv, "目录特项标志", "list_sp_item_flag", 150);
+            AddDGVColumn(dgv, "生育费用标志", "matn_fee_flag", 150);
+        }
+
         #endregion
     }
 

Forms/AssistSelect.Designer.cs

@@ -0,0 +1,301 @@
+namespace AnHuiMI.Forms
+{
+    partial class AssistSelect
+    {
+        /// <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()
+        {
+            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();
+            this.uiTabControl1 = new Sunny.UI.UITabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.uiDataGridView1 = new Sunny.UI.UIDataGridView();
+            this.uiPanel1 = new Sunny.UI.UIPanel();
+            this.uiButton1 = new Sunny.UI.UIButton();
+            this.uiMbyyButton1 = new Sunny.UI.UIButton();
+            this.uiLabel2 = new Sunny.UI.UILabel();
+            this.uiDatetimePicker2 = new Sunny.UI.UIDatetimePicker();
+            this.uiDatetimePicker1 = new Sunny.UI.UIDatetimePicker();
+            this.uiLabel1 = new Sunny.UI.UILabel();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.uiTextBox1 = new Sunny.UI.UITextBox();
+            this.uiTabControl1.SuspendLayout();
+            this.tabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.uiDataGridView1)).BeginInit();
+            this.uiPanel1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // uiTabControl1
+            // 
+            this.uiTabControl1.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.uiTabControl1.Controls.Add(this.tabPage1);
+            this.uiTabControl1.Controls.Add(this.tabPage2);
+            this.uiTabControl1.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed;
+            this.uiTabControl1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiTabControl1.ItemSize = new System.Drawing.Size(150, 40);
+            this.uiTabControl1.Location = new System.Drawing.Point(12, 2);
+            this.uiTabControl1.MainPage = "";
+            this.uiTabControl1.Name = "uiTabControl1";
+            this.uiTabControl1.SelectedIndex = 0;
+            this.uiTabControl1.Size = new System.Drawing.Size(1421, 694);
+            this.uiTabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
+            this.uiTabControl1.TabIndex = 0;
+            this.uiTabControl1.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiTabControl1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.uiDataGridView1);
+            this.tabPage1.Controls.Add(this.uiPanel1);
+            this.tabPage1.Location = new System.Drawing.Point(0, 40);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Size = new System.Drawing.Size(1421, 654);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "人员慢病用药历史查询";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // uiDataGridView1
+            // 
+            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            this.uiDataGridView1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
+            this.uiDataGridView1.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.uiDataGridView1.BackgroundColor = System.Drawing.Color.White;
+            this.uiDataGridView1.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.uiDataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+            this.uiDataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            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.uiDataGridView1.DefaultCellStyle = dataGridViewCellStyle8;
+            this.uiDataGridView1.EnableHeadersVisualStyles = false;
+            this.uiDataGridView1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiDataGridView1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            this.uiDataGridView1.Location = new System.Drawing.Point(323, 14);
+            this.uiDataGridView1.Name = "uiDataGridView1";
+            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.uiDataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle10.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiDataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle10;
+            this.uiDataGridView1.RowTemplate.Height = 23;
+            this.uiDataGridView1.SelectedIndex = -1;
+            this.uiDataGridView1.Size = new System.Drawing.Size(1095, 635);
+            this.uiDataGridView1.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            this.uiDataGridView1.TabIndex = 1;
+            this.uiDataGridView1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // uiPanel1
+            // 
+            this.uiPanel1.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.uiPanel1.Controls.Add(this.uiTextBox1);
+            this.uiPanel1.Controls.Add(this.uiButton1);
+            this.uiPanel1.Controls.Add(this.uiMbyyButton1);
+            this.uiPanel1.Controls.Add(this.uiLabel2);
+            this.uiPanel1.Controls.Add(this.uiDatetimePicker2);
+            this.uiPanel1.Controls.Add(this.uiDatetimePicker1);
+            this.uiPanel1.Controls.Add(this.uiLabel1);
+            this.uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiPanel1.Location = new System.Drawing.Point(4, 5);
+            this.uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiPanel1.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiPanel1.Name = "uiPanel1";
+            this.uiPanel1.Size = new System.Drawing.Size(312, 644);
+            this.uiPanel1.TabIndex = 0;
+            this.uiPanel1.Text = null;
+            this.uiPanel1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.uiPanel1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.uiPanel1.Click += new System.EventHandler(this.uiPanel1_Click);
+            // 
+            // uiButton1
+            // 
+            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(38, 450);
+            this.uiButton1.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiButton1.Name = "uiButton1";
+            this.uiButton1.Size = new System.Drawing.Size(156, 35);
+            this.uiButton1.TabIndex = 6;
+            this.uiButton1.Text = "医保读卡";
+            this.uiButton1.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiButton1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.uiButton1.Click += new System.EventHandler(this.uiButton1_Click);
+            // 
+            // uiMbyyButton1
+            // 
+            this.uiMbyyButton1.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.uiMbyyButton1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiMbyyButton1.Location = new System.Drawing.Point(38, 365);
+            this.uiMbyyButton1.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiMbyyButton1.Name = "uiMbyyButton1";
+            this.uiMbyyButton1.Size = new System.Drawing.Size(156, 36);
+            this.uiMbyyButton1.TabIndex = 5;
+            this.uiMbyyButton1.Text = "查   询";
+            this.uiMbyyButton1.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiMbyyButton1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.uiMbyyButton1.Click += new System.EventHandler(this.uiMbyyButton1_Click);
+            // 
+            // uiLabel2
+            // 
+            this.uiLabel2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel2.Location = new System.Drawing.Point(10, 150);
+            this.uiLabel2.Name = "uiLabel2";
+            this.uiLabel2.Size = new System.Drawing.Size(197, 23);
+            this.uiLabel2.TabIndex = 4;
+            this.uiLabel2.Text = "开始-截止时间范围";
+            this.uiLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.uiLabel2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // uiDatetimePicker2
+            // 
+            this.uiDatetimePicker2.FillColor = System.Drawing.Color.White;
+            this.uiDatetimePicker2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiDatetimePicker2.Location = new System.Drawing.Point(7, 254);
+            this.uiDatetimePicker2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiDatetimePicker2.MaxLength = 19;
+            this.uiDatetimePicker2.MinimumSize = new System.Drawing.Size(63, 0);
+            this.uiDatetimePicker2.Name = "uiDatetimePicker2";
+            this.uiDatetimePicker2.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+            this.uiDatetimePicker2.Size = new System.Drawing.Size(200, 29);
+            this.uiDatetimePicker2.SymbolDropDown = 61555;
+            this.uiDatetimePicker2.SymbolNormal = 61555;
+            this.uiDatetimePicker2.TabIndex = 3;
+            this.uiDatetimePicker2.Text = "2023-09-06 17:16:27";
+            this.uiDatetimePicker2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.uiDatetimePicker2.Value = new System.DateTime(2023, 9, 6, 17, 16, 27, 131);
+            this.uiDatetimePicker2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // uiDatetimePicker1
+            // 
+            this.uiDatetimePicker1.FillColor = System.Drawing.Color.White;
+            this.uiDatetimePicker1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiDatetimePicker1.Location = new System.Drawing.Point(7, 190);
+            this.uiDatetimePicker1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiDatetimePicker1.MaxLength = 19;
+            this.uiDatetimePicker1.MinimumSize = new System.Drawing.Size(63, 0);
+            this.uiDatetimePicker1.Name = "uiDatetimePicker1";
+            this.uiDatetimePicker1.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+            this.uiDatetimePicker1.Size = new System.Drawing.Size(200, 29);
+            this.uiDatetimePicker1.SymbolDropDown = 61555;
+            this.uiDatetimePicker1.SymbolNormal = 61555;
+            this.uiDatetimePicker1.TabIndex = 2;
+            this.uiDatetimePicker1.Text = "2023-09-06 17:16:15";
+            this.uiDatetimePicker1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.uiDatetimePicker1.Value = new System.DateTime(2023, 9, 6, 17, 16, 15, 594);
+            this.uiDatetimePicker1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // uiLabel1
+            // 
+            this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel1.Location = new System.Drawing.Point(3, 47);
+            this.uiLabel1.Name = "uiLabel1";
+            this.uiLabel1.Size = new System.Drawing.Size(107, 29);
+            this.uiLabel1.TabIndex = 0;
+            this.uiLabel1.Text = "医保人员编号";
+            this.uiLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.uiLabel1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Location = new System.Drawing.Point(0, 40);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Size = new System.Drawing.Size(1421, 654);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "tabPage2";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // uiTextBox1
+            // 
+            this.uiTextBox1.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.uiTextBox1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiTextBox1.Location = new System.Drawing.Point(14, 98);
+            this.uiTextBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiTextBox1.MinimumSize = new System.Drawing.Size(1, 16);
+            this.uiTextBox1.Name = "uiTextBox1";
+            this.uiTextBox1.ShowText = false;
+            this.uiTextBox1.Size = new System.Drawing.Size(230, 29);
+            this.uiTextBox1.TabIndex = 7;
+            this.uiTextBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.uiTextBox1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // AssistSelect
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1432, 694);
+            this.Controls.Add(this.uiTabControl1);
+            this.Name = "AssistSelect";
+            this.Text = "辅助查询";
+            this.Load += new System.EventHandler(this.AssistSelect_Load);
+            this.uiTabControl1.ResumeLayout(false);
+            this.tabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.uiDataGridView1)).EndInit();
+            this.uiPanel1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Sunny.UI.UITabControl uiTabControl1;
+        private System.Windows.Forms.TabPage tabPage1;
+        private Sunny.UI.UIPanel uiPanel1;
+        private System.Windows.Forms.TabPage tabPage2;
+        private Sunny.UI.UIButton uiButton1;
+        private Sunny.UI.UIButton uiMbyyButton1;
+        private Sunny.UI.UILabel uiLabel2;
+        private Sunny.UI.UIDatetimePicker uiDatetimePicker2;
+        private Sunny.UI.UIDatetimePicker uiDatetimePicker1;
+        private Sunny.UI.UILabel uiLabel1;
+        private Sunny.UI.UIDataGridView uiDataGridView1;
+        private Sunny.UI.UITextBox uiTextBox1;
+    }
+}

Forms/AssistSelect.cs

@@ -0,0 +1,78 @@
+using Newtonsoft.Json.Linq;
+using PTMedicalInsurance.Business;
+using PTMedicalInsurance.Helper;
+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;
+using AnHuiMI.Common;
+using PTMedicalInsurance.Variables;
+using PTMedicalInsurance.FormSetter;
+
+namespace AnHuiMI.Forms
+{
+    public partial class AssistSelect : Form
+    {
+        public AssistSelect()
+        {
+            InitializeComponent();
+        }
+        HisMainBusiness hBus = new HisMainBusiness();
+        private InvokeHelper invoker = new InvokeHelper();
+        private void AssistSelect_Load(object sender, EventArgs e)
+        {
+            uiDatetimePicker1.Text = DateTime.Now.ToString("yyyy-MM-01 00:00:00");
+            uiDatetimePicker2.Value = DateTime.Now.AddDays(1 - DateTime.Now.Day).AddMonths(1).AddDays(-1);
+        }
+        private void uiButton1_Click(object sender, EventArgs e)
+        {
+            string outParam;
+            //打开读卡窗口，操作员选择读卡类型后进行读卡器读卡，再进行1101获取参保信息
+            if (hBus.readCard(out outParam) != 0)
+            {
+                MessageBox.Show(JsonHelper.setExceptionJson(-100, "读卡失败！",  outParam).ToString());
+            }
+            else
+            {
+                //展示患者信息界面
+                if (hBus.showPatInfo(outParam, out outParam) != 0)
+                {
+                    MessageBox.Show(JsonHelper.setIrisReturnValue(0, "展示患者信息失败", JObject.Parse(outParam)).ToString());
+                }
+                else
+                {
+                    
+                }
+            }
+            uiTextBox1.Text = Global.pat.psn_no;
+        }
+
+        private void uiMbyyButton1_Click(object sender, EventArgs e)
+        {
+            GridViewSetter grdSetter = new GridViewSetter();
+            grdSetter.SetMbMedicationHistory(uiDataGridView1);
+            JObject jo5205= new JObject();
+            jo5205.Add("psn_no", uiTextBox1.Text);//必填
+            jo5205.Add("begntime", uiDatetimePicker1.Text);//yyyy-MM-dd HH:mm:ss必填
+            jo5205.Add("endtime", uiDatetimePicker2.Text);//yyyy-MM-dd HH:mm:ss
+            JObject data5205= new JObject();
+            data5205.Add("data", jo5205);
+            JObject out5205= invoker.invokeCenterService("5205", JObject.Parse(JsonHelper.setCenterInpar("5205", data5205)));
+            DataTable dt = (DataTable)out5205["output"]["feedetail"].ToObject(typeof(DataTable));
+            uiDataGridView1.DataSource = dt;
+        }
+
+        private void uiPanel1_Click(object sender, EventArgs e)
+        {
+
+        }
+
+      
+    }
+}
+ 

Forms/AssistSelect.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/BasicData.cs

@@ -1264,10 +1264,10 @@ namespace PTMedicalInsurance.Forms
                 case 15://目录信息查询
                     {
                         funNo = "1312";
-                        joData.query_date = ""; //查询时间点
+                        joData.query_date = DateTime.Now.ToString("yyyy-MM-dd"); //查询时间点
                         joData.hilist_code = tbDirectoryCode.Text;  //医保目录编码
                         joData.insu_admdvs = "";  //参保机构医保区划
-                        joData.begndate = ""; //开始日期
+                        joData.begndate = TexDate.Text; //开始日期
                         joData.hilist_name = tbDircetoryName.Text;      //医保目录名称
                         joData.wubi = "";  //五笔助记码
                         joData.pinyin = "";     //拼音助记码
@@ -1762,6 +1762,11 @@ namespace PTMedicalInsurance.Forms
                 }
             }
         }
+
+        private void rbAutoDown_CheckedChanged(object sender, EventArgs e)
+        {
+
+        }
     }
     
 }

Forms/BasicData.designer.cs

@@ -164,20 +164,18 @@
             this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabControl1.Font = new System.Drawing.Font("华文隶书", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.tabControl1.Location = new System.Drawing.Point(0, 0);
-            this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(2104, 875);
+            this.tabControl1.Size = new System.Drawing.Size(1450, 583);
             this.tabControl1.TabIndex = 0;
             // 
             // tabPage1
             // 
             this.tabPage1.Controls.Add(this.panel1);
-            this.tabPage1.Location = new System.Drawing.Point(4, 42);
-            this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.tabPage1.Location = new System.Drawing.Point(4, 31);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
-            this.tabPage1.Size = new System.Drawing.Size(2096, 829);
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(1442, 548);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "数据下载";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -188,10 +186,9 @@
             this.panel1.Controls.Add(this.pgDownload);
             this.panel1.Controls.Add(this.panel2);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel1.Location = new System.Drawing.Point(4, 4);
-            this.panel1.Margin = new System.Windows.Forms.Padding(4);
+            this.panel1.Location = new System.Drawing.Point(3, 3);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(2088, 821);
+            this.panel1.Size = new System.Drawing.Size(1436, 542);
             this.panel1.TabIndex = 0;
             // 
             // dgvDirectoy
@@ -225,7 +222,6 @@
             this.dgvDirectoy.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvDirectoy.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
             this.dgvDirectoy.Location = new System.Drawing.Point(0, 0);
-            this.dgvDirectoy.Margin = new System.Windows.Forms.Padding(4);
             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)))));
@@ -241,7 +237,7 @@
             this.dgvDirectoy.RowsDefaultCellStyle = dataGridViewCellStyle5;
             this.dgvDirectoy.RowTemplate.Height = 23;
             this.dgvDirectoy.SelectedIndex = -1;
-            this.dgvDirectoy.Size = new System.Drawing.Size(2088, 403);
+            this.dgvDirectoy.Size = new System.Drawing.Size(1436, 264);
             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);
@@ -258,45 +254,45 @@
             this.toolStripSeparator2,
             this.toolStripMenuItem3});
             this.cmsUpdateInsuDir.Name = "uiContextMenuStrip1";
-            this.cmsUpdateInsuDir.Size = new System.Drawing.Size(401, 124);
+            this.cmsUpdateInsuDir.Size = new System.Drawing.Size(289, 88);
             this.cmsUpdateInsuDir.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // toolStripMenuItem1
             // 
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(400, 38);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(288, 26);
             this.toolStripMenuItem1.Text = "医保目录信息查询";
             // 
             // toolStripMenuItem2
             // 
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(400, 38);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(288, 26);
             this.toolStripMenuItem2.Text = "医保目录限价信息查询";
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(397, 6);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(285, 6);
             // 
             // toolStripMenuItem3
             // 
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(400, 38);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(288, 26);
             this.toolStripMenuItem3.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, 403);
-            this.pgDownload.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.pgDownload.MinimumSize = new System.Drawing.Size(2, 2);
+            this.pgDownload.Location = new System.Drawing.Point(0, 264);
+            this.pgDownload.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.pgDownload.MinimumSize = new System.Drawing.Size(1, 1);
             this.pgDownload.Name = "pgDownload";
             this.pgDownload.PagerCount = 13;
             this.pgDownload.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
             this.pgDownload.ShowJumpButton = false;
             this.pgDownload.ShowText = false;
-            this.pgDownload.Size = new System.Drawing.Size(2088, 44);
+            this.pgDownload.Size = new System.Drawing.Size(1436, 29);
             this.pgDownload.TabIndex = 2;
             this.pgDownload.Text = "uiPagination1";
             this.pgDownload.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -317,10 +313,9 @@
             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, 447);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4);
+            this.panel2.Location = new System.Drawing.Point(0, 293);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(2088, 374);
+            this.panel2.Size = new System.Drawing.Size(1436, 249);
             this.panel2.TabIndex = 1;
             // 
             // rbgDirecType
@@ -352,12 +347,12 @@
             "医保目录先自付比例",
             "医药机构信息"});
             this.rbgDirecType.ItemSize = new System.Drawing.Size(150, 30);
-            this.rbgDirecType.Location = new System.Drawing.Point(10, -12);
-            this.rbgDirecType.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.rbgDirecType.MinimumSize = new System.Drawing.Size(2, 2);
+            this.rbgDirecType.Location = new System.Drawing.Point(7, -8);
+            this.rbgDirecType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.rbgDirecType.MinimumSize = new System.Drawing.Size(1, 1);
             this.rbgDirecType.Name = "rbgDirecType";
-            this.rbgDirecType.Padding = new System.Windows.Forms.Padding(0, 48, 0, 0);
-            this.rbgDirecType.Size = new System.Drawing.Size(720, 362);
+            this.rbgDirecType.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
+            this.rbgDirecType.Size = new System.Drawing.Size(480, 241);
             this.rbgDirecType.TabIndex = 24;
             this.rbgDirecType.Text = "请选择下载类型";
             this.rbgDirecType.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -370,11 +365,10 @@
             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(1850, 302);
-            this.btnExit.Margin = new System.Windows.Forms.Padding(4);
-            this.btnExit.MinimumSize = new System.Drawing.Size(2, 2);
+            this.btnExit.Location = new System.Drawing.Point(1277, 201);
+            this.btnExit.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnExit.Name = "btnExit";
-            this.btnExit.Size = new System.Drawing.Size(213, 48);
+            this.btnExit.Size = new System.Drawing.Size(142, 32);
             this.btnExit.TabIndex = 23;
             this.btnExit.Text = "退出";
             this.btnExit.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -393,39 +387,39 @@
             this.ToolStripMenuItem_Upload,
             this.ToolStripMenuItem_CancelUpload});
             this.cmsMapping.Name = "uiContextMenuStrip1";
-            this.cmsMapping.Size = new System.Drawing.Size(377, 162);
+            this.cmsMapping.Size = new System.Drawing.Size(273, 114);
             this.cmsMapping.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // tsmiMapping
             // 
             this.tsmiMapping.Name = "tsmiMapping";
-            this.tsmiMapping.Size = new System.Drawing.Size(376, 38);
+            this.tsmiMapping.Size = new System.Drawing.Size(272, 26);
             this.tsmiMapping.Text = "对照";
             this.tsmiMapping.Click += new System.EventHandler(this.tsmiMapping_Click);
             // 
             // tsmiCancleMapping
             // 
             this.tsmiCancleMapping.Name = "tsmiCancleMapping";
-            this.tsmiCancleMapping.Size = new System.Drawing.Size(376, 38);
+            this.tsmiCancleMapping.Size = new System.Drawing.Size(272, 26);
             this.tsmiCancleMapping.Text = "取消对照";
             this.tsmiCancleMapping.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(373, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(269, 6);
             // 
             // ToolStripMenuItem_Upload
             // 
             this.ToolStripMenuItem_Upload.Name = "ToolStripMenuItem_Upload";
-            this.ToolStripMenuItem_Upload.Size = new System.Drawing.Size(376, 38);
+            this.ToolStripMenuItem_Upload.Size = new System.Drawing.Size(272, 26);
             this.ToolStripMenuItem_Upload.Text = "单条目录对照关系上传";
             this.ToolStripMenuItem_Upload.Click += new System.EventHandler(this.ToolStripMenuItem_Upload_Click);
             // 
             // ToolStripMenuItem_CancelUpload
             // 
             this.ToolStripMenuItem_CancelUpload.Name = "ToolStripMenuItem_CancelUpload";
-            this.ToolStripMenuItem_CancelUpload.Size = new System.Drawing.Size(376, 38);
+            this.ToolStripMenuItem_CancelUpload.Size = new System.Drawing.Size(272, 26);
             this.ToolStripMenuItem_CancelUpload.Text = "单条目录对照关系上传撤销";
             this.ToolStripMenuItem_CancelUpload.Click += new System.EventHandler(this.ToolStripMenuItem_CancelUpload_Click);
             // 
@@ -438,12 +432,12 @@
             this.uiGroupBox3.Controls.Add(this.TexDQYS);
             this.uiGroupBox3.Controls.Add(this.TexDate);
             this.uiGroupBox3.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiGroupBox3.Location = new System.Drawing.Point(1563, 26);
-            this.uiGroupBox3.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.uiGroupBox3.MinimumSize = new System.Drawing.Size(2, 2);
+            this.uiGroupBox3.Location = new System.Drawing.Point(1042, 17);
+            this.uiGroupBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiGroupBox3.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox3.Name = "uiGroupBox3";
-            this.uiGroupBox3.Padding = new System.Windows.Forms.Padding(0, 48, 0, 0);
-            this.uiGroupBox3.Size = new System.Drawing.Size(264, 324);
+            this.uiGroupBox3.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
+            this.uiGroupBox3.Size = new System.Drawing.Size(176, 216);
             this.uiGroupBox3.TabIndex = 22;
             this.uiGroupBox3.Text = "查询条件";
             this.uiGroupBox3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -519,11 +513,10 @@
             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(1962, 162);
-            this.btEditDir.Margin = new System.Windows.Forms.Padding(4);
-            this.btEditDir.MinimumSize = new System.Drawing.Size(2, 2);
+            this.btEditDir.Location = new System.Drawing.Point(1352, 108);
+            this.btEditDir.MinimumSize = new System.Drawing.Size(1, 1);
             this.btEditDir.Name = "btEditDir";
-            this.btEditDir.Size = new System.Drawing.Size(100, 48);
+            this.btEditDir.Size = new System.Drawing.Size(67, 32);
             this.btEditDir.TabIndex = 19;
             this.btEditDir.Text = "修改";
             this.btEditDir.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -536,11 +529,10 @@
             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(1962, 56);
-            this.btAddDir.Margin = new System.Windows.Forms.Padding(4);
-            this.btAddDir.MinimumSize = new System.Drawing.Size(2, 2);
+            this.btAddDir.Location = new System.Drawing.Point(1352, 37);
+            this.btAddDir.MinimumSize = new System.Drawing.Size(1, 1);
             this.btAddDir.Name = "btAddDir";
-            this.btAddDir.Size = new System.Drawing.Size(100, 48);
+            this.btAddDir.Size = new System.Drawing.Size(67, 32);
             this.btAddDir.TabIndex = 18;
             this.btAddDir.Text = "新增";
             this.btAddDir.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -554,12 +546,12 @@
             this.uiGroupBox5.Controls.Add(this.tbDicType);
             this.uiGroupBox5.Controls.Add(this.tbDicDate);
             this.uiGroupBox5.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiGroupBox5.Location = new System.Drawing.Point(1032, -142);
-            this.uiGroupBox5.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.uiGroupBox5.MinimumSize = new System.Drawing.Size(2, 2);
+            this.uiGroupBox5.Location = new System.Drawing.Point(688, -95);
+            this.uiGroupBox5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiGroupBox5.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox5.Name = "uiGroupBox5";
-            this.uiGroupBox5.Padding = new System.Windows.Forms.Padding(0, 48, 0, 0);
-            this.uiGroupBox5.Size = new System.Drawing.Size(255, 436);
+            this.uiGroupBox5.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
+            this.uiGroupBox5.Size = new System.Drawing.Size(170, 291);
             this.uiGroupBox5.TabIndex = 17;
             this.uiGroupBox5.Text = "字典下载";
             this.uiGroupBox5.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -608,12 +600,12 @@
             this.uiGroupBox2.Controls.Add(this.tbDircetoryName);
             this.uiGroupBox2.Controls.Add(this.tbDirectoryCode);
             this.uiGroupBox2.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiGroupBox2.Location = new System.Drawing.Point(1293, -142);
-            this.uiGroupBox2.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.uiGroupBox2.MinimumSize = new System.Drawing.Size(2, 2);
+            this.uiGroupBox2.Location = new System.Drawing.Point(862, -95);
+            this.uiGroupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiGroupBox2.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox2.Name = "uiGroupBox2";
-            this.uiGroupBox2.Padding = new System.Windows.Forms.Padding(0, 48, 0, 0);
-            this.uiGroupBox2.Size = new System.Drawing.Size(262, 436);
+            this.uiGroupBox2.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
+            this.uiGroupBox2.Size = new System.Drawing.Size(175, 291);
             this.uiGroupBox2.TabIndex = 15;
             this.uiGroupBox2.Text = "查询";
             this.uiGroupBox2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -661,12 +653,12 @@
             this.uiGroupBox1.Controls.Add(this.rbSingleDown);
             this.uiGroupBox1.Controls.Add(this.tbVer);
             this.uiGroupBox1.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiGroupBox1.Location = new System.Drawing.Point(738, -146);
-            this.uiGroupBox1.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.uiGroupBox1.MinimumSize = new System.Drawing.Size(2, 2);
+            this.uiGroupBox1.Location = new System.Drawing.Point(492, -97);
+            this.uiGroupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiGroupBox1.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox1.Name = "uiGroupBox1";
-            this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 48, 0, 0);
-            this.uiGroupBox1.Size = new System.Drawing.Size(290, 440);
+            this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
+            this.uiGroupBox1.Size = new System.Drawing.Size(193, 293);
             this.uiGroupBox1.TabIndex = 14;
             this.uiGroupBox1.Text = "目录下载";
             this.uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -685,6 +677,7 @@
             this.rbAutoDown.TabIndex = 2;
             this.rbAutoDown.Text = "自动检索最大版本号";
             this.rbAutoDown.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.rbAutoDown.CheckedChanged += new System.EventHandler(this.rbAutoDown_CheckedChanged);
             // 
             // rbSingleDown
             // 
@@ -724,11 +717,10 @@
             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(1850, 56);
-            this.btnQuery.Margin = new System.Windows.Forms.Padding(4);
-            this.btnQuery.MinimumSize = new System.Drawing.Size(2, 2);
+            this.btnQuery.Location = new System.Drawing.Point(1277, 37);
+            this.btnQuery.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnQuery.Name = "btnQuery";
-            this.btnQuery.Size = new System.Drawing.Size(100, 48);
+            this.btnQuery.Size = new System.Drawing.Size(67, 32);
             this.btnQuery.TabIndex = 13;
             this.btnQuery.Text = "查询";
             this.btnQuery.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -741,11 +733,10 @@
             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(1850, 162);
-            this.btnDownload.Margin = new System.Windows.Forms.Padding(4);
-            this.btnDownload.MinimumSize = new System.Drawing.Size(2, 2);
+            this.btnDownload.Location = new System.Drawing.Point(1277, 108);
+            this.btnDownload.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnDownload.Name = "btnDownload";
-            this.btnDownload.Size = new System.Drawing.Size(100, 48);
+            this.btnDownload.Size = new System.Drawing.Size(67, 32);
             this.btnDownload.TabIndex = 12;
             this.btnDownload.Text = "下载";
             this.btnDownload.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -757,11 +748,10 @@
             this.uiProcessBar1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.uiProcessBar1.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
             this.uiProcessBar1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiProcessBar1.Location = new System.Drawing.Point(738, 306);
-            this.uiProcessBar1.Margin = new System.Windows.Forms.Padding(4);
-            this.uiProcessBar1.MinimumSize = new System.Drawing.Size(105, 4);
+            this.uiProcessBar1.Location = new System.Drawing.Point(492, 204);
+            this.uiProcessBar1.MinimumSize = new System.Drawing.Size(70, 3);
             this.uiProcessBar1.Name = "uiProcessBar1";
-            this.uiProcessBar1.Size = new System.Drawing.Size(819, 44);
+            this.uiProcessBar1.Size = new System.Drawing.Size(546, 29);
             this.uiProcessBar1.TabIndex = 11;
             this.uiProcessBar1.Text = "uiProcessBar1";
             this.uiProcessBar1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -770,11 +760,10 @@
             // 
             this.tabPage2.Controls.Add(this.panel7);
             this.tabPage2.Controls.Add(this.uiPanel3);
-            this.tabPage2.Location = new System.Drawing.Point(4, 42);
-            this.tabPage2.Margin = new System.Windows.Forms.Padding(4);
+            this.tabPage2.Location = new System.Drawing.Point(4, 31);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
-            this.tabPage2.Size = new System.Drawing.Size(1916, 1004);
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(1442, 548);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "数据对照";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -783,10 +772,9 @@
             // 
             this.panel7.Controls.Add(this.uiSplitContainer1);
             this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel7.Location = new System.Drawing.Point(272, 4);
-            this.panel7.Margin = new System.Windows.Forms.Padding(4);
+            this.panel7.Location = new System.Drawing.Point(182, 3);
             this.panel7.Name = "panel7";
-            this.panel7.Size = new System.Drawing.Size(1640, 996);
+            this.panel7.Size = new System.Drawing.Size(1257, 542);
             this.panel7.TabIndex = 3;
             // 
             // uiSplitContainer1
@@ -794,8 +782,7 @@
             this.uiSplitContainer1.Cursor = System.Windows.Forms.Cursors.Default;
             this.uiSplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.uiSplitContainer1.Location = new System.Drawing.Point(0, 0);
-            this.uiSplitContainer1.Margin = new System.Windows.Forms.Padding(4);
-            this.uiSplitContainer1.MinimumSize = new System.Drawing.Size(30, 30);
+            this.uiSplitContainer1.MinimumSize = new System.Drawing.Size(20, 20);
             this.uiSplitContainer1.Name = "uiSplitContainer1";
             this.uiSplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
             // 
@@ -807,9 +794,9 @@
             // uiSplitContainer1.Panel2
             // 
             this.uiSplitContainer1.Panel2.Controls.Add(this.panel4);
-            this.uiSplitContainer1.Size = new System.Drawing.Size(1640, 996);
-            this.uiSplitContainer1.SplitterDistance = 502;
-            this.uiSplitContainer1.SplitterWidth = 16;
+            this.uiSplitContainer1.Size = new System.Drawing.Size(1257, 542);
+            this.uiSplitContainer1.SplitterDistance = 273;
+            this.uiSplitContainer1.SplitterWidth = 11;
             this.uiSplitContainer1.TabIndex = 3;
             this.uiSplitContainer1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
@@ -820,9 +807,8 @@
             this.panel3.Controls.Add(this.pgHISDirect);
             this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel3.Location = new System.Drawing.Point(0, 0);
-            this.panel3.Margin = new System.Windows.Forms.Padding(4);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(1640, 502);
+            this.panel3.Size = new System.Drawing.Size(1257, 273);
             this.panel3.TabIndex = 2;
             // 
             // dgvHISDirectory
@@ -855,8 +841,7 @@
             this.dgvHISDirectory.EnableHeadersVisualStyles = false;
             this.dgvHISDirectory.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvHISDirectory.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            this.dgvHISDirectory.Location = new System.Drawing.Point(0, 68);
-            this.dgvHISDirectory.Margin = new System.Windows.Forms.Padding(4);
+            this.dgvHISDirectory.Location = new System.Drawing.Point(0, 45);
             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)))));
@@ -873,7 +858,7 @@
             this.dgvHISDirectory.RowsDefaultCellStyle = dataGridViewCellStyle10;
             this.dgvHISDirectory.RowTemplate.Height = 25;
             this.dgvHISDirectory.SelectedIndex = -1;
-            this.dgvHISDirectory.Size = new System.Drawing.Size(1640, 382);
+            this.dgvHISDirectory.Size = new System.Drawing.Size(1257, 193);
             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);
@@ -893,20 +878,18 @@
             this.panel5.Controls.Add(this.tbHISDirectoryFilter);
             this.panel5.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel5.Location = new System.Drawing.Point(0, 0);
-            this.panel5.Margin = new System.Windows.Forms.Padding(4);
             this.panel5.Name = "panel5";
-            this.panel5.Size = new System.Drawing.Size(1640, 68);
+            this.panel5.Size = new System.Drawing.Size(1257, 45);
             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(1110, 12);
-            this.btnExport.Margin = new System.Windows.Forms.Padding(4);
-            this.btnExport.MinimumSize = new System.Drawing.Size(2, 2);
+            this.btnExport.Location = new System.Drawing.Point(740, 8);
+            this.btnExport.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnExport.Name = "btnExport";
-            this.btnExport.Size = new System.Drawing.Size(150, 42);
+            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)));
@@ -919,10 +902,11 @@
             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(1419, 12);
-            this.btnCancelUpShip.MinimumSize = new System.Drawing.Size(2, 2);
+            this.btnCancelUpShip.Location = new System.Drawing.Point(1110, 8);
+            this.btnCancelUpShip.Margin = new System.Windows.Forms.Padding(2);
+            this.btnCancelUpShip.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnCancelUpShip.Name = "btnCancelUpShip";
-            this.btnCancelUpShip.Size = new System.Drawing.Size(210, 42);
+            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)));
@@ -934,10 +918,11 @@
             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(1246, 12);
-            this.btnUpShip.MinimumSize = new System.Drawing.Size(2, 2);
+            this.btnUpShip.Location = new System.Drawing.Point(995, 8);
+            this.btnUpShip.Margin = new System.Windows.Forms.Padding(2);
+            this.btnUpShip.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnUpShip.Name = "btnUpShip";
-            this.btnUpShip.Size = new System.Drawing.Size(165, 42);
+            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)));
@@ -948,12 +933,12 @@
             // 
             this.uiTextBox1.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.uiTextBox1.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiTextBox1.Location = new System.Drawing.Point(501, 12);
-            this.uiTextBox1.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.uiTextBox1.MinimumSize = new System.Drawing.Size(2, 24);
+            this.uiTextBox1.Location = new System.Drawing.Point(334, 8);
+            this.uiTextBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiTextBox1.MinimumSize = new System.Drawing.Size(1, 16);
             this.uiTextBox1.Name = "uiTextBox1";
             this.uiTextBox1.ShowText = false;
-            this.uiTextBox1.Size = new System.Drawing.Size(225, 44);
+            this.uiTextBox1.Size = new System.Drawing.Size(150, 29);
             this.uiTextBox1.TabIndex = 9;
             this.uiTextBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.uiTextBox1.Watermark = "已对照医保名称/编码";
@@ -963,12 +948,11 @@
             // 
             this.rbAll.Cursor = System.Windows.Forms.Cursors.Hand;
             this.rbAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rbAll.Location = new System.Drawing.Point(752, 16);
-            this.rbAll.Margin = new System.Windows.Forms.Padding(4);
-            this.rbAll.MinimumSize = new System.Drawing.Size(2, 2);
+            this.rbAll.Location = new System.Drawing.Point(501, 11);
+            this.rbAll.MinimumSize = new System.Drawing.Size(1, 1);
             this.rbAll.Name = "rbAll";
-            this.rbAll.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0);
-            this.rbAll.Size = new System.Drawing.Size(94, 34);
+            this.rbAll.Padding = new System.Windows.Forms.Padding(15, 0, 0, 0);
+            this.rbAll.Size = new System.Drawing.Size(63, 23);
             this.rbAll.TabIndex = 8;
             this.rbAll.Text = "全部";
             this.rbAll.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -978,12 +962,11 @@
             // 
             this.rbNoMaped.Cursor = System.Windows.Forms.Cursors.Hand;
             this.rbNoMaped.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rbNoMaped.Location = new System.Drawing.Point(974, 16);
-            this.rbNoMaped.Margin = new System.Windows.Forms.Padding(4);
-            this.rbNoMaped.MinimumSize = new System.Drawing.Size(2, 2);
+            this.rbNoMaped.Location = new System.Drawing.Point(649, 11);
+            this.rbNoMaped.MinimumSize = new System.Drawing.Size(1, 1);
             this.rbNoMaped.Name = "rbNoMaped";
-            this.rbNoMaped.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0);
-            this.rbNoMaped.Size = new System.Drawing.Size(94, 34);
+            this.rbNoMaped.Padding = new System.Windows.Forms.Padding(15, 0, 0, 0);
+            this.rbNoMaped.Size = new System.Drawing.Size(63, 23);
             this.rbNoMaped.TabIndex = 7;
             this.rbNoMaped.Text = "未对照";
             this.rbNoMaped.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -993,12 +976,11 @@
             // 
             this.rbMaped.Cursor = System.Windows.Forms.Cursors.Hand;
             this.rbMaped.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rbMaped.Location = new System.Drawing.Point(862, 16);
-            this.rbMaped.Margin = new System.Windows.Forms.Padding(4);
-            this.rbMaped.MinimumSize = new System.Drawing.Size(2, 2);
+            this.rbMaped.Location = new System.Drawing.Point(575, 11);
+            this.rbMaped.MinimumSize = new System.Drawing.Size(1, 1);
             this.rbMaped.Name = "rbMaped";
-            this.rbMaped.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0);
-            this.rbMaped.Size = new System.Drawing.Size(94, 34);
+            this.rbMaped.Padding = new System.Windows.Forms.Padding(15, 0, 0, 0);
+            this.rbMaped.Size = new System.Drawing.Size(63, 23);
             this.rbMaped.TabIndex = 6;
             this.rbMaped.Text = "已对照";
             this.rbMaped.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -1008,11 +990,10 @@
             // 
             this.btnQueryHISDirectory.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnQueryHISDirectory.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnQueryHISDirectory.Location = new System.Drawing.Point(15, 10);
-            this.btnQueryHISDirectory.Margin = new System.Windows.Forms.Padding(4);
-            this.btnQueryHISDirectory.MinimumSize = new System.Drawing.Size(2, 2);
+            this.btnQueryHISDirectory.Location = new System.Drawing.Point(10, 7);
+            this.btnQueryHISDirectory.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnQueryHISDirectory.Name = "btnQueryHISDirectory";
-            this.btnQueryHISDirectory.Size = new System.Drawing.Size(225, 42);
+            this.btnQueryHISDirectory.Size = new System.Drawing.Size(150, 28);
             this.btnQueryHISDirectory.TabIndex = 5;
             this.btnQueryHISDirectory.Text = "查询HIS目录";
             this.btnQueryHISDirectory.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1023,12 +1004,12 @@
             // 
             this.tbHISDirectoryFilter.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.tbHISDirectoryFilter.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbHISDirectoryFilter.Location = new System.Drawing.Point(261, 12);
-            this.tbHISDirectoryFilter.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.tbHISDirectoryFilter.MinimumSize = new System.Drawing.Size(2, 24);
+            this.tbHISDirectoryFilter.Location = new System.Drawing.Point(174, 8);
+            this.tbHISDirectoryFilter.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbHISDirectoryFilter.MinimumSize = new System.Drawing.Size(1, 16);
             this.tbHISDirectoryFilter.Name = "tbHISDirectoryFilter";
             this.tbHISDirectoryFilter.ShowText = false;
-            this.tbHISDirectoryFilter.Size = new System.Drawing.Size(225, 44);
+            this.tbHISDirectoryFilter.Size = new System.Drawing.Size(150, 29);
             this.tbHISDirectoryFilter.TabIndex = 4;
             this.tbHISDirectoryFilter.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.tbHISDirectoryFilter.Watermark = "HIS名称/编码";
@@ -1039,14 +1020,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, 450);
-            this.pgHISDirect.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.pgHISDirect.MinimumSize = new System.Drawing.Size(2, 2);
+            this.pgHISDirect.Location = new System.Drawing.Point(0, 238);
+            this.pgHISDirect.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.pgHISDirect.MinimumSize = new System.Drawing.Size(1, 1);
             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(1640, 52);
+            this.pgHISDirect.Size = new System.Drawing.Size(1257, 35);
             this.pgHISDirect.TabIndex = 6;
             this.pgHISDirect.Text = "uiPagination2";
             this.pgHISDirect.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1060,7 +1041,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(290, 30);
+            this.LabExplain.Size = new System.Drawing.Size(454, 30);
             this.LabExplain.TabIndex = 26;
             this.LabExplain.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.LabExplain.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -1072,9 +1053,8 @@
             this.panel4.Controls.Add(this.pgCenterDirect);
             this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel4.Location = new System.Drawing.Point(0, 0);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(1640, 478);
+            this.panel4.Size = new System.Drawing.Size(1257, 258);
             this.panel4.TabIndex = 3;
             // 
             // dgvCenterDirectory
@@ -1106,8 +1086,7 @@
             this.dgvCenterDirectory.EnableHeadersVisualStyles = false;
             this.dgvCenterDirectory.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvCenterDirectory.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            this.dgvCenterDirectory.Location = new System.Drawing.Point(0, 60);
-            this.dgvCenterDirectory.Margin = new System.Windows.Forms.Padding(4);
+            this.dgvCenterDirectory.Location = new System.Drawing.Point(0, 40);
             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)))));
@@ -1123,7 +1102,7 @@
             this.dgvCenterDirectory.RowsDefaultCellStyle = dataGridViewCellStyle15;
             this.dgvCenterDirectory.RowTemplate.Height = 23;
             this.dgvCenterDirectory.SelectedIndex = -1;
-            this.dgvCenterDirectory.Size = new System.Drawing.Size(1640, 366);
+            this.dgvCenterDirectory.Size = new System.Drawing.Size(1257, 183);
             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);
@@ -1140,9 +1119,8 @@
             this.panel6.Controls.Add(this.tbCenterDirectoryFilter);
             this.panel6.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel6.Location = new System.Drawing.Point(0, 0);
-            this.panel6.Margin = new System.Windows.Forms.Padding(4);
             this.panel6.Name = "panel6";
-            this.panel6.Size = new System.Drawing.Size(1640, 60);
+            this.panel6.Size = new System.Drawing.Size(1257, 40);
             this.panel6.TabIndex = 2;
             // 
             // tbManufacturer
@@ -1150,12 +1128,12 @@
             this.tbManufacturer.Controls.Add(this.uiTextBox8);
             this.tbManufacturer.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.tbManufacturer.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbManufacturer.Location = new System.Drawing.Point(1164, 8);
-            this.tbManufacturer.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.tbManufacturer.MinimumSize = new System.Drawing.Size(2, 24);
+            this.tbManufacturer.Location = new System.Drawing.Point(776, 5);
+            this.tbManufacturer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbManufacturer.MinimumSize = new System.Drawing.Size(1, 16);
             this.tbManufacturer.Name = "tbManufacturer";
             this.tbManufacturer.ShowText = false;
-            this.tbManufacturer.Size = new System.Drawing.Size(220, 45);
+            this.tbManufacturer.Size = new System.Drawing.Size(147, 30);
             this.tbManufacturer.TabIndex = 13;
             this.tbManufacturer.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.tbManufacturer.Watermark = "生产厂家";
@@ -1181,12 +1159,12 @@
             this.tbSpecifications.Controls.Add(this.uiTextBox6);
             this.tbSpecifications.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.tbSpecifications.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbSpecifications.Location = new System.Drawing.Point(1388, 8);
-            this.tbSpecifications.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.tbSpecifications.MinimumSize = new System.Drawing.Size(2, 24);
+            this.tbSpecifications.Location = new System.Drawing.Point(925, 5);
+            this.tbSpecifications.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbSpecifications.MinimumSize = new System.Drawing.Size(1, 16);
             this.tbSpecifications.Name = "tbSpecifications";
             this.tbSpecifications.ShowText = false;
-            this.tbSpecifications.Size = new System.Drawing.Size(184, 45);
+            this.tbSpecifications.Size = new System.Drawing.Size(123, 30);
             this.tbSpecifications.TabIndex = 12;
             this.tbSpecifications.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.tbSpecifications.Watermark = "规格";
@@ -1213,12 +1191,12 @@
             this.tbDosageForm.Controls.Add(this.uiTextBox4);
             this.tbDosageForm.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.tbDosageForm.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbDosageForm.Location = new System.Drawing.Point(972, 8);
-            this.tbDosageForm.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.tbDosageForm.MinimumSize = new System.Drawing.Size(2, 24);
+            this.tbDosageForm.Location = new System.Drawing.Point(648, 5);
+            this.tbDosageForm.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbDosageForm.MinimumSize = new System.Drawing.Size(1, 16);
             this.tbDosageForm.Name = "tbDosageForm";
             this.tbDosageForm.ShowText = false;
-            this.tbDosageForm.Size = new System.Drawing.Size(189, 45);
+            this.tbDosageForm.Size = new System.Drawing.Size(126, 30);
             this.tbDosageForm.TabIndex = 11;
             this.tbDosageForm.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.tbDosageForm.Watermark = "剂型名称";
@@ -1275,12 +1253,12 @@
             this.tbApprovalNO.Controls.Add(this.uiTextBox2);
             this.tbApprovalNO.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.tbApprovalNO.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbApprovalNO.Location = new System.Drawing.Point(784, 8);
-            this.tbApprovalNO.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.tbApprovalNO.MinimumSize = new System.Drawing.Size(2, 24);
+            this.tbApprovalNO.Location = new System.Drawing.Point(523, 5);
+            this.tbApprovalNO.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbApprovalNO.MinimumSize = new System.Drawing.Size(1, 16);
             this.tbApprovalNO.Name = "tbApprovalNO";
             this.tbApprovalNO.ShowText = false;
-            this.tbApprovalNO.Size = new System.Drawing.Size(184, 45);
+            this.tbApprovalNO.Size = new System.Drawing.Size(123, 30);
             this.tbApprovalNO.TabIndex = 8;
             this.tbApprovalNO.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.tbApprovalNO.Watermark = "批准文号";
@@ -1305,12 +1283,12 @@
             // 
             this.tbInsuCode.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.tbInsuCode.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbInsuCode.Location = new System.Drawing.Point(436, 8);
-            this.tbInsuCode.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.tbInsuCode.MinimumSize = new System.Drawing.Size(2, 24);
+            this.tbInsuCode.Location = new System.Drawing.Point(291, 5);
+            this.tbInsuCode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbInsuCode.MinimumSize = new System.Drawing.Size(1, 16);
             this.tbInsuCode.Name = "tbInsuCode";
             this.tbInsuCode.ShowText = false;
-            this.tbInsuCode.Size = new System.Drawing.Size(345, 45);
+            this.tbInsuCode.Size = new System.Drawing.Size(230, 30);
             this.tbInsuCode.TabIndex = 7;
             this.tbInsuCode.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.tbInsuCode.Watermark = "输入准确编码";
@@ -1320,11 +1298,10 @@
             // 
             this.btnQueryCenterDirectory.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnQueryCenterDirectory.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnQueryCenterDirectory.Location = new System.Drawing.Point(16, 8);
-            this.btnQueryCenterDirectory.Margin = new System.Windows.Forms.Padding(4);
-            this.btnQueryCenterDirectory.MinimumSize = new System.Drawing.Size(2, 2);
+            this.btnQueryCenterDirectory.Location = new System.Drawing.Point(11, 5);
+            this.btnQueryCenterDirectory.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnQueryCenterDirectory.Name = "btnQueryCenterDirectory";
-            this.btnQueryCenterDirectory.Size = new System.Drawing.Size(224, 46);
+            this.btnQueryCenterDirectory.Size = new System.Drawing.Size(149, 31);
             this.btnQueryCenterDirectory.TabIndex = 6;
             this.btnQueryCenterDirectory.Text = "查询中心目录";
             this.btnQueryCenterDirectory.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1335,12 +1312,12 @@
             // 
             this.tbCenterDirectoryFilter.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.tbCenterDirectoryFilter.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbCenterDirectoryFilter.Location = new System.Drawing.Point(244, 8);
-            this.tbCenterDirectoryFilter.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.tbCenterDirectoryFilter.MinimumSize = new System.Drawing.Size(2, 24);
+            this.tbCenterDirectoryFilter.Location = new System.Drawing.Point(163, 5);
+            this.tbCenterDirectoryFilter.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbCenterDirectoryFilter.MinimumSize = new System.Drawing.Size(1, 16);
             this.tbCenterDirectoryFilter.Name = "tbCenterDirectoryFilter";
             this.tbCenterDirectoryFilter.ShowText = false;
-            this.tbCenterDirectoryFilter.Size = new System.Drawing.Size(189, 45);
+            this.tbCenterDirectoryFilter.Size = new System.Drawing.Size(126, 30);
             this.tbCenterDirectoryFilter.TabIndex = 5;
             this.tbCenterDirectoryFilter.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.tbCenterDirectoryFilter.Watermark = "名称/缩写";
@@ -1351,14 +1328,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, 426);
-            this.pgCenterDirect.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.pgCenterDirect.MinimumSize = new System.Drawing.Size(2, 2);
+            this.pgCenterDirect.Location = new System.Drawing.Point(0, 223);
+            this.pgCenterDirect.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.pgCenterDirect.MinimumSize = new System.Drawing.Size(1, 1);
             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(1640, 52);
+            this.pgCenterDirect.Size = new System.Drawing.Size(1257, 35);
             this.pgCenterDirect.TabIndex = 0;
             this.pgCenterDirect.Text = "uiPagination3";
             this.pgCenterDirect.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1370,7 +1347,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(1234, 4);
+            this.uiButton1.Location = new System.Drawing.Point(1398, 4);
             this.uiButton1.Margin = new System.Windows.Forms.Padding(4);
             this.uiButton1.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiButton1.Name = "uiButton1";
@@ -1386,11 +1363,11 @@
             this.uiPanel3.Controls.Add(this.rbgDirecType_C);
             this.uiPanel3.Dock = System.Windows.Forms.DockStyle.Left;
             this.uiPanel3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiPanel3.Location = new System.Drawing.Point(4, 4);
-            this.uiPanel3.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.uiPanel3.MinimumSize = new System.Drawing.Size(2, 2);
+            this.uiPanel3.Location = new System.Drawing.Point(3, 3);
+            this.uiPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiPanel3.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiPanel3.Name = "uiPanel3";
-            this.uiPanel3.Size = new System.Drawing.Size(268, 996);
+            this.uiPanel3.Size = new System.Drawing.Size(179, 542);
             this.uiPanel3.TabIndex = 5;
             this.uiPanel3.Text = null;
             this.uiPanel3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1409,7 +1386,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(268, 996);
+            this.rbgDirecType_C.Size = new System.Drawing.Size(179, 542);
             this.rbgDirecType_C.TabIndex = 6;
             this.rbgDirecType_C.Text = "目录类型";
             this.rbgDirecType_C.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1425,30 +1402,29 @@
             this.tsmiSingleUpdateAuxInfo,
             this.tsmiUpdateAllAuxInfo});
             this.cmsUpdateAuxInfo.Name = "cmsUpdateAuxInfo";
-            this.cmsUpdateAuxInfo.Size = new System.Drawing.Size(329, 80);
+            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(328, 38);
+            this.tsmiSingleUpdateAuxInfo.Size = new System.Drawing.Size(240, 26);
             this.tsmiSingleUpdateAuxInfo.Text = "单新单条目录附属信息";
             // 
             // tsmiUpdateAllAuxInfo
             // 
             this.tsmiUpdateAllAuxInfo.Name = "tsmiUpdateAllAuxInfo";
-            this.tsmiUpdateAllAuxInfo.Size = new System.Drawing.Size(328, 38);
+            this.tsmiUpdateAllAuxInfo.Size = new System.Drawing.Size(240, 26);
             this.tsmiUpdateAllAuxInfo.Text = "更新所有目录附属信息";
             // 
             // BasicData
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            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(2104, 875);
+            this.ClientSize = new System.Drawing.Size(1450, 583);
             this.Controls.Add(this.tabControl1);
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "BasicData";
             this.Text = "医保基础数据平台";
             this.Load += new System.EventHandler(this.Form1_Load);

Forms/ChooseCard.cs

@@ -42,9 +42,9 @@ namespace PTMedicalInsurance.Forms
 
             Global.pat.OtherProv = rbgOtherProv.SelectedIndex;
 
-            if ((rbgOtherProv.SelectedIndex == 1)&&(cbCBD.Text==""))
+            if ((rbgOtherProv.SelectedIndex == 1)&&(cbCBD.Text=="")&&(rbgCardType.SelectedIndex==1)) 
             {
-                MessageBox.Show("异地结算,请选择统筹区！");
+                MessageBox.Show("身份证异地结算,请选择统筹区！");
                 return;
             }
             // 身份证

Forms/OutpatientRegistration.cs

@@ -12,13 +12,16 @@ using System.Windows.Forms;
 using PTMedicalInsurance.Common;
 using PTMedicalInsurance.Helper;
 using PTMedicalInsurance.Variables;
+using FastReport.Utils;
+using Sunny.UI.Win32;
+using AnHuiMI.Common;
 
 
 namespace PTMedicalInsurance.Forms
 {
     public partial class OutpatientRegistration : Form
     {
-
+        private InvokeHelper invoker =new InvokeHelper();
         public OutpatientRegistration()
         {
             InitializeComponent();
@@ -44,7 +47,8 @@ namespace PTMedicalInsurance.Forms
                 SetDBLKCombox(ref dblkcbxSettelmentWay, sqlStr);
 
                 sqlStr = " SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr WHERE A.InsuCode = 'IPT_TYPE'" + sqlCondition;
-                SetDBLKCombox(ref dblkcbxHospType, sqlStr);
+                SetDBLKCombox(ref dblkcbxHospType, sqlStr);                
+                
             }
             else
             {
@@ -52,8 +56,8 @@ namespace PTMedicalInsurance.Forms
                 string sqlStr = "SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr  WHERE A.InsuCode = 'insutype'" + sqlCondition;
                 SetDBLKCombox(ref dblkcbxInsuranceType, sqlStr);
 
-                sqlStr = "select A.Code, A.Name FROM HB_MedInsuDirectory A where A.ValidFlag='1' And A.HisType=7" + sqlCondition;
-                SetDBLKCombox(ref dblkcbxDisease, sqlStr);
+                //sqlStr = "select A.Code, A.Name FROM HB_MedInsuDirectory A where A.ValidFlag='1' And A.HisType=7" + sqlCondition;
+                //SetDBLKCombox(ref dblkcbxDisease, sqlStr);
 
                 sqlStr = "SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr  WHERE A.InsuCode = 'psn_setlway'" + sqlCondition;
                 SetDBLKCombox(ref dblkcbxSettelmentWay, sqlStr);
@@ -63,6 +67,9 @@ namespace PTMedicalInsurance.Forms
 
                 sqlStr = " SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr WHERE A.InsuCode = 'IPT_TYPE'" + sqlCondition;
                 SetDBLKCombox(ref dblkcbxHospType, sqlStr);
+
+                sqlStr = " SELECT Code, Name FROM HB_MedInsuDirectory A where A.ValidFlag='1' AND A.HisType=6" + sqlCondition;
+                SetDBLKCombox(ref dblkcbxDisease, sqlStr);
             }
             
             cbxAccountPay.Checked = true;
@@ -205,6 +212,32 @@ namespace PTMedicalInsurance.Forms
 
             med_type = dataRow["Code"].ToString().Trim();
             med_type_name = dataRow["Name"].ToString().Trim();
+
+            if (med_type == "14")
+            {
+                JObject Jo5301 = new JObject();
+                Jo5301.Add("psn_no", Global.pat.psn_no);
+                JObject data5301 = new JObject();
+                data5301.Add("data", Jo5301);
+                JObject Out5301 = new JObject();
+                Out5301 = invoker.invokeCenterService("5301", JObject.Parse(JsonHelper.setCenterInpar("5301", data5301)));                
+                JArray joMbxx = JArray.Parse(JsonHelper.getDestValue(Out5301, "output.feedetail"));
+                if (joMbxx.Count > 0)
+                {
+                    for (int i = 0; i < joMbxx.Count; i++)
+                    {
+                        Utils.convertTimestamp((JObject)joMbxx[i], "begndate");
+                        Utils.convertTimestamp((JObject)joMbxx[i], "enddate");
+
+                    }
+                    MessageBox.Show("人员慢病信息查询结果：" + joMbxx.ToString());
+                }
+                else
+                {
+                    MessageBox.Show("人员慢病信息查询结果：" + Out5301.ToString());
+                }
+                
+            }
         }
 
         private void dblkcbxDisease_AfterSelector(object sender, PTControl.AfterSelectorEventArgs e)
@@ -270,13 +303,14 @@ namespace PTMedicalInsurance.Forms
             joData2001.Add("fixmedins_code", Global.inf.hospitalNO);
             joData2001.Add("med_type", med_type);
             joData2001.Add("begntime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-            joData2001.Add("endtime", "");
+            joData2001.Add("endtime", DateTime.Now.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss"));
             joData2001.Add("dise_codg", diseCodg);
             joData2001.Add("dise_name", diseName);
             joData2001.Add("oprn_oprt_code", "");
             joData2001.Add("oprn_oprt_name", "");
             joData2001.Add("matn_type", "");
             joData2001.Add("birctrl_type", "");
+            joData2001.Add("exp_content", "");            
 
             JObject joInput = new JObject();
             joInput.Add("data", joData2001);
@@ -311,5 +345,15 @@ namespace PTMedicalInsurance.Forms
             iptTypeCode = dataRow["Code"].ToString().Trim();
             iptTypeName = dataRow["Name"].ToString().Trim();
         }
+
+        private void dblkcbxDisease_SelectedIndexChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void dblkcbxMedicalType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            
+        }
     }
 }

Forms/OutpatientRegistration.designer.cs

@@ -30,7 +30,7 @@ namespace PTMedicalInsurance.Forms
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             this.panel1 = new System.Windows.Forms.Panel();
             this.cbxUnifPayStdType = new System.Windows.Forms.ComboBox();
             this.label7 = new System.Windows.Forms.Label();
@@ -121,7 +121,7 @@ namespace PTMedicalInsurance.Forms
             "6\t非体外循环"});
             this.cbxUnifPayStdType.Location = new System.Drawing.Point(163, 223);
             this.cbxUnifPayStdType.Name = "cbxUnifPayStdType";
-            this.cbxUnifPayStdType.Size = new System.Drawing.Size(257, 30);
+            this.cbxUnifPayStdType.Size = new System.Drawing.Size(257, 23);
             this.cbxUnifPayStdType.TabIndex = 50;
             // 
             // label7
@@ -131,7 +131,7 @@ namespace PTMedicalInsurance.Forms
             this.label7.Location = new System.Drawing.Point(35, 226);
             this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(142, 22);
+            this.label7.Size = new System.Drawing.Size(103, 15);
             this.label7.TabIndex = 49;
             this.label7.Text = "包干标准类型";
             // 
@@ -199,7 +199,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxHospType.sDisplayField = "";
             this.dblkcbxHospType.sDisplayMember = "";
             this.dblkcbxHospType.SeparatorChar = "|";
-            this.dblkcbxHospType.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxHospType.Size = new System.Drawing.Size(257, 23);
             this.dblkcbxHospType.sKeyWords = "";
             this.dblkcbxHospType.sValueMember = "";
             this.dblkcbxHospType.TabIndex = 44;
@@ -213,7 +213,7 @@ namespace PTMedicalInsurance.Forms
             this.label8.Location = new System.Drawing.Point(506, 177);
             this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(98, 22);
+            this.label8.Size = new System.Drawing.Size(71, 15);
             this.label8.TabIndex = 43;
             this.label8.Text = "住院类型";
             // 
@@ -227,7 +227,7 @@ namespace PTMedicalInsurance.Forms
             "4.无症状感染者"});
             this.cbxMdtrtGrpType.Location = new System.Drawing.Point(163, 174);
             this.cbxMdtrtGrpType.Name = "cbxMdtrtGrpType";
-            this.cbxMdtrtGrpType.Size = new System.Drawing.Size(257, 30);
+            this.cbxMdtrtGrpType.Size = new System.Drawing.Size(257, 23);
             this.cbxMdtrtGrpType.TabIndex = 42;
             // 
             // label9
@@ -237,7 +237,7 @@ namespace PTMedicalInsurance.Forms
             this.label9.Location = new System.Drawing.Point(35, 177);
             this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(142, 22);
+            this.label9.Size = new System.Drawing.Size(103, 15);
             this.label9.TabIndex = 41;
             this.label9.Text = "就诊人群类型";
             // 
@@ -252,7 +252,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxDiseaseType.sDisplayField = "";
             this.dblkcbxDiseaseType.sDisplayMember = "";
             this.dblkcbxDiseaseType.SeparatorChar = "|";
-            this.dblkcbxDiseaseType.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxDiseaseType.Size = new System.Drawing.Size(257, 23);
             this.dblkcbxDiseaseType.sKeyWords = "";
             this.dblkcbxDiseaseType.sValueMember = "";
             this.dblkcbxDiseaseType.TabIndex = 23;
@@ -270,7 +270,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxSettelmentWay.sDisplayField = "";
             this.dblkcbxSettelmentWay.sDisplayMember = "";
             this.dblkcbxSettelmentWay.SeparatorChar = "|";
-            this.dblkcbxSettelmentWay.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxSettelmentWay.Size = new System.Drawing.Size(257, 23);
             this.dblkcbxSettelmentWay.sKeyWords = "";
             this.dblkcbxSettelmentWay.sValueMember = "";
             this.dblkcbxSettelmentWay.TabIndex = 22;
@@ -288,7 +288,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxOperation.sDisplayField = "";
             this.dblkcbxOperation.sDisplayMember = "";
             this.dblkcbxOperation.SeparatorChar = "|";
-            this.dblkcbxOperation.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxOperation.Size = new System.Drawing.Size(257, 23);
             this.dblkcbxOperation.sKeyWords = "";
             this.dblkcbxOperation.sValueMember = "";
             this.dblkcbxOperation.TabIndex = 21;
@@ -306,12 +306,13 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxDisease.sDisplayField = "";
             this.dblkcbxDisease.sDisplayMember = "";
             this.dblkcbxDisease.SeparatorChar = "|";
-            this.dblkcbxDisease.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxDisease.Size = new System.Drawing.Size(257, 23);
             this.dblkcbxDisease.sKeyWords = "";
             this.dblkcbxDisease.sValueMember = "";
             this.dblkcbxDisease.TabIndex = 20;
             this.dblkcbxDisease.Value = "";
             this.dblkcbxDisease.AfterSelector += new PTControl.AfterSelectorEventHandler(this.dblkcbxDisease_AfterSelector);
+            this.dblkcbxDisease.SelectedIndexChanged += new System.EventHandler(this.dblkcbxDisease_SelectedIndexChanged);
             // 
             // dblkcbxMedicalType
             // 
@@ -324,12 +325,13 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxMedicalType.sDisplayField = "";
             this.dblkcbxMedicalType.sDisplayMember = "";
             this.dblkcbxMedicalType.SeparatorChar = "|";
-            this.dblkcbxMedicalType.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxMedicalType.Size = new System.Drawing.Size(257, 23);
             this.dblkcbxMedicalType.sKeyWords = "";
             this.dblkcbxMedicalType.sValueMember = "";
             this.dblkcbxMedicalType.TabIndex = 19;
             this.dblkcbxMedicalType.Value = "";
             this.dblkcbxMedicalType.AfterSelector += new PTControl.AfterSelectorEventHandler(this.dblkcbxMedicalType_AfterSelector);
+            this.dblkcbxMedicalType.SelectedIndexChanged += new System.EventHandler(this.dblkcbxMedicalType_SelectedIndexChanged);
             // 
             // dblkcbxInsuranceType
             // 
@@ -342,7 +344,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxInsuranceType.sDisplayField = "";
             this.dblkcbxInsuranceType.sDisplayMember = "";
             this.dblkcbxInsuranceType.SeparatorChar = "|";
-            this.dblkcbxInsuranceType.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxInsuranceType.Size = new System.Drawing.Size(257, 23);
             this.dblkcbxInsuranceType.sKeyWords = "";
             this.dblkcbxInsuranceType.sValueMember = "";
             this.dblkcbxInsuranceType.TabIndex = 18;
@@ -356,7 +358,7 @@ namespace PTMedicalInsurance.Forms
             this.label6.Location = new System.Drawing.Point(506, 128);
             this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(98, 22);
+            this.label6.Size = new System.Drawing.Size(71, 15);
             this.label6.TabIndex = 17;
             this.label6.Text = "病种类型";
             // 
@@ -367,7 +369,7 @@ namespace PTMedicalInsurance.Forms
             this.label5.Location = new System.Drawing.Point(506, 79);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(98, 22);
+            this.label5.Size = new System.Drawing.Size(71, 15);
             this.label5.TabIndex = 16;
             this.label5.Text = "手术操作";
             // 
@@ -378,7 +380,7 @@ namespace PTMedicalInsurance.Forms
             this.label4.Location = new System.Drawing.Point(506, 30);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(98, 22);
+            this.label4.Size = new System.Drawing.Size(71, 15);
             this.label4.TabIndex = 15;
             this.label4.Text = "医疗类别";
             // 
@@ -389,7 +391,7 @@ namespace PTMedicalInsurance.Forms
             this.label3.Location = new System.Drawing.Point(67, 128);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(98, 22);
+            this.label3.Size = new System.Drawing.Size(71, 15);
             this.label3.TabIndex = 14;
             this.label3.Text = "结算方式";
             // 
@@ -400,7 +402,7 @@ namespace PTMedicalInsurance.Forms
             this.label2.Location = new System.Drawing.Point(67, 79);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(98, 22);
+            this.label2.Size = new System.Drawing.Size(71, 15);
             this.label2.TabIndex = 13;
             this.label2.Text = "病种名称\r\n";
             // 
@@ -411,7 +413,7 @@ namespace PTMedicalInsurance.Forms
             this.label1.Location = new System.Drawing.Point(67, 30);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(98, 22);
+            this.label1.Size = new System.Drawing.Size(71, 15);
             this.label1.TabIndex = 12;
             this.label1.Text = "险种类型";
             // 
@@ -428,13 +430,13 @@ namespace PTMedicalInsurance.Forms
             // 
             this.dgvDiagnose.AllowUserToAddRows = false;
             this.dgvDiagnose.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.ButtonShadow;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("新宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDiagnose.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.ButtonShadow;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("新宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDiagnose.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
             this.dgvDiagnose.ColumnHeadersHeight = 40;
             this.dgvDiagnose.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvDiagnose.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -600,7 +602,7 @@ namespace PTMedicalInsurance.Forms
             // 
             // OutpatientRegistration
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 22F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1197, 527);
             this.Controls.Add(this.panel3);

Forms/SettlementInfo.cs

@@ -10,6 +10,7 @@ using System.Windows.Forms;
 using Newtonsoft.Json.Linq;
 using PTMedicalInsurance.Variables;
 using PTMedicalInsurance.Business;
+using PTMedicalInsurance.Helper;
 
 namespace PTMedicalInsurance.Forms
 {
@@ -35,36 +36,36 @@ namespace PTMedicalInsurance.Forms
             InitializeComponent();
             JObject joSettlmentInfo = JObject.FromObject(jo["setlinfo"]);
             dtSettlmentDetail = (DataTable)jo["setldetail"].ToObject(typeof(DataTable));
-            this.tbAdmCertType.Text = joSettlmentInfo["mdtrt_cert_type"].ToString();
-            this.tbPsnCertType.Text = joSettlmentInfo["psn_cert_type"].ToString();
-            this.tbPsnCertNO.Text = joSettlmentInfo["certno"].ToString();
-            this.tbInsuType.Text = joSettlmentInfo["insutype"].ToString();
-            this.tbPersonType.Text = joSettlmentInfo["psn_type"].ToString();
-            this.tbMedType.Text = joSettlmentInfo["med_type"].ToString();
-            this.tbSumamt.Text = joSettlmentInfo["medfee_sumamt"].ToString();
-            this.tbFullOwnPay.Text = joSettlmentInfo["fulamt_ownpay_amt"].ToString();
-            this.tbOverLimitOwnPay.Text = joSettlmentInfo["overlmt_selfpay"].ToString();
-            this.tbPreSelfPay.Text = joSettlmentInfo["preselfpay_amt"].ToString();
-            this.tbInScopyAmount.Text = joSettlmentInfo["inscp_scp_amt"].ToString();
-            this.tbActualPayDeduLine.Text = joSettlmentInfo["act_pay_dedc"].ToString();
-            this.tbInsuFundPay.Text = joSettlmentInfo["hifp_pay"].ToString();
-            this.tbInsuFundPayRito.Text = joSettlmentInfo["pool_prop_selfpay"].ToString();
-            this.tbCvlserv_pay.Text = joSettlmentInfo["cvlserv_pay"].ToString();
-            this.tbHifes_pay.Text = joSettlmentInfo["hifes_pay"].ToString();
-            this.tbHifmi_pay.Text = joSettlmentInfo["hifmi_pay"].ToString();
-            this.tbWorkerLargeMedical.Text = joSettlmentInfo["hifob_pay"].ToString();
-            this.tbAssian.Text = joSettlmentInfo["maf_pay"].ToString();
-            this.tbOtherPay.Text = joSettlmentInfo["oth_pay"].ToString();
-            this.tbFundPaySummat.Text = joSettlmentInfo["fund_pay_sumamt"].ToString();
-            this.tbPsnSummat.Text = joSettlmentInfo["psn_part_amt"].ToString();
-            this.tbPsnAccountPaySummat.Text = joSettlmentInfo["acct_pay"].ToString();
-            this.tbPsnCashPay.Text = joSettlmentInfo["psn_cash_pay"].ToString();
-            this.tbHospitalPartAmount.Text = joSettlmentInfo["hosp_part_amt"].ToString();
-            this.tbBalc.Text = joSettlmentInfo["balc"].ToString();
-            this.tbAccountMutualAidAmount.Text = joSettlmentInfo["acct_mulaid_pay"].ToString();
-            this.tbClearingWay.Text = joSettlmentInfo["clr_way"].ToString();
-            this.tbClearingType.Text = joSettlmentInfo["clr_type"].ToString();
-            Global.Set.acctPay = joSettlmentInfo["acct_pay"].ToString();
+            this.tbAdmCertType.Text = JsonHelper.getDestValue(joSettlmentInfo, "mdtrt_cert_type");
+            this.tbPsnCertType.Text = JsonHelper.getDestValue(joSettlmentInfo, "psn_cert_type");
+            this.tbPsnCertNO.Text = JsonHelper.getDestValue(joSettlmentInfo, "certno");
+            this.tbInsuType.Text = JsonHelper.getDestValue(joSettlmentInfo, "insutype");
+            this.tbPersonType.Text = JsonHelper.getDestValue(joSettlmentInfo, "psn_type");
+            this.tbMedType.Text = JsonHelper.getDestValue(joSettlmentInfo, "med_type");
+            this.tbSumamt.Text = JsonHelper.getDestValue(joSettlmentInfo, "medfee_sumamt");
+            this.tbFullOwnPay.Text = JsonHelper.getDestValue(joSettlmentInfo, "fulamt_ownpay_amt");
+            this.tbOverLimitOwnPay.Text = JsonHelper.getDestValue(joSettlmentInfo, "overlmt_selfpay");
+            this.tbPreSelfPay.Text = JsonHelper.getDestValue(joSettlmentInfo, "preselfpay_amt");
+            this.tbInScopyAmount.Text = JsonHelper.getDestValue(joSettlmentInfo, "inscp_scp_amt");
+            this.tbActualPayDeduLine.Text = JsonHelper.getDestValue(joSettlmentInfo, "act_pay_dedc");
+            this.tbInsuFundPay.Text = JsonHelper.getDestValue(joSettlmentInfo, "hifp_pay");
+            this.tbInsuFundPayRito.Text = JsonHelper.getDestValue(joSettlmentInfo, "pool_prop_selfpay");
+            this.tbCvlserv_pay.Text = JsonHelper.getDestValue(joSettlmentInfo, "cvlserv_pay");
+            this.tbHifes_pay.Text = JsonHelper.getDestValue(joSettlmentInfo, "hifes_pay");
+            this.tbHifmi_pay.Text = JsonHelper.getDestValue(joSettlmentInfo, "hifmi_pay");
+            this.tbWorkerLargeMedical.Text = JsonHelper.getDestValue(joSettlmentInfo, "hifob_pay");
+            this.tbAssian.Text = JsonHelper.getDestValue(joSettlmentInfo, "maf_pay");
+            this.tbOtherPay.Text = JsonHelper.getDestValue(joSettlmentInfo, "oth_pay");
+            this.tbFundPaySummat.Text = JsonHelper.getDestValue(joSettlmentInfo, "fund_pay_sumamt");
+            this.tbPsnSummat.Text = JsonHelper.getDestValue(joSettlmentInfo, "psn_part_amt");
+            this.tbPsnAccountPaySummat.Text = JsonHelper.getDestValue(joSettlmentInfo, "acct_pay");
+            this.tbPsnCashPay.Text = JsonHelper.getDestValue(joSettlmentInfo, "psn_cash_pay");
+            this.tbHospitalPartAmount.Text = JsonHelper.getDestValue(joSettlmentInfo, "hosp_part_amt");
+            this.tbBalc.Text = JsonHelper.getDestValue(joSettlmentInfo, "balc");
+            this.tbAccountMutualAidAmount.Text = JsonHelper.getDestValue(joSettlmentInfo, "acct_mulaid_pay");
+            this.tbClearingWay.Text = JsonHelper.getDestValue(joSettlmentInfo, "clr_way");
+            this.tbClearingType.Text = JsonHelper.getDestValue(joSettlmentInfo, "clr_type");
+            Global.Set.acctPay = JsonHelper.getDestValue(joSettlmentInfo, "acct_pay");
             setDgvSettlDetailHeader();
             dgvSetlDetail.DataSource = dtSettlmentDetail;           
 

HeFeiMI.csproj

@@ -131,6 +131,12 @@
     <Compile Include="Forms\Clearing.designer.cs">
       <DependentUpon>Clearing.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\AssistSelect.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\AssistSelect.Designer.cs">
+      <DependentUpon>AssistSelect.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\InformationOfSelfPatients.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -250,6 +256,9 @@
     <EmbeddedResource Include="Forms\AddSignleDirectory.resx">
       <DependentUpon>AddSignleDirectory.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\AssistSelect.resx">
+      <DependentUpon>AssistSelect.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\CenterResult.resx">
       <DependentUpon>CenterResult.cs</DependentUpon>
     </EmbeddedResource>

Helper/InvokeHelper.cs

@@ -110,6 +110,12 @@ namespace PTMedicalInsurance.Helper
             IniFile ini = new IniFile(Global.curEvt.path + @"\CenterServiceURL.ini");
            // Global.inf.centerURL = ini.ReadValue("CENTER", "url");
            if (Global.inf.interfaceDr == 12)//省
+            {
+                Global.inf.uploadURL = "http://10.88.29.31:80/fsi/api/fileupload/upload";
+                Global.inf.downURL = "http://10.88.29.31:80/fsi/api/fileupload/download";
+                Global.inf.ecURL = "http://10.66.159.55:8080/localcfc/api/hsecfc/localQrCodeQuery";
+            }
+            if (Global.inf.interfaceDr == 15)//省
             {
                 Global.inf.uploadURL = "http://10.88.29.31:80/fsi/api/fileupload/upload";
                 Global.inf.downURL = "http://10.88.29.31:80/fsi/api/fileupload/download";
@@ -121,9 +127,15 @@ namespace PTMedicalInsurance.Helper
                 Global.inf.downURL = "http://10.67.240.56:80/fsi/api/fileupload/download";
                 Global.inf.ecURL = "http://10.66.159.55:8080/localcfc/api/hsecfc/localQrCodeQuery";
              }
-           // Global.inf.uploadURL = ini.ReadValue("CENTER", "upload");
+            if (Global.inf.interfaceDr == 17)//市
+            {
+                Global.inf.uploadURL = "http://10.67.240.56:80/fsi/api/fileupload/upload";
+                Global.inf.downURL = "http://10.67.240.56:80/fsi/api/fileupload/download";
+                Global.inf.ecURL = "http://10.66.159.55:8080/localcfc/api/hsecfc/localQrCodeQuery";
+            }
+            // Global.inf.uploadURL = ini.ReadValue("CENTER", "upload");
             //Global.inf.downURL = ini.ReadValue("CENTER", "download");
-           // Global.inf.ecURL = ini.ReadValue("CENTER", "ecToken");
+            // Global.inf.ecURL = ini.ReadValue("CENTER", "ecToken");
         }
         
         
@@ -261,8 +273,7 @@ namespace PTMedicalInsurance.Helper
                 //string CreditID = Global.inf.CreditID;            //服务商统一社会信用代码                
 
                 //内容类型
-                request.ContentType = "application/json";
-
+                request.ContentType = "application/json;charset=UTF-8";
                 //昆明增加头部信息
                 //string sTemp = timestamp + BusinessID + nonce;
                 //Sha256 加密生成的签名 signature = sha256(hsf_timestamp + infosyssign + hsf_nonce)
@@ -294,9 +305,16 @@ namespace PTMedicalInsurance.Helper
                     //获得响应流
                     response = (HttpWebResponse)request.GetResponse();
                 }
-                catch (Exception ex)
+                catch (WebException ex)
                 {
-                    return JsonHelper.setExceptionJson(-99, "centerServeiceInvok中获得响应流异常", ex.Message);
+                    // return JsonHelper.setExceptionJson(-99, "centerServeiceInvok中获得响应流异常", ex.Message);
+
+                    HttpWebResponse res = (HttpWebResponse)ex.Response;
+                    Stream myResponseStream = res.GetResponseStream();
+                    StreamReader myStreamReader = new StreamReader(myResponseStream, Encoding.UTF8);
+                    string retString = myStreamReader.ReadToEnd();
+                    return JsonHelper.setExceptionJson(-99, "centerServeiceInvok中获得响应流异常", retString);
+
                 }
                 postContent = getResponseData(response);
                 joRtn = JObject.Parse(postContent);//返回Json数据
@@ -645,7 +663,7 @@ namespace PTMedicalInsurance.Helper
             }
             finally
             {
-                Global.writeLog("DownloadCenterFile" +"(" + Global.curEvt.URL + ")", data, sRtn);
+                Global.writeLog("DownloadCenterFile" +"(" + Global.inf.downURL + ")", data, sRtn);
             }
         }
 

InsuBusiness.cs

@@ -13,6 +13,7 @@ using PTMedicalInsurance.Forms;
 using System.IO;
 using System.Reflection;
 using System.Data;
+using AnHuiMI.Forms;
 
 namespace PTMedicalInsurance
 {
@@ -1627,6 +1628,12 @@ namespace PTMedicalInsurance
                             Referral.ShowDialog();
                             break;
                         }
+                    case "AssistSelect"://辅助查询
+                        {
+                            AssistSelect Serach = new AssistSelect();
+                            Serach.ShowDialog();
+                            break;
+                        }
                     default:
                         {
                             rtnResult = JsonHelper.setExceptionJson(-1, "AgentFun 交易", "传入的业务编码不对！").ToString();