ソースを参照

fix:修复hisHospitalDr为空解析报错问题

zhanfei 3 日 前
コミット
040b418963

BIN
.vs/ChengDu/v16/.suo


+ 34 - 13
Business/HisMainBusiness.cs

@@ -105,7 +105,15 @@ namespace PTMedicalInsurance.Business
         {
             inf = new InterfaceInfo();
             inf.hospitalDr = int.Parse(JsonHelper.getDestValue(joInpar, "HospitalDr"));
-            inf.hisHospitalDr = int.Parse(JsonHelper.getDestValue(joInpar, "hisHospitalDr"));
+            if (JsonHelper.getDestValue(joInpar, "hisHospitalDr") == "")
+            {
+                inf.hisHospitalDr = 0;
+            }
+            else
+            {
+                inf.hisHospitalDr = int.Parse(JsonHelper.getDestValue(joInpar, "hisHospitalDr"));
+            }
+            
             inf.hospitalName = JsonHelper.getDestValue(joInpar, "HospitalName");
             inf.interfaceDr = int.Parse(JsonHelper.getDestValue(joInpar, "ID"));
             inf.interfaceID = JsonHelper.getDestValue(joInpar, "InterfaceID");
@@ -125,21 +133,20 @@ namespace PTMedicalInsurance.Business
             IniFile ini = new IniFile(Global.curEvt.path + @"\INSUConfigure.ini");
             Global.inf.fixedPointType = ini.ReadValue("FixedPointInfo", "TYPE"); //1.省本级 2.市本级 3.区本级
 
-            if (joInpar.ContainsKey("CenterURL2"))
-            {
-                inf.centerURL2 = JsonHelper.getDestValue(joInpar, "CenterURL2");
-            }
-            else
-            {
-                inf.centerURL2 = JsonHelper.getDestValue(joInpar, "centerURL2");
-            }
+            //if (joInpar.ContainsKey("CenterURL2"))
+            //{
+                inf.centerURL2 = JsonHelper.getDestValue(joInpar, "CenterURL2"); //CenterURL2
+            //}
+            //else
+            //{
+            //    inf.centerURL2 = JsonHelper.getDestValue(joInpar, "centerURL2");
+            //}
             
             byte[] b = Base64.Decode(inf.centerURL2);
             string centerURL2 = System.Text.Encoding.UTF8.GetString(b);
             JObject joCenterURL2 = JObject.Parse(centerURL2);
 
-
-
+            Global.writeLog(centerURL2);
             inf.MobilePay.url = JsonHelper.getDestValue(joCenterURL2, "mobilePay.url");
             inf.MobilePay.appid = JsonHelper.getDestValue(joCenterURL2, "mobilePay.appid");
             inf.MobilePay.secretKey = JsonHelper.getDestValue(joCenterURL2, "mobilePay.secretKey");
@@ -152,7 +159,6 @@ namespace PTMedicalInsurance.Business
             inf.PresCir.privateKey = JsonHelper.getDestValue(joCenterURL2, "mobilePay.privateKey");
             inf.PresCir.publicKey = JsonHelper.getDestValue(joCenterURL2, "mobilePay.publicKey");
 
-
             inf.ecURL = JsonHelper.getDestValue(joCenterURL2, "core.ecURL");
             inf.cardURL = JsonHelper.getDestValue(joCenterURL2, "core.cardURL");
 
@@ -169,7 +175,14 @@ namespace PTMedicalInsurance.Business
             inf = new InterfaceInfo();
 
             inf.hospitalDr = int.Parse(JsonHelper.getDestValue(joInpar, "hospitalID"));
-            inf.hisHospitalDr = int.Parse(JsonHelper.getDestValue(joInpar, "hisHospitalDr"));
+            if (JsonHelper.getDestValue(joInpar, "hisHospitalDr") == "")
+            {
+                inf.hisHospitalDr = 0;
+            }
+            else
+            {
+                inf.hisHospitalDr = int.Parse(JsonHelper.getDestValue(joInpar, "hisHospitalDr"));
+            }
             inf.hospitalName = JsonHelper.getDestValue(joInpar, "hospitalName");
             inf.interfaceDr = int.Parse(JsonHelper.getDestValue(joInpar, "medInsuInterfaceID"));
             inf.interfaceID = JsonHelper.getDestValue(joInpar, "interfaceNO");
@@ -1191,6 +1204,8 @@ namespace PTMedicalInsurance.Business
                     joSetlInpar.Add("overlmt_selfpay", JsonHelper.getDestValue(joSumFee, "data.OverLimitAmount"));
                     joSetlInpar.Add("preselfpay_amt", JsonHelper.getDestValue(joSumFee, "data.PreSelfPayAmount"));
                     joSetlInpar.Add("dscgTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                    joSetlInpar.Add("minpacunt_drug_trac_cnt", Global.Set.minpacunt_drug_trac_cnt);
+                    joSetlInpar.Add("mcs_trac_cnt", Global.Set.mcs_trac_cnt);
 
                     JObject joDataExp = new JObject();
                     //joDataExp.Add("cla_trt_flag", "");
@@ -1418,6 +1433,8 @@ namespace PTMedicalInsurance.Business
                     joSetlInpar.Add("acct_used_flag", frmReg.personAccountUsedFlag);//个人账户使用标志
                     joSetlInpar.Add("insutype", frmReg.insuType);//险种类型
                     joSetlInpar.Add("pub_hosp_rfom_flag", "");
+                    joSetlInpar.Add("minpacunt_drug_trac_cnt", Global.Set.minpacunt_drug_trac_cnt);
+                    joSetlInpar.Add("mcs_trac_cnt", Global.Set.mcs_trac_cnt);
 
                     //成都新增
                     joSetlInpar.Add("insuplc_admdvs", Global.pat.insuplc_admdvs);
@@ -1714,6 +1731,8 @@ namespace PTMedicalInsurance.Business
                         pat.adm_Dr = int.Parse(JsonHelper.getDestValue(joInparam, "params[0].admID"));
                         pat.recordID = JsonHelper.getDestValue(joInparam, "params[0].recordID");
                         pat.billID = JsonHelper.getDestValue(joInparam, "params[0].billID");
+                        Global.Set.minpacunt_drug_trac_cnt = JsonHelper.getDestValue(joInparam, "insuAdmObj.minpacunt_drug_trac_cnt");
+                        Global.Set.mcs_trac_cnt = JsonHelper.getDestValue(joInparam, "insuAdmObj.mcs_trac_cnt");
                         Global.pat.insuplc_admdvs = "";
                         break;
                     }
@@ -1761,6 +1780,8 @@ namespace PTMedicalInsurance.Business
                         pat.billID = JsonHelper.getDestValue(joInparam, "params[0].billID");
                         pat.hisDischargeTime = Convert.ToDateTime(JsonHelper.getDestValue(joInparam, "insuAdmObj.disDateTime")).ToString("yyyy-MM-dd HH:mm:ss");
 
+                        Global.Set.minpacunt_drug_trac_cnt = JsonHelper.getDestValue(joInparam, "insuAdmObj.minpacunt_drug_trac_cnt");
+                        Global.Set.mcs_trac_cnt = JsonHelper.getDestValue(joInparam, "insuAdmObj.mcs_trac_cnt");
                         if (string.IsNullOrEmpty(JsonHelper.getDestValue(joInparam, "insuAdmObj.inDays")))
                         {
                             Global.Set.hospitalizationsDays = 0;

+ 4 - 0
Common/WinAPI/WndHelper.cs

@@ -11,6 +11,10 @@ namespace PTMedicalInsurance.Common.WinAPI
 {
     class WndHelper
     {
+        // 发送按键的方法(根据你的需求)
+        [DllImport("user32.dll")]
+        public static extern void keybd_event(byte bVk, byte bScan, uint dwFlags, UIntPtr dwExtraInfo);
+
         // <summary>
         /// 枚举窗口时的委托参数
         /// </summary>

+ 73 - 24
Common/YinHaiSafeCtrl.cs

@@ -97,7 +97,8 @@ namespace PTMedicalInsurance.Common
             JObject joInput = JsonHelper.setYinHaiSafe(funNo);
             sSafeControlsRtnValue = string.Empty;
 
-            FindAndCloseComWindow("身份识别 - 正式版V2.310.23",key);
+            //FindAndCloseComWindow("身份识别 - 正式版V2.310.23",key);
+            FindAndCloseComWindow("身份识别 - 正式版V", key);
 
             Init();
             Call(funNo, joInput.ToString(), out sSafeControlsRtnValue);
@@ -160,7 +161,8 @@ namespace PTMedicalInsurance.Common
         }
         static async void AsyncMethod(int key)
         {
-            var result = await FindAndCloseComWindow("身份识别 - 正式版V2.310.23",key);
+            var result = await FindAndCloseComWindow("身份识别 - 正式版V",key);
+            //var result = await FindAndCloseComWindow("身份识别 - 正式版V2.310.23", key);
         }
 
 
@@ -179,33 +181,80 @@ namespace PTMedicalInsurance.Common
 
         }
 
-        static bool FindAndCloseComWindowA(string title,int key)
+        //static bool FindAndCloseComWindowA(string title,int key)
+        //{
+        //    //WndHelper.wndInfo[] windows = WndHelper.GetAllDesktopWindows();
+        //    //for (int i = 0; i < windows.Length; i++)
+        //    //{
+        //    //    IntPtr paraentPtr = WndHelper.GetParent(windows[i].hWnd);
+        //    //    int threadId = WndHelper.GetWindowThreadProcessId(windows[i].hWnd, out int processId);
+        //    //    string msg = $"序号:{i},hwnd:{windows[i].hWnd},threadID:{threadId},processId:{processId},父窗口句柄:{paraentPtr},szWindowName:{windows[i].szWindowName}";
+        //    //    Global.writeLog(msg);
+        //    //}
+
+        //    //string title = "身份识别 - 正式版V2.310.23";
+        //    IntPtr myPtr = WndHelper.FindWindow(null, title);
+        //    if (WndHelper.IsWindowVisible(myPtr))
+        //    {
+        //        int len = WndHelper.GetWindowTextLength(myPtr);
+        //        StringBuilder sb = new StringBuilder();
+        //        WndHelper.GetWindowText(myPtr, sb, len + 1);
+        //        //Global.writeLog($@"找到""{title}"":{myPtr}");
+        //        WndHelper.SendMsg(WndHelper.msgType.keybd_event, myPtr, key); //不能触发,但能触发F
+        //        return true;
+        //    }
+        //    else
+        //    {
+        //        //Global.writeLog($@"未找到""{title}""");
+        //        return false;
+        //    }
+        //}
+
+        
+
+
+        // 模糊查找窗口并发送按键
+        public static bool FindAndCloseComWindowA(string pattern, int key)
         {
-            //WndHelper.wndInfo[] windows = WndHelper.GetAllDesktopWindows();
-            //for (int i = 0; i < windows.Length; i++)
-            //{
-            //    IntPtr paraentPtr = WndHelper.GetParent(windows[i].hWnd);
-            //    int threadId = WndHelper.GetWindowThreadProcessId(windows[i].hWnd, out int processId);
-            //    string msg = $"序号:{i},hwnd:{windows[i].hWnd},threadID:{threadId},processId:{processId},父窗口句柄:{paraentPtr},szWindowName:{windows[i].szWindowName}";
-            //    Global.writeLog(msg);
-            //}
+            IntPtr targetHwnd = IntPtr.Zero;
 
-            //string title = "身份识别 - 正式版V2.310.23";
-            IntPtr myPtr = WndHelper.FindWindow(null, title);
-            if (WndHelper.IsWindowVisible(myPtr))
+            WndHelper.EnumWindows((hWnd, lParam) =>
             {
-                int len = WndHelper.GetWindowTextLength(myPtr);
-                StringBuilder sb = new StringBuilder();
-                WndHelper.GetWindowText(myPtr, sb, len + 1);
-                //Global.writeLog($@"找到""{title}"":{myPtr}");
-                WndHelper.SendMsg(WndHelper.msgType.keybd_event, myPtr, key); //不能触发,但能触发F
-                return true;
-            }
-            else
+                if (WndHelper.IsWindowVisible(hWnd))
+                {
+                    int length = WndHelper.GetWindowTextLength(hWnd);
+                    if (length == 0) return true;
+
+                    StringBuilder sb = new StringBuilder(length + 1);
+                    WndHelper.GetWindowText(hWnd, sb, sb.Capacity);
+
+                    string title = sb.ToString();
+
+                    // 使用 Contains 匹配
+                    if (!string.IsNullOrEmpty(title) && title.Contains(pattern))
+                    {
+                        targetHwnd = hWnd;
+                        return false; // 停止遍历
+                    }
+
+                    // 或者使用正则表达式匹配(更灵活)
+                    // if (Regex.IsMatch(title, pattern))
+                    // {
+                    //     targetHwnd = hWnd;
+                    //     return false;
+                    // }
+                }
+
+                return true; // 继续遍历
+            }, IntPtr.Zero.ToInt32());
+
+            if (targetHwnd != IntPtr.Zero)
             {
-                //Global.writeLog($@"未找到""{title}""");
-                return false;
+                WndHelper.SendMsg(WndHelper.msgType.keybd_event, targetHwnd, key); //不能触发,但能触发F
+                return true;
             }
+
+            return false;
         }
 
 

+ 3 - 2
Forms/BasicData.cs

@@ -3003,9 +3003,10 @@ namespace PTMedicalInsurance.Forms
             return iFalse;
         }
 
