Browse Source

门诊慢病用药历史查询优化:根据身份证号调用1101然后根据返回的人员编号直接调用查询接口

zzz 2 months ago
parent
commit
21703b645d
5 changed files with 288 additions and 185 deletions
  1. 14 1
      Business/HisMainBusiness.cs
  2. 17 14
      FormSetter/GridViewSetter.cs
  3. 131 44
      Forms/MedInsuQuery.cs
  4. 123 123
      Forms/MedInsuQuery.designer.cs
  5. 3 3
      InsuBusiness.cs

+ 14 - 1
Business/HisMainBusiness.cs

@@ -33,6 +33,7 @@ using System.Reflection;
 using System.IO;
 using System.IO.Compression;
 using AnHuiMI.Common;
+using Sunny.UI.Win32;
 
 namespace PTMedicalInsurance.Business
 {
@@ -77,10 +78,22 @@ namespace PTMedicalInsurance.Business
             {
                 Global.user.ID = JsonHelper.getDestValue(joSession, "userCode");
             }
-            
+           
+
             Global.user.name = JsonHelper.getDestValue(joSession, "userName");
+            if (string.IsNullOrEmpty(Global.user.name))
+            {
+                Global.user.name = JsonHelper.getDestValue(joSession, "userCode");
+            }
+            if (string.IsNullOrEmpty(Global.user.name))
+            {
+                Global.user.name = JsonHelper.getDestValue(joSession, "userID");
+            }
             Global.user.type = "1";
             Global.inf.hospCode = JsonHelper.getDestValue(joSession, "hospCode");
+
+
+            
         }
 
         /// <summary>

+ 17 - 14
FormSetter/GridViewSetter.cs

@@ -1381,38 +1381,41 @@ namespace PTMedicalInsurance.FormSetter
         {
             dgv.AutoGenerateColumns = false;
             dgv.Columns.Clear();
+            AddDGVColumn(dgv, "医保目录编码", "hilist_code", 80);
+            AddDGVColumn(dgv, "医保目录名称", "hilist_name", 300);
+            AddDGVColumn(dgv, "费用发生时间", "fee_ocur_time", 300);
+            AddDGVColumn(dgv, "数量", "cnt", 300);
+            AddDGVColumn(dgv, "单价", "pric", 200);
+            AddDGVColumn(dgv, "定点医药机构编号", "fixmedins_code", 280);
+            AddDGVColumn(dgv, "定点医药机构名称", "fixmedins_name", 200);
             AddDGVColumn(dgv, "费用明细流水号", "feedetl_sn", 300);
             AddDGVColumn(dgv, "处方/医嘱号", "rx_drord_no", 300);
-            AddDGVColumn(dgv, "定点医药机构编号", "fixmedins_code", 300);
-            AddDGVColumn(dgv, "定点医药机构名称", "fixmedins_name", 200);
+            
             AddDGVColumn(dgv, "人员编号", "psn_no", 200);
             AddDGVColumn(dgv, "医疗类别", "med_type", 80);
-            AddDGVColumn(dgv, "费用发生时间", "fee_ocur_time", 300);
-            AddDGVColumn(dgv, "数量", "cnt", 300);
-            AddDGVColumn(dgv, "单价", "pric", 200);
+            
             AddDGVColumn(dgv, "收费项目等级", "chrgitm_lv", 200);
-            AddDGVColumn(dgv, "医保目录编码", "hilist_code", 80);
-            AddDGVColumn(dgv, "医保目录名称", "hilist_name", 300);
+            
             AddDGVColumn(dgv, "目录类别", "list_type", 300);
             AddDGVColumn(dgv, "医疗目录编码", "med_list_codg", 200);
             AddDGVColumn(dgv, "医药机构目录编码", "medins_list_codg", 200);
             AddDGVColumn(dgv, "医药机构目录名称", "medins_list_name", 80);
             AddDGVColumn(dgv, "医疗收费项目类别", "med_chrgitm_type", 300);
-            AddDGVColumn(dgv, "商品名", "prodname", 300);
-            AddDGVColumn(dgv, "规格", "spec", 200);
-            AddDGVColumn(dgv, "剂型名称", "dosform_name", 80);
+            //AddDGVColumn(dgv, "商品名", "prodname", 300);
+            //AddDGVColumn(dgv, "规格", "spec", 200);
+            //AddDGVColumn(dgv, "剂型名称", "dosform_name", 80);
             AddDGVColumn(dgv, "限制使用标志", "lmt_used_flag", 80);
-            AddDGVColumn(dgv, "医院制剂标志", "hosp_prep_flag", 80);
+           // AddDGVColumn(dgv, "医院制剂标志", "hosp_prep_flag", 80);
             AddDGVColumn(dgv, "医院审批标志", "hosp_appr_flag", 80);
             AddDGVColumn(dgv, "中药使用方式", "tcmdrug_used_way", 80);
-            AddDGVColumn(dgv, "生产地类别", "prodplac_type", 80);
+            //AddDGVColumn(dgv, "生产地类别", "prodplac_type", 80);
             AddDGVColumn(dgv, "基本药物标志", "bas_medn_flag", 80);
             AddDGVColumn(dgv, "医保谈判药品标志", "hi_nego_drug_flag", 80);
-            AddDGVColumn(dgv, "儿童用药标志", "chld_medc_flag", 80);
+            //AddDGVColumn(dgv, "儿童用药标志", "chld_medc_flag", 80);
             AddDGVColumn(dgv, "外检标志", "etip_flag", 80);
             AddDGVColumn(dgv, "外检医院编码", "etip_hosp_code", 80);
             AddDGVColumn(dgv, "出院带药标志", "dscg_tkdrug_flag", 80);
-            AddDGVColumn(dgv, "目录特项标志", "list_sp_item_flag", 80);
+           // AddDGVColumn(dgv, "目录特项标志", "list_sp_item_flag", 80);
             AddDGVColumn(dgv, "生育费用标志", "matn_fee_flag", 80);
         }
     }

