فهرست منبع

feat:个性化调整

zhengjie 1 سال پیش
والد
کامیت
a5db6bd2e0

BIN
.vs/MedicalInsurance/v16/.suo


+ 2 - 4
.vs/VSWorkspaceState.json

@@ -1,9 +1,7 @@
 {
   "ExpandedNodes": [
-    "",
-    "\\Business",
-    "\\Helper"
+    ""
   ],
-  "SelectedNode": "\\Business\\IrisServices.cs",
+  "SelectedNode": "\\InsuBusiness.cs",
   "PreviewInSolutionExplorer": false
 }

BIN
.vs/slnx.sqlite


+ 1 - 1
Business/Basic/OPSettlementService.cs

@@ -21,7 +21,7 @@ namespace PTMedicalInsurance.Business
             ProcessManager pManager = new ProcessManager()
             .Add(new ReadPatientProcess())
             // 挂号[2201] 
-            //.Add(new OPRegProcess())
+            .Add(new OPRegProcess())
             // 就诊信息上传[2203]
             .Add(new OPAdmUploadProcess())
             // 费用上传[2204] 

+ 15 - 13
Business/HisMainBusiness.cs

@@ -689,17 +689,17 @@ namespace PTMedicalInsurance.Business
                     }
                 }
                 //治疗方式
-                dt = (DataTable)frmReg.dblkcbxTreatway.DataSource;
-                for (int i = 0; i < dt.Rows.Count; i++)
-                {
-                    if (dt.Rows[i]["Code"].ToString() == "A")
-                    {
-                        frmReg.dblkcbxTreatway.Text = dt.Rows[i]["Name"].ToString();
-                        frmReg.treatway_code = dt.Rows[i]["Code"].ToString();
-                        break;
-                    }
-                }
-                //住院(离院)方式
+                //dt = (DataTable)frmReg.dblkcbxTreatway.DataSource;
+                //for (int i = 0; i < dt.Rows.Count; i++)
+                //{
+                //    if (dt.Rows[i]["Code"].ToString() == "A")
+                //    {
+                //        frmReg.dblkcbxTreatway.Text = dt.Rows[i]["Name"].ToString();
+                //        frmReg.treatway_code = dt.Rows[i]["Code"].ToString();
+                //        break;
+                //    }
+                //}
+                //(离院)方式
                 dt = (DataTable)frmReg.dblkcbxExitway.DataSource;
                 for (int i = 0; i < dt.Rows.Count; i++)
                 {
@@ -743,6 +743,7 @@ namespace PTMedicalInsurance.Business
                     ExportObj.Add("ipt_type", frmReg.iptTypeCode);          //住院类型
                     ExportObj.Add("rel_ttp_flag", frmReg.relTtpFlag);       //涉及第三方标志
                     ExportObj.Add("mdtrt_grp_type", frmReg.mdtrtGrpType);   //就诊人群类型
+                    ExportObj.Add("iden_crit_falg", frmReg.dangerFlag);
                     // 合并已有内容
                     if (!string.IsNullOrEmpty(Global.pat.ExpContent))
                     {
@@ -1186,11 +1187,12 @@ namespace PTMedicalInsurance.Business
                     }
                 }
 
-                //医疗类别(人群类别)
+                //医疗类别
                 DataTable dtMedType = (DataTable)frmReg.dblkcbxMedicalType.DataSource;
+                string defaultMedType = string.IsNullOrEmpty(Global.pat.medType) ? "11": Global.pat.medType;
                 for (int i = 0; i < dtMedType.Rows.Count; i++)
                 {
-                    if (dtMedType.Rows[i]["Code"].ToString() == Global.pat.medType)
+                    if (dtMedType.Rows[i]["Code"].ToString() == defaultMedType)
                     {
                         frmReg.dblkcbxMedicalType.Text = dtMedType.Rows[i]["Name"].ToString();
                         frmReg.med_type = dtMedType.Rows[i]["Code"].ToString();

+ 8 - 18
Forms/InpatientRegistration.cs

@@ -49,10 +49,7 @@ namespace PTMedicalInsurance.Forms
                 sqlStr = "SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr  WHERE A.InsuCode = 'psn_setlway'" + sqlCondition;
                 SetDBLKCombox(ref dblkcbxSettelmentWay, sqlStr);
 
-                sqlStr = " SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr WHERE A.InsuCode = 'ZLFS'" + sqlCondition;
-                SetDBLKCombox(ref dblkcbxTreatway, sqlStr);
-
-                sqlStr = " SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr WHERE A.InsuCode = 'CYFS'" + sqlCondition;
+                sqlStr = " SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr WHERE A.InsuCode = 'dscg_way'" + sqlCondition;
                 SetDBLKCombox(ref dblkcbxExitway, sqlStr);
             }
             else
@@ -70,10 +67,7 @@ namespace PTMedicalInsurance.Forms
                 sqlStr = "SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr  WHERE A.InsuCode = 'med_type'" + sqlCondition;
                 SetDBLKCombox(ref dblkcbxMedicalType, sqlStr);
 
-                sqlStr = " SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr WHERE A.InsuCode = 'ZLFS'" + sqlCondition;
-                SetDBLKCombox(ref dblkcbxTreatway, sqlStr);
-
-                sqlStr = " SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr WHERE A.InsuCode = 'CYFS'" + sqlCondition;
+                sqlStr = " SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr WHERE A.InsuCode = 'dscg_way'" + sqlCondition;
                 SetDBLKCombox(ref dblkcbxExitway, sqlStr);
             }
             