+        private void tsmExportMappedDataByLeft_Click(object sender, EventArgs e)
+        {
 
-
-      
+        }
     }
 
     public class OutParamWrapper

+ 99 - 98
Forms/BasicData.designer.cs

@@ -28,21 +28,21 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.panel1 = new System.Windows.Forms.Panel();
@@ -210,28 +210,28 @@
             // 
             this.dgvDirectoy.AllowUserToAddRows = false;
             this.dgvDirectoy.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            this.dgvDirectoy.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            this.dgvDirectoy.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
             this.dgvDirectoy.BackgroundColor = System.Drawing.Color.White;
             this.dgvDirectoy.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDirectoy.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDirectoy.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
             this.dgvDirectoy.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvDirectoy.ContextMenuStrip = this.cmsUpdateAuxInfo;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvDirectoy.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvDirectoy.DefaultCellStyle = dataGridViewCellStyle8;
             this.dgvDirectoy.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvDirectoy.EnableHeadersVisualStyles = false;
             this.dgvDirectoy.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -239,18 +239,18 @@
             this.dgvDirectoy.Location = new System.Drawing.Point(0, 0);
             this.dgvDirectoy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.dgvDirectoy.Name = "dgvDirectoy";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDirectoy.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDirectoy.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;
             this.dgvDirectoy.RowHeadersWidth = 51;
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvDirectoy.RowsDefaultCellStyle = dataGridViewCellStyle5;
+            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(1573, 175);
@@ -888,28 +888,28 @@
             // 
             this.dgvHISDirectory.AllowUserToAddRows = false;
             this.dgvHISDirectory.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            this.dgvHISDirectory.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            this.dgvHISDirectory.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle16;
             this.dgvHISDirectory.BackgroundColor = System.Drawing.Color.White;
             this.dgvHISDirectory.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvHISDirectory.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle17.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle17.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvHISDirectory.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17;
             this.dgvHISDirectory.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvHISDirectory.ContextMenuStrip = this.cmsMapping;
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvHISDirectory.DefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvHISDirectory.DefaultCellStyle = dataGridViewCellStyle18;
             this.dgvHISDirectory.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvHISDirectory.EnableHeadersVisualStyles = false;
             this.dgvHISDirectory.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -917,19 +917,19 @@
             this.dgvHISDirectory.Location = new System.Drawing.Point(0, 46);
             this.dgvHISDirectory.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.dgvHISDirectory.Name = "dgvHISDirectory";
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvHISDirectory.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle19.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle19.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle19.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle19.SelectionForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvHISDirectory.RowHeadersDefaultCellStyle = dataGridViewCellStyle19;
             this.dgvHISDirectory.RowHeadersWidth = 51;
             this.dgvHISDirectory.RowHeight = 25;
