feat: 事前事中功能

Business/HisMainBusiness.cs

@@ -120,8 +120,8 @@ namespace PTMedicalInsurance.Business
             inf.ecURL = "http://ec.yn.hsip.gov.cn/localcfc/api/hsecfc/localQrCodeQuery";
 
             //瑶海正式环境应该配置到服务器
-            inf.BusinessID = "41a8514ba8ed429eb4dde381eda02fe0";   //商务ID码 
-            inf.CreditID = "91530112MA6Q3GGC1E";                   //服务商统一社会信用代码
+            //inf.BusinessID = "41a8514ba8ed429eb4dde381eda02fe0";   //商务ID码 
+            //inf.CreditID = "91530112MA6Q3GGC1E";                   //服务商统一社会信用代码
 
             // 根据参保地固定收费员
             //if (string.IsNullOrEmpty(inf.areaCode) || inf.areaCode.Substring(0, 4) == "3401")
@@ -168,20 +168,19 @@ namespace PTMedicalInsurance.Business
             inf.cardURL = inf.centerURL;
             inf.ecURL = "http://ec.yn.hsip.gov.cn/localcfc/api/hsecfc/localQrCodeQuery";
 
-            //瑶海正式环境应该配置到服务器
-            inf.BusinessID = "41a8514ba8ed429eb4dde381eda02fe0";   //商务ID码 
-            inf.CreditID = "91530112MA6Q3GGC1E";                   //服务商统一社会信用代码
+            //inf.BusinessID = "41a8514ba8ed429eb4dde381eda02fe0";   //商务ID码 
+            //inf.CreditID = "91530112MA6Q3GGC1E";                   //服务商统一社会信用代码
 
-            if (string.IsNullOrEmpty(inf.areaCode) || inf.areaCode.Substring(0, 4) == "3401")
-            {
-                inf.areaCode = "340100";
-                Global.user.ID = "7571C4995A2F4290";
-            }
-            else
-            {
-                inf.areaCode = "349900";
-                Global.user.ID = "48664E4455CC0F8F";
-            }
+            //if (string.IsNullOrEmpty(inf.areaCode) || inf.areaCode.Substring(0, 4) == "3401")
+            //{
+            //    inf.areaCode = "340100";
+            //    Global.user.ID = "7571C4995A2F4290";
+            //}
+            //else
+            //{
+            //    inf.areaCode = "349900";
+            //    Global.user.ID = "48664E4455CC0F8F";
+            //}
 
             inf.cainfo = "";
 
@@ -276,6 +275,7 @@ namespace PTMedicalInsurance.Business
                         Global.pat.mdtrtcertType = "01";
                         Global.businessType = cc.businessType;
                         outParam = ECTokenReader.ECQuery("1");
+                        return 0;
                     }
                     //身份证
                     if (cc.cardType == "02")
@@ -296,78 +296,20 @@ namespace PTMedicalInsurance.Business
                         }
 
                         Global.pat.card.SN = "";
+                        return this.trade1101(out outParam);
                     }
                     //社保卡
                     if (cc.cardType == "03")
                     {
-                        InvokeHelper invoker = new InvokeHelper();
                         #region 调用读卡接口信息
-                        joRtn = invoker.invokeCenterService("1161", JsonHelper.setCenterInpar("1161", joInput));
-                        if (JsonHelper.parseCenterRtnValue(joRtn, out errorMsg) != 0)
-                        {
-                            outParam = "读卡失败：" + errorMsg;
-                            return -1;
-                        }
-                        else
-                        {
-                            Resp1101 info = JsonHelper.getOutput<Resp1101>(joRtn);
-                            Global.pat.card.NO = info.cardInfo.cardno;
-                            Global.pat.card.SN = info.cardInfo.card_sn;
-                            Global.pat.card.Cardtoken = info.cardInfo.ecToken;
-                            if (info.insuInfo != null && info.insuInfo.Length > 0)
-                            { 
-                                //参保地
-                                Global.pat.insuplc_admdvs = info.insuInfo[0].insuplc_admdvs;
-                            }
-                            //姓名
-                            Global.pat.name = info.baseInfo.psn_name;
-                            //证件号
-                            Global.pat.certNO = info.baseInfo.certno;
-                            // 人员证件类型
-                            Global.pat.certType = info.baseInfo.psn_cert_type;
-                            // 就诊类型
-                            Global.pat.mdtrtcertType = "03";
-                            // 就诊凭证号
-                            Global.pat.mdtrtcertNO = Global.pat.card.NO;
-                            // 异地
-                            if (Global.pat.OtherProv != 0)
-                            {
-                                Global.pat.insuplc_admdvs = "";
-                            }
-                        }
-
+                        // 重庆读卡合并到1161交易（取消1101）
+                        return this.trade1161(out outParam);
                         #endregion
 
                     }
                 }
-
-                #region【1101获取身份信息】
-                JObject joData = new JObject();
-                joData.Add("mdtrt_cert_type", Global.pat.mdtrtcertType);
-                joData.Add("mdtrt_cert_no", Global.pat.mdtrtcertNO);
-                joData.Add("card_sn", Global.pat.card.SN);
-                joData.Add("begntime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-                joData.Add("psn_cert_type", Global.pat.certType);
-                joData.Add("certno", Global.pat.certNO); //证件号码
-                joData.Add("psn_name", Global.pat.name);
+                return 0;
                 
-                joInput.Add("data",joData);
-               
-                joRtn = invoker.invokeCenterService("1101", JsonHelper.setCenterInpar("1101", joInput));
-                if (JsonHelper.parseCenterRtnValue(joRtn, out errorMsg) != 0)
-                {
-                    outParam = "获取病人信息失败：" + errorMsg;                    
-                    return -1;
-                }
-                else
-                {
-                    //joRtn.Add("cardinfo",joCardInfo);
-                    outParam = joRtn.ToString();
-                    Global.pat.insuplc_admdvs = JsonHelper.getDestValue(JObject.Parse(outParam), "output.insuinfo[0].insuplc_admdvs"); //参保地
-
-                    return 0;
-                }
-                #endregion
             }
             catch (Exception ex)
             {
@@ -376,6 +318,88 @@ namespace PTMedicalInsurance.Business
             }
         }
 