@@ -121,6 +115,8 @@ namespace PTMedicalInsurance.Forms
         public string otpErReflFlag = "0";
         public string mdtrtGrpType;
         public string unifPayStdType = "";
+        //危重患者
+        public string dangerFlag = "0";
 
         //住院类型(离院)
         public string iptTypeCode = "1";
@@ -188,16 +184,10 @@ namespace PTMedicalInsurance.Forms
             else
                 relTtpFlag = "0";
 
-            //包干标准类型
-            //if (cbxUnifPayStdType.Text!="")
-            //    unifPayStdType = (cbxUnifPayStdType.SelectedIndex).ToString();
-
-            // 选择病种后,必须选择医疗类别
-            //if (string.IsNullOrEmpty(med_type))
-            //{
-            //    MessageBox.Show("请选择医疗类别!");
-            //    return;
-            //}
+            if (chkDanger.Checked)
+            {
+                dangerFlag = "1";
+            }
 
             // 是否使用个人账户金额
             if (cbxAccountPay.Checked)

+ 42 - 77
Forms/InpatientRegistration.designer.cs

@@ -30,21 +30,18 @@ namespace PTMedicalInsurance.Forms
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.chkOPToEP = new Sunny.UI.UICheckBox();
             this.chkEmergency = new Sunny.UI.UICheckBox();
             this.cbxAccountPay = new Sunny.UI.UICheckBox();
             this.Chk_RelTtpFlag = new Sunny.UI.UICheckBox();
             this.Chk_TraumaFlag = new Sunny.UI.UICheckBox();
             this.dblkcbxExitway = new PTControl.DBLookupCombox();
             this.label8 = new System.Windows.Forms.Label();
-            this.dblkcbxTreatway = new PTControl.DBLookupCombox();
             this.dblkcbxSettelmentWay = new PTControl.DBLookupCombox();
             this.dblkcbxDisease = new PTControl.DBLookupCombox();
             this.dblkcbxMedicalType = new PTControl.DBLookupCombox();
             this.dblkcbxInsuranceType = new PTControl.DBLookupCombox();
-            this.label6 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
@@ -65,6 +62,7 @@ namespace PTMedicalInsurance.Forms
             this.dise_dor_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.diag_time = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.chkDanger = new Sunny.UI.UICheckBox();
             this.panel1.SuspendLayout();
             this.panel3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvDiagnose)).BeginInit();
@@ -74,19 +72,17 @@ namespace PTMedicalInsurance.Forms
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.SystemColors.Window;
-            this.panel1.Controls.Add(this.chkOPToEP);
             this.panel1.Controls.Add(this.chkEmergency);
             this.panel1.Controls.Add(this.cbxAccountPay);
             this.panel1.Controls.Add(this.Chk_RelTtpFlag);
+            this.panel1.Controls.Add(this.chkDanger);
             this.panel1.Controls.Add(this.Chk_TraumaFlag);
             this.panel1.Controls.Add(this.dblkcbxExitway);
             this.panel1.Controls.Add(this.label8);
-            this.panel1.Controls.Add(this.dblkcbxTreatway);
             this.panel1.Controls.Add(this.dblkcbxSettelmentWay);
             this.panel1.Controls.Add(this.dblkcbxDisease);
             this.panel1.Controls.Add(this.dblkcbxMedicalType);
             this.panel1.Controls.Add(this.dblkcbxInsuranceType);
-            this.panel1.Controls.Add(this.label6);
             this.panel1.Controls.Add(this.label4);
             this.panel1.Controls.Add(this.label3);
             this.panel1.Controls.Add(this.label2);
@@ -98,24 +94,11 @@ namespace PTMedicalInsurance.Forms
             this.panel1.Size = new System.Drawing.Size(1267, 176);
             this.panel1.TabIndex = 12;
             // 
-            // chkOPToEP
-            // 
-            this.chkOPToEP.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.chkOPToEP.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkOPToEP.Location = new System.Drawing.Point(1100, 128);
-            this.chkOPToEP.MinimumSize = new System.Drawing.Size(1, 1);
-            this.chkOPToEP.Name = "chkOPToEP";
-            this.chkOPToEP.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0);
-            this.chkOPToEP.Size = new System.Drawing.Size(132, 29);
-            this.chkOPToEP.TabIndex = 49;
-            this.chkOPToEP.Text = "门诊转急诊";
-            this.chkOPToEP.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
             // chkEmergency
             // 
             this.chkEmergency.Cursor = System.Windows.Forms.Cursors.Hand;
             this.chkEmergency.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkEmergency.Location = new System.Drawing.Point(944, 128);
+            this.chkEmergency.Location = new System.Drawing.Point(944, 27);
             this.chkEmergency.MinimumSize = new System.Drawing.Size(1, 1);
             this.chkEmergency.Name = "chkEmergency";
             this.chkEmergency.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0);