-            dataGridViewCellStyle10.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvHISDirectory.RowsDefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle20.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle20.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvHISDirectory.RowsDefaultCellStyle = dataGridViewCellStyle20;
             this.dgvHISDirectory.RowTemplate.Height = 25;
             this.dgvHISDirectory.SelectedIndex = -1;
             this.dgvHISDirectory.Size = new System.Drawing.Size(1395, 148);
@@ -991,7 +991,7 @@
             this.tsmImportMapRelation,
             this.tsmImportExcelDir});
             this.uiContextMenuStrip1.Name = "uiContextMenuStrip1";
-            this.uiContextMenuStrip1.Size = new System.Drawing.Size(459, 264);
+            this.uiContextMenuStrip1.Size = new System.Drawing.Size(459, 286);
             this.uiContextMenuStrip1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // tsmExportAllMappedData
@@ -1006,6 +1006,7 @@
             this.tsmExportMappedDataByLeft.Name = "tsmExportMappedDataByLeft";
             this.tsmExportMappedDataByLeft.Size = new System.Drawing.Size(458, 26);
             this.tsmExportMappedDataByLeft.Text = "按左侧类别导出已对照数据";
+            this.tsmExportMappedDataByLeft.Click += new System.EventHandler(this.tsmExportMappedDataByLeft_Click);
             // 
             // tsmUploadAllMappedData
             // 