+        private int trade1161(out string outParam)
+        {
+            outParam = "";
+            string errorMsg = "";
+
+            JObject joInput = new JObject();
+            JObject joRtn = new JObject();
+
+
+            #region 1161交易
+            InvokeHelper invoker = new InvokeHelper();
+            joRtn = invoker.invokeCenterService("1161", JsonHelper.setCenterInpar("1161", joInput));
+            if (JsonHelper.parseCenterRtnValue(joRtn, out errorMsg) != 0)
+            {
+                outParam = "读卡失败：" + errorMsg;
+                return -1;
+            }
+            else
+            {
+                Resp1101 info = JsonHelper.getOutput<Resp1101>(joRtn);
+                Global.pat.card.NO = info.cardInfo.cardno;
+                Global.pat.card.SN = info.cardInfo.card_sn;
+                Global.pat.card.Cardtoken = info.cardInfo.ecToken;
+                if (info.insuInfo != null && info.insuInfo.Length > 0)
+                {
+                    //参保地
+                    Global.pat.insuplc_admdvs = info.insuInfo[0].insuplc_admdvs;
+                }
+                //姓名
+                Global.pat.name = info.baseInfo.psn_name;
+                //证件号
+                Global.pat.certNO = info.baseInfo.certno;
+                // 人员证件类型
+                Global.pat.certType = info.baseInfo.psn_cert_type;
+                // 就诊类型
+                Global.pat.mdtrtcertType = "03";
+                // 就诊凭证号
+                Global.pat.mdtrtcertNO = Global.pat.card.NO;
+
+                outParam = joRtn.ToString();
+            }
+            return 0;
+            #endregion
+        }
+
+        private int trade1101(out string outParam)
+        {
+            outParam = "";
+            string errorMsg = "";
+
+            JObject joInput = new JObject();
+            JObject joRtn = new JObject();
+
+            #region【1101获取身份信息】
+            JObject joData = new JObject();
+            joData.Add("mdtrt_cert_type", Global.pat.mdtrtcertType);
+            joData.Add("mdtrt_cert_no", Global.pat.mdtrtcertNO);
+            joData.Add("card_sn", Global.pat.card.SN);
+            joData.Add("begntime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+            joData.Add("psn_cert_type", Global.pat.certType);
+            joData.Add("certno", Global.pat.certNO); //证件号码
+            joData.Add("psn_name", Global.pat.name);
+
+            joInput.Add("data", joData);
+
+            joRtn = invoker.invokeCenterService("1101", JsonHelper.setCenterInpar("1101", joInput));
+            if (JsonHelper.parseCenterRtnValue(joRtn, out errorMsg) != 0)
+            {
+                outParam = "获取病人信息失败：" + errorMsg;
+                return -1;
+            }
+            else
+            {
+                //joRtn.Add("cardinfo",joCardInfo);
+                outParam = joRtn.ToString();
+                Global.pat.insuplc_admdvs = JsonHelper.getDestValue(JObject.Parse(outParam), "output.insuinfo[0].insuplc_admdvs"); //参保地
+
+                return 0;
+            }
+            #endregion
+        }
+
         /// <summary>
         /// 正式结算前调用身份验证
         /// </summary>
@@ -660,10 +684,11 @@ namespace PTMedicalInsurance.Business
                 //    errMsg = "患者姓名(" + Global.pat.name + ")与参保人姓名(" + JsonHelper.getDestValue(joPatInfo, "output.baseinfo.psn_name") + ")不一致，请检查！";
                 //    return -1;
                 //}
-
+                Global.writeLog("确定患者信息:"+patInfo);
                 Global.pat.name = JsonHelper.getDestValue(joPatInfo, "output.baseinfo.psn_name");
                 //选中的参保信息
                 Global.pat.insuplc_admdvs = JsonHelper.getDestValue(joPatInfo, "selectedInsuInfo.insuplc_admdvs");
+
                 Global.pat.psn_insu_date = JsonHelper.getDestValue(joPatInfo, "selectedInsuInfo.psn_insu_date");
                 Global.pat.cvlserv_flag = JsonHelper.getDestValue(joPatInfo, "selectedInsuInfo.cvlserv_flag");
                 Global.pat.balc = JsonHelper.getDestValue(joPatInfo, "selectedInsuInfo.balc");
@@ -856,6 +881,23 @@ namespace PTMedicalInsurance.Business
                     ExportObj.Add("ipt_type", frmReg.iptTypeCode);          //住院类型
                     ExportObj.Add("rel_ttp_flag", frmReg.relTtpFlag);       //涉及第三方标志
                     ExportObj.Add("mdtrt_grp_type", frmReg.mdtrtGrpType);   //就诊人群类型
+                    // 合并已有内容
+                    if (!string.IsNullOrEmpty(Global.pat.ExpContent))
+                    {
+                        try
+                        {
+                            JObject jo = JObject.Parse(Global.pat.ExpContent);
+                            ExportObj.Merge(jo, new JsonMergeSettings
+                            {
+                                MergeArrayHandling = MergeArrayHandling.Union
+                            });
+                        }
+                        catch
+                        {
+                            Global.writeLog("转换失败:ExpContent内容不是JSON格式:"+Global.pat.ExpContent);
+                        }
+                        
+                    }
 
                     Global.pat.ExpContent = ExportObj.ToString();
 
@@ -879,7 +921,10 @@ namespace PTMedicalInsurance.Business
                     joMdtrtinfo.Add("mdtrt_cert_type", Global.pat.mdtrtcertType);          //就诊凭证类型
                     joMdtrtinfo.Add("mdtrt_cert_no", Global.pat.mdtrtcertNO);          //就诊凭证编号
                     joMdtrtinfo.Add("med_type", frmReg.med_type);          //医疗类别
-                    joMdtrtinfo.Add("ipt_no", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.ipt_no"));          //住院号
+
+                    string ipAdmNo = Utils.convertAdmDr(JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.ipt_no"));
+
+                    joMdtrtinfo.Add("ipt_no", ipAdmNo);          //住院号
                     joMdtrtinfo.Add("medrcdno", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.medrcdno"));          //病历号
                     joMdtrtinfo.Add("atddr_no", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.atddr_no"));          //主治医生编码
                     joMdtrtinfo.Add("chfpdr_name", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.chfpdr_name"));          //主诊医师姓名
@@ -1345,7 +1390,10 @@ namespace PTMedicalInsurance.Business
                     joRegInpar.Add("begntime", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.begntime"));//挂号时间 occurTime
                     joRegInpar.Add("mdtrt_cert_type", Global.pat.mdtrtcertType);
                     joRegInpar.Add("mdtrt_cert_no", Global.pat.mdtrtcertNO);
-                    joRegInpar.Add("ipt_otp_no", Global.pat.adm_Dr);
+                    
+                    string admDr = Utils.convertAdmDr(Global.pat.adm_Dr.ToString());
+                    joRegInpar.Add("ipt_otp_no", admDr);
+
                     joRegInpar.Add("atddr_no", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.atddr_no"));
                     joRegInpar.Add("dr_name", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.chfpdr_name"));
                     joRegInpar.Add("dept_code", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.adm_dept_codg"));
@@ -1539,6 +1587,7 @@ namespace PTMedicalInsurance.Business
                             pat.certNO = JsonHelper.getDestValue(joInparam, "params[0].patientInfo.output.baseinfo.certno");
                             pat.billID = JsonHelper.getDestValue(joInparam, "params[0].billID");
                             pat.card.SN = JsonHelper.getDestValue(joInparam, "params[0].patientInfo.cardinfo.card_sn");
+
                             break;
                         }
                     case "Z2C"://入院登记取消
@@ -1568,14 +1617,6 @@ namespace PTMedicalInsurance.Business
                             break;
                         }
                 }
-                //如果患者异地的则就医地需要该为369900
-                if (Global.pat.insuplc_admdvs != "")
-                {
-                    if (Global.pat.insuplc_admdvs.Substring(0, 4) != Global.inf.areaCode.Substring(0, 4))
-                    {
-                        Global.inf.areaCode = "539900";
-                    }
-                }
             }
             catch (Exception ex)
             {
@@ -2154,10 +2195,8 @@ namespace PTMedicalInsurance.Business
                     {
                         return -1;
                     }
-
                 }
 
-
                 PreAndInProcessAnalysis preAnalysis = new PreAndInProcessAnalysis(outparam);
                 if (preAnalysis.setPatientByHisBaseInfo(out outparam) != 0)
                 {
@@ -2233,5 +2272,30 @@ namespace PTMedicalInsurance.Business
                 Global.writeLog("InProcessAnalysis", "", outparam);
             }
         }
+
+        public void GetAgentFunHisInfo(string businessType, JObject joInparam, out Patients pat)
+        {
+            pat = new Patients();
+            switch (businessType)
+            {
+                case "PreAndInProcessAnalysis"://事前事中
+                    {
+                        pat.adm_Dr = int.Parse(JsonHelper.getDestValue(joInparam, "insuAdmObj.admID"));
+                        pat.psn_no = JsonHelper.getDestValue(joInparam, "insuAdmObj.psn_no");
+                        pat.mdtrtID = JsonHelper.getDestValue(joInparam, "insuAdmObj.mdtrt_id");
+                        pat.insuplc_admdvs = JsonHelper.getDestValue(joInparam, "insuAdmObj.insuplc_admdvs");
+                        pat.name = JsonHelper.getDestValue(joInparam, "insuAdmObj.psn_name");
+                        pat.billID = JsonHelper.getDestValue(joInparam, "params[0].billID");
+                        Global.pat.insuType = JsonHelper.getDestValue(joInparam, "insuAdmObj.insutype");
+                        break;
+                    }
+                default:
+                    {
+                        break;
+                    }
+
+            }
+
+        }
     }
 }

Business/IrisServices.cs

@@ -926,7 +926,9 @@ namespace PTMedicalInsurance.Business
 
                 joTmp.Add("HospitalDr", Global.inf.hospitalDr);
                 joTmp.Add("InterfaceDr", Global.inf.interfaceDr);
+
                 joTmp.Add("AdmDr", Global.pat.adm_Dr);
+
                 joTmp.Add("PatientName", Global.pat.name);
                 joTmp.Add("PersonalNO", Global.pat.psn_no);
                 joTmp.Add("InsuRegID", JsonHelper.getDestValue(jo2201Rtn, "output.data.mdtrt_id"));

Business/PreAndInProcessAnalysis.cs

@@ -1,4 +1,5 @@
 using Newtonsoft.Json.Linq;
+using PTMedicalInsurance.Common;
 using PTMedicalInsurance.Helper;
 using PTMedicalInsurance.Variables;
 using System;
@@ -28,6 +29,7 @@ namespace PTMedicalInsurance.Business
                 JObject jo = JObject.Parse(inpar);
                 JObject joResult = JObject.FromObject(jo["result"]);
                 patient_dtos = JArray.FromObject(joResult["patient_dtos"]);
+
                 fsi_encounter_dtos = JArray.FromObject(patient_dtos[0]["fsi_encounter_dtos"]);
                 fsi_diagnose_dtos = JArray.FromObject(fsi_encounter_dtos[0]["fsi_diagnose_dtos"]);
                 fsi_order_dtos = JArray.FromObject(fsi_encounter_dtos[0]["fsi_order_dtos"]);
@@ -157,18 +159,7 @@ namespace PTMedicalInsurance.Business
                 joInpar.Add("dscg_dept_codg", JsonHelper.getDestValue(jofsi_encounter_dtos, "dscg_dept_codg"));  //出院科室标识
                 joInpar.Add("dscg_dept_name", JsonHelper.getDestValue(jofsi_encounter_dtos, "dscg_dept_name"));  //出院科室名称
                 joInpar.Add("med_mdtrt_type", JsonHelper.getDestValue(jofsi_encounter_dtos, "med_mdtrt_type"));  //就诊类型
-                //银海和基线版不一样
                 string med_type = JsonHelper.getDestValue(jofsi_encounter_dtos, "med_type");
-                if (med_type == "") med_type = Global.pat.medType;
-                if (med_type == "31") med_type = "21";
-                if (med_type == "12") med_type = "41";
-                if (med_type == "17") med_type = "21";
-                if (med_type == "37") med_type = "23";
-                if (med_type == "11") med_type = "11";
-                if (med_type == "36") med_type = "23";
-                if (med_type == "18") med_type = "14";
-                if (med_type == "32") med_type = "92";
-                if (med_type == "1102") med_type = "91";
                 joInpar.Add("med_type", med_type);  //医疗类别
                 joInpar.Add("fsi_order_dtos", GetFsi__order_dtos(trig_scen,p));  //处方(医嘱)信息
                 string matn_stas = JsonHelper.getDestValue(jofsi_encounter_dtos, "matn_stas");
@@ -183,13 +174,21 @@ namespace PTMedicalInsurance.Business
                 joInpar.Add("setl_totlnum", JsonHelper.getDestValue(jofsi_encounter_dtos, "setl_totlnum"));  //结算总次数
                 string insutype = JsonHelper.getDestValue(jofsi_encounter_dtos, "insutype");
                 if (insutype =="") insutype = Global.pat.insuType;
-                if (insutype == "1") insutype = "310";
-                if (insutype == "2") insutype = "310";
-                if (insutype == "3") insutype = "390";
-                if (insutype == "4") insutype = "340";
                 joInpar.Add("insutype", insutype);  //险种
-                joInpar.Add("reim_flag", JsonHelper.getDestValue(jofsi_encounter_dtos, "reim_flag"));  //报销标志
-                joInpar.Add("out_setl_flag", JsonHelper.getDestValue(jofsi_encounter_dtos, "out_setl_flag"));  //异地结算标志
+                string reimFlag = JsonHelper.getDestValue(jofsi_encounter_dtos, "reim_flag");
+                // 报销标志(必填）
+                if (string.IsNullOrEmpty(reimFlag))
+                {
+                    reimFlag = "1";
+                }
+                joInpar.Add("reim_flag", reimFlag);
+                // 异地结算标志(必填）
+                string outSetlFlag = JsonHelper.getDestValue(jofsi_encounter_dtos, "out_setl_flag");
+                if (string.IsNullOrEmpty(outSetlFlag))
+                {
+                    outSetlFlag = Utils.isOtherCityPatient()?"1":"0";
+                }
+                joInpar.Add("out_setl_flag", outSetlFlag);
                 joInpar.Add("fsi_operation_dtos", GetFsi__operation__dtos(trig_scen,p));  //手术操作集合
 
                 JArray ja = new JArray();

Common/Utils.cs

@@ -63,32 +63,6 @@ namespace PTMedicalInsurance.Common
 
         }
 
-        /// <summary>
-        /// 在JObject对象基础上进行包装
-        /// </summary>
-        /// <param name="jsonInParam"></param>
-        /// <returns></returns>
-        public static JObject Wrapper(JObject jsonInParam)
-        {
-            //dynamic request = new JObject();
-            //request.arg0 = jsonInParam;
-            //return request;
-            return jsonInParam;
-        }
-        /// <summary>
-        /// 删除JObject上的进行包装
-        /// </summary>
-        /// <param name="jsonInParam"></param>
-        /// <returns></returns>
-        public static JObject removeWrapper(JObject jsonInParam)
-        {
-            //if (jsonInParam.ContainsKey("arg0"))
-            //{
-            //    return (JObject)jsonInParam.GetValue("arg0");
-            //}
-            return jsonInParam;
-        }
-
         #endregion
 
         #region BeanUtils
@@ -155,8 +129,66 @@ namespace PTMedicalInsurance.Common
             return result.ToObject<T>();
         }
 
-
         #endregion
 
+
+        #region 业务个性化
+
+        /// <summary>
+        /// 在JObject对象基础上进行包装
+        /// </summary>
+        /// <param name="jsonInParam"></param>
+        /// <returns></returns>
+        public static JObject Wrapper(JObject jsonInParam)
+        {
+            //dynamic request = new JObject();
+            //request.arg0 = jsonInParam;
+            //return request;
+            return jsonInParam;
+        }
+        /// <summary>
+        /// 删除JObject上的进行包装
+        /// </summary>
+        /// <param name="jsonInParam"></param>
+        /// <returns></returns>
+        public static JObject removeWrapper(JObject jsonInParam)
+        {
+            //if (jsonInParam.ContainsKey("arg0"))
+            //{
+            //    return (JObject)jsonInParam.GetValue("arg0");
+            //}
+            return jsonInParam;
+        }
+
+        public static bool isOtherCityPatient()
+        {
+            // 重庆没有市内异地
+            string areaCode = Global.pat.insuplc_admdvs;
+            if (!string.IsNullOrEmpty(areaCode) && areaCode.Length>2 && areaCode.Substring(0, 2) != "50")
+            {
+                return true;
+            }
+            return false;
+        }
+
+        public static string convertAdmDr(string admNo)
+        {
+            // 重庆异地（每次唯一）
+            if (isOtherCityPatient())
+            {
+                // 住院号15位，控制总长度不超过20
+                string ret = admNo + "-" + DateTime.Now.ToString("HHmm");
+                // 保存到扩展信息字段中
+                JObject exp = new JObject();
+                exp.Add("admDr",ret);
+                Global.pat.ExpContent = exp.ToString();
+
+                return ret;
+            }
+
+            return admNo;
+        }
+
+        #endregion
     }
 }