@@ -129,13 +112,13 @@ namespace PTMedicalInsurance.Forms
             this.cbxAccountPay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.cbxAccountPay.Cursor = System.Windows.Forms.Cursors.Hand;
             this.cbxAccountPay.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbxAccountPay.Location = new System.Drawing.Point(944, 27);
+            this.cbxAccountPay.Location = new System.Drawing.Point(1100, 27);
             this.cbxAccountPay.MinimumSize = new System.Drawing.Size(1, 1);
             this.cbxAccountPay.Name = "cbxAccountPay";
             this.cbxAccountPay.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0);
-            this.cbxAccountPay.Size = new System.Drawing.Size(236, 29);
+            this.cbxAccountPay.Size = new System.Drawing.Size(128, 29);
             this.cbxAccountPay.TabIndex = 48;
-            this.cbxAccountPay.Text = "使用医保账户支付";
+            this.cbxAccountPay.Text = "账户支付";
             this.cbxAccountPay.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // Chk_RelTtpFlag
@@ -146,7 +129,7 @@ namespace PTMedicalInsurance.Forms
             this.Chk_RelTtpFlag.MinimumSize = new System.Drawing.Size(1, 1);
             this.Chk_RelTtpFlag.Name = "Chk_RelTtpFlag";
             this.Chk_RelTtpFlag.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0);
-            this.Chk_RelTtpFlag.Size = new System.Drawing.Size(156, 29);
+            this.Chk_RelTtpFlag.Size = new System.Drawing.Size(128, 29);
             this.Chk_RelTtpFlag.TabIndex = 46;
             this.Chk_RelTtpFlag.Text = "涉及第三方";
             this.Chk_RelTtpFlag.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -159,7 +142,7 @@ namespace PTMedicalInsurance.Forms
             this.Chk_TraumaFlag.MinimumSize = new System.Drawing.Size(1, 1);
             this.Chk_TraumaFlag.Name = "Chk_TraumaFlag";
             this.Chk_TraumaFlag.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0);
-            this.Chk_TraumaFlag.Size = new System.Drawing.Size(168, 29);
+            this.Chk_TraumaFlag.Size = new System.Drawing.Size(102, 29);
             this.Chk_TraumaFlag.TabIndex = 45;
             this.Chk_TraumaFlag.Text = "外伤";
             this.Chk_TraumaFlag.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -167,7 +150,7 @@ namespace PTMedicalInsurance.Forms
             // dblkcbxExitway
             // 
             this.dblkcbxExitway.FormattingEnabled = true;
-            this.dblkcbxExitway.Location = new System.Drawing.Point(602, 128);
+            this.dblkcbxExitway.Location = new System.Drawing.Point(602, 79);
             this.dblkcbxExitway.Name = "dblkcbxExitway";
             this.dblkcbxExitway.NullValue = "";
             this.dblkcbxExitway.PopupGridAutoSize = false;
@@ -175,7 +158,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxExitway.sDisplayField = "";
             this.dblkcbxExitway.sDisplayMember = "";
             this.dblkcbxExitway.SeparatorChar = "|";
-            this.dblkcbxExitway.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxExitway.Size = new System.Drawing.Size(257, 26);
             this.dblkcbxExitway.sKeyWords = "";
             this.dblkcbxExitway.sValueMember = "";
             this.dblkcbxExitway.TabIndex = 44;
@@ -186,31 +169,13 @@ namespace PTMedicalInsurance.Forms
             // 
             this.label8.AutoSize = true;
             this.label8.ForeColor = System.Drawing.SystemColors.InfoText;
-            this.label8.Location = new System.Drawing.Point(506, 131);
+            this.label8.Location = new System.Drawing.Point(506, 82);
             this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(98, 22);
+            this.label8.Size = new System.Drawing.Size(89, 19);
             this.label8.TabIndex = 43;
             this.label8.Text = "离院方式";
             // 
-            // dblkcbxTreatway
-            // 
-            this.dblkcbxTreatway.FormattingEnabled = true;
-            this.dblkcbxTreatway.Location = new System.Drawing.Point(602, 76);
-            this.dblkcbxTreatway.Name = "dblkcbxTreatway";
-            this.dblkcbxTreatway.NullValue = "";
-            this.dblkcbxTreatway.PopupGridAutoSize = false;
-            this.dblkcbxTreatway.RowFilterVisible = false;
-            this.dblkcbxTreatway.sDisplayField = "";
-            this.dblkcbxTreatway.sDisplayMember = "";
-            this.dblkcbxTreatway.SeparatorChar = "|";
-            this.dblkcbxTreatway.Size = new System.Drawing.Size(257, 30);
-            this.dblkcbxTreatway.sKeyWords = "";
-            this.dblkcbxTreatway.sValueMember = "";
-            this.dblkcbxTreatway.TabIndex = 23;
-            this.dblkcbxTreatway.Value = "";
-            this.dblkcbxTreatway.AfterSelector += new PTControl.AfterSelectorEventHandler(this.dblkcbxTreatway_AfterSelector);
-            // 
             // dblkcbxSettelmentWay
             // 
             this.dblkcbxSettelmentWay.FormattingEnabled = true;
