医保即时结算业务代码更新

Business/IrisServices.cs

@@ -664,7 +664,6 @@ namespace PTMedicalInsurance.Business
                 joTmp.sumFeeObj = joSumFee;
 
                 //0511018 {"feeObj":{"ybAmt":"医保支付","psnAcctAmt":"个人账户","psnCashAmt":"个人现金","hospAmt":"医院垫付"}}
-
                 JObject joRtn = invoker.invokeHISService(JsonHelper.setIrisInpar("05110018", joTmp).ToString(), "返回2207结算结果给HIS");
                 //JObject joRtn = invoker.invokeHISService(JsonHelper.setIrisInpar("05110009", joTmp).ToString(), "返回2207结算结果给HIS");
                 if (JsonHelper.parseIrisRtnValue(joRtn, out errMsg) != 0)
@@ -732,7 +731,7 @@ namespace PTMedicalInsurance.Business
             {
                 Global.Set.medIns_wallet_pay = "0";
                 Global.Set.medIns_wallet_balance = "0";
-                if (string.IsNullOrEmpty(JsonHelper.getDestValue(jo, "exp_content")) == false)                
+                if (!string.IsNullOrEmpty(JsonHelper.getDestValue(jo, "exp_content")))                
                 {              
                     JObject joExpContent = JObject.Parse(JsonHelper.getDestValue(jo, "exp_content"));
                     Global.Set.medIns_wallet_pay = JsonHelper.getDestValue(joExpContent, "medIns_wallet_pay");

FormSetter/GridViewSetter.cs

@@ -233,7 +233,7 @@ namespace PTMedicalInsurance.FormSetter
             AddDGVColumn(dgv, "批准文号", "approvalNum",200);
             AddDGVColumn(dgv, "规格", "medSpec",180);
             AddDGVColumn(dgv, "单位", "medUnitDesc",50);
-            AddDGVColumn(dgv, "单价", "medPrice",65);
+            //AddDGVColumn(dgv, "单价", "medPrice",65);
             //AddDGVColumn(dgv, "状态", "tipState", 50);
             AddDGVColumn(dgv, "说明", "tipDesc", 500);
             AddDGVColumn(dgv, "备注", "negotiationTipDesc");           

Forms/Clearing.Designer.cs

@@ -229,7 +229,7 @@
             this.uiLabel20 = new Sunny.UI.UILabel();
             this.tb_Admdvs = new Sunny.UI.UITextBox();
             this.uiLabel21 = new Sunny.UI.UILabel();
-            this.uiComboBox3 = new Sunny.UI.UIComboBox();
+            this.cbb_ClrType = new Sunny.UI.UIComboBox();
             this.uiLabel23 = new Sunny.UI.UILabel();
             this.rbg_QueryType = new Sunny.UI.UIRadioButtonGroup();
             this.uiGroupBox12 = new Sunny.UI.UIGroupBox();
@@ -240,6 +240,8 @@
             this.uiContextMenuStrip1 = new Sunny.UI.UIContextMenuStrip();
             this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
+            this.uiContextMenuStrip2 = new Sunny.UI.UIContextMenuStrip();
+            this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.uiTabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             this.uiPanel2.SuspendLayout();
@@ -300,6 +302,7 @@
             this.uiGroupBox12.SuspendLayout();
             this.uiGroupBox13.SuspendLayout();
             this.uiContextMenuStrip1.SuspendLayout();
+            this.uiContextMenuStrip2.SuspendLayout();
             this.SuspendLayout();
             // 
             // uiTabControl1
@@ -312,7 +315,7 @@
             this.uiTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.uiTabControl1.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed;
             this.uiTabControl1.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiTabControl1.ItemSize = new System.Drawing.Size(150, 30);
+            this.uiTabControl1.ItemSize = new System.Drawing.Size(150, 35);
             this.uiTabControl1.Location = new System.Drawing.Point(0, 0);
             this.uiTabControl1.MainPage = "";
             this.uiTabControl1.Name = "uiTabControl1";
@@ -2643,9 +2646,9 @@
             // 
             this.tabPage11.Controls.Add(this.tbQueryData);
             this.tabPage11.Controls.Add(this.uiPanel8);
-            this.tabPage11.Location = new System.Drawing.Point(0, 30);
+            this.tabPage11.Location = new System.Drawing.Point(0, 35);
             this.tabPage11.Name = "tabPage11";
-            this.tabPage11.Size = new System.Drawing.Size(1200, 721);
+            this.tabPage11.Size = new System.Drawing.Size(1200, 716);
             this.tabPage11.TabIndex = 4;
             this.tabPage11.Text = "即时结算查询";
             this.tabPage11.UseVisualStyleBackColor = true;
@@ -2656,14 +2659,13 @@
             this.tbQueryData.Controls.Add(this.tabPage16);
             this.tbQueryData.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tbQueryData.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed;
-            this.tbQueryData.Enabled = false;
             this.tbQueryData.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tbQueryData.ItemSize = new System.Drawing.Size(150, 25);
+            this.tbQueryData.ItemSize = new System.Drawing.Size(350, 35);
             this.tbQueryData.Location = new System.Drawing.Point(270, 0);
             this.tbQueryData.MainPage = "";
             this.tbQueryData.Name = "tbQueryData";
             this.tbQueryData.SelectedIndex = 0;
-            this.tbQueryData.Size = new System.Drawing.Size(930, 721);
+            this.tbQueryData.Size = new System.Drawing.Size(930, 716);
             this.tbQueryData.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.tbQueryData.TabIndex = 5;
             this.tbQueryData.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -2676,7 +2678,7 @@
             this.tabPage13.Name = "tabPage13";
             this.tabPage13.Size = new System.Drawing.Size(930, 696);
             this.tabPage13.TabIndex = 0;
-            this.tabPage13.Text = "即时结算申请查询";
+            this.tabPage13.Text = "即时结算申请查询（选中记录右击撤销申报）";
             this.tabPage13.UseVisualStyleBackColor = true;
             // 
             // dgv_2804_A
@@ -2695,7 +2697,7 @@
             dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
             this.dgv_2804_A.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle37;
             this.dgv_2804_A.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgv_2804_A.ContextMenuStrip = this.cmsClearing;
+            this.dgv_2804_A.ContextMenuStrip = this.uiContextMenuStrip2;
             dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
             dataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Window;
             dataGridViewCellStyle38.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -2734,9 +2736,9 @@
             // tabPage16
             // 
             this.tabPage16.Controls.Add(this.dgv_2803_A);
-            this.tabPage16.Location = new System.Drawing.Point(0, 25);
+            this.tabPage16.Location = new System.Drawing.Point(0, 35);
             this.tabPage16.Name = "tabPage16";
-            this.tabPage16.Size = new System.Drawing.Size(0, 35);
+            this.tabPage16.Size = new System.Drawing.Size(930, 681);
             this.tabPage16.TabIndex = 1;
             this.tabPage16.Text = "即时结算模式查询";
             this.tabPage16.UseVisualStyleBackColor = true;
@@ -2788,7 +2790,7 @@
             this.dgv_2803_A.RowsDefaultCellStyle = dataGridViewCellStyle45;
             this.dgv_2803_A.RowTemplate.Height = 30;
             this.dgv_2803_A.SelectedIndex = -1;
-            this.dgv_2803_A.Size = new System.Drawing.Size(0, 35);
+            this.dgv_2803_A.Size = new System.Drawing.Size(930, 681);
             this.dgv_2803_A.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
             this.dgv_2803_A.TabIndex = 1;
             this.dgv_2803_A.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -2805,7 +2807,7 @@
             this.uiPanel8.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiPanel8.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiPanel8.Name = "uiPanel8";
-            this.uiPanel8.Size = new System.Drawing.Size(270, 721);
+            this.uiPanel8.Size = new System.Drawing.Size(270, 716);
             this.uiPanel8.TabIndex = 4;
             this.uiPanel8.Text = null;
             this.uiPanel8.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2817,7 +2819,7 @@
             this.uiGroupBox14.Controls.Add(this.uiLabel20);
             this.uiGroupBox14.Controls.Add(this.tb_Admdvs);
             this.uiGroupBox14.Controls.Add(this.uiLabel21);
-            this.uiGroupBox14.Controls.Add(this.uiComboBox3);
+            this.uiGroupBox14.Controls.Add(this.cbb_ClrType);
             this.uiGroupBox14.Controls.Add(this.uiLabel23);
             this.uiGroupBox14.Dock = System.Windows.Forms.DockStyle.Top;
             this.uiGroupBox14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -2872,8 +2874,9 @@
             // tb_Admdvs
             // 
             this.tb_Admdvs.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.tb_Admdvs.Enabled = false;
+            this.tb_Admdvs.DoubleValue = 610199D;
             this.tb_Admdvs.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tb_Admdvs.IntValue = 610199;
             this.tb_Admdvs.Location = new System.Drawing.Point(91, 31);
             this.tb_Admdvs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.tb_Admdvs.MinimumSize = new System.Drawing.Size(1, 16);
@@ -2881,6 +2884,7 @@
             this.tb_Admdvs.ShowText = false;
             this.tb_Admdvs.Size = new System.Drawing.Size(161, 25);
             this.tb_Admdvs.TabIndex = 10;
+            this.tb_Admdvs.Text = "610199";
             this.tb_Admdvs.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
             this.tb_Admdvs.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
@@ -2895,25 +2899,25 @@
             this.uiLabel21.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.uiLabel21.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // uiComboBox3
-            // 
-            this.uiComboBox3.DataSource = null;
-            this.uiComboBox3.FillColor = System.Drawing.Color.White;
-            this.uiComboBox3.FilterMaxCount = 50;
-            this.uiComboBox3.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiComboBox3.ItemHeight = 20;
-            this.uiComboBox3.Items.AddRange(new object[] {
-            "1",
-            "2"});
-            this.uiComboBox3.Location = new System.Drawing.Point(91, 66);
-            this.uiComboBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.uiComboBox3.MinimumSize = new System.Drawing.Size(63, 0);
-            this.uiComboBox3.Name = "uiComboBox3";
-            this.uiComboBox3.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
-            this.uiComboBox3.Size = new System.Drawing.Size(161, 25);
-            this.uiComboBox3.TabIndex = 5;
-            this.uiComboBox3.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.uiComboBox3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // cbb_ClrType
+            // 
+            this.cbb_ClrType.DataSource = null;
+            this.cbb_ClrType.FillColor = System.Drawing.Color.White;
+            this.cbb_ClrType.FilterMaxCount = 50;
+            this.cbb_ClrType.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbb_ClrType.ItemHeight = 20;
+            this.cbb_ClrType.Items.AddRange(new object[] {
+            "1-门诊",
+            "2-住院"});
+            this.cbb_ClrType.Location = new System.Drawing.Point(91, 66);
+            this.cbb_ClrType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.cbb_ClrType.MinimumSize = new System.Drawing.Size(63, 0);
+            this.cbb_ClrType.Name = "cbb_ClrType";
+            this.cbb_ClrType.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+            this.cbb_ClrType.Size = new System.Drawing.Size(161, 25);
+            this.cbb_ClrType.TabIndex = 5;
+            this.cbb_ClrType.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.cbb_ClrType.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // uiLabel23
             // 
@@ -2952,7 +2956,7 @@
             this.uiGroupBox12.Controls.Add(this.btbQuery);
             this.uiGroupBox12.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.uiGroupBox12.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiGroupBox12.Location = new System.Drawing.Point(0, 587);
+            this.uiGroupBox12.Location = new System.Drawing.Point(0, 582);
             this.uiGroupBox12.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiGroupBox12.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox12.Name = "uiGroupBox12";
@@ -3042,7 +3046,7 @@
             this.toolStripMenuItem2,
             this.toolStripMenuItem3});
             this.uiContextMenuStrip1.Name = "cmsClearing";