+ 131 - 44
Forms/MedInsuQuery.cs

@@ -27,9 +27,10 @@ namespace PTMedicalInsurance.Forms
         public string patInfo = "", ReadCardOutParam = "", CertNo = "";
         public string presAdmLoc = "", presAdmDoc = "", presAdmID = "", presNo = "", hiRxno = "";
         public string DrCode = "", DrName = "", DrInsuCode = "", DrCertNo = "";
+        public string IID;
 
-        //1.声明自适应类实例
-        AutoResizeForm asc = new AutoResizeForm();
+       //1.声明自适应类实例
+       AutoResizeForm asc = new AutoResizeForm();
         private InvokeHelper invoker = new InvokeHelper();
         private HisIrisServices hIS = new HisIrisServices();
         private MIIrisServices mIS = new MIIrisServices();
@@ -42,8 +43,38 @@ namespace PTMedicalInsurance.Forms
             asc.controllInitializeSize(this);
             asc.controlAutoSize(this);
         }
+        public MedInsuQuery(JObject jo)
+        {
+            InitializeComponent();
+            Global.pat.certNO = JsonHelper.getDestValue(jo, "idNo");
+             IID = JsonHelper.getDestValue(jo, "idNo");
+            if (!string.IsNullOrEmpty(Global.pat.admID))
+            {
+                string hisPatBaseInfo = "";
+
+                if (hIS.GetHisPatBaseInfo(out hisPatBaseInfo) != 0)
+                {
 
-        public MedInsuQuery( int iPage)
+                }
+            }
+            //jaVolaItems = JArray.Parse(JsonHelper.getDestValue(jo, "output.result"));
+            //dtVolaItems = (DataTable)jo["output"]["result"].ToObject(typeof(DataTable));
+            //dgvVolaItems.DataSource = dtVolaItems;
+            //grdSetter.SetHeaderTextOfPAIPAVolaItem(dgvVolaItems);
+            //tbJrID.Text = JsonHelper.getDestValue(jo, "output.result[0].jr_id");
+            //tbRuleID.Text = JsonHelper.getDestValue(jo, "output.result[0].rule_id");
+            //tbPatID.Text = JsonHelper.getDestValue(jo, "output.result[0].patn_id");
+            //tbMdtrdID.Text = JsonHelper.getDestValue(jo, "output.result[0].mdtrt_id");
+            //tbVolaAmt.Text = JsonHelper.getDestValue(jo, "output.result[0].vola_amt");
+            //tbVolaAmtStas.Text = JsonHelper.getDestValue(jo, "output.result[0].vola_amt_stas");
+            //tbSevDeg.Text = JsonHelper.getDestValue(jo, "output.result[0].sev_deg");
+            //tbVolaBhvrType.Text = JsonHelper.getDestValue(jo, "output.result[0].vola_bhvr_type");
+            //tbVolaEvid.Text = JsonHelper.getDestValue(jo, "output.result[0].vola_evid");
+            //tbRuleName.Text = JsonHelper.getDestValue(jo, "output.result[0].rule_name");
+            //rbtVolaContent.Text = JsonHelper.getDestValue(jo, "output.result[0].vola_cont");
+        }
+
+        public MedInsuQuery(int iPage)
         {
             InitializeComponent();
 
@@ -54,7 +85,7 @@ namespace PTMedicalInsurance.Forms
         }
 
         private void btnClose_Click(object sender, EventArgs e)