@@ -222,7 +187,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxSettelmentWay.sDisplayField = "";
             this.dblkcbxSettelmentWay.sDisplayMember = "";
             this.dblkcbxSettelmentWay.SeparatorChar = "|";
-            this.dblkcbxSettelmentWay.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxSettelmentWay.Size = new System.Drawing.Size(257, 26);
             this.dblkcbxSettelmentWay.sKeyWords = "";
             this.dblkcbxSettelmentWay.sValueMember = "";
             this.dblkcbxSettelmentWay.TabIndex = 22;
@@ -240,7 +205,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxDisease.sDisplayField = "";
             this.dblkcbxDisease.sDisplayMember = "";
             this.dblkcbxDisease.SeparatorChar = "|";
-            this.dblkcbxDisease.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxDisease.Size = new System.Drawing.Size(257, 26);
             this.dblkcbxDisease.sKeyWords = "";
             this.dblkcbxDisease.sValueMember = "";
             this.dblkcbxDisease.TabIndex = 20;
@@ -258,7 +223,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxMedicalType.sDisplayField = "";
             this.dblkcbxMedicalType.sDisplayMember = "";
             this.dblkcbxMedicalType.SeparatorChar = "|";
-            this.dblkcbxMedicalType.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxMedicalType.Size = new System.Drawing.Size(257, 26);
             this.dblkcbxMedicalType.sKeyWords = "";
             this.dblkcbxMedicalType.sValueMember = "";
             this.dblkcbxMedicalType.TabIndex = 19;
@@ -276,24 +241,13 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxInsuranceType.sDisplayField = "";
             this.dblkcbxInsuranceType.sDisplayMember = "";
             this.dblkcbxInsuranceType.SeparatorChar = "|";
-            this.dblkcbxInsuranceType.Size = new System.Drawing.Size(257, 30);
+            this.dblkcbxInsuranceType.Size = new System.Drawing.Size(257, 26);
             this.dblkcbxInsuranceType.sKeyWords = "";
             this.dblkcbxInsuranceType.sValueMember = "";
             this.dblkcbxInsuranceType.TabIndex = 18;
             this.dblkcbxInsuranceType.Value = "";
             this.dblkcbxInsuranceType.AfterSelector += new PTControl.AfterSelectorEventHandler(this.dblkcbxInsuranceType_AfterSelector);
             // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.ForeColor = System.Drawing.SystemColors.InfoText;
-            this.label6.Location = new System.Drawing.Point(506, 79);
-            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(98, 22);
-            this.label6.TabIndex = 17;
-            this.label6.Text = "治疗方式";
-            // 
             // label4
             // 
             this.label4.AutoSize = true;
@@ -301,7 +255,7 @@ namespace PTMedicalInsurance.Forms
             this.label4.Location = new System.Drawing.Point(506, 30);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(98, 22);
+            this.label4.Size = new System.Drawing.Size(89, 19);
             this.label4.TabIndex = 15;
             this.label4.Text = "医疗类别";
             // 
@@ -312,7 +266,7 @@ namespace PTMedicalInsurance.Forms
             this.label3.Location = new System.Drawing.Point(67, 128);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(98, 22);
+            this.label3.Size = new System.Drawing.Size(89, 19);
             this.label3.TabIndex = 14;
             this.label3.Text = "结算方式";
             // 
@@ -323,7 +277,7 @@ namespace PTMedicalInsurance.Forms
             this.label2.Location = new System.Drawing.Point(67, 79);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(98, 22);
+            this.label2.Size = new System.Drawing.Size(89, 19);
             this.label2.TabIndex = 13;
             this.label2.Text = "病种名称\r\n";
             // 
@@ -334,7 +288,7 @@ namespace PTMedicalInsurance.Forms
             this.label1.Location = new System.Drawing.Point(67, 30);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(98, 22);
+            this.label1.Size = new System.Drawing.Size(89, 19);
             this.label1.TabIndex = 12;
             this.label1.Text = "险种类型";
             // 
@@ -393,13 +347,13 @@ namespace PTMedicalInsurance.Forms
             // 
             this.dgvDiagnose.AllowUserToAddRows = false;
             this.dgvDiagnose.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.ButtonShadow;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("新宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDiagnose.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.ButtonShadow;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("新宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvDiagnose.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
             this.dgvDiagnose.ColumnHeadersHeight = 40;
             this.dgvDiagnose.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvDiagnose.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -521,6 +475,19 @@ namespace PTMedicalInsurance.Forms
             this.panel2.Size = new System.Drawing.Size(1267, 465);
             this.panel2.TabIndex = 13;
             // 
+            // chkDanger
+            // 
+            this.chkDanger.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.chkDanger.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.chkDanger.Location = new System.Drawing.Point(944, 125);
+            this.chkDanger.MinimumSize = new System.Drawing.Size(1, 1);
+            this.chkDanger.Name = "chkDanger";
+            this.chkDanger.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0);
+            this.chkDanger.Size = new System.Drawing.Size(139, 29);
+            this.chkDanger.TabIndex = 45;
+            this.chkDanger.Text = "危重患者";
+            this.chkDanger.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
             // InpatientRegistration
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -560,11 +527,9 @@ namespace PTMedicalInsurance.Forms
         }
 
         private System.Windows.Forms.Panel panel1;