Forms/BasicData.cs

@@ -827,7 +827,7 @@ namespace PTMedicalInsurance.Forms
         /// <param name="uiProcessBar"></param>
         /// <param name="errorMessage"></param>
         /// <returns></returns>
-        public int downloadDicionary(JObject joData, Sunny.UI.UIProcessBar uiProcessBar, out string errorMessage)
+        public int downloadDicionary(JObject joData, Sunny.UI.UIProcessBar uiProcessBar, string dictCode,out string errorMessage)
         {
             errorMessage = "";
             int iResult = -1;
@@ -839,7 +839,7 @@ namespace PTMedicalInsurance.Forms
                 {
                     DataImoport DI = new DataImoport();
                     JArray jaList = JArray.Parse(JsonHelper.getDestValue(joRtn, "output.list"));
-                    JObject joImportRtn = DI.importDictionary(uiProcessBar, jaList, tbDicType.Text);
+                    JObject joImportRtn = DI.importDictionary(uiProcessBar, jaList, dictCode);
                     if (JsonHelper.parseIrisRtnValue(joImportRtn, out errorMessage) == 0)
                     {
                         iResult = 0;
@@ -911,19 +911,12 @@ namespace PTMedicalInsurance.Forms
                     MessageBox.Show("请输入查询日期！");
                     return;
                 }
-
-                dynamic joData = new JObject();
-                joData.type = tbDicType.Text;   //字典类型
-                joData.parentValue = "";        //父字典键值 
-                joData.admdvs = Global.inf.areaCode;        //行政区划  就医地
-                joData.date = tbDicDate.Text;  //查询日期 
-                joData.vali_flag = "1";   //有效标志 
-
-                if (downloadDicionary(joData, uiProcessBar1, out errorMessage) != 0)
+                // 支持批量
+                string[] dictText = tbDicType.Text.Trim().Split(",".ToCharArray());
+                dictText.ToList().ForEach((dict) =>
                 {
-                    MessageBox.Show("医保字典下载失败：" + errorMessage);
-                    return;
-                }
+                    this.downloadDict(dict);
+                });
             }
             else if (rbgDirecType.SelectedIndex <=10)
             {
@@ -955,6 +948,29 @@ namespace PTMedicalInsurance.Forms
             btnQuery_Click(sender, e);
         }
 