-            this.uiContextMenuStrip1.Size = new System.Drawing.Size(203, 78);
+            this.uiContextMenuStrip1.Size = new System.Drawing.Size(203, 56);
             this.uiContextMenuStrip1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // toolStripMenuItem2
@@ -3058,6 +3062,23 @@
             this.toolStripMenuItem3.Size = new System.Drawing.Size(202, 26);
             this.toolStripMenuItem3.Text = "查看HIS结算记录";
             // 
+            // uiContextMenuStrip2
+            // 
+            this.uiContextMenuStrip2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
+            this.uiContextMenuStrip2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiContextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.ToolStripMenuItem});
+            this.uiContextMenuStrip2.Name = "uiContextMenuStrip2";
+            this.uiContextMenuStrip2.Size = new System.Drawing.Size(273, 30);
+            this.uiContextMenuStrip2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // ToolStripMenuItem
+            // 
+            this.ToolStripMenuItem.Name = "ToolStripMenuItem";
+            this.ToolStripMenuItem.Size = new System.Drawing.Size(272, 26);
+            this.ToolStripMenuItem.Text = "即时结算申报撤销(2802_A)";
+            this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
+            // 
             // Clearing
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -3127,6 +3148,7 @@
             this.uiGroupBox12.ResumeLayout(false);
             this.uiGroupBox13.ResumeLayout(false);
             this.uiContextMenuStrip1.ResumeLayout(false);