-        public PTControl.DBLookupCombox dblkcbxTreatway;
         public PTControl.DBLookupCombox dblkcbxSettelmentWay;
         public PTControl.DBLookupCombox dblkcbxMedicalType;
         public PTControl.DBLookupCombox dblkcbxInsuranceType;
-        private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label2;
@@ -591,7 +556,7 @@ namespace PTMedicalInsurance.Forms
         private System.Windows.Forms.DataGridViewTextBoxColumn dise_dor_name;
         private System.Windows.Forms.DataGridViewTextBoxColumn diag_time;
         private System.Windows.Forms.Panel panel2;
-        public Sunny.UI.UICheckBox chkOPToEP;
         public Sunny.UI.UICheckBox chkEmergency;
+        public Sunny.UI.UICheckBox chkDanger;
     }
 }

+ 1 - 8
Forms/OutpatientRegistration.cs

@@ -67,8 +67,6 @@ namespace PTMedicalInsurance.Forms
                 sqlStr = "SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr  WHERE A.InsuCode = 'psn_setlway'" + sqlCondition;
                 SetDBLKCombox(ref dblkcbxSettelmentWay, sqlStr);
 
-                sqlStr = " SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr WHERE A.InsuCode = 'JYLB'" + sqlCondition;
-                SetDBLKCombox(ref dblkcbxTreatway, sqlStr);
             }
             else
             {
@@ -83,13 +81,8 @@ namespace PTMedicalInsurance.Forms
 
                 sqlStr = "SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr  WHERE A.InsuCode = 'med_type'" + sqlCondition;
                 SetDBLKCombox(ref dblkcbxMedicalType, sqlStr);
-
-                sqlStr = " SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr WHERE A.InsuCode = 'JYLB'" + sqlCondition;
-                SetDBLKCombox(ref dblkcbxTreatway, sqlStr);
             }
-            // 治疗方式
-            sqlStr = " SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr WHERE A.InsuCode = 'ZLFS'" + sqlCondition;
-            SetDBLKCombox(ref dblkcbxTreatway, sqlStr);
+            
         }
         public OutpatientRegistration()
         {

+ 49 - 136
Forms/OutpatientRegistration.designer.cs

@@ -34,19 +34,12 @@ namespace PTMedicalInsurance.Forms
             this.panel1 = new System.Windows.Forms.Panel();
             this.cbxAccountPay = new Sunny.UI.UICheckBox();
             this.Chk_RelTtpFlag = new Sunny.UI.UICheckBox();
-            this.chkOPToEP = new Sunny.UI.UICheckBox();
             this.chkEmergency = new Sunny.UI.UICheckBox();
             this.Chk_TraumaFlag = new Sunny.UI.UICheckBox();
-            this.dblkcbxTreatway = new PTControl.DBLookupCombox();
-            this.dblkcbxSettelmentWay = new PTControl.DBLookupCombox();
-            this.dblkcbxVisitType = new PTControl.DBLookupCombox();
             this.dblkcbxDisease = new PTControl.DBLookupCombox();
             this.dblkcbxMedicalType = new PTControl.DBLookupCombox();
             this.dblkcbxInsuranceType = new PTControl.DBLookupCombox();
-            this.label6 = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.panel3 = new System.Windows.Forms.Panel();
@@ -92,6 +85,8 @@ namespace PTMedicalInsurance.Forms
             this.uiLabel21 = new Sunny.UI.UILabel();
             this.uiGroupBox2 = new Sunny.UI.UIGroupBox();
             this.uiGroupBox3 = new Sunny.UI.UIGroupBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.dblkcbxSettelmentWay = new PTControl.DBLookupCombox();
             this.panel1.SuspendLayout();
             this.panel3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvDiagnose)).BeginInit();
@@ -105,17 +100,12 @@ namespace PTMedicalInsurance.Forms
             this.panel1.BackColor = System.Drawing.SystemColors.Window;
             this.panel1.Controls.Add(this.cbxAccountPay);
             this.panel1.Controls.Add(this.Chk_RelTtpFlag);
-            this.panel1.Controls.Add(this.chkOPToEP);
             this.panel1.Controls.Add(this.chkEmergency);
             this.panel1.Controls.Add(this.Chk_TraumaFlag);
-            this.panel1.Controls.Add(this.dblkcbxTreatway);
             this.panel1.Controls.Add(this.dblkcbxSettelmentWay);
-            this.panel1.Controls.Add(this.dblkcbxVisitType);
             this.panel1.Controls.Add(this.dblkcbxDisease);
             this.panel1.Controls.Add(this.dblkcbxMedicalType);
             this.panel1.Controls.Add(this.dblkcbxInsuranceType);
-            this.panel1.Controls.Add(this.label6);
-            this.panel1.Controls.Add(this.label5);
             this.panel1.Controls.Add(this.label4);
             this.panel1.Controls.Add(this.label3);
             this.panel1.Controls.Add(this.label2);