+        private void downloadDict(string dictCode)
+        {
+            try
+            {
+                string errorMessage = "";
+                dynamic joData = new JObject();
+                joData.type = dictCode;   //字典类型
+                joData.parentValue = "";        //父字典键值 
+                joData.admdvs = Global.inf.areaCode;        //行政区划  就医地
+                joData.date = tbDicDate.Text;  //查询日期 
+                joData.vali_flag = "1";   //有效标志 
+
+                if (downloadDicionary(joData, uiProcessBar1,dictCode, out errorMessage) != 0)
+                {
+                    MessageBox.Show("医保字典下载失败：" + errorMessage);
+                }
+            }
+            catch (Exception e)
+            { 
+                
+            }
+        }
+
         private void btnQuery_Click(object sender, EventArgs e)
         {
             #region 校验查询条件

Forms/MaintainBasicData.Designer.cs

@@ -50,9 +50,6 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
             this.tcBasicData = new System.Windows.Forms.TabControl();
             this.tpMaintainInterface = new System.Windows.Forms.TabPage();
-            this.tpDownloadDirectory = new System.Windows.Forms.TabPage();
-            this.tpMapDirectory = new System.Windows.Forms.TabPage();
-            this.rbgInterface = new Sunny.UI.UIRadioButtonGroup();
             this.uiPanel1 = new Sunny.UI.UIPanel();
             this.dgvInterface = new Sunny.UI.UIDataGridView();
             this.pnlInterfaceBottom = new Sunny.UI.UIPanel();
@@ -61,6 +58,8 @@
             this.btnInterfaceDelete = new Sunny.UI.UIButton();
             this.btnIntefaceQuery = new Sunny.UI.UIButton();
             this.btnInterfaceAdd = new Sunny.UI.UIButton();
+            this.rbgInterface = new Sunny.UI.UIRadioButtonGroup();
+            this.tpDownloadDirectory = new System.Windows.Forms.TabPage();
             this.panel1 = new System.Windows.Forms.Panel();
             this.dgvDirectoy = new Sunny.UI.UIDataGridView();
             this.pgDownload = new Sunny.UI.UIPagination();
@@ -82,10 +81,7 @@
             this.btnQuery = new Sunny.UI.UIButton();
             this.btnDownload = new Sunny.UI.UIButton();
             this.uiProcessBar1 = new Sunny.UI.UIProcessBar();
-            this.uiPanel3 = new Sunny.UI.UIPanel();
-            this.rbgDirecType_C = new Sunny.UI.UIRadioButtonGroup();
-            this.uiGroupBox3 = new Sunny.UI.UIGroupBox();
-            this.cbxInterface = new Sunny.UI.UIComboBox();
+            this.tpMapDirectory = new System.Windows.Forms.TabPage();
             this.panel7 = new System.Windows.Forms.Panel();
             this.uiSplitContainer1 = new Sunny.UI.UISplitContainer();
             this.panel3 = new System.Windows.Forms.Panel();
@@ -104,13 +100,16 @@
             this.btnQueryCenterDirectory = new Sunny.UI.UIButton();
             this.tbCenterDirectoryFilter = new Sunny.UI.UITextBox();
             this.pgCenterDirect = new Sunny.UI.UIPagination();
+            this.uiPanel3 = new Sunny.UI.UIPanel();
+            this.rbgDirecType_C = new Sunny.UI.UIRadioButtonGroup();
+            this.uiGroupBox3 = new Sunny.UI.UIGroupBox();
+            this.cbxInterface = new Sunny.UI.UIComboBox();
             this.tcBasicData.SuspendLayout();
             this.tpMaintainInterface.SuspendLayout();
-            this.tpDownloadDirectory.SuspendLayout();
-            this.tpMapDirectory.SuspendLayout();
             this.uiPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvInterface)).BeginInit();
             this.pnlInterfaceBottom.SuspendLayout();
+            this.tpDownloadDirectory.SuspendLayout();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvDirectoy)).BeginInit();
             this.panel2.SuspendLayout();
@@ -118,8 +117,7 @@
             this.uiGroupBox4.SuspendLayout();
             this.uiGroupBox2.SuspendLayout();
             this.uiGroupBox1.SuspendLayout();
-            this.uiPanel3.SuspendLayout();
-            this.uiGroupBox3.SuspendLayout();
+            this.tpMapDirectory.SuspendLayout();
             this.panel7.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.uiSplitContainer1)).BeginInit();
             this.uiSplitContainer1.Panel1.SuspendLayout();
@@ -131,6 +129,8 @@
             this.panel4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvCenterDirectory)).BeginInit();
             this.panel6.SuspendLayout();
+            this.uiPanel3.SuspendLayout();
+            this.uiGroupBox3.SuspendLayout();
             this.SuspendLayout();
             // 
             // tcBasicData
@@ -140,75 +140,36 @@
             this.tcBasicData.Controls.Add(this.tpMapDirectory);
             this.tcBasicData.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tcBasicData.Location = new System.Drawing.Point(0, 0);
+            this.tcBasicData.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tcBasicData.Name = "tcBasicData";
             this.tcBasicData.SelectedIndex = 0;
-            this.tcBasicData.Size = new System.Drawing.Size(1357, 639);
+            this.tcBasicData.Size = new System.Drawing.Size(1809, 799);
             this.tcBasicData.TabIndex = 0;
             // 
             // tpMaintainInterface
             // 
             this.tpMaintainInterface.Controls.Add(this.uiPanel1);
             this.tpMaintainInterface.Controls.Add(this.rbgInterface);
-            this.tpMaintainInterface.Location = new System.Drawing.Point(4, 22);
+            this.tpMaintainInterface.Location = new System.Drawing.Point(4, 25);
+            this.tpMaintainInterface.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tpMaintainInterface.Name = "tpMaintainInterface";
-            this.tpMaintainInterface.Padding = new System.Windows.Forms.Padding(3);
-            this.tpMaintainInterface.Size = new System.Drawing.Size(1349, 613);
+            this.tpMaintainInterface.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tpMaintainInterface.Size = new System.Drawing.Size(1801, 770);
             this.tpMaintainInterface.TabIndex = 0;
             this.tpMaintainInterface.Text = "接口维护";
             this.tpMaintainInterface.UseVisualStyleBackColor = true;
             // 
-            // tpDownloadDirectory
-            // 
-            this.tpDownloadDirectory.Controls.Add(this.panel1);
-            this.tpDownloadDirectory.Location = new System.Drawing.Point(4, 22);
-            this.tpDownloadDirectory.Name = "tpDownloadDirectory";
-            this.tpDownloadDirectory.Padding = new System.Windows.Forms.Padding(3);
-            this.tpDownloadDirectory.Size = new System.Drawing.Size(1349, 613);
-            this.tpDownloadDirectory.TabIndex = 1;
-            this.tpDownloadDirectory.Text = "数据下载";
-            this.tpDownloadDirectory.UseVisualStyleBackColor = true;
-            // 
-            // tpMapDirectory
-            // 
-            this.tpMapDirectory.Controls.Add(this.panel7);
-            this.tpMapDirectory.Controls.Add(this.uiPanel3);
-            this.tpMapDirectory.Location = new System.Drawing.Point(4, 22);
-            this.tpMapDirectory.Name = "tpMapDirectory";
-            this.tpMapDirectory.Size = new System.Drawing.Size(1349, 613);
-            this.tpMapDirectory.TabIndex = 2;
-            this.tpMapDirectory.Text = "数据对照";
-            this.tpMapDirectory.UseVisualStyleBackColor = true;
-            // 
-            // rbgInterface
-            // 
-            this.rbgInterface.Dock = System.Windows.Forms.DockStyle.Left;
-            this.rbgInterface.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rbgInterface.Items.AddRange(new object[] {
-            "接口维护",
-            "险种类型",
-            "备用"});
-            this.rbgInterface.Location = new System.Drawing.Point(3, 3);
-            this.rbgInterface.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.rbgInterface.MinimumSize = new System.Drawing.Size(1, 1);
-            this.rbgInterface.Name = "rbgInterface";
-            this.rbgInterface.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.rbgInterface.Size = new System.Drawing.Size(151, 607);
-            this.rbgInterface.TabIndex = 4;
-            this.rbgInterface.Text = "项目";
-            this.rbgInterface.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            this.rbgInterface.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
             // uiPanel1
             // 
             this.uiPanel1.Controls.Add(this.dgvInterface);
             this.uiPanel1.Controls.Add(this.pnlInterfaceBottom);
             this.uiPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
             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(154, 3);
-            this.uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiPanel1.Location = new System.Drawing.Point(205, 4);
+            this.uiPanel1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
             this.uiPanel1.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiPanel1.Name = "uiPanel1";
-            this.uiPanel1.Size = new System.Drawing.Size(1192, 607);
+            this.uiPanel1.Size = new System.Drawing.Size(1592, 762);
             this.uiPanel1.TabIndex = 5;
             this.uiPanel1.Text = null;
             this.uiPanel1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -253,6 +214,7 @@
             dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
             dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
             this.dgvInterface.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
+            this.dgvInterface.RowHeadersWidth = 51;
             this.dgvInterface.RowHeight = 30;
             dataGridViewCellStyle5.BackColor = System.Drawing.Color.White;
             dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -262,7 +224,7 @@
             this.dgvInterface.RowsDefaultCellStyle = dataGridViewCellStyle5;
             this.dgvInterface.RowTemplate.Height = 30;
             this.dgvInterface.SelectedIndex = -1;
-            this.dgvInterface.Size = new System.Drawing.Size(1192, 528);
+            this.dgvInterface.Size = new System.Drawing.Size(1592, 683);
             this.dgvInterface.TabIndex = 1;
             this.dgvInterface.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
@@ -275,11 +237,11 @@
             this.pnlInterfaceBottom.Controls.Add(this.btnInterfaceAdd);
             this.pnlInterfaceBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.pnlInterfaceBottom.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pnlInterfaceBottom.Location = new System.Drawing.Point(0, 528);
+            this.pnlInterfaceBottom.Location = new System.Drawing.Point(0, 683);
             this.pnlInterfaceBottom.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.pnlInterfaceBottom.MinimumSize = new System.Drawing.Size(1, 1);
             this.pnlInterfaceBottom.Name = "pnlInterfaceBottom";