-        {            
+        {
             this.Close();
         }
 
@@ -62,7 +93,7 @@ namespace PTMedicalInsurance.Forms
         {
             //this.WindowState = FormWindowState.Maximized;
 
-            tbcMain.SelectedIndex = 1;
+            tbcMain.SelectedIndex = 6;
 
             dpST.Text = DateTime.Now.ToString("yyyy-MM-dd 00:00:00");
             dpED.Text = DateTime.Now.ToString("yyyy-MM-dd 23:59:59");
@@ -82,8 +113,8 @@ namespace PTMedicalInsurance.Forms
             DT_ST1.Text = DateTime.Now.ToString("yyyy-MM-dd 00:00:00");
             DT_ET1.Text = DateTime.Now.ToString("yyyy-MM-dd 23:59:59");
 
-            dptST.Text = DateTime.Now.ToString("yyyy-MM-01 00:00:00");
-            dptET.Text = DateTime.Now.ToString("yyyy-MM-31 23:59:59");
+            dptST.Text = DateTime.Now.AddDays(-30).ToString("yyyy-MM-dd 00:00:00");
+            dptET.Text = DateTime.Now.ToString("yyyy-MM-dd 23:59:59");
 
             dtTHSJ.Text = DateTime.Now.ToString();
 
@@ -99,7 +130,7 @@ namespace PTMedicalInsurance.Forms
 
             grdSetter.SetHeaderTextOfSettlList(dgvSettleData);
             grdSetter.SetHeaderTextOfSettltMentFeelDetailInfo(dgvFeeInfo);
-            
+
             grdSetter.SetHeaderTextOfHISRegister(dgv_HISRegInfo);
             grdSetter.SetHeaderTextOfHISPrescFee(dgv_PrescriptionInfo);
             grdSetter.SetHeaderTextOfBillInfo(dgv_BillInfo);
@@ -116,7 +147,14 @@ namespace PTMedicalInsurance.Forms
 
             rbg_Type.SelectedIndex = 0;
             tbJGBM.Text = Global.inf.hospitalNO;
-            dtTHSJ.Text= DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            dtTHSJ.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+
+            if (!string.IsNullOrEmpty(IID))
+            {
+                tbcMain.TabPages.Clear();
+                tbcMain.TabPages.Add(tab5205);
+            }
+            
         }
 
         private void btnQuery_Click(object sender, EventArgs e)
@@ -125,7 +163,7 @@ namespace PTMedicalInsurance.Forms
             string sCZYXM = Global.user.name;
 
             string SqlHeard = " Adm_Dr,MdtrtID,Name as PatientName,Age,PsnCertNO,Gend,PsnType,EmpName,AdmInDepName,insuplcAdmdvs,sZYZT AS sZTSM, "
-                            + " AdmBed,RegDate,MainDiagName,AttendDoctorNO,ChiefPhyDocName,'"+ sCZYXM+ "' as OpertName,'' as InHospNo,''Address ";                           
+                            + " AdmBed,RegDate,MainDiagName,AttendDoctorNO,ChiefPhyDocName,'" + sCZYXM + "' as OpertName,'' as InHospNo,''Address ";
 
             string SqlStrMain = " SELECT a.*,b.*,a.PatientName AS Name,a.PsnType AS PsnTypeCode,'在院' sZYZT FROM BS_MIPatCurrentInsuInfo a LEFT JOIN BS_MedInsuRegisterInfo b "
                               + " ON a.MdtrtID=b.InsuRegID AND a.Interface_Dr=b.Interface_Dr AND a.Hospital_Dr=b.Hospital_Dr "
@@ -137,10 +175,10 @@ namespace PTMedicalInsurance.Forms
                               + " FROM BS_MIPatCurrentInsuInfo a LEFT JOIN BS_MedInsuRegisterInfo b "
                               + " ON a.MdtrtID=b.InsuRegID AND a.Interface_Dr=b.Interface_Dr AND a.Hospital_Dr=b.Hospital_Dr "
                               + " LEFT JOIN BS_MedInsuSettlement c ON a.MdtrtID=b.InsuRegID AND b.InsuRegID=c.MdtrtID AND a.Interface_Dr=b.Interface_Dr AND b.Interface_Dr=c.Interface_Dr "
-                              + " WHERE b.Type=1 AND b.ValidFlag=1 AND c.BillType=1 AND b.Hospital_Dr= " + Global.inf.hospitalDr + " AND b.Interface_Dr= " + Global.inf.interfaceDr                    
+                              + " WHERE b.Type=1 AND b.ValidFlag=1 AND c.BillType=1 AND b.Hospital_Dr= " + Global.inf.hospitalDr + " AND b.Interface_Dr= " + Global.inf.interfaceDr
                               + " AND c.AdmType=2 AND c.SettlementDateTime<='" + dpED.Text + "' AND c.SettlementDateTime>'" + dpST.Text + "' ";  //
 
-            string sqlStr = " SELECT "+ SqlHeard + " FROM ("+ SqlStrMain +") M ";
+            string sqlStr = " SELECT " + SqlHeard + " FROM (" + SqlStrMain + ") M ";
 
             //MessageBox.Show(sqlStr);
 
@@ -178,7 +216,7 @@ namespace PTMedicalInsurance.Forms
                 {
                     string BedNo, BedDocName, InHospNo, Address;
                     JObject joTmp = new JObject();
-                    joTmp.Add("admID", dt.Rows[i]["Adm_Dr"].ToString());               
+                    joTmp.Add("admID", dt.Rows[i]["Adm_Dr"].ToString());
                     JObject joRtn2 = invoker.invokeHISService(JsonHelper.setIrisInpar("05110014", joTmp).ToString(), "获取患者就诊信息");
                     if (JsonHelper.parseIrisRtnValue(joRtn2, out string errMsg) == 0)
                     {
@@ -190,10 +228,10 @@ namespace PTMedicalInsurance.Forms
                         dt.Rows[i]["AttendDoctorNO"] = BedDocName;
                         dt.Rows[i]["InHospNo"] = InHospNo;
                         dt.Rows[i]["Address"] = Address;
-                    }  
+                    }
                     else
                     {
-                        if (errMsg.IndexOf("请重新登录") > 0)                        
+                        if (errMsg.IndexOf("请重新登录") > 0)
                         {
                             MessageBox.Show("获取患者信息失败,请重新登录系统!");
                             break;
@@ -206,7 +244,7 @@ namespace PTMedicalInsurance.Forms
         private void btnPrint_Click(object sender, EventArgs e)
         {
             string LSH = DateTime.Now.ToString("yyyy-MM-dd"); //DateTime.Now.ToString("MMddHHmmssffff");
-            string sFliePathName = @"C:\Users\Administrator\Desktop\" + LSH + "医保在院患者登记或结算信息.xls";  
+            string sFliePathName = @"C:\Users\Administrator\Desktop\" + LSH + "医保在院患者登记或结算信息.xls";
             string ReturnFileName = ExportToExcel.DataTabletoExcel(dtExport, sFliePathName);
             if (ReturnFileName != "")
             {
@@ -298,7 +336,7 @@ namespace PTMedicalInsurance.Forms
             sqlstr = sqlstr + " and a.OccurTime<'" + DT_ET1.Text + "'";
             sqlstr = sqlstr + " and a.Interface_Dr='" + Global.inf.interfaceDr + "'";
 
-            if (tb_CertNo.Text!="")
+            if (tb_CertNo.Text != "")
                 sqlstr = sqlstr + " and a.CertificateNO='" + tb_CertNo.Text + "'";
 
             JObject joSqlstr = new JObject();
@@ -350,7 +388,7 @@ namespace PTMedicalInsurance.Forms
             joData.Add("certno", certno);
             joData.Add("psn_name", psn_name);
             joData.Add("gend", gend);
-            joData.Add("naty", naty); 
+            joData.Add("naty", naty);
             joData.Add("brdy", brdy);
             joData.Add("age", age);
             joData.Add("balc", balc);
@@ -394,7 +432,7 @@ namespace PTMedicalInsurance.Forms
 
             JObject joSqlstr = new JObject();
             joSqlstr.Add("sqlStr", sqlStr);
- 
+
             JArray jaParam = new JArray();
             jaParam.Add(joSqlstr);
             JObject joSettlQuery = new JObject();
@@ -435,7 +473,7 @@ namespace PTMedicalInsurance.Forms
                 return;
             }
 
-            int iCenter = dgvSettleData.CurrentRow.Index;            
+            int iCenter = dgvSettleData.CurrentRow.Index;
             Global.pat.mdtrtID = dgvSettleData.Rows[iCenter].Cells["MdtrtID"].Value.ToString();
             Global.pat.medType = dgvSettleData.Rows[iCenter].Cells["MedicalType"].Value.ToString();
             Global.pat.psn_no = dgvSettleData.Rows[iCenter].Cells["PersonnelNO"].Value.ToString();
@@ -443,7 +481,7 @@ namespace PTMedicalInsurance.Forms
             Global.pat.billID = dgvSettleData.Rows[iCenter].Cells["BillID"].Value.ToString();
             Global.pat.recordID = dgvSettleData.Rows[iCenter].Cells["RecordID"].Value.ToString();
             Global.pat.certNO = dgvSettleData.Rows[iCenter].Cells["CertificateNO"].Value.ToString();
-            Global.pat.name= dgvSettleData.Rows[iCenter].Cells["PatientName"].Value.ToString();
+            Global.pat.name = dgvSettleData.Rows[iCenter].Cells["PatientName"].Value.ToString();
 
             Global.pat.brdy = dgvSettleData.Rows[iCenter].Cells["BirthDay"].Value.ToString();
             Global.pat.gend = dgvSettleData.Rows[iCenter].Cells["Gender"].Value.ToString();
@@ -564,7 +602,7 @@ namespace PTMedicalInsurance.Forms
                 {
                     if ((joRtn["result"].ToString() == "[]") || (joRtn["result"].ToString() == ""))
                     {
-                        MessageBox.Show("调用HIS接口服务05110038获取处方号【"+ presNo + "】门诊处方风险提示参数结果为空!");
+                        MessageBox.Show("调用HIS接口服务05110038获取处方号【" + presNo + "】门诊处方风险提示参数结果为空!");
                         return;
                     }
 
@@ -597,7 +635,7 @@ namespace PTMedicalInsurance.Forms
         /// </summary>
         /// <param name="param"></param>
         /// <returns></returns>
-        public string GetPsnType(string param)        
+        public string GetPsnType(string param)
         {
             if ((param == "11") || (param == "11021") || (param == "11031") ||
                 (param == "1101") || (param == "1102") || (param == "1103") ||
@@ -712,7 +750,7 @@ namespace PTMedicalInsurance.Forms
             else
             if ((param == "16") || (param == "160104") || (param == "140805") ||
                 (param == "160100") || (param == "160101") || (param == "160102") ||
-                (param == "160103"))            
+                (param == "160103"))
                 return "1025113"; //居民(老年)          
             else
                 return "1025111"; //居民(成年)
@@ -747,7 +785,7 @@ namespace PTMedicalInsurance.Forms
             return 0;
         }
 
-        public string GetInsuFeeInfo(string admID, string InsuCode)        
+        public string GetInsuFeeInfo(string admID, string InsuCode)
         {
             string sqlStr;
             sqlStr = " SELECT admID as Adm_Dr,'' as Name,''as HISCode,MedInsuNO,Price,Sumamt, ";
@@ -769,9 +807,9 @@ namespace PTMedicalInsurance.Forms
             decimal SelfPayProp = decimal.Parse(JsonHelper.getDestValue(joRtn, "result.data[0].SelfPayProp"));
 
             //1007100-医保个人,1007200-医保统筹,1007300-现金
-            if (SelfPayProp == 0)            
-                return "1007200"; 
-            else 
+            if (SelfPayProp == 0)
+                return "1007200";
+            else
                 return "1007300";
         }
 
@@ -798,7 +836,7 @@ namespace PTMedicalInsurance.Forms
                 string billCode = dgv_BillInfo.Rows[dgv_BillInfo.CurrentRow.Index].Cells["billCode"].Value.ToString();
                 string billTime = dgv_BillInfo.Rows[dgv_BillInfo.CurrentRow.Index].Cells["billTime"].Value.ToString();
                 string InsuredType = dgv_BillInfo.Rows[dgv_BillInfo.CurrentRow.Index].Cells["participateType"].Value.ToString(); //险种类型
-                string admID = dgv_BillInfo.Rows[dgv_BillInfo.CurrentRow.Index].Cells["admID"].Value.ToString(); 
+                string admID = dgv_BillInfo.Rows[dgv_BillInfo.CurrentRow.Index].Cells["admID"].Value.ToString();
 
                 if (InsuredType.Substring(0, 2) == "31")
                 {
@@ -822,8 +860,8 @@ namespace PTMedicalInsurance.Forms
                 joData["participateType"] = participateType;
                 joData["personnelType"] = personnelType;
 
-                JArray jaFeeDetail = JArray.Parse(JsonHelper.getDestValue(joInput20002, "result[0].detail"));                
-    
+                JArray jaFeeDetail = JArray.Parse(JsonHelper.getDestValue(joInput20002, "result[0].detail"));
+
                 //for (int i = 0; i < jaFeeDetail.Count; i++)
                 //{
                 //    string InsuCode = jaFeeDetail[i]["medicalDrugId"].ToString();                    
@@ -854,7 +892,7 @@ namespace PTMedicalInsurance.Forms
 
         private void dgv_BillInfo_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
         {
-            
+
         }
 
         private void uiButton19_Click(object sender, EventArgs e)
@@ -865,7 +903,7 @@ namespace PTMedicalInsurance.Forms
                 MessageBox.Show("请查询患者参保信息");
                 return;
             }
-       
+
             for (int i = 0; i < dgv_4001.Rows.Count; i++)
             {
                 //int iCenter = dgv_4001.CurrentRow.Index;
@@ -1082,7 +1120,7 @@ namespace PTMedicalInsurance.Forms
                     {
                         MessageBox.Show("门诊处方风险提示上传失败:" + errorMsg);
                         return;
-                    }             
+                    }
                 }
             }
 
@@ -1165,6 +1203,7 @@ namespace PTMedicalInsurance.Forms
         private void btnReadCard_Click(object sender, EventArgs e)
         {
             string outParam = "", errMsg = "";
+
             if (hBus.readCard(out outParam) != 0)
             {
                 MessageBox.Show("读卡失败!" + outParam);
@@ -1186,7 +1225,7 @@ namespace PTMedicalInsurance.Forms
                     {
                         MessageBox.Show("setGlobalPatAfaterShowPatInfo全局变量赋值异常!" + errMsg);
                         return;
-                    }                    
+                    }
                 }
             }
         }
@@ -1194,21 +1233,56 @@ namespace PTMedicalInsurance.Forms
         private void btn5205_Click(object sender, EventArgs e)
         {
             string outParam = "", errMsg = "";
+            JObject joData = new JObject();
+            JObject joInput = new JObject();
+            JObject joRtn = new JObject();
+            string errorMsg = "";
+            if (string.IsNullOrEmpty(Global.pat.psn_no))
+            {
+                joData.Add("mdtrt_cert_type", "02");
+                joData.Add("mdtrt_cert_no", Global.pat.certNO);
+                joData.Add("card_sn","");
+                joData.Add("begntime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                joData.Add("psn_cert_type", "01");
+                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;
+
+                }
+                else
+                {
+                    //joRtn.Add("cardinfo",joCardInfo);
+
+                    outParam = joRtn.ToString();
+                    Global.pat.insuplc_admdvs = JsonHelper.getDestValue(JObject.Parse(outParam), "output.insuinfo.insuplc_admdvs"); //参保地
+                    Global.pat.psn_no = JsonHelper.getDestValue(JObject.Parse(outParam), "output.baseinfo.psn_no"); //人员编号
+
+
+                }
+            }
 
             if (string.IsNullOrEmpty(Global.pat.psn_no))
             {
-                MessageBox.Show("未获取到该患者的医保个人编号,请重新读卡!");
+                MessageBox.Show("未获取到该患者的医保个人编号,请确认患者建卡信息是否维护身份证号!");
                 return;
             }
 
-            JObject joInput = new JObject();
-            JObject joData = new JObject();
-            joData.Add("psn_no", Global.pat.psn_no);
-            joData.Add("begntime", dptST.Text);
-            joData.Add("endtime", dptET.Text);
-            joInput.Add("data", joData);
+            JObject joInput1 = new JObject();
+            JObject joData1 = new JObject();
+            joData1.Add("psn_no", Global.pat.psn_no);
+            //joData1.Add("psn_no", "34010000000005004087");//合肥
+            //joData1.Add("psn_no", "34990010039324");//省医保
+            joData1.Add("begntime", dptST.Text);
+            joData1.Add("endtime", dptET.Text);
+            joInput1.Add("data", joData1);
 
-            JObject joRtn = invoker.invokeCenterService("5205", JsonHelper.setCenterInparF("5205", joInput));
+            JObject joRtn1 = invoker.invokeCenterService("5205", JsonHelper.setCenterInpar("5205", joInput1));
             if (JsonHelper.parseCenterRtnValue(joRtn, out errMsg) != 0)
             {
                 MessageBox.Show("人员慢特病用药记录查询失败:" + errMsg);
@@ -1216,9 +1290,22 @@ namespace PTMedicalInsurance.Forms
             }
             else
             {
-                dgv5205.DataSource = (DataTable)joRtn["output"]["feedetail"].ToObject(typeof(DataTable));
+                
             }
+            JObject joOutput = JObject.Parse(JsonHelper.getDestValue(joRtn1, "output"));
+            JArray joIDInfo = JArray.Parse(JsonHelper.getDestValue(joOutput, "feedetail"));
+
+            if (joIDInfo.Count > 0)
+            {
+                for (int i = 0; i < joIDInfo.Count; i++)
+                {
+                    Utils.convertTimestamp((JObject)joIDInfo[i], "fee_ocur_time");
+                }
+            }
+            //dgv5205.DataSource = (DataTable)joRtn["output"]["feedetail"].ToObject(typeof(DataTable));
+            dgv5205.DataSource = (DataTable)joIDInfo.ToObject(typeof(DataTable));
         }
+    
 
         public int queryHISDirectory(out string errMsg)        
         {

+ 123 - 123
Forms/MedInsuQuery.designer.cs

@@ -217,18 +217,18 @@ namespace PTMedicalInsurance.Forms
             this.uiGroupBox7 = new Sunny.UI.UIGroupBox();
             this.dtp_et = new Sunny.UI.UIDatetimePicker();
             this.dtp_st = new Sunny.UI.UIDatetimePicker();
-            this.cbbRYCBLB = new Sunny.UI.UIComboBox();
-            this.cbbRYLB = new Sunny.UI.UIComboBox();
             this.tab5205 = new System.Windows.Forms.TabPage();
-            this.uiPanel10 = new Sunny.UI.UIPanel();
-            this.btnReadCard = new Sunny.UI.UIButton();
-            this.uiButton24 = new Sunny.UI.UIButton();
-            this.btn5205 = new Sunny.UI.UIButton();
             this.uiTitlePanel9 = new Sunny.UI.UITitlePanel();
             this.dgv5205 = new Sunny.UI.UIDataGridView();
+            this.uiPanel10 = new Sunny.UI.UIPanel();
             this.uiGroupBox5 = new Sunny.UI.UIGroupBox();
             this.dptET = new Sunny.UI.UIDatetimePicker();
             this.dptST = new Sunny.UI.UIDatetimePicker();
+            this.btnReadCard = new Sunny.UI.UIButton();
+            this.uiButton24 = new Sunny.UI.UIButton();
+            this.btn5205 = new Sunny.UI.UIButton();
+            this.cbbRYCBLB = new Sunny.UI.UIComboBox();
+            this.cbbRYLB = new Sunny.UI.UIComboBox();
             this.tbcMain.SuspendLayout();
             this.tabInHosPerInfoExport.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvSettlRecord)).BeginInit();