@@ -123,21 +113,20 @@ namespace PTMedicalInsurance.Forms
             this.panel1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.panel1.Location = new System.Drawing.Point(5, 28);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1188, 182);
+            this.panel1.Size = new System.Drawing.Size(1188, 125);
             this.panel1.TabIndex = 12;
             // 
             // cbxAccountPay
             // 
-            this.cbxAccountPay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.cbxAccountPay.Cursor = System.Windows.Forms.Cursors.Hand;
             this.cbxAccountPay.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbxAccountPay.Location = new System.Drawing.Point(917, 21);
+            this.cbxAccountPay.Location = new System.Drawing.Point(1044, 26);
             this.cbxAccountPay.MinimumSize = new System.Drawing.Size(1, 1);
             this.cbxAccountPay.Name = "cbxAccountPay";
             this.cbxAccountPay.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0);
-            this.cbxAccountPay.Size = new System.Drawing.Size(207, 29);
+            this.cbxAccountPay.Size = new System.Drawing.Size(125, 29);
             this.cbxAccountPay.TabIndex = 48;
-            this.cbxAccountPay.Text = "使用个人账户支付";
+            this.cbxAccountPay.Text = "账户支付";
             this.cbxAccountPay.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // Chk_RelTtpFlag
@@ -153,24 +142,11 @@ namespace PTMedicalInsurance.Forms
             this.Chk_RelTtpFlag.Text = "涉及第三方";
             this.Chk_RelTtpFlag.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // chkOPToEP
-            // 
-            this.chkOPToEP.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.chkOPToEP.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkOPToEP.Location = new System.Drawing.Point(1044, 120);
-            this.chkOPToEP.MinimumSize = new System.Drawing.Size(1, 1);
-            this.chkOPToEP.Name = "chkOPToEP";
-            this.chkOPToEP.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0);
-            this.chkOPToEP.Size = new System.Drawing.Size(132, 29);
-            this.chkOPToEP.TabIndex = 45;
-            this.chkOPToEP.Text = "门诊转急诊";
-            this.chkOPToEP.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            // 
             // chkEmergency
             // 
             this.chkEmergency.Cursor = System.Windows.Forms.Cursors.Hand;
             this.chkEmergency.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkEmergency.Location = new System.Drawing.Point(917, 120);
+            this.chkEmergency.Location = new System.Drawing.Point(917, 26);
             this.chkEmergency.MinimumSize = new System.Drawing.Size(1, 1);
             this.chkEmergency.Name = "chkEmergency";
             this.chkEmergency.Padding = new System.Windows.Forms.Padding(22, 0, 0, 0);
@@ -192,60 +168,6 @@ namespace PTMedicalInsurance.Forms
             this.Chk_TraumaFlag.Text = "外伤";
             this.Chk_TraumaFlag.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
-            // dblkcbxTreatway
-            // 
-            this.dblkcbxTreatway.FormattingEnabled = true;
-            this.dblkcbxTreatway.Location = new System.Drawing.Point(575, 124);
-            this.dblkcbxTreatway.Name = "dblkcbxTreatway";
-            this.dblkcbxTreatway.NullValue = "";
-            this.dblkcbxTreatway.PopupGridAutoSize = false;
-            this.dblkcbxTreatway.RowFilterVisible = false;
-            this.dblkcbxTreatway.sDisplayField = "";
-            this.dblkcbxTreatway.sDisplayMember = "";
-            this.dblkcbxTreatway.SeparatorChar = "|";
-            this.dblkcbxTreatway.Size = new System.Drawing.Size(257, 29);
-            this.dblkcbxTreatway.sKeyWords = "";
-            this.dblkcbxTreatway.sValueMember = "";
-            this.dblkcbxTreatway.TabIndex = 23;
-            this.dblkcbxTreatway.Value = "";
-            this.dblkcbxTreatway.AfterSelector += new PTControl.AfterSelectorEventHandler(this.dblkcbxDiseaseType_AfterSelector);
-            // 
-            // dblkcbxSettelmentWay
-            // 
-            this.dblkcbxSettelmentWay.FormattingEnabled = true;
-            this.dblkcbxSettelmentWay.Location = new System.Drawing.Point(136, 124);
-            this.dblkcbxSettelmentWay.Name = "dblkcbxSettelmentWay";
-            this.dblkcbxSettelmentWay.NullValue = "";
-            this.dblkcbxSettelmentWay.PopupGridAutoSize = false;
-            this.dblkcbxSettelmentWay.RowFilterVisible = false;
-            this.dblkcbxSettelmentWay.sDisplayField = "";
-            this.dblkcbxSettelmentWay.sDisplayMember = "";
-            this.dblkcbxSettelmentWay.SeparatorChar = "|";
-            this.dblkcbxSettelmentWay.Size = new System.Drawing.Size(257, 29);
-            this.dblkcbxSettelmentWay.sKeyWords = "";
-            this.dblkcbxSettelmentWay.sValueMember = "";
-            this.dblkcbxSettelmentWay.TabIndex = 22;
-            this.dblkcbxSettelmentWay.Value = "";
-            this.dblkcbxSettelmentWay.AfterSelector += new PTControl.AfterSelectorEventHandler(this.dblkcbxSettelmentWay_AfterSelector);
-            // 
-            // dblkcbxVisitType
-            // 
-            this.dblkcbxVisitType.FormattingEnabled = true;
-            this.dblkcbxVisitType.Location = new System.Drawing.Point(575, 75);
-            this.dblkcbxVisitType.Name = "dblkcbxVisitType";
-            this.dblkcbxVisitType.NullValue = "";
-            this.dblkcbxVisitType.PopupGridAutoSize = false;
-            this.dblkcbxVisitType.RowFilterVisible = false;
-            this.dblkcbxVisitType.sDisplayField = "";
-            this.dblkcbxVisitType.sDisplayMember = "";
-            this.dblkcbxVisitType.SeparatorChar = "|";
-            this.dblkcbxVisitType.Size = new System.Drawing.Size(257, 29);
-            this.dblkcbxVisitType.sKeyWords = "";
-            this.dblkcbxVisitType.sValueMember = "";
-            this.dblkcbxVisitType.TabIndex = 21;
-            this.dblkcbxVisitType.Value = "";
-            this.dblkcbxVisitType.AfterSelector += new PTControl.AfterSelectorEventHandler(this.dblkcbxOperation_AfterSelector);
-            // 
             // dblkcbxDisease
             // 
             this.dblkcbxDisease.FormattingEnabled = true;