-            this.pnlInterfaceBottom.Size = new System.Drawing.Size(1192, 79);
+            this.pnlInterfaceBottom.Size = new System.Drawing.Size(1592, 79);
             this.pnlInterfaceBottom.TabIndex = 0;
             this.pnlInterfaceBottom.Text = null;
             this.pnlInterfaceBottom.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -290,7 +252,7 @@
             this.uiButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             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(638, 15);
+            this.uiButton1.Location = new System.Drawing.Point(1038, 15);
             this.uiButton1.Margin = new System.Windows.Forms.Padding(4);
             this.uiButton1.MinimumSize = new System.Drawing.Size(2, 2);
             this.uiButton1.Name = "uiButton1";
@@ -305,7 +267,7 @@
             this.btnInterfceSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnInterfceSave.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnInterfceSave.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnInterfceSave.Location = new System.Drawing.Point(1043, 15);
+            this.btnInterfceSave.Location = new System.Drawing.Point(1443, 15);
             this.btnInterfceSave.Margin = new System.Windows.Forms.Padding(4);
             this.btnInterfceSave.MinimumSize = new System.Drawing.Size(2, 2);
             this.btnInterfceSave.Name = "btnInterfceSave";
@@ -320,7 +282,7 @@
             this.btnInterfaceDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnInterfaceDelete.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnInterfaceDelete.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnInterfaceDelete.Location = new System.Drawing.Point(908, 15);
+            this.btnInterfaceDelete.Location = new System.Drawing.Point(1308, 15);
             this.btnInterfaceDelete.Margin = new System.Windows.Forms.Padding(4);
             this.btnInterfaceDelete.MinimumSize = new System.Drawing.Size(2, 2);
             this.btnInterfaceDelete.Name = "btnInterfaceDelete";
@@ -335,7 +297,7 @@
             this.btnIntefaceQuery.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnIntefaceQuery.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnIntefaceQuery.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnIntefaceQuery.Location = new System.Drawing.Point(503, 15);
+            this.btnIntefaceQuery.Location = new System.Drawing.Point(903, 15);
             this.btnIntefaceQuery.Margin = new System.Windows.Forms.Padding(4);
             this.btnIntefaceQuery.MinimumSize = new System.Drawing.Size(2, 2);
             this.btnIntefaceQuery.Name = "btnIntefaceQuery";
@@ -350,7 +312,7 @@
             this.btnInterfaceAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnInterfaceAdd.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnInterfaceAdd.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnInterfaceAdd.Location = new System.Drawing.Point(773, 15);
+            this.btnInterfaceAdd.Location = new System.Drawing.Point(1173, 15);
             this.btnInterfaceAdd.Margin = new System.Windows.Forms.Padding(4);
             this.btnInterfaceAdd.MinimumSize = new System.Drawing.Size(2, 2);
             this.btnInterfaceAdd.Name = "btnInterfaceAdd";
@@ -360,15 +322,47 @@
             this.btnInterfaceAdd.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnInterfaceAdd.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
+            // rbgInterface
+            // 
+            this.rbgInterface.Dock = System.Windows.Forms.DockStyle.Left;
+            this.rbgInterface.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.rbgInterface.Items.AddRange(new object[] {
+            "接口维护",
+            "险种类型",
+            "备用"});
+            this.rbgInterface.Location = new System.Drawing.Point(4, 4);
+            this.rbgInterface.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+            this.rbgInterface.MinimumSize = new System.Drawing.Size(1, 1);
+            this.rbgInterface.Name = "rbgInterface";
+            this.rbgInterface.Padding = new System.Windows.Forms.Padding(0, 40, 0, 0);
+            this.rbgInterface.Size = new System.Drawing.Size(201, 762);
+            this.rbgInterface.TabIndex = 4;
+            this.rbgInterface.Text = "项目";
+            this.rbgInterface.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.rbgInterface.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // tpDownloadDirectory
+            // 
+            this.tpDownloadDirectory.Controls.Add(this.panel1);
+            this.tpDownloadDirectory.Location = new System.Drawing.Point(4, 25);
+            this.tpDownloadDirectory.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tpDownloadDirectory.Name = "tpDownloadDirectory";
+            this.tpDownloadDirectory.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tpDownloadDirectory.Size = new System.Drawing.Size(1801, 770);
+            this.tpDownloadDirectory.TabIndex = 1;
+            this.tpDownloadDirectory.Text = "数据下载";
+            this.tpDownloadDirectory.UseVisualStyleBackColor = true;
+            // 
             // panel1
             // 
             this.panel1.Controls.Add(this.dgvDirectoy);
             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(3, 3);
+            this.panel1.Location = new System.Drawing.Point(4, 4);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1343, 607);
+            this.panel1.Size = new System.Drawing.Size(1793, 762);
             this.panel1.TabIndex = 1;
             // 
             // dgvDirectoy
@@ -401,6 +395,7 @@
             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, 4, 4, 4);
             this.dgvDirectoy.Name = "dgvDirectoy";
             dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
             dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
@@ -410,12 +405,13 @@
             dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.White;
             dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
             this.dgvDirectoy.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;
+            this.dgvDirectoy.RowHeadersWidth = 51;
             dataGridViewCellStyle10.BackColor = System.Drawing.Color.White;
             dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvDirectoy.RowsDefaultCellStyle = dataGridViewCellStyle10;
             this.dgvDirectoy.RowTemplate.Height = 23;
             this.dgvDirectoy.SelectedIndex = -1;
-            this.dgvDirectoy.Size = new System.Drawing.Size(1343, 435);
+            this.dgvDirectoy.Size = new System.Drawing.Size(1793, 547);
             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);
@@ -424,15 +420,15 @@
             // 
             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, 435);
-            this.pgDownload.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.pgDownload.Location = new System.Drawing.Point(0, 547);
+            this.pgDownload.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
             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(1343, 31);
+            this.pgDownload.Size = new System.Drawing.Size(1793, 39);
             this.pgDownload.TabIndex = 2;
             this.pgDownload.Text = "uiPagination1";
             this.pgDownload.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -451,9 +447,10 @@
             this.panel2.Controls.Add(this.uiProcessBar1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.panel2.Font = new System.Drawing.Font("华文隶书", 9.749999F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.panel2.Location = new System.Drawing.Point(0, 466);
+            this.panel2.Location = new System.Drawing.Point(0, 586);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1343, 141);
+            this.panel2.Size = new System.Drawing.Size(1793, 176);
             this.panel2.TabIndex = 1;
             // 
             // uiButton2
@@ -461,10 +458,11 @@
             this.uiButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.uiButton2.Cursor = System.Windows.Forms.Cursors.Hand;
             this.uiButton2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton2.Location = new System.Drawing.Point(1271, 80);
+            this.uiButton2.Location = new System.Drawing.Point(1697, 100);
+            this.uiButton2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.uiButton2.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiButton2.Name = "uiButton2";
-            this.uiButton2.Size = new System.Drawing.Size(67, 32);
+            this.uiButton2.Size = new System.Drawing.Size(89, 40);
             this.uiButton2.TabIndex = 18;
             this.uiButton2.Text = "新增";
             this.uiButton2.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -475,12 +473,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(890, 3);
-            this.uiGroupBox5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiGroupBox5.Location = new System.Drawing.Point(1187, 4);
+            this.uiGroupBox5.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
             this.uiGroupBox5.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox5.Name = "uiGroupBox5";
-            this.uiGroupBox5.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.uiGroupBox5.Size = new System.Drawing.Size(192, 133);
+            this.uiGroupBox5.Padding = new System.Windows.Forms.Padding(0, 40, 0, 0);
+            this.uiGroupBox5.Size = new System.Drawing.Size(256, 166);
             this.uiGroupBox5.TabIndex = 17;
             this.uiGroupBox5.Text = "字典下载";
             this.uiGroupBox5.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -520,12 +518,12 @@
             // 
             this.uiGroupBox4.Controls.Add(this.cbxInterface_down);
             this.uiGroupBox4.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiGroupBox4.Location = new System.Drawing.Point(373, 40);
-            this.uiGroupBox4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiGroupBox4.Location = new System.Drawing.Point(497, 50);
+            this.uiGroupBox4.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
             this.uiGroupBox4.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox4.Name = "uiGroupBox4";
-            this.uiGroupBox4.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.uiGroupBox4.Size = new System.Drawing.Size(154, 98);
+            this.uiGroupBox4.Padding = new System.Windows.Forms.Padding(0, 40, 0, 0);
+            this.uiGroupBox4.Size = new System.Drawing.Size(205, 122);
             this.uiGroupBox4.TabIndex = 16;
             this.uiGroupBox4.Text = "接口选择";
             this.uiGroupBox4.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -552,12 +550,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(700, 8);
-            this.uiGroupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiGroupBox2.Location = new System.Drawing.Point(933, 10);
+            this.uiGroupBox2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
             this.uiGroupBox2.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox2.Name = "uiGroupBox2";
-            this.uiGroupBox2.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.uiGroupBox2.Size = new System.Drawing.Size(184, 130);
+            this.uiGroupBox2.Padding = new System.Windows.Forms.Padding(0, 40, 0, 0);
+            this.uiGroupBox2.Size = new System.Drawing.Size(245, 162);
             this.uiGroupBox2.TabIndex = 15;
             this.uiGroupBox2.Text = "查询";
             this.uiGroupBox2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -599,12 +597,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(535, 5);
-            this.uiGroupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiGroupBox1.Location = new System.Drawing.Point(713, 6);
+            this.uiGroupBox1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
             this.uiGroupBox1.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox1.Name = "uiGroupBox1";
-            this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.uiGroupBox1.Size = new System.Drawing.Size(164, 131);
+            this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 40, 0, 0);
+            this.uiGroupBox1.Size = new System.Drawing.Size(219, 164);
             this.uiGroupBox1.TabIndex = 14;
             this.uiGroupBox1.Text = "目录下载";
             this.uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -666,12 +664,12 @@
             "日间手术",
             "字典表"});
             this.rbgDirecType.ItemSize = new System.Drawing.Size(110, 25);