+            this.uiContextMenuStrip2.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -3295,9 +3317,11 @@
         private Sunny.UI.UILabel uiLabel20;
         private Sunny.UI.UITextBox tb_Admdvs;
         private Sunny.UI.UILabel uiLabel21;
-        private Sunny.UI.UIComboBox uiComboBox3;
+        private Sunny.UI.UIComboBox cbb_ClrType;
         private Sunny.UI.UILabel uiLabel23;
         private Sunny.UI.UIRadioButtonGroup rbg_QueryType;
         private Sunny.UI.UIDatetimePicker dt_DateYM;
+        private Sunny.UI.UIContextMenuStrip uiContextMenuStrip2;
+        private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
     }
 }

Forms/Clearing.cs

@@ -74,6 +74,11 @@ namespace PTMedicalInsurance.Forms
             cbValid_3.SelectedIndex = 0;
             rbgTimeWay.SelectedIndex = 0;
             cbOtherPlaceFlag.SelectedIndex = 2;
+            rbg_QueryType.SelectedIndex = 0;
+            cbb_ClrWay.SelectedIndex = 0;
+            cbb_ClrType.SelectedIndex = 0;
+
+            dt_DateYM.Text = DateTime.Now.ToString("yyyy-MM-01");
 
             dpST.Text = DateTime.Now.ToString("yyyy-MM-01 00:00:00");
             dpED.Value = DateTime.Now.AddDays(1 - DateTime.Now.Day).AddMonths(1).AddDays(-1);