@@ -257,7 +179,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxDisease.sDisplayField = "";
             this.dblkcbxDisease.sDisplayMember = "";
             this.dblkcbxDisease.SeparatorChar = "|";
-            this.dblkcbxDisease.Size = new System.Drawing.Size(257, 29);
+            this.dblkcbxDisease.Size = new System.Drawing.Size(257, 25);
             this.dblkcbxDisease.sKeyWords = "";
             this.dblkcbxDisease.sValueMember = "";
             this.dblkcbxDisease.TabIndex = 20;
@@ -275,7 +197,7 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxMedicalType.sDisplayField = "";
             this.dblkcbxMedicalType.sDisplayMember = "";
             this.dblkcbxMedicalType.SeparatorChar = "|";
-            this.dblkcbxMedicalType.Size = new System.Drawing.Size(257, 29);
+            this.dblkcbxMedicalType.Size = new System.Drawing.Size(257, 25);
             this.dblkcbxMedicalType.sKeyWords = "";
             this.dblkcbxMedicalType.sValueMember = "";
             this.dblkcbxMedicalType.TabIndex = 19;
@@ -293,35 +215,13 @@ namespace PTMedicalInsurance.Forms
             this.dblkcbxInsuranceType.sDisplayField = "";
             this.dblkcbxInsuranceType.sDisplayMember = "";
             this.dblkcbxInsuranceType.SeparatorChar = "|";
-            this.dblkcbxInsuranceType.Size = new System.Drawing.Size(257, 29);
+            this.dblkcbxInsuranceType.Size = new System.Drawing.Size(257, 25);
             this.dblkcbxInsuranceType.sKeyWords = "";
             this.dblkcbxInsuranceType.sValueMember = "";
             this.dblkcbxInsuranceType.TabIndex = 18;
             this.dblkcbxInsuranceType.Value = "";
             this.dblkcbxInsuranceType.AfterSelector += new PTControl.AfterSelectorEventHandler(this.dblkcbxInsuranceType_AfterSelector);
             // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.ForeColor = System.Drawing.SystemColors.InfoText;
-            this.label6.Location = new System.Drawing.Point(479, 127);
-            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(94, 21);
-            this.label6.TabIndex = 17;
-            this.label6.Text = "治疗方式";
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.ForeColor = System.Drawing.SystemColors.InfoText;
-            this.label5.Location = new System.Drawing.Point(479, 78);
-            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(94, 21);
-            this.label5.TabIndex = 16;
-            this.label5.Text = "就医类别";
-            // 
             // label4
             // 
             this.label4.AutoSize = true;
@@ -329,21 +229,10 @@ namespace PTMedicalInsurance.Forms
             this.label4.Location = new System.Drawing.Point(479, 29);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(94, 21);
+            this.label4.Size = new System.Drawing.Size(80, 18);
             this.label4.TabIndex = 15;
             this.label4.Text = "医疗类别";
             // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.ForeColor = System.Drawing.SystemColors.InfoText;
-            this.label3.Location = new System.Drawing.Point(40, 127);
-            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(94, 21);
-            this.label3.TabIndex = 14;
-            this.label3.Text = "认证方式";
-            // 
             // label2
             // 
             this.label2.AutoSize = true;
@@ -351,7 +240,7 @@ namespace PTMedicalInsurance.Forms
             this.label2.Location = new System.Drawing.Point(40, 78);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(94, 21);
+            this.label2.Size = new System.Drawing.Size(80, 18);
             this.label2.TabIndex = 13;
             this.label2.Text = "病种名称\r\n";
             // 
@@ -362,7 +251,7 @@ namespace PTMedicalInsurance.Forms
             this.label1.Location = new System.Drawing.Point(40, 29);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(94, 21);
+            this.label1.Size = new System.Drawing.Size(80, 18);
             this.label1.TabIndex = 12;
             this.label1.Text = "险种类型";
             // 