-            this.rbgDirecType.Location = new System.Drawing.Point(6, 38);
-            this.rbgDirecType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.rbgDirecType.Location = new System.Drawing.Point(8, 48);
+            this.rbgDirecType.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
             this.rbgDirecType.MinimumSize = new System.Drawing.Size(1, 1);
             this.rbgDirecType.Name = "rbgDirecType";
-            this.rbgDirecType.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.rbgDirecType.Size = new System.Drawing.Size(359, 101);
+            this.rbgDirecType.Padding = new System.Windows.Forms.Padding(0, 40, 0, 0);
+            this.rbgDirecType.Size = new System.Drawing.Size(479, 126);
             this.rbgDirecType.TabIndex = 1;
             this.rbgDirecType.Text = "请选择下载类型";
             this.rbgDirecType.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -682,10 +680,11 @@
             this.btnQuery.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             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(1167, 26);
+            this.btnQuery.Location = new System.Drawing.Point(1558, 32);
+            this.btnQuery.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnQuery.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnQuery.Name = "btnQuery";
-            this.btnQuery.Size = new System.Drawing.Size(67, 32);
+            this.btnQuery.Size = new System.Drawing.Size(89, 40);
             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)));
@@ -696,101 +695,50 @@
             this.btnDownload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             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(1259, 26);
+            this.btnDownload.Location = new System.Drawing.Point(1681, 32);
+            this.btnDownload.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnDownload.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnDownload.Name = "btnDownload";
-            this.btnDownload.Size = new System.Drawing.Size(67, 32);
+            this.btnDownload.Size = new System.Drawing.Size(89, 40);
             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)));
             this.btnDownload.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.btnDownload.Click += new System.EventHandler(this.btnDownload_Click);
             // 
             // uiProcessBar1
             // 
             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(5, 6);
-            this.uiProcessBar1.MinimumSize = new System.Drawing.Size(70, 3);
+            this.uiProcessBar1.Location = new System.Drawing.Point(7, 8);
+            this.uiProcessBar1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.uiProcessBar1.MinimumSize = new System.Drawing.Size(93, 4);
             this.uiProcessBar1.Name = "uiProcessBar1";
-            this.uiProcessBar1.Size = new System.Drawing.Size(522, 29);
+            this.uiProcessBar1.Size = new System.Drawing.Size(696, 36);
             this.uiProcessBar1.TabIndex = 11;
             this.uiProcessBar1.Text = "uiProcessBar1";
             this.uiProcessBar1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // uiPanel3
-            // 
-            this.uiPanel3.Controls.Add(this.rbgDirecType_C);
-            this.uiPanel3.Controls.Add(this.uiGroupBox3);
-            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(0, 0);
-            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(179, 613);
-            this.uiPanel3.TabIndex = 6;
-            this.uiPanel3.Text = null;
-            this.uiPanel3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            this.uiPanel3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
-            // rbgDirecType_C
-            // 
-            this.rbgDirecType_C.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.rbgDirecType_C.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rbgDirecType_C.Items.AddRange(new object[] {
-            "药品",
-            "诊疗",
-            "材料"});
-            this.rbgDirecType_C.Location = new System.Drawing.Point(0, 80);
-            this.rbgDirecType_C.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            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(179, 533);
-            this.rbgDirecType_C.TabIndex = 6;
-            this.rbgDirecType_C.Text = "目录类型";
-            this.rbgDirecType_C.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            this.rbgDirecType_C.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
-            // uiGroupBox3
-            // 
-            this.uiGroupBox3.Controls.Add(this.cbxInterface);
-            this.uiGroupBox3.Dock = System.Windows.Forms.DockStyle.Top;
-            this.uiGroupBox3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiGroupBox3.Location = new System.Drawing.Point(0, 0);
-            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, 32, 0, 0);
-            this.uiGroupBox3.Size = new System.Drawing.Size(179, 80);
-            this.uiGroupBox3.TabIndex = 5;
-            this.uiGroupBox3.Text = "接口选择";
-            this.uiGroupBox3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            this.uiGroupBox3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
-            // cbxInterface
+            // tpMapDirectory
             // 
-            this.cbxInterface.DataSource = null;
-            this.cbxInterface.FillColor = System.Drawing.Color.White;
-            this.cbxInterface.FilterMaxCount = 50;
-            this.cbxInterface.Font = new System.Drawing.Font("新宋体", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbxInterface.Location = new System.Drawing.Point(6, 37);
-            this.cbxInterface.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.cbxInterface.MinimumSize = new System.Drawing.Size(63, 0);
-            this.cbxInterface.Name = "cbxInterface";
-            this.cbxInterface.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
-            this.cbxInterface.Size = new System.Drawing.Size(166, 23);
-            this.cbxInterface.TabIndex = 0;
-            this.cbxInterface.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.cbxInterface.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.tpMapDirectory.Controls.Add(this.panel7);
+            this.tpMapDirectory.Controls.Add(this.uiPanel3);
+            this.tpMapDirectory.Location = new System.Drawing.Point(4, 25);
+            this.tpMapDirectory.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tpMapDirectory.Name = "tpMapDirectory";
+            this.tpMapDirectory.Size = new System.Drawing.Size(1801, 770);
+            this.tpMapDirectory.TabIndex = 2;
+            this.tpMapDirectory.Text = "数据对照";
+            this.tpMapDirectory.UseVisualStyleBackColor = true;
             // 
             // panel7
             // 
             this.panel7.Controls.Add(this.uiSplitContainer1);
             this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel7.Location = new System.Drawing.Point(179, 0);
+            this.panel7.Location = new System.Drawing.Point(239, 0);
+            this.panel7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel7.Name = "panel7";
-            this.panel7.Size = new System.Drawing.Size(1170, 613);
+            this.panel7.Size = new System.Drawing.Size(1562, 770);
             this.panel7.TabIndex = 7;
             // 
             // uiSplitContainer1
@@ -798,7 +746,8 @@
             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.MinimumSize = new System.Drawing.Size(20, 20);
+            this.uiSplitContainer1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.uiSplitContainer1.MinimumSize = new System.Drawing.Size(27, 25);
             this.uiSplitContainer1.Name = "uiSplitContainer1";
             // 
             // uiSplitContainer1.Panel1
@@ -809,9 +758,9 @@
             // uiSplitContainer1.Panel2
             // 
             this.uiSplitContainer1.Panel2.Controls.Add(this.panel4);
-            this.uiSplitContainer1.Size = new System.Drawing.Size(1170, 613);
-            this.uiSplitContainer1.SplitterDistance = 444;
-            this.uiSplitContainer1.SplitterWidth = 11;
+            this.uiSplitContainer1.Size = new System.Drawing.Size(1562, 770);
+            this.uiSplitContainer1.SplitterDistance = 592;
+            this.uiSplitContainer1.SplitterWidth = 15;
             this.uiSplitContainer1.TabIndex = 3;
             this.uiSplitContainer1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
@@ -822,8 +771,9 @@
             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, 4, 4, 4);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(444, 613);
+            this.panel3.Size = new System.Drawing.Size(592, 770);
             this.panel3.TabIndex = 2;
             // 
             // dgvHISDirectory
@@ -856,7 +806,8 @@
             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, 45);
+            this.dgvHISDirectory.Location = new System.Drawing.Point(0, 56);
+            this.dgvHISDirectory.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dgvHISDirectory.Name = "dgvHISDirectory";
             dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
             dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
@@ -866,12 +817,13 @@
             dataGridViewCellStyle14.SelectionForeColor = System.Drawing.Color.White;
             dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
             this.dgvHISDirectory.RowHeadersDefaultCellStyle = dataGridViewCellStyle14;
+            this.dgvHISDirectory.RowHeadersWidth = 51;
             dataGridViewCellStyle15.BackColor = System.Drawing.Color.White;
             dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvHISDirectory.RowsDefaultCellStyle = dataGridViewCellStyle15;
             this.dgvHISDirectory.RowTemplate.Height = 23;
             this.dgvHISDirectory.SelectedIndex = -1;
-            this.dgvHISDirectory.Size = new System.Drawing.Size(444, 533);
+            this.dgvHISDirectory.Size = new System.Drawing.Size(592, 670);
             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);