@@ -1215,27 +1216,27 @@
             // 
             this.dgvCenterDirectory.AllowUserToAddRows = false;
             this.dgvCenterDirectory.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            this.dgvCenterDirectory.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            this.dgvCenterDirectory.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvCenterDirectory.BackgroundColor = System.Drawing.Color.White;
             this.dgvCenterDirectory.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvCenterDirectory.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvCenterDirectory.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
             this.dgvCenterDirectory.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvCenterDirectory.DefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvCenterDirectory.DefaultCellStyle = dataGridViewCellStyle3;
             this.dgvCenterDirectory.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvCenterDirectory.EnableHeadersVisualStyles = false;
             this.dgvCenterDirectory.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1243,18 +1244,18 @@
             this.dgvCenterDirectory.Location = new System.Drawing.Point(0, 40);
             this.dgvCenterDirectory.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.dgvCenterDirectory.Name = "dgvCenterDirectory";
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle14.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle14.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvCenterDirectory.RowHeadersDefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvCenterDirectory.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
             this.dgvCenterDirectory.RowHeadersWidth = 51;
-            dataGridViewCellStyle15.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgvCenterDirectory.RowsDefaultCellStyle = dataGridViewCellStyle15;
+            dataGridViewCellStyle5.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvCenterDirectory.RowsDefaultCellStyle = dataGridViewCellStyle5;
             this.dgvCenterDirectory.RowTemplate.Height = 23;
             this.dgvCenterDirectory.SelectedIndex = -1;
             this.dgvCenterDirectory.Size = new System.Drawing.Size(1395, 142);