@@ -445,7 +334,7 @@ namespace PTMedicalInsurance.Forms
             this.dgvDiagnose.Name = "dgvDiagnose";
             this.dgvDiagnose.RowHeadersWidth = 51;
             this.dgvDiagnose.RowTemplate.Height = 30;
-            this.dgvDiagnose.Size = new System.Drawing.Size(1184, 128);
+            this.dgvDiagnose.Size = new System.Drawing.Size(1184, 191);
             this.dgvDiagnose.TabIndex = 0;
             // 
             // diag_type_name
@@ -905,7 +794,7 @@ namespace PTMedicalInsurance.Forms
             this.uiGroupBox2.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox2.Name = "uiGroupBox2";
             this.uiGroupBox2.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.uiGroupBox2.Size = new System.Drawing.Size(1193, 220);
+            this.uiGroupBox2.Size = new System.Drawing.Size(1193, 164);
             this.uiGroupBox2.TabIndex = 15;
             this.uiGroupBox2.Text = "险种信息";
             this.uiGroupBox2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -915,20 +804,49 @@ namespace PTMedicalInsurance.Forms
             // 
             this.uiGroupBox3.Controls.Add(this.dgvDiagnose);
             this.uiGroupBox3.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiGroupBox3.Location = new System.Drawing.Point(0, 365);
+            this.uiGroupBox3.Location = new System.Drawing.Point(0, 308);
             this.uiGroupBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiGroupBox3.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox3.Name = "uiGroupBox3";
             this.uiGroupBox3.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
-            this.uiGroupBox3.Size = new System.Drawing.Size(1193, 164);
+            this.uiGroupBox3.Size = new System.Drawing.Size(1193, 221);
             this.uiGroupBox3.TabIndex = 15;
             this.uiGroupBox3.Text = "诊断信息";
             this.uiGroupBox3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.uiGroupBox3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.ForeColor = System.Drawing.SystemColors.InfoText;
+            this.label3.Location = new System.Drawing.Point(479, 78);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(80, 18);
+            this.label3.TabIndex = 14;
+            this.label3.Text = "结算方式";
+            // 
+            // dblkcbxSettelmentWay
+            // 
+            this.dblkcbxSettelmentWay.FormattingEnabled = true;
+            this.dblkcbxSettelmentWay.Location = new System.Drawing.Point(575, 75);
+            this.dblkcbxSettelmentWay.Name = "dblkcbxSettelmentWay";
+            this.dblkcbxSettelmentWay.NullValue = "";
+            this.dblkcbxSettelmentWay.PopupGridAutoSize = false;
+            this.dblkcbxSettelmentWay.RowFilterVisible = false;
+            this.dblkcbxSettelmentWay.sDisplayField = "";
+            this.dblkcbxSettelmentWay.sDisplayMember = "";
+            this.dblkcbxSettelmentWay.SeparatorChar = "|";
+            this.dblkcbxSettelmentWay.Size = new System.Drawing.Size(257, 25);
+            this.dblkcbxSettelmentWay.sKeyWords = "";
+            this.dblkcbxSettelmentWay.sValueMember = "";
+            this.dblkcbxSettelmentWay.TabIndex = 22;
+            this.dblkcbxSettelmentWay.Value = "";
+            this.dblkcbxSettelmentWay.AfterSelector += new PTControl.AfterSelectorEventHandler(this.dblkcbxSettelmentWay_AfterSelector);
+            // 
             // OutpatientRegistration
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 22F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1193, 594);
             this.Controls.Add(this.uiGroupBox2);
@@ -970,15 +888,9 @@ namespace PTMedicalInsurance.Forms
         }
 
         private System.Windows.Forms.Panel panel1;
-        private PTControl.DBLookupCombox dblkcbxTreatway;
-        public PTControl.DBLookupCombox dblkcbxSettelmentWay;
-        private PTControl.DBLookupCombox dblkcbxVisitType;
         public PTControl.DBLookupCombox dblkcbxMedicalType;
         public PTControl.DBLookupCombox dblkcbxInsuranceType;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Panel panel3;
@@ -1028,7 +940,8 @@ namespace PTMedicalInsurance.Forms
         private Sunny.UI.UILabel uiLabel2;
         private Sunny.UI.UITextBox txtBalc;
         private Sunny.UI.UILabel uiLabel1;
-        public Sunny.UI.UICheckBox chkOPToEP;
         public Sunny.UI.UICheckBox chkEmergency;
+        public PTControl.DBLookupCombox dblkcbxSettelmentWay;
+        private System.Windows.Forms.Label label3;
     }
 }

+ 2 - 2
Variables/TradeEnum.cs

@@ -20,13 +20,13 @@ namespace PTMedicalInsurance
         SingOut,
 
         // 1101
-        [Trade("1101", "获取个人信息",ModeEnum.DLL)]
+        [Trade("1101", "获取个人信息")]
         PatientInfo,
 
         /// <summary>
         /// 1161,读卡并获取个人信息
         /// </summary>
-        [Trade("1101", "读卡并获取个人信息")]
+        [Trade("1161", "读卡并获取个人信息")]
         ReadCardInfo,
 
         /// <summary>