@@ -885,19 +837,21 @@
             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, 4, 4, 4);
             this.panel5.Name = "panel5";
-            this.panel5.Size = new System.Drawing.Size(444, 45);
+            this.panel5.Size = new System.Drawing.Size(592, 56);
             this.panel5.TabIndex = 1;
             // 
             // rbAll
             // 
             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(331, 7);
+            this.rbAll.Location = new System.Drawing.Point(441, 9);
+            this.rbAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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(63, 23);
+            this.rbAll.Padding = new System.Windows.Forms.Padding(29, 0, 0, 0);
+            this.rbAll.Size = new System.Drawing.Size(84, 29);
             this.rbAll.TabIndex = 8;
             this.rbAll.Text = "全部";
             this.rbAll.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -906,11 +860,12 @@
             // 
             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(479, 7);
+            this.rbNoMaped.Location = new System.Drawing.Point(639, 9);
+            this.rbNoMaped.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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(63, 23);
+            this.rbNoMaped.Padding = new System.Windows.Forms.Padding(29, 0, 0, 0);
+            this.rbNoMaped.Size = new System.Drawing.Size(84, 29);
             this.rbNoMaped.TabIndex = 7;
             this.rbNoMaped.Text = "未对照";
             this.rbNoMaped.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -919,11 +874,12 @@
             // 
             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(405, 7);
+            this.rbMaped.Location = new System.Drawing.Point(540, 9);
+            this.rbMaped.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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(63, 23);
+            this.rbMaped.Padding = new System.Windows.Forms.Padding(29, 0, 0, 0);
+            this.rbMaped.Size = new System.Drawing.Size(84, 29);
             this.rbMaped.TabIndex = 6;
             this.rbMaped.Text = "已对照";
             this.rbMaped.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -932,10 +888,11 @@
             // 
             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(7, 7);
+            this.btnQueryHISDirectory.Location = new System.Drawing.Point(9, 9);
+            this.btnQueryHISDirectory.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnQueryHISDirectory.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnQueryHISDirectory.Name = "btnQueryHISDirectory";
-            this.btnQueryHISDirectory.Size = new System.Drawing.Size(150, 28);
+            this.btnQueryHISDirectory.Size = new System.Drawing.Size(200, 35);
             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)));
@@ -945,12 +902,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(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.Location = new System.Drawing.Point(232, 10);
+            this.tbHISDirectoryFilter.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+            this.tbHISDirectoryFilter.MinimumSize = new System.Drawing.Size(1, 20);
             this.tbHISDirectoryFilter.Name = "tbHISDirectoryFilter";
             this.tbHISDirectoryFilter.ShowText = false;
-            this.tbHISDirectoryFilter.Size = new System.Drawing.Size(150, 29);
+            this.tbHISDirectoryFilter.Size = new System.Drawing.Size(200, 36);
             this.tbHISDirectoryFilter.TabIndex = 4;
             this.tbHISDirectoryFilter.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.tbHISDirectoryFilter.Watermark = "名称/缩写";
@@ -960,13 +917,14 @@
             // 
             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, 578);
-            this.pgHISDirect.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.pgHISDirect.Location = new System.Drawing.Point(0, 726);
+            this.pgHISDirect.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
             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(444, 35);
+            this.pgHISDirect.Size = new System.Drawing.Size(592, 44);
             this.pgHISDirect.TabIndex = 6;
             this.pgHISDirect.Text = "uiPagination2";
             this.pgHISDirect.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -979,8 +937,9 @@
             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, 4, 4, 4);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(715, 613);
+            this.panel4.Size = new System.Drawing.Size(955, 770);
             this.panel4.TabIndex = 3;
             // 
             // dgvCenterDirectory
@@ -1012,7 +971,8 @@
             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, 45);
+            this.dgvCenterDirectory.Location = new System.Drawing.Point(0, 56);
+            this.dgvCenterDirectory.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dgvCenterDirectory.Name = "dgvCenterDirectory";
             dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
             dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
@@ -1022,12 +982,13 @@
             dataGridViewCellStyle19.SelectionForeColor = System.Drawing.Color.White;
             dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
             this.dgvCenterDirectory.RowHeadersDefaultCellStyle = dataGridViewCellStyle19;
+            this.dgvCenterDirectory.RowHeadersWidth = 51;
             dataGridViewCellStyle20.BackColor = System.Drawing.Color.White;
             dataGridViewCellStyle20.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvCenterDirectory.RowsDefaultCellStyle = dataGridViewCellStyle20;
             this.dgvCenterDirectory.RowTemplate.Height = 23;
             this.dgvCenterDirectory.SelectedIndex = -1;
-            this.dgvCenterDirectory.Size = new System.Drawing.Size(715, 533);
+            this.dgvCenterDirectory.Size = new System.Drawing.Size(955, 670);
             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);
@@ -1039,20 +1000,21 @@
             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, 4, 4, 4);
             this.panel6.Name = "panel6";
-            this.panel6.Size = new System.Drawing.Size(715, 45);
+            this.panel6.Size = new System.Drawing.Size(955, 56);
             this.panel6.TabIndex = 2;
             // 
             // tbInsuCode
             // 
             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(327, 4);
-            this.tbInsuCode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.tbInsuCode.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbInsuCode.Location = new System.Drawing.Point(436, 5);
+            this.tbInsuCode.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+            this.tbInsuCode.MinimumSize = new System.Drawing.Size(1, 20);
             this.tbInsuCode.Name = "tbInsuCode";
             this.tbInsuCode.ShowText = false;
-            this.tbInsuCode.Size = new System.Drawing.Size(230, 30);
+            this.tbInsuCode.Size = new System.Drawing.Size(307, 38);
             this.tbInsuCode.TabIndex = 7;
             this.tbInsuCode.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.tbInsuCode.Watermark = "输入准确编码";
@@ -1062,10 +1024,11 @@
             // 
             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(11, 5);
+            this.btnQueryCenterDirectory.Location = new System.Drawing.Point(15, 6);
+            this.btnQueryCenterDirectory.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnQueryCenterDirectory.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnQueryCenterDirectory.Name = "btnQueryCenterDirectory";
-            this.btnQueryCenterDirectory.Size = new System.Drawing.Size(149, 31);
+            this.btnQueryCenterDirectory.Size = new System.Drawing.Size(199, 39);
             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)));
@@ -1075,12 +1038,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(176, 5);
-            this.tbCenterDirectoryFilter.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.tbCenterDirectoryFilter.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbCenterDirectoryFilter.Location = new System.Drawing.Point(235, 6);
+            this.tbCenterDirectoryFilter.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+            this.tbCenterDirectoryFilter.MinimumSize = new System.Drawing.Size(1, 20);
             this.tbCenterDirectoryFilter.Name = "tbCenterDirectoryFilter";
             this.tbCenterDirectoryFilter.ShowText = false;
-            this.tbCenterDirectoryFilter.Size = new System.Drawing.Size(143, 30);
+            this.tbCenterDirectoryFilter.Size = new System.Drawing.Size(191, 38);
             this.tbCenterDirectoryFilter.TabIndex = 5;
             this.tbCenterDirectoryFilter.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.tbCenterDirectoryFilter.Watermark = "名称/缩写";
@@ -1090,33 +1053,101 @@
             // 
             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, 578);
-            this.pgCenterDirect.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.pgCenterDirect.Location = new System.Drawing.Point(0, 726);
+            this.pgCenterDirect.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
             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(715, 35);
+            this.pgCenterDirect.Size = new System.Drawing.Size(955, 44);
             this.pgCenterDirect.TabIndex = 0;
             this.pgCenterDirect.Text = "uiPagination3";
             this.pgCenterDirect.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.pgCenterDirect.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
+            // uiPanel3
+            // 
+            this.uiPanel3.Controls.Add(this.rbgDirecType_C);
+            this.uiPanel3.Controls.Add(this.uiGroupBox3);
+            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(0, 0);
+            this.uiPanel3.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+            this.uiPanel3.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiPanel3.Name = "uiPanel3";
+            this.uiPanel3.Size = new System.Drawing.Size(239, 770);
+            this.uiPanel3.TabIndex = 6;
+            this.uiPanel3.Text = null;
+            this.uiPanel3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.uiPanel3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // rbgDirecType_C
+            // 
+            this.rbgDirecType_C.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.rbgDirecType_C.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.rbgDirecType_C.Items.AddRange(new object[] {
+            "药品",
+            "诊疗",
+            "材料"});
+            this.rbgDirecType_C.Location = new System.Drawing.Point(0, 80);
+            this.rbgDirecType_C.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            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(239, 690);
+            this.rbgDirecType_C.TabIndex = 6;
+            this.rbgDirecType_C.Text = "目录类型";
+            this.rbgDirecType_C.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.rbgDirecType_C.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // uiGroupBox3
+            // 
+            this.uiGroupBox3.Controls.Add(this.cbxInterface);
+            this.uiGroupBox3.Dock = System.Windows.Forms.DockStyle.Top;
+            this.uiGroupBox3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiGroupBox3.Location = new System.Drawing.Point(0, 0);
+            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, 32, 0, 0);
+            this.uiGroupBox3.Size = new System.Drawing.Size(239, 80);
+            this.uiGroupBox3.TabIndex = 5;
+            this.uiGroupBox3.Text = "接口选择";
+            this.uiGroupBox3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.uiGroupBox3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // cbxInterface
+            // 
+            this.cbxInterface.DataSource = null;
+            this.cbxInterface.FillColor = System.Drawing.Color.White;
+            this.cbxInterface.FilterMaxCount = 50;
+            this.cbxInterface.Font = new System.Drawing.Font("新宋体", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbxInterface.Location = new System.Drawing.Point(6, 37);
+            this.cbxInterface.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.cbxInterface.MinimumSize = new System.Drawing.Size(63, 0);
+            this.cbxInterface.Name = "cbxInterface";
+            this.cbxInterface.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+            this.cbxInterface.Size = new System.Drawing.Size(166, 23);
+            this.cbxInterface.TabIndex = 0;
+            this.cbxInterface.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.cbxInterface.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
             // MaintainBasicData
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1357, 639);
+            this.ClientSize = new System.Drawing.Size(1809, 799);
             this.Controls.Add(this.tcBasicData);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "MaintainBasicData";
             this.Text = "维护基础数据";
             this.tcBasicData.ResumeLayout(false);
             this.tpMaintainInterface.ResumeLayout(false);