+ 3 - 3
Forms/BasicData.resx

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

+ 1 - 0
Helper/InvokeHelper.cs

@@ -185,6 +185,7 @@ namespace PTMedicalInsurance.Helper
             return invokeCenterService(data);
         }
 
+
         private JObject invokeCenterService(string data, ModeEnum mode = ModeEnum.REST)
         {
             JObject joRtn = new JObject();

+ 13 - 1
InsuBusiness.cs

@@ -31,6 +31,7 @@ namespace PTMedicalInsurance
         private JObject joInParam;
         private JArray jaSession ;
         private JArray jaParams;
+        private JArray jaParam;
         private JObject joParam;
         private JObject joInterface;
         private JObject joInsuAdmObj;
@@ -62,7 +63,18 @@ namespace PTMedicalInsurance
                 jaSession = JArray.Parse(JsonHelper.getDestValue(joInParam, "session"));
                 Global.curEvt.jaSession = jaSession;
                 jaParams = JArray.Parse(JsonHelper.getDestValue(joInParam, "params"));
-                joParam = JObject.FromObject(jaParams[0]);
+
+                JToken firstItem = jaParams[0];
+
+                if (firstItem is JObject)
+                {
+                    joParam = (JObject)firstItem;
+                }
+                else if (firstItem is JArray)
+                {
+                    jaParam = (JArray)firstItem;
+                    // 处理 JArray
+                }
 
                 if (JsonHelper.getDestValue(joInParam, "insuAdmObj") != "")
                     joInsuAdmObj = JObject.Parse(JsonHelper.getDestValue(joInParam, "insuAdmObj"));

+ 2 - 0
Variables/Struct.cs

@@ -279,6 +279,8 @@ namespace PTMedicalInsurance.Variables
         public int confirmFlag; //确认标志
         public string onlineYBFalg; //线上线下标志  Y  N
         public string payOrdId; //订单编号
+        public string minpacunt_drug_trac_cnt; //本次结算应上传最小包装追溯码数量
+        public string mcs_trac_cnt; //本次结算应上传耗材追溯码数量
     }
 
     //当前环境实时信息