@@ -284,9 +284,9 @@ namespace PTMedicalInsurance.Forms
             this.uiPanel8.SuspendLayout();
             this.uiGroupBox7.SuspendLayout();
             this.tab5205.SuspendLayout();
-            this.uiPanel10.SuspendLayout();
             this.uiTitlePanel9.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgv5205)).BeginInit();
+            this.uiPanel10.SuspendLayout();
             this.uiGroupBox5.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -309,7 +309,7 @@ namespace PTMedicalInsurance.Forms
             this.tbcMain.SelectedIndex = 0;
             this.tbcMain.Size = new System.Drawing.Size(1368, 797);
             this.tbcMain.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
-            this.tbcMain.TabIndex = 0;
+            this.tbcMain.TabIndex = 6;
             this.tbcMain.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.tbcMain.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
@@ -2587,57 +2587,6 @@ namespace PTMedicalInsurance.Forms
             this.dtp_st.Value = new System.DateTime(2024, 7, 5, 0, 0, 0, 0);
             this.dtp_st.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // cbbRYCBLB
-            // 
-            this.cbbRYCBLB.DataSource = null;
-            this.cbbRYCBLB.FillColor = System.Drawing.Color.White;
-            this.cbbRYCBLB.FilterMaxCount = 50;
-            this.cbbRYCBLB.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbbRYCBLB.Items.AddRange(new object[] {
-            "1024100-职工",
-            "1024200-居民",
-            "1024300-学生",
-            "1024400-异地人员"});
-            this.cbbRYCBLB.Location = new System.Drawing.Point(127, 30);
-            this.cbbRYCBLB.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.cbbRYCBLB.MinimumSize = new System.Drawing.Size(63, 0);
-            this.cbbRYCBLB.Name = "cbbRYCBLB";
-            this.cbbRYCBLB.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
-            this.cbbRYCBLB.Size = new System.Drawing.Size(230, 29);
-            this.cbbRYCBLB.TabIndex = 1;
-            this.cbbRYCBLB.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.cbbRYCBLB.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
-            // cbbRYLB
-            // 
-            this.cbbRYLB.DataSource = null;
-            this.cbbRYLB.FillColor = System.Drawing.Color.White;
-            this.cbbRYLB.FilterMaxCount = 50;
-            this.cbbRYLB.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbbRYLB.Items.AddRange(new object[] {
-            "1025100\t在职",
-            "1025200\t农民工",
-            "1025300\t退休人员",
-            "1025400\t离休",
-            "1025500\t居民(未成年)",
-            "1025600\t新生儿",
-            "1025700\t学龄前儿童",
-            "1025800\t中小学生",
-            "1025900\t大学生",
-            "1025110\t未成年(未入学)",
-            "1025111\t居民(成年)",
-            "1025112\t普通居民(成年)",
-            "1025113\t居民(老年)"});
-            this.cbbRYLB.Location = new System.Drawing.Point(127, 65);
-            this.cbbRYLB.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.cbbRYLB.MinimumSize = new System.Drawing.Size(63, 0);
-            this.cbbRYLB.Name = "cbbRYLB";
-            this.cbbRYLB.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
-            this.cbbRYLB.Size = new System.Drawing.Size(230, 29);
-            this.cbbRYLB.TabIndex = 3;
-            this.cbbRYLB.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.cbbRYLB.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
             // tab5205
             // 
             this.tab5205.Controls.Add(this.uiTitlePanel9);