@@ -2054,6 +2059,36 @@ namespace PTMedicalInsurance.Forms
                 tbQueryData.SelectedIndex = 1;
         }
 
+        private int Query_2802_A(out JObject joRtn, out string error)
+        {
+            error = "";
+            joRtn = null;
+
+            if ((DataTable)dgv_2804_A.DataSource == null)
+            {
+                MessageBox.Show("请先查询该患者就诊处方信息！");      
+                return -1;
+            }
+
+            DataTable dt = (DataTable)dgv_2804_A.DataSource;
+            int i = dgv_2804_A.CurrentRow.Index;        
+
+            dynamic jo = new JObject();
+            jo.clr_appy_evt_id = dt.Rows[i]["clr_appy_evt_id"].ToString(); //事件流水号
+
+            JObject joData = new JObject();
+            joData.Add("data", jo);
+
+            string input = JsonHelper.setCenterInpar("2802_A", joData.ToString());
+            joRtn = invoker.invokeCenterService("2802_A", input);
+            if (JsonHelper.parseCenterReturnJson(joRtn, out error) != 0)
+            {                
+                return -1;
+            }
+
+            return 0;
+        }
+
         /// <summary>
         /// 即时结算模式查询
         /// </summary>
@@ -2096,8 +2131,7 @@ namespace PTMedicalInsurance.Forms
 
             dynamic joClearing = new JObject();
             joClearing.clr_stas = ""; //清算状态
-            joClearing.clr_type = "";  //清算类别
-
+            joClearing.clr_type = cbb_ClrType.Text.Substring(0, 1);  //清算类别
             joClearing.clr_way = cbb_ClrWay.Text.Substring(0, 2);  //清算方式
 
             joClearing.clr_type_lv2 = "";  //二级清算类别