-            this.tpDownloadDirectory.ResumeLayout(false);
-            this.tpMapDirectory.ResumeLayout(false);
             this.uiPanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvInterface)).EndInit();
             this.pnlInterfaceBottom.ResumeLayout(false);
+            this.tpDownloadDirectory.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvDirectoy)).EndInit();
             this.panel2.ResumeLayout(false);
@@ -1124,8 +1155,7 @@
             this.uiGroupBox4.ResumeLayout(false);
             this.uiGroupBox2.ResumeLayout(false);
             this.uiGroupBox1.ResumeLayout(false);
-            this.uiPanel3.ResumeLayout(false);
-            this.uiGroupBox3.ResumeLayout(false);
+            this.tpMapDirectory.ResumeLayout(false);
             this.panel7.ResumeLayout(false);
             this.uiSplitContainer1.Panel1.ResumeLayout(false);
             this.uiSplitContainer1.Panel2.ResumeLayout(false);
@@ -1137,6 +1167,8 @@
             this.panel4.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvCenterDirectory)).EndInit();
             this.panel6.ResumeLayout(false);
+            this.uiPanel3.ResumeLayout(false);
+            this.uiGroupBox3.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }

Forms/MaintainBasicData.cs

@@ -16,5 +16,10 @@ namespace NanChangMI.Forms
         {
             InitializeComponent();
         }
+
+        private void btnDownload_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }

Forms/SettlementChecklist.cs

@@ -29,7 +29,6 @@ namespace PTMedicalInsurance.Forms
         private string interfaceNO;
         private string hospitalName;
         private string hospitalAreaCode;
-        private string reportTemplate = Global.curEvt.path + "\\frx\\settlement.frx";
 
         private bool disposed = false;
 
@@ -55,6 +54,7 @@ namespace PTMedicalInsurance.Forms
 
             if (joParam == null) return;
 
+            Global.pat.insuplc_admdvs = JsonHelper.getDestValue(joParam, "insuplc_admdvs");
             string setl_id = JsonHelper.getDestValue(joParam, "setl_id");
             if (setl_id == "")
             {
@@ -72,6 +72,15 @@ namespace PTMedicalInsurance.Forms
             dgvSettlRecord.DataSource = dt;
         }
 
+        private string getTemplatePath()
+        {
+            if (Utils.isOtherCityPatient())
+            {
+                return Global.curEvt.path + "\\frx\\settlement_other.frx";
+            }
+            return Global.curEvt.path + "\\frx\\settlement.frx";
+        }
+
         public void Dispose()
         {
         
@@ -275,7 +284,7 @@ namespace PTMedicalInsurance.Forms
                     return;
                 }
 
-                report.Load(reportTemplate);
+                report.Load(getTemplatePath());
                 PrintDesign pf = new PrintDesign();
                 pf.designerControl1.Report = report;
 
@@ -314,7 +323,7 @@ namespace PTMedicalInsurance.Forms
                 report.RegisterData(json.result.data.reginfo, "reginfo");
                 report.RegisterData(json.result.data.patinsuinfo, "patinsuinfo");
 
-                report.Load(reportTemplate);
+                report.Load(getTemplatePath());
                 this.ShowInTaskbar = true;
                 PrintPreview pf = new PrintPreview();
                 report.Preview = pf.previewControl1;
@@ -349,7 +358,7 @@ namespace PTMedicalInsurance.Forms
                 return;
             }
             //report.Design();
-            report.Load(reportTemplate);
+            report.Load(getTemplatePath());
             //report.Show();
             PrintPreview preview1 = new PrintPreview();
             preview1.Show();

Helper/JsonHelper.cs

@@ -347,9 +347,6 @@ namespace PTMedicalInsurance.Helper
             Jo.infno = infno;
             Global.curEvt.msgid = Global.inf.hospitalNO + DateTime.Now.ToString("yyyyMMddHHmmssffff");
             Jo.msgid = Global.curEvt.msgid;
-
-            
-            Global.pat.insuplc_admdvs = Global.inf.areaCode;
             Global.pat.mdtrtarea_admvs = Global.inf.areaCode;
 
             // 参保地
@@ -376,7 +373,9 @@ namespace PTMedicalInsurance.Helper
             // 报文签名(不包含cainfo和input)
             //EncryptHelper encrypt = new EncryptHelper();
             Jo.cainfo = ""; // encrypt.signWithSM2(Jo);
-
+            // 服务商信息
+            Jo.serv_code = "HH00029";
+            Jo.serv_sign = "0C9BC4D70BDE653D8E";
 
             if (joInput != null)
             {

InsuBusiness.cs

@@ -321,7 +321,6 @@ namespace PTMedicalInsurance
                             //显示登记面板
                             if (hBus.showInPatRegisterForm( out regInParam) == 0)
                             {
-                                Global.writeLog(regInParam);
                                 JObject joRegIn_plain = JObject.Parse(JsonHelper.setCenterInpar_plain("2401", regInParam));
                                 JObject joRegIn = JObject.Parse(JsonHelper.setCenterInpar("2401", regInParam));
                                 //上传给中心
@@ -756,8 +755,8 @@ namespace PTMedicalInsurance
                             jo2203Inpar.Add("diseinfo", JArray.Parse(JsonHelper.getDestValue(joReg, "diseinfo")));
 
                             jo2203Inpar["mdtrtinfo"]["mdtrt_id"] = Global.pat.mdtrtID;
-                            jo2203Inpar_plain = JObject.Parse(JsonHelper.setCenterInpar_plain("2203", jo2203Inpar));
-                            jo2203Inpar = JObject.Parse(JsonHelper.setCenterInpar("2203", jo2203Inpar));
+                            jo2203Inpar_plain = JObject.Parse(JsonHelper.setCenterInpar_plain("2203A", jo2203Inpar));
+                            jo2203Inpar = JObject.Parse(JsonHelper.setCenterInpar("2203A", jo2203Inpar));
 
                             //门诊登记信息，插入云医保平台
                             jo2201Rtn.Add("validflag", 1);
@@ -771,11 +770,11 @@ namespace PTMedicalInsurance
 
                             #endregion
 
-                            #region 就诊信息上传[2203]
+                            #region 就诊信息上传[2203]/[2203A]
 
                            
                             //门诊就诊信息上传                            
-                            JObject jo2203Rtn = invoker.invokeCenterService("2203",jo2203Inpar );
+                            JObject jo2203Rtn = invoker.invokeCenterService("2203A", jo2203Inpar );
                             if (JsonHelper.parseCenterRtnValue(jo2203Rtn, out errMsg) != 0)
                             {
                                 rtnResult = JsonHelper.setExceptionJson(-1, "门诊就诊信息上传", errMsg).ToString();
@@ -1428,11 +1427,16 @@ namespace PTMedicalInsurance
                 //BS架构调用方式问题，每次调用都需要重新初始化
                 if (init(InParam, out outParam) != 0)
                 {
+                    Global.writeLog("初始化异常:"+outParam);
                     rtnResult = outParam;
-                    return rtnResult;
+                    // 基础数据没有初始化成功，也可以运行
+                    if (!businessType.Equals("BasicData")) {
+                        return rtnResult;
+                    }
+                    
                 }
                 //获取pat
-                //hBus.GetFeeHisInfo(businessType, joInParam, out Global.pat);
+                hBus.GetAgentFunHisInfo(businessType, joInParam, out Global.pat);
                 switch (businessType)
                 {
                     case "BasicData"://基础数据维护

Variables/Struct.cs

@@ -109,6 +109,8 @@ namespace PTMedicalInsurance.Variables
         public string psn_insu_stas;
         public string paus_insu_date;
         public int OtherProv;
+        // 传递给医保的就诊号
+        public string insuAdmNo;
 
         public string disCode;
         public string disName;