@@ -2649,69 +2598,6 @@ namespace PTMedicalInsurance.Forms
             this.tab5205.Text = "人员慢特病用药记录查询";
             this.tab5205.UseVisualStyleBackColor = true;
             // 
-            // uiPanel10
-            // 
-            this.uiPanel10.Controls.Add(this.uiGroupBox5);
-            this.uiPanel10.Controls.Add(this.btnReadCard);
-            this.uiPanel10.Controls.Add(this.uiButton24);
-            this.uiPanel10.Controls.Add(this.btn5205);
-            this.uiPanel10.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.uiPanel10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiPanel10.Location = new System.Drawing.Point(0, 657);
-            this.uiPanel10.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.uiPanel10.MinimumSize = new System.Drawing.Size(1, 1);
-            this.uiPanel10.Name = "uiPanel10";
-            this.uiPanel10.Size = new System.Drawing.Size(1368, 100);
-            this.uiPanel10.TabIndex = 17;
-            this.uiPanel10.Text = null;
-            this.uiPanel10.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            this.uiPanel10.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
-            // btnReadCard
-            // 
-            this.btnReadCard.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnReadCard.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnReadCard.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnReadCard.Location = new System.Drawing.Point(1028, 16);
-            this.btnReadCard.MinimumSize = new System.Drawing.Size(1, 1);
-            this.btnReadCard.Name = "btnReadCard";
-            this.btnReadCard.Size = new System.Drawing.Size(110, 70);
-            this.btnReadCard.TabIndex = 27;
-            this.btnReadCard.Text = "读  卡";
-            this.btnReadCard.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnReadCard.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            this.btnReadCard.Click += new System.EventHandler(this.btnReadCard_Click);
-            // 
-            // uiButton24
-            // 
-            this.uiButton24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.uiButton24.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.uiButton24.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton24.Location = new System.Drawing.Point(1254, 16);
-            this.uiButton24.MinimumSize = new System.Drawing.Size(1, 1);
-            this.uiButton24.Name = "uiButton24";
-            this.uiButton24.Size = new System.Drawing.Size(110, 70);
-            this.uiButton24.TabIndex = 26;
-            this.uiButton24.Text = "退    出";
-            this.uiButton24.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiButton24.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            this.uiButton24.Click += new System.EventHandler(this.btnClose_Click);
-            // 
-            // btn5205
-            // 
-            this.btn5205.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btn5205.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btn5205.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn5205.Location = new System.Drawing.Point(1141, 16);
-            this.btn5205.MinimumSize = new System.Drawing.Size(1, 1);
-            this.btn5205.Name = "btn5205";
-            this.btn5205.Size = new System.Drawing.Size(110, 70);
-            this.btn5205.TabIndex = 19;
-            this.btn5205.Text = "查    询";
-            this.btn5205.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn5205.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            this.btn5205.Click += new System.EventHandler(this.btn5205_Click);
-            // 
             // uiTitlePanel9
             // 
             this.uiTitlePanel9.Controls.Add(this.dgv5205);