@@ -2128,11 +2162,9 @@ namespace PTMedicalInsurance.Forms
 
         private void btbQuery_Click(object sender, EventArgs e)
         {
-
-
             string error = "";
             JObject joRtn = new JObject();
-            if (rbg_QueryType.SelectedIndex == 0)
+            if (rbg_QueryType.SelectedIndex == 1)
             {
                 if (Query_2803_A(out joRtn, out error) != 0)
                     MessageBox.Show("即时结算模式查询失败：" + error);
@@ -2146,6 +2178,12 @@ namespace PTMedicalInsurance.Forms
             }
             else
             {
+                if (string.IsNullOrEmpty(tb_Admdvs.Text)|| string.IsNullOrEmpty(cbb_ClrType.Text)|| string.IsNullOrEmpty(cbb_ClrWay.Text))
+                {
+                    MessageBox.Show("经办机构/清算类别/清算方式,不能为空！");
+                    return;
+                }
+
                 if (Query_2804_A(out joRtn, out error) != 0)
                     MessageBox.Show("即时结算申请查询失败：" + error);
                 else
@@ -2158,9 +2196,26 @@ namespace PTMedicalInsurance.Forms
             }
         }
 
+        private void ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            string error = "";
+            JObject joRtn = new JObject();
+            if ((DataTable)dgv_2804_A.DataSource == null)
+            {
+                MessageBox.Show("请先查询即时结算申请记录！");
+                return;
+            }
+
+            if (Query_2802_A(out joRtn, out error) != 0)
+                MessageBox.Show("即时结算申报撤销失败：" + error);
+            else
+                MessageBox.Show("即时结算申报撤销成功");
+        }
+
         private void toolStripMenuItem2_Click(object sender, EventArgs e)
         {
 
         }
+
     }
 }

Forms/Clearing.resx

@@ -135,6 +135,9 @@
   <metadata name="cmsClearing.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>132, 25</value>
   </metadata>
+  <metadata name="uiContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>586, 25</value>
+  </metadata>
   <metadata name="uiContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>408, 25</value>
   </metadata>

Forms/HospitalRegister.cs

@@ -54,8 +54,7 @@ namespace PTMedicalInsurance.Forms
         }
 
         private void HospitalRegister_Load(object sender, EventArgs e)
-        {
-            //WindowState = FormWindowState.Maximized;
+        {           
             dt_Begin.Text = DateTime.Now.ToString("yyyy-MM-01 00:00:00");
             dt_End.Value = DateTime.Now.AddDays(1 - DateTime.Now.Day).AddMonths(1).AddDays(-1);
 
@@ -81,6 +80,8 @@ namespace PTMedicalInsurance.Forms
             JObject joUserInfo = hIS.GetHosUserInfo("");
             DataTable dt = (DataTable)joUserInfo["result"]["rows"].ToObject(typeof(DataTable));
             SetDBLKCombox(ref cbx_DocInfo, dt);
+
+          this.WindowState = FormWindowState.Maximized;
         }
 
         /// <summary>
@@ -114,7 +115,33 @@ namespace PTMedicalInsurance.Forms
                 return JsonHelper.setIrisReturnValue(-1, "查询限制药品信息结果为空", null); 
             }
 
-            return joRtn;
+            JArray jaItem = new JArray();
+            JArray ja = JArray.Parse(JsonHelper.getDestValue(joRtn, "data"));
+            for (int i = 0; i < JArray.Parse(JsonHelper.getDestValue(joRtn, "data")).Count; i++)
+            {
+                JObject jo = new JObject();
+                jo.Add("medItemID", ja[i]["medItemID"]);
+                jo.Add("medCode", ja[i]["medCode"]);
+                jo.Add("medDesc", ja[i]["medDesc"]);
+                jo.Add("approvalNum", ja[i]["approvalNum"]);
+                jo.Add("medSpec", ja[i]["medSpec"]);
+                jo.Add("medUnitDesc", ja[i]["medUnitDesc"]);
+                jo.Add("medPrice", "0");
+                jo.Add("tipState", ja[i]["tipState"]);
+                jo.Add("tipDesc", ja[i]["tipDesc"]);
+                jo.Add("negotiationTipDesc", ja[i]["negotiationTipDesc"]);
+                jo.Add("Cnt", ja[i]["Cnt"]);
+       
+                jaItem.Add(jo);
+            }
+
+            JObject joRtnNew = new JObject();
+            joRtnNew.Add("errorCode", "");
+            joRtnNew.Add("errorMessage", "");
+            joRtnNew.Add("total", "");
+            joRtnNew.Add("data", jaItem);            
+
+            return joRtnNew;
         }
 
         public void LoadRestrictedDrugsInfo(JObject joRtn)