@@ -2779,6 +2665,24 @@ namespace PTMedicalInsurance.Forms
             this.dgv5205.TabIndex = 6;
             this.dgv5205.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
+            // uiPanel10
+            // 
+            this.uiPanel10.Controls.Add(this.uiGroupBox5);
+            this.uiPanel10.Controls.Add(this.btnReadCard);
+            this.uiPanel10.Controls.Add(this.uiButton24);
+            this.uiPanel10.Controls.Add(this.btn5205);
+            this.uiPanel10.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.uiPanel10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiPanel10.Location = new System.Drawing.Point(0, 657);
+            this.uiPanel10.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiPanel10.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiPanel10.Name = "uiPanel10";
+            this.uiPanel10.Size = new System.Drawing.Size(1368, 100);
+            this.uiPanel10.TabIndex = 17;
+            this.uiPanel10.Text = null;
+            this.uiPanel10.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.uiPanel10.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
             // uiGroupBox5
             // 
             this.uiGroupBox5.Controls.Add(this.dptET);
@@ -2834,6 +2738,102 @@ namespace PTMedicalInsurance.Forms
             this.dptST.Value = new System.DateTime(2024, 1, 5, 0, 0, 0, 0);
             this.dptST.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
+            // btnReadCard
+            // 
+            this.btnReadCard.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnReadCard.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnReadCard.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnReadCard.Location = new System.Drawing.Point(1028, 16);
+            this.btnReadCard.MinimumSize = new System.Drawing.Size(1, 1);
+            this.btnReadCard.Name = "btnReadCard";
+            this.btnReadCard.Size = new System.Drawing.Size(110, 70);
+            this.btnReadCard.TabIndex = 27;
+            this.btnReadCard.Text = "读  卡";
+            this.btnReadCard.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnReadCard.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.btnReadCard.Click += new System.EventHandler(this.btnReadCard_Click);
+            // 
+            // uiButton24
+            // 
+            this.uiButton24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.uiButton24.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.uiButton24.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiButton24.Location = new System.Drawing.Point(1254, 16);
+            this.uiButton24.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiButton24.Name = "uiButton24";
+            this.uiButton24.Size = new System.Drawing.Size(110, 70);
+            this.uiButton24.TabIndex = 26;
+            this.uiButton24.Text = "退    出";
+            this.uiButton24.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiButton24.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.uiButton24.Click += new System.EventHandler(this.btnClose_Click);
+            // 
+            // btn5205
+            // 
+            this.btn5205.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btn5205.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btn5205.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btn5205.Location = new System.Drawing.Point(1141, 16);
+            this.btn5205.MinimumSize = new System.Drawing.Size(1, 1);
+            this.btn5205.Name = "btn5205";
+            this.btn5205.Size = new System.Drawing.Size(110, 70);
+            this.btn5205.TabIndex = 19;
+            this.btn5205.Text = "查    询";
+            this.btn5205.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btn5205.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.btn5205.Click += new System.EventHandler(this.btn5205_Click);
+            // 
+            // cbbRYCBLB
+            // 
+            this.cbbRYCBLB.DataSource = null;
+            this.cbbRYCBLB.FillColor = System.Drawing.Color.White;
+            this.cbbRYCBLB.FilterMaxCount = 50;
+            this.cbbRYCBLB.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbbRYCBLB.Items.AddRange(new object[] {
+            "1024100-职工",
+            "1024200-居民",
+            "1024300-学生",
+            "1024400-异地人员"});
+            this.cbbRYCBLB.Location = new System.Drawing.Point(127, 30);
+            this.cbbRYCBLB.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.cbbRYCBLB.MinimumSize = new System.Drawing.Size(63, 0);
+            this.cbbRYCBLB.Name = "cbbRYCBLB";
+            this.cbbRYCBLB.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+            this.cbbRYCBLB.Size = new System.Drawing.Size(230, 29);
+            this.cbbRYCBLB.TabIndex = 1;
+            this.cbbRYCBLB.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.cbbRYCBLB.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // cbbRYLB
+            // 
+            this.cbbRYLB.DataSource = null;
+            this.cbbRYLB.FillColor = System.Drawing.Color.White;
+            this.cbbRYLB.FilterMaxCount = 50;
+            this.cbbRYLB.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbbRYLB.Items.AddRange(new object[] {
+            "1025100\t在职",
+            "1025200\t农民工",
+            "1025300\t退休人员",
+            "1025400\t离休",
+            "1025500\t居民(未成年)",
+            "1025600\t新生儿",
+            "1025700\t学龄前儿童",
+            "1025800\t中小学生",
+            "1025900\t大学生",
+            "1025110\t未成年(未入学)",
+            "1025111\t居民(成年)",
+            "1025112\t普通居民(成年)",
+            "1025113\t居民(老年)"});
+            this.cbbRYLB.Location = new System.Drawing.Point(127, 65);
+            this.cbbRYLB.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.cbbRYLB.MinimumSize = new System.Drawing.Size(63, 0);
+            this.cbbRYLB.Name = "cbbRYLB";
+            this.cbbRYLB.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+            this.cbbRYLB.Size = new System.Drawing.Size(230, 29);
+            this.cbbRYLB.TabIndex = 3;
+            this.cbbRYLB.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.cbbRYLB.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
             // MedInsuQuery
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -2899,9 +2899,9 @@ namespace PTMedicalInsurance.Forms
             this.uiPanel8.ResumeLayout(false);
             this.uiGroupBox7.ResumeLayout(false);
             this.tab5205.ResumeLayout(false);
-            this.uiPanel10.ResumeLayout(false);
             this.uiTitlePanel9.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgv5205)).EndInit();
+            this.uiPanel10.ResumeLayout(false);
             this.uiGroupBox5.ResumeLayout(false);
             this.ResumeLayout(false);
 

+ 3 - 3
InsuBusiness.cs

@@ -1843,14 +1843,14 @@ namespace PTMedicalInsurance
 
                     case "QuerySpecialDrugDetilInfo"://人员慢特病用药记录查询
                         {
-                            MedInsuQuery MedQuery = new MedInsuQuery(6);
-                            //bd.ShowDialog();                            
+                            MedInsuQuery MedQuery = new MedInsuQuery(joParam);
+                            //bd.ShowDialog();                           
 
                             if (MedQuery.ShowDialog() != DialogResult.OK)
                             {
                                 rtnResult = JsonHelper.setExceptionJson(-100, "", "已退出人员慢特病用药记录查询界面").ToString();
                                 return rtnResult;
-                            }
+                            }                           
 
                             break;
                         }