Browse Source

perf:优化单条目录维护,新增目录类别,最小包装数量等属性的维护;优化事前事中反馈界面,去除保存按钮,增加确定后安全性检查

zhanfei 3 tuần trước cách đây
mục cha
commit
287bfe1d30

+ 7 - 0
FormSetter/GridViewSetterBase.cs

@@ -97,5 +97,12 @@ namespace PTMedicalInsurance.FormSetter
             //dt.Columns[2].ColumnName = "拼音查找码";
             return dt;
         }
+
+        public void SetCombox(ref System.Windows.Forms.ComboBox cbx, string sqlStr, string displayMember = "Name", string valueMember = "Code")
+        {
+            cbx.DataSource = GetDBLKComboxTable(sqlStr);
+            cbx.DisplayMember = displayMember;
+            cbx.ValueMember = valueMember;
+        }
     }
 }

+ 51 - 42
Forms/AddSignleDirectory.cs

@@ -1,4 +1,6 @@
 using Newtonsoft.Json.Linq;
+using PTMedicalInsurance.FormSetter;
+using PTMedicalInsurance.Variables;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -17,6 +19,7 @@ namespace PTMedicalInsurance
     {
         private int direcType ;
         public JObject joPamam = new JObject();
+        private GridViewSetterBase grdSetterBase = new GridViewSetterBase();
         public AddSingleDirectory()
         {
             InitializeComponent();
@@ -40,11 +43,6 @@ namespace PTMedicalInsurance
 
         }
 
-        private void pnlClient_Paint(object sender, PaintEventArgs e)
-        {
-
-        }
-
         private void btnNo_Click(object sender, EventArgs e)
         {
             DialogResult = DialogResult.Cancel;
@@ -56,7 +54,7 @@ namespace PTMedicalInsurance
             //遍历所有控件
             foreach (Control control in sonControls)
             {
-                if (control is TextBox) control.Enabled = b;
+                if (control is System.Windows.Forms.TextBox) control.Enabled = b;
             }
         }
         private bool getFlag(string value)
@@ -76,10 +74,27 @@ namespace PTMedicalInsurance
             }
         }
 
+        private void InitCombox()
+        {
+            string sqlCondition = " and A.Interface_Dr = '" + Global.inf.interfaceDr.ToString() + "'";
+
+            string 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 = 'list_type'" + sqlCondition;
+
+            grdSetterBase.SetCombox(ref cbxListType,sqlStr);
+
+            //med_chrgitm_type
+
+             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_chrgitm_type'" + sqlCondition;
+
+            grdSetterBase.SetCombox(ref cbxChargeItemType, sqlStr);
+        }
 
         private void initForm()
         {
             setTextBoxEnabled(true);
+            InitCombox();
             switch (direcType)
             {
                 case 0:
@@ -105,6 +120,22 @@ namespace PTMedicalInsurance
         //            }
         //    }
         //}
+
+        private void SetSelectValue(System.Windows.Forms.ComboBox cbx,string targetName )
+        {
+            for (int i = 0; i < cbx.Items.Count; i++)
+            {
+                // 假设数据源是 DataTable,绑定的是 DataRowView
+                if (cbx.Items[i] is DataRowView rowView)
+                {
+                    if (rowView["Name"].ToString() == targetName)
+                    {
+                        cbx.SelectedIndex = i;
+                        break;
+                    }
+                }
+            }
+        }
         private void setValue(DataRow dr)
         {
             try
@@ -138,6 +169,10 @@ namespace PTMedicalInsurance
                 tbNationalCode.Text = dr["NationalCode"].ToString();
                 tbNationalName.Text = dr["NationalName"].ToString();
                 tbManufacturers.Text = dr["Manufacturers"].ToString();
+                tbMinPackagingQuantity.Text = dr["MinPackagingQuantity"].ToString();
+                cbxListType.SelectedValue = dr["ListType"].ToString();
+                //cbxChargeItemType.SelectedValue = dr["ChargeItemType"].ToString();
+                SetSelectValue(cbxChargeItemType, dr["ChargeItemType"].ToString());
                 if (dr["ChargeItemLevel"].ToString() != "")
                 {
                     cbxChargeItemLevel.SelectedIndex = int.Parse(dr["ChargeItemLevel"].ToString()) - 1;
@@ -147,7 +182,7 @@ namespace PTMedicalInsurance
                     cbxChargeItemLevel.Text = dr["ChargeItemLevel"].ToString();
                 }
                 
-                tbCompany.Text = dr["Company"].ToString();
+                //tbCompany.Text = dr["Company"].ToString();
             }
             catch (Exception ex)
             {
@@ -158,6 +193,7 @@ namespace PTMedicalInsurance
         {
             string hisTypeName = cbxDirecType.Text;
 
+
             string pym = tbPinyinSearchCode.Text;
             if (tbPinyinSearchCode.Text == "")
             {
@@ -170,6 +206,8 @@ namespace PTMedicalInsurance
                 ChargeItemLevel = "0" + (cbxChargeItemLevel.SelectedIndex + 1).ToString();
             }
 
+
+
             joPamam.Add("Code",tbCode.Text);
             joPamam.Add("Name", tbName.Text);
             joPamam.Add("HisType",direcType + 1);
@@ -206,51 +244,22 @@ namespace PTMedicalInsurance
             joPamam.Add("Manufacturers", tbManufacturers.Text);
             joPamam.Add("UpdateTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
             joPamam.Add("ChargeItemLevel", ChargeItemLevel);
-            joPamam.Add("Company", tbCompany.Text);
+            //joPamam.Add("Company", tbCompany.Text);
+            joPamam.Add("MinPackagingQuantity", tbMinPackagingQuantity.Text);
+            joPamam.Add("ChargeItemType", cbxChargeItemType.SelectedValue?.ToString());
+            joPamam.Add("ListType", cbxListType.SelectedValue?.ToString());
         }
-
         private void initDrugForm()
         {
             lbApprovalNO.ForeColor = Color.Red;
             lbSpecification.ForeColor = Color.Red;
             lbManufacturers.ForeColor = Color.Red;
             lbUnitOfPackag.ForeColor = Color.Red;
-            lbCompany.ForeColor = Color.Red;
+            //lbCompany.ForeColor = Color.Red;
         }
 
-        private void initMedicalServiceForm()
-        {
-
-           
-        }
-        private void initMaterialsForm()
-        {
-
-        }
-
-        private void initDiagnoseForm()
-        {
-
-        }
-        private void initDictionaryForm()
-        {
-
-        }
-
-        private void textBox23_TextChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        private void lbUniqueRecordNO_Click(object sender, EventArgs e)
-        {
-
-        }
+       
 
-        private void tbUniqueRecordNO_TextChanged(object sender, EventArgs e)
-        {
-
-        }
 
         private void btnYes_Click(object sender, EventArgs e)
         {

+ 77 - 7
Forms/AddSignleDirectory.designer.cs

@@ -82,6 +82,10 @@
             this.lbStartDate = new System.Windows.Forms.Label();
             this.tbStartDate = new System.Windows.Forms.TextBox();
             this.pnlClient = new System.Windows.Forms.Panel();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.tbMinPackagingQuantity = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
             this.cbxChargeItemLevel = new System.Windows.Forms.ComboBox();
             this.tbCompany = new System.Windows.Forms.TextBox();
             this.lbCompany = new System.Windows.Forms.Label();
@@ -97,6 +101,8 @@
             this.rtbLimitRange = new System.Windows.Forms.RichTextBox();
             this.gbConnotation = new System.Windows.Forms.GroupBox();
             this.rtbConnotation = new System.Windows.Forms.RichTextBox();
+            this.cbxChargeItemType = new System.Windows.Forms.ComboBox();
+            this.cbxListType = new System.Windows.Forms.ComboBox();
             this.pnlTop.SuspendLayout();
             this.pnlBottom.SuspendLayout();
             this.pnlClient.SuspendLayout();
@@ -174,6 +180,7 @@
             // 
             // cbxDirecType
             // 
+            this.cbxDirecType.Enabled = false;
             this.cbxDirecType.FormattingEnabled = true;
             this.cbxDirecType.Items.AddRange(new object[] {
             "药品",
@@ -185,10 +192,10 @@
             "DRGs",
             "日间手术",
             "字典表"});
-            this.cbxDirecType.Location = new System.Drawing.Point(103, 13);
+            this.cbxDirecType.Location = new System.Drawing.Point(137, 13);
             this.cbxDirecType.Margin = new System.Windows.Forms.Padding(4);
             this.cbxDirecType.Name = "cbxDirecType";
-            this.cbxDirecType.Size = new System.Drawing.Size(228, 23);
+            this.cbxDirecType.Size = new System.Drawing.Size(193, 23);
             this.cbxDirecType.TabIndex = 7;
             // 
             // label24
@@ -446,7 +453,6 @@
             this.lbUniqueRecordNO.Size = new System.Drawing.Size(82, 15);
             this.lbUniqueRecordNO.TabIndex = 40;
             this.lbUniqueRecordNO.Text = "唯一记录号";
-            this.lbUniqueRecordNO.Click += new System.EventHandler(this.lbUniqueRecordNO_Click);
             // 
             // tbUniqueRecordNO
             // 
@@ -455,7 +461,6 @@
             this.tbUniqueRecordNO.Name = "tbUniqueRecordNO";
             this.tbUniqueRecordNO.Size = new System.Drawing.Size(225, 25);
             this.tbUniqueRecordNO.TabIndex = 41;
-            this.tbUniqueRecordNO.TextChanged += new System.EventHandler(this.tbUniqueRecordNO_TextChanged);
             // 
             // lbManufacturers
             // 
@@ -631,6 +636,12 @@
             // 
             // pnlClient
             // 
+            this.pnlClient.Controls.Add(this.cbxListType);
+            this.pnlClient.Controls.Add(this.cbxChargeItemType);
+            this.pnlClient.Controls.Add(this.label3);
+            this.pnlClient.Controls.Add(this.label2);
+            this.pnlClient.Controls.Add(this.tbMinPackagingQuantity);
+            this.pnlClient.Controls.Add(this.label1);
             this.pnlClient.Controls.Add(this.cbxChargeItemLevel);
             this.pnlClient.Controls.Add(this.tbCompany);
             this.pnlClient.Controls.Add(this.lbCompany);
@@ -688,7 +699,44 @@
             this.pnlClient.Name = "pnlClient";
             this.pnlClient.Size = new System.Drawing.Size(1424, 553);
             this.pnlClient.TabIndex = 1;
-            this.pnlClient.Paint += new System.Windows.Forms.PaintEventHandler(this.pnlClient_Paint);
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(698, 239);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(67, 15);
+            this.label3.TabIndex = 87;
+            this.label3.Text = "目录类别";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(354, 240);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(97, 15);
+            this.label2.TabIndex = 85;
+            this.label2.Text = "收费项目类别";
+            // 
+            // tbMinPackagingQuantity
+            // 
+            this.tbMinPackagingQuantity.Location = new System.Drawing.Point(152, 240);
+            this.tbMinPackagingQuantity.Margin = new System.Windows.Forms.Padding(4);
+            this.tbMinPackagingQuantity.Name = "tbMinPackagingQuantity";
+            this.tbMinPackagingQuantity.Size = new System.Drawing.Size(179, 25);
+            this.tbMinPackagingQuantity.TabIndex = 84;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(32, 243);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(112, 15);
+            this.label1.TabIndex = 83;
+            this.label1.Text = "最小包装转换数";
             // 
             // cbxChargeItemLevel
             // 
@@ -757,7 +805,7 @@
             this.gbExceptContent.Size = new System.Drawing.Size(672, 125);
             this.gbExceptContent.TabIndex = 78;
             this.gbExceptContent.TabStop = false;
-            this.gbExceptContent.Text = "除外内容ExceptContent";
+            this.gbExceptContent.Text = "除外内容";
             // 
             // rtbExceptContent
             // 
@@ -777,7 +825,7 @@
             this.gbInstructions.Size = new System.Drawing.Size(1424, 125);
             this.gbInstructions.TabIndex = 77;
             this.gbInstructions.TabStop = false;
-            this.gbInstructions.Text = "说明Instructions";
+            this.gbInstructions.Text = "说明";
             // 
             // rtbInstructions
             // 
@@ -838,6 +886,22 @@
             this.rtbConnotation.TabIndex = 0;
             this.rtbConnotation.Text = "";
             // 
+            // cbxChargeItemType
+            // 
+            this.cbxChargeItemType.FormattingEnabled = true;
+            this.cbxChargeItemType.Location = new System.Drawing.Point(453, 236);
+            this.cbxChargeItemType.Name = "cbxChargeItemType";
+            this.cbxChargeItemType.Size = new System.Drawing.Size(225, 23);
+            this.cbxChargeItemType.TabIndex = 88;
+            // 
+            // cbxListType
+            // 
+            this.cbxListType.FormattingEnabled = true;
+            this.cbxListType.Location = new System.Drawing.Point(797, 237);
+            this.cbxListType.Name = "cbxListType";
+            this.cbxListType.Size = new System.Drawing.Size(225, 23);
+            this.cbxListType.TabIndex = 89;
+            // 
             // AddSingleDirectory
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -938,5 +1002,11 @@
         private System.Windows.Forms.TextBox tbCompany;
         private System.Windows.Forms.Label lbCompany;
         private System.Windows.Forms.ComboBox cbxChargeItemLevel;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox tbMinPackagingQuantity;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.ComboBox cbxListType;
+        private System.Windows.Forms.ComboBox cbxChargeItemType;
     }
 }

+ 108 - 0
Forms/AddSingleDictionary.cs

@@ -0,0 +1,108 @@
+using Newtonsoft.Json.Linq;
+using PTMedicalInsurance.Variables;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace PTMedicalInsurance.Forms
+{
+    public partial class AddSingleDictionary : Form
+    {
+        enum operatType { Add,Update };
+
+        operatType opt;
+
+        public DataRow dr;
+        public JObject joPamam;
+        public AddSingleDictionary()
+        {
+            InitializeComponent();
+            cbxDirecType.SelectedIndex = 8;
+            opt = operatType.Add;
+            tbInsuCodeStartDate.Text = DateTime.Now.ToString("yyyy-MM-dd");
+            tbStartDate.Text = DateTime.Now.ToString("yyyy-MM-dd");
+            this.dr = null;
+        }
+
+        public AddSingleDictionary(DataRow dr)
+        {
+            InitializeComponent();
+            cbxDirecType.SelectedIndex = 8;
+            setValue(dr);
+            opt = operatType.Update;
+            this.dr = dr;
+        }
+        private void btnYes_Click(object sender, EventArgs e)
+        {
+            AssignToJoParam();
+            this.DialogResult = DialogResult.OK;
+        }
+
+        private void setValue(DataRow dr)
+        {
+            try
+            {
+                tbInsuCode.Text = dr["insuCode"].ToString();
+                tbInsuDesc.Text = dr["insuDesc"].ToString();
+                tbInsuCodeStartDate.Text = dr["insuCodeStartDate"].ToString();
+                tbInsuCodeStopDate.Text = dr["insuCodeStopDate"].ToString();
+                tbCode.Text = dr["code"].ToString();
+                tbDescripts.Text = dr["descripts"].ToString();
+                tbStartDate.Text = dr["startDate"].ToString();
+                tbStopDate.Text = dr["stopDate"].ToString();
+                tbPinyinSearchCode.Text = dr["pinyinSearchCode"].ToString();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("setValue" + ex.Message);
+            }
+        }
+      
+        private void AssignToJoParam()
+        {
+            joPamam = new JObject();
+            JObject joDic = new JObject();
+            JObject joDicDetail = new JObject();
+            joDic.Add("HospitalDr", Global.inf.hospitalDr);
+            joDic.Add("InterfaceDr", Global.inf.interfaceDr);
+            joDic.Add("InsuCode", tbInsuCode.Text);
+            joDic.Add("InsuDesc", tbInsuDesc.Text);
+            joDic.Add("StartDate", tbInsuCodeStartDate.Text);
+            joDic.Add("StopDate", tbInsuCodeStopDate.Text);
+            if (opt == operatType.Add)
+            {
+                joDic.Add("CreateDate", DateTime.Now.ToString("yyyy-MM-dd"));
+                joDic.Add("CreateTime", DateTime.Now.ToString("HH:mm:ss"));
+            }
+
+            joDicDetail.Add("HospitalDr", Global.inf.hospitalDr);
+            joDicDetail.Add("InterfaceDr", Global.inf.interfaceDr);
+            joDicDetail.Add("Code", tbCode.Text);
+            joDicDetail.Add("Descripts", tbDescripts.Text);
+            joDicDetail.Add("PinyinSearchCode", tbPinyinSearchCode.Text);
+            joDicDetail.Add("StartDate", tbStartDate.Text);
+            joDicDetail.Add("StopDate", tbStopDate.Text);
+            if (opt == operatType.Add)
+            {
+                joDicDetail.Add("CreateDate", DateTime.Now.ToString("yyyy-MM-dd"));
+                joDicDetail.Add("CreateTime", DateTime.Now.ToString("HH:mm:ss"));
+                joDicDetail.Add("CreateUserDr", tbStartDate.Text);
+            }
+
+            joPamam.Add("dicObj", joDic);
+            joPamam.Add("detailObj", joDicDetail);
+            joPamam.Add("operateType",opt.GetHashCode());
+        }
+
+        private void btnNo_Click(object sender, EventArgs e)
+        {
+            Close();
+        }
+    }
+}

+ 424 - 0
Forms/AddSingleDictionary.designer.cs

@@ -0,0 +1,424 @@
+
+namespace PTMedicalInsurance.Forms
+{
+    partial class AddSingleDictionary
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.pnlBottom = new System.Windows.Forms.Panel();
+            this.btnNo = new System.Windows.Forms.Button();
+            this.btnYes = new System.Windows.Forms.Button();
+            this.pnlClient = new System.Windows.Forms.Panel();
+            this.gbConnotation = new System.Windows.Forms.GroupBox();
+            this.tbStopDate = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.tbStartDate = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.tbPinyinSearchCode = new System.Windows.Forms.TextBox();
+            this.lbLocateCode = new System.Windows.Forms.Label();
+            this.tbDescripts = new System.Windows.Forms.TextBox();
+            this.lbName = new System.Windows.Forms.Label();
+            this.tbCode = new System.Windows.Forms.TextBox();
+            this.lbCode = new System.Windows.Forms.Label();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.tbInsuCodeStopDate = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.tbInsuCodeStartDate = new System.Windows.Forms.TextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.tbInsuDesc = new System.Windows.Forms.TextBox();
+            this.label7 = new System.Windows.Forms.Label();
+            this.tbInsuCode = new System.Windows.Forms.TextBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.label24 = new System.Windows.Forms.Label();
+            this.cbxDirecType = new System.Windows.Forms.ComboBox();
+            this.pnlTop = new System.Windows.Forms.Panel();
+            this.pnlBottom.SuspendLayout();
+            this.pnlClient.SuspendLayout();
+            this.gbConnotation.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            this.pnlTop.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // pnlBottom
+            // 
+            this.pnlBottom.Controls.Add(this.btnNo);
+            this.pnlBottom.Controls.Add(this.btnYes);
+            this.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pnlBottom.Location = new System.Drawing.Point(0, 424);
+            this.pnlBottom.Margin = new System.Windows.Forms.Padding(7);
+            this.pnlBottom.Name = "pnlBottom";
+            this.pnlBottom.Size = new System.Drawing.Size(1333, 110);
+            this.pnlBottom.TabIndex = 3;
+            // 
+            // btnNo
+            // 
+            this.btnNo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnNo.Location = new System.Drawing.Point(979, 30);
+            this.btnNo.Margin = new System.Windows.Forms.Padding(7);
+            this.btnNo.Name = "btnNo";
+            this.btnNo.Size = new System.Drawing.Size(233, 51);
+            this.btnNo.TabIndex = 1;
+            this.btnNo.Text = "放弃";
+            this.btnNo.UseVisualStyleBackColor = true;
+            this.btnNo.Click += new System.EventHandler(this.btnNo_Click);
+            // 
+            // btnYes
+            // 
+            this.btnYes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnYes.Location = new System.Drawing.Point(695, 30);
+            this.btnYes.Margin = new System.Windows.Forms.Padding(7);
+            this.btnYes.Name = "btnYes";
+            this.btnYes.Size = new System.Drawing.Size(233, 51);
+            this.btnYes.TabIndex = 0;
+            this.btnYes.Text = "确定";
+            this.btnYes.UseVisualStyleBackColor = true;
+            this.btnYes.Click += new System.EventHandler(this.btnYes_Click);
+            // 
+            // pnlClient
+            // 
+            this.pnlClient.Controls.Add(this.gbConnotation);
+            this.pnlClient.Controls.Add(this.groupBox1);
+            this.pnlClient.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pnlClient.Font = new System.Drawing.Font("宋体", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pnlClient.Location = new System.Drawing.Point(0, 66);
+            this.pnlClient.Margin = new System.Windows.Forms.Padding(7);
+            this.pnlClient.Name = "pnlClient";
+            this.pnlClient.Size = new System.Drawing.Size(1333, 358);
+            this.pnlClient.TabIndex = 4;
+            // 
+            // gbConnotation
+            // 
+            this.gbConnotation.Controls.Add(this.tbStopDate);
+            this.gbConnotation.Controls.Add(this.label2);
+            this.gbConnotation.Controls.Add(this.tbStartDate);
+            this.gbConnotation.Controls.Add(this.label3);
+            this.gbConnotation.Controls.Add(this.tbPinyinSearchCode);
+            this.gbConnotation.Controls.Add(this.lbLocateCode);
+            this.gbConnotation.Controls.Add(this.tbDescripts);
+            this.gbConnotation.Controls.Add(this.lbName);
+            this.gbConnotation.Controls.Add(this.tbCode);
+            this.gbConnotation.Controls.Add(this.lbCode);
+            this.gbConnotation.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gbConnotation.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gbConnotation.Location = new System.Drawing.Point(0, 162);
+            this.gbConnotation.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.gbConnotation.Name = "gbConnotation";
+            this.gbConnotation.Padding = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.gbConnotation.Size = new System.Drawing.Size(1333, 196);
+            this.gbConnotation.TabIndex = 79;
+            this.gbConnotation.TabStop = false;
+            this.gbConnotation.Text = "字典明细";
+            // 
+            // tbStopDate
+            // 
+            this.tbStopDate.Location = new System.Drawing.Point(835, 77);
+            this.tbStopDate.Margin = new System.Windows.Forms.Padding(7);
+            this.tbStopDate.Name = "tbStopDate";
+            this.tbStopDate.Size = new System.Drawing.Size(415, 31);
+            this.tbStopDate.TabIndex = 73;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.ForeColor = System.Drawing.Color.Black;
+            this.label2.Location = new System.Drawing.Point(691, 80);
+            this.label2.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(136, 21);
+            this.label2.TabIndex = 72;
+            this.label2.Text = "明细失效日期";
+            // 
+            // tbStartDate
+            // 
+            this.tbStartDate.Location = new System.Drawing.Point(189, 77);
+            this.tbStartDate.Margin = new System.Windows.Forms.Padding(7);
+            this.tbStartDate.Name = "tbStartDate";
+            this.tbStartDate.Size = new System.Drawing.Size(415, 31);
+            this.tbStartDate.TabIndex = 71;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.ForeColor = System.Drawing.Color.Red;
+            this.label3.Location = new System.Drawing.Point(39, 80);
+            this.label3.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(136, 21);
+            this.label3.TabIndex = 70;
+            this.label3.Text = "明细生效日期";
+            // 
+            // tbPinyinSearchCode
+            // 
+            this.tbPinyinSearchCode.Location = new System.Drawing.Point(189, 130);
+            this.tbPinyinSearchCode.Margin = new System.Windows.Forms.Padding(7);
+            this.tbPinyinSearchCode.Name = "tbPinyinSearchCode";
+            this.tbPinyinSearchCode.Size = new System.Drawing.Size(415, 31);
+            this.tbPinyinSearchCode.TabIndex = 67;
+            // 
+            // lbLocateCode
+            // 
+            this.lbLocateCode.AutoSize = true;
+            this.lbLocateCode.Location = new System.Drawing.Point(60, 131);
+            this.lbLocateCode.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+            this.lbLocateCode.Name = "lbLocateCode";
+            this.lbLocateCode.Size = new System.Drawing.Size(115, 21);
+            this.lbLocateCode.TabIndex = 66;
+            this.lbLocateCode.Text = "拼音查找码";
+            // 
+            // tbDescripts
+            // 
+            this.tbDescripts.Location = new System.Drawing.Point(835, 24);
+            this.tbDescripts.Margin = new System.Windows.Forms.Padding(7);
+            this.tbDescripts.Name = "tbDescripts";
+            this.tbDescripts.Size = new System.Drawing.Size(415, 31);
+            this.tbDescripts.TabIndex = 65;
+            // 
+            // lbName
+            // 
+            this.lbName.AutoSize = true;
+            this.lbName.ForeColor = System.Drawing.Color.Red;
+            this.lbName.Location = new System.Drawing.Point(691, 29);
+            this.lbName.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+            this.lbName.Name = "lbName";
+            this.lbName.Size = new System.Drawing.Size(136, 21);
+            this.lbName.TabIndex = 64;
+            this.lbName.Text = "明细编码描述";
+            // 
+            // tbCode
+            // 
+            this.tbCode.Location = new System.Drawing.Point(189, 24);
+            this.tbCode.Margin = new System.Windows.Forms.Padding(7);
+            this.tbCode.Name = "tbCode";
+            this.tbCode.Size = new System.Drawing.Size(415, 31);
+            this.tbCode.TabIndex = 63;
+            // 
+            // lbCode
+            // 
+            this.lbCode.AutoSize = true;
+            this.lbCode.ForeColor = System.Drawing.Color.Red;
+            this.lbCode.Location = new System.Drawing.Point(39, 28);
+            this.lbCode.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+            this.lbCode.Name = "lbCode";
+            this.lbCode.Size = new System.Drawing.Size(136, 21);
+            this.lbCode.TabIndex = 62;
+            this.lbCode.Text = "字典明细编码";
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.tbInsuCodeStopDate);
+            this.groupBox1.Controls.Add(this.label1);
+            this.groupBox1.Controls.Add(this.tbInsuCodeStartDate);
+            this.groupBox1.Controls.Add(this.label6);
+            this.groupBox1.Controls.Add(this.tbInsuDesc);
+            this.groupBox1.Controls.Add(this.label7);
+            this.groupBox1.Controls.Add(this.tbInsuCode);
+            this.groupBox1.Controls.Add(this.label8);
+            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.groupBox1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.groupBox1.Location = new System.Drawing.Point(0, 0);
+            this.groupBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.groupBox1.Size = new System.Drawing.Size(1333, 162);
+            this.groupBox1.TabIndex = 78;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "字典大类";
+            // 
+            // tbInsuCodeStopDate
+            // 
+            this.tbInsuCodeStopDate.Location = new System.Drawing.Point(835, 89);
+            this.tbInsuCodeStopDate.Margin = new System.Windows.Forms.Padding(7);
+            this.tbInsuCodeStopDate.Name = "tbInsuCodeStopDate";
+            this.tbInsuCodeStopDate.Size = new System.Drawing.Size(415, 31);
+            this.tbInsuCodeStopDate.TabIndex = 11;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.ForeColor = System.Drawing.Color.Black;
+            this.label1.Location = new System.Drawing.Point(691, 91);
+            this.label1.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(136, 21);
+            this.label1.TabIndex = 10;
+            this.label1.Text = "大类失效日期";
+            // 
+            // tbInsuCodeStartDate
+            // 
+            this.tbInsuCodeStartDate.Location = new System.Drawing.Point(189, 89);
+            this.tbInsuCodeStartDate.Margin = new System.Windows.Forms.Padding(7);
+            this.tbInsuCodeStartDate.Name = "tbInsuCodeStartDate";
+            this.tbInsuCodeStartDate.Size = new System.Drawing.Size(415, 31);
+            this.tbInsuCodeStartDate.TabIndex = 9;
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.ForeColor = System.Drawing.Color.Red;
+            this.label6.Location = new System.Drawing.Point(39, 91);
+            this.label6.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(136, 21);
+            this.label6.TabIndex = 8;
+            this.label6.Text = "大类生效日期";
+            // 
+            // tbInsuDesc
+            // 
+            this.tbInsuDesc.Location = new System.Drawing.Point(835, 36);
+            this.tbInsuDesc.Margin = new System.Windows.Forms.Padding(7);
+            this.tbInsuDesc.Name = "tbInsuDesc";
+            this.tbInsuDesc.Size = new System.Drawing.Size(415, 31);
+            this.tbInsuDesc.TabIndex = 7;
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.ForeColor = System.Drawing.Color.Red;
+            this.label7.Location = new System.Drawing.Point(691, 44);
+            this.label7.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(136, 21);
+            this.label7.TabIndex = 6;
+            this.label7.Text = "字典大类描述";
+            // 
+            // tbInsuCode
+            // 
+            this.tbInsuCode.Location = new System.Drawing.Point(189, 36);
+            this.tbInsuCode.Margin = new System.Windows.Forms.Padding(7);
+            this.tbInsuCode.Name = "tbInsuCode";
+            this.tbInsuCode.Size = new System.Drawing.Size(415, 31);
+            this.tbInsuCode.TabIndex = 5;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.ForeColor = System.Drawing.Color.Red;
+            this.label8.Location = new System.Drawing.Point(39, 44);
+            this.label8.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(136, 21);
+            this.label8.TabIndex = 4;
+            this.label8.Text = "字典大类代码";
+            // 
+            // label24
+            // 
+            this.label24.AutoSize = true;
+            this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label24.Location = new System.Drawing.Point(37, 28);
+            this.label24.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+            this.label24.Name = "label24";
+            this.label24.Size = new System.Drawing.Size(52, 21);
+            this.label24.TabIndex = 6;
+            this.label24.Text = "类型";
+            // 
+            // cbxDirecType
+            // 
+            this.cbxDirecType.Enabled = false;
+            this.cbxDirecType.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbxDirecType.FormattingEnabled = true;
+            this.cbxDirecType.Items.AddRange(new object[] {
+            "药品",
+            "诊疗",
+            "材料",
+            "疾病诊断",
+            "手术",
+            "门诊慢特病种",
+            "DRGs",
+            "日间手术",
+            "字典表"});
+            this.cbxDirecType.Location = new System.Drawing.Point(117, 20);
+            this.cbxDirecType.Margin = new System.Windows.Forms.Padding(7);
+            this.cbxDirecType.Name = "cbxDirecType";
+            this.cbxDirecType.Size = new System.Drawing.Size(351, 29);
+            this.cbxDirecType.TabIndex = 7;
+            // 
+            // pnlTop
+            // 
+            this.pnlTop.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.pnlTop.Controls.Add(this.cbxDirecType);
+            this.pnlTop.Controls.Add(this.label24);
+            this.pnlTop.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlTop.Location = new System.Drawing.Point(0, 0);
+            this.pnlTop.Margin = new System.Windows.Forms.Padding(7);
+            this.pnlTop.Name = "pnlTop";
+            this.pnlTop.Size = new System.Drawing.Size(1333, 66);
+            this.pnlTop.TabIndex = 1;
+            // 
+            // AddSingleDictionary
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1333, 534);
+            this.Controls.Add(this.pnlClient);
+            this.Controls.Add(this.pnlBottom);
+            this.Controls.Add(this.pnlTop);
+            this.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.Name = "AddSingleDictionary";
+            this.Text = "AddSingleDictionary";
+            this.pnlBottom.ResumeLayout(false);
+            this.pnlClient.ResumeLayout(false);
+            this.gbConnotation.ResumeLayout(false);
+            this.gbConnotation.PerformLayout();
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.pnlTop.ResumeLayout(false);
+            this.pnlTop.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+        private System.Windows.Forms.Panel pnlBottom;
+        private System.Windows.Forms.Button btnNo;
+        private System.Windows.Forms.Button btnYes;
+        private System.Windows.Forms.Panel pnlClient;
+        private System.Windows.Forms.GroupBox gbConnotation;
+        private System.Windows.Forms.TextBox tbStopDate;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox tbStartDate;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox tbPinyinSearchCode;
+        private System.Windows.Forms.Label lbLocateCode;
+        private System.Windows.Forms.TextBox tbDescripts;
+        private System.Windows.Forms.Label lbName;
+        private System.Windows.Forms.TextBox tbCode;
+        private System.Windows.Forms.Label lbCode;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.TextBox tbInsuCodeStopDate;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TextBox tbInsuCodeStartDate;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox tbInsuDesc;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.TextBox tbInsuCode;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label label24;
+        private System.Windows.Forms.ComboBox cbxDirecType;
+        private System.Windows.Forms.Panel pnlTop;
+    }
+}

+ 120 - 0
Forms/AddSingleDictionary.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

+ 16 - 16
Forms/BasicDatas/DirectoryMap.Designer.cs

@@ -259,7 +259,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             this.panel7.Location = new System.Drawing.Point(157, 0);
             this.panel7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel7.Name = "panel7";
-            this.panel7.Size = new System.Drawing.Size(1126, 707);
+            this.panel7.Size = new System.Drawing.Size(1403, 707);
             this.panel7.TabIndex = 7;
             // 
             // uiSplitContainer1
@@ -280,7 +280,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             // uiSplitContainer1.Panel2
             // 
             this.uiSplitContainer1.Panel2.Controls.Add(this.panel4);
-            this.uiSplitContainer1.Size = new System.Drawing.Size(1126, 707);
+            this.uiSplitContainer1.Size = new System.Drawing.Size(1403, 707);
             this.uiSplitContainer1.SplitterDistance = 353;
             this.uiSplitContainer1.SplitterWidth = 11;
             this.uiSplitContainer1.TabIndex = 3;
@@ -295,7 +295,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             this.panel3.Location = new System.Drawing.Point(0, 0);
             this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(1126, 353);
+            this.panel3.Size = new System.Drawing.Size(1403, 353);
             this.panel3.TabIndex = 2;
             // 
             // dgvHISDirectory
@@ -346,7 +346,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             this.dgvHISDirectory.RowsDefaultCellStyle = dataGridViewCellStyle5;
             this.dgvHISDirectory.RowTemplate.Height = 25;
             this.dgvHISDirectory.SelectedIndex = -1;
-            this.dgvHISDirectory.Size = new System.Drawing.Size(1126, 273);
+            this.dgvHISDirectory.Size = new System.Drawing.Size(1403, 273);
             this.dgvHISDirectory.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
             this.dgvHISDirectory.TabIndex = 4;
             this.dgvHISDirectory.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -368,7 +368,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             this.tsmSingleUpdateCellingPriceInfo,
             this.tsmSingleUpdateSelfRatioInfo});
             this.cmsMapping.Name = "uiContextMenuStrip1";
-            this.cmsMapping.Size = new System.Drawing.Size(459, 218);
+            this.cmsMapping.Size = new System.Drawing.Size(459, 240);
             this.cmsMapping.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // tsmiMapping
@@ -444,7 +444,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             this.panel5.Location = new System.Drawing.Point(0, 0);
             this.panel5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel5.Name = "panel5";
-            this.panel5.Size = new System.Drawing.Size(1126, 46);
+            this.panel5.Size = new System.Drawing.Size(1403, 46);
             this.panel5.TabIndex = 1;
             // 
             // btTripMenu
@@ -459,7 +459,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             this.btTripMenu.MinimumSize = new System.Drawing.Size(2, 2);
             this.btTripMenu.Name = "btTripMenu";
             this.btTripMenu.Radius = 2;
-            this.btTripMenu.Size = new System.Drawing.Size(2, 28);
+            this.btTripMenu.Size = new System.Drawing.Size(279, 28);
             this.btTripMenu.TabIndex = 14;
             this.btTripMenu.Text = "集成菜单";
             this.btTripMenu.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -583,7 +583,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             this.pgHISDirect.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
             this.pgHISDirect.ShowJumpButton = false;
             this.pgHISDirect.ShowText = false;
-            this.pgHISDirect.Size = new System.Drawing.Size(1126, 34);
+            this.pgHISDirect.Size = new System.Drawing.Size(1403, 34);
             this.pgHISDirect.TabIndex = 6;
             this.pgHISDirect.Text = "uiPagination2";
             this.pgHISDirect.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -594,7 +594,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             // 
             this.btSetHisDirHeaderText.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.btSetHisDirHeaderText.Font = new System.Drawing.Font("微软雅黑 Light", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btSetHisDirHeaderText.Location = new System.Drawing.Point(963, 3);
+            this.btSetHisDirHeaderText.Location = new System.Drawing.Point(1240, 3);
             this.btSetHisDirHeaderText.Name = "btSetHisDirHeaderText";
             this.btSetHisDirHeaderText.Size = new System.Drawing.Size(104, 23);
             this.btSetHisDirHeaderText.TabIndex = 20;
@@ -611,7 +611,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             this.panel4.Location = new System.Drawing.Point(0, 0);
             this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(1126, 343);
+            this.panel4.Size = new System.Drawing.Size(1403, 343);
             this.panel4.TabIndex = 3;
             // 
             // dgvCenterDirectory
@@ -660,7 +660,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             this.dgvCenterDirectory.RowsDefaultCellStyle = dataGridViewCellStyle10;
             this.dgvCenterDirectory.RowTemplate.Height = 23;
             this.dgvCenterDirectory.SelectedIndex = -1;
-            this.dgvCenterDirectory.Size = new System.Drawing.Size(1126, 269);
+            this.dgvCenterDirectory.Size = new System.Drawing.Size(1403, 269);
             this.dgvCenterDirectory.StripeOddColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
             this.dgvCenterDirectory.TabIndex = 3;
             this.dgvCenterDirectory.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
@@ -678,7 +678,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             this.pgCenterDirect.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
             this.pgCenterDirect.ShowJumpButton = false;
             this.pgCenterDirect.ShowText = false;
-            this.pgCenterDirect.Size = new System.Drawing.Size(1126, 34);
+            this.pgCenterDirect.Size = new System.Drawing.Size(1403, 34);
             this.pgCenterDirect.TabIndex = 4;
             this.pgCenterDirect.Text = "uiPagination3";
             this.pgCenterDirect.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -689,7 +689,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             // 
             this.btSetCenterDirHeaderText.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.btSetCenterDirHeaderText.Font = new System.Drawing.Font("微软雅黑 Light", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btSetCenterDirHeaderText.Location = new System.Drawing.Point(934, 3);
+            this.btSetCenterDirHeaderText.Location = new System.Drawing.Point(1211, 3);
             this.btSetCenterDirHeaderText.Name = "btSetCenterDirHeaderText";
             this.btSetCenterDirHeaderText.Size = new System.Drawing.Size(104, 23);
             this.btSetCenterDirHeaderText.TabIndex = 21;
@@ -725,7 +725,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             this.panel6.Location = new System.Drawing.Point(0, 0);
             this.panel6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel6.Name = "panel6";
-            this.panel6.Size = new System.Drawing.Size(1126, 40);
+            this.panel6.Size = new System.Drawing.Size(1403, 40);
             this.panel6.TabIndex = 2;
             // 
             // rbOnlyName
@@ -889,7 +889,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             this.tsmImportMapRelation,
             this.tsmImportExcelDir});
             this.cmsIntegratedMenu.Name = "uiContextMenuStrip1";
-            this.cmsIntegratedMenu.Size = new System.Drawing.Size(459, 286);
+            this.cmsIntegratedMenu.Size = new System.Drawing.Size(459, 264);
             this.cmsIntegratedMenu.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
             // tsmExportAllMappedData
@@ -963,7 +963,7 @@ namespace PTMedicalInsurance.Forms.BasicDatas
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1283, 707);
+            this.ClientSize = new System.Drawing.Size(1560, 707);
             this.Controls.Add(this.panel7);
             this.Controls.Add(this.uiPanel3);
             this.Name = "DirectoryMap";

+ 195 - 101
Forms/PreAndInProcessAnalysisForm.Designer.cs

@@ -28,20 +28,25 @@
         /// </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 dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
             this.uiPanel1 = new Sunny.UI.UIPanel();
             this.btnCancle = new Sunny.UI.UIButton();
             this.btnOK = new Sunny.UI.UIButton();
             this.uiPanel2 = new Sunny.UI.UIPanel();
+            this.uiLabel11 = new Sunny.UI.UILabel();
+            this.tbDspoWay = new Sunny.UI.UITextBox();
+            this.uiGroupBox5 = new Sunny.UI.UIGroupBox();
+            this.rtbDspoWayRea = new Sunny.UI.UIRichTextBox();
+            this.cbxDspoWay = new Sunny.UI.UIComboBox();
             this.uiGroupBox2 = new Sunny.UI.UIGroupBox();
             this.dgvVolaDetailDtos = new Sunny.UI.UIDataGridView();
             this.tbRuleName = new Sunny.UI.UITextBox();
@@ -70,6 +75,7 @@
             this.dgvVolaItems = new Sunny.UI.UIDataGridView();
             this.uiPanel1.SuspendLayout();
             this.uiPanel2.SuspendLayout();
+            this.uiGroupBox5.SuspendLayout();
             this.uiGroupBox2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvVolaDetailDtos)).BeginInit();
             this.uiGroupBox1.SuspendLayout();
@@ -83,11 +89,11 @@
             this.uiPanel1.Controls.Add(this.btnOK);
             this.uiPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiPanel1.Location = new System.Drawing.Point(0, 806);
-            this.uiPanel1.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.uiPanel1.MinimumSize = new System.Drawing.Size(2, 2);
+            this.uiPanel1.Location = new System.Drawing.Point(0, 875);
+            this.uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiPanel1.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiPanel1.Name = "uiPanel1";
-            this.uiPanel1.Size = new System.Drawing.Size(1953, 80);
+            this.uiPanel1.Size = new System.Drawing.Size(1545, 53);
             this.uiPanel1.TabIndex = 0;
             this.uiPanel1.Text = null;
             this.uiPanel1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -98,7 +104,7 @@
             this.btnCancle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnCancle.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnCancle.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnCancle.Location = new System.Drawing.Point(1045, 3);
+            this.btnCancle.Location = new System.Drawing.Point(1288, 3);
             this.btnCancle.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnCancle.Name = "btnCancle";
             this.btnCancle.Size = new System.Drawing.Size(100, 35);
@@ -113,7 +119,7 @@
             this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnOK.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnOK.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnOK.Location = new System.Drawing.Point(896, 4);
+            this.btnOK.Location = new System.Drawing.Point(1139, 4);
             this.btnOK.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnOK.Name = "btnOK";
             this.btnOK.Size = new System.Drawing.Size(100, 35);
@@ -125,6 +131,10 @@
             // 
             // uiPanel2
             // 
+            this.uiPanel2.Controls.Add(this.uiLabel11);
+            this.uiPanel2.Controls.Add(this.tbDspoWay);
+            this.uiPanel2.Controls.Add(this.uiGroupBox5);
+            this.uiPanel2.Controls.Add(this.cbxDspoWay);
             this.uiPanel2.Controls.Add(this.uiGroupBox2);
             this.uiPanel2.Controls.Add(this.tbRuleName);
             this.uiPanel2.Controls.Add(this.tbVolaEvid);
@@ -149,27 +159,109 @@
             this.uiPanel2.Controls.Add(this.uiGroupBox1);
             this.uiPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.uiPanel2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiPanel2.Location = new System.Drawing.Point(405, 0);
-            this.uiPanel2.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
-            this.uiPanel2.MinimumSize = new System.Drawing.Size(2, 2);
+            this.uiPanel2.Location = new System.Drawing.Point(270, 0);
+            this.uiPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiPanel2.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiPanel2.Name = "uiPanel2";
-            this.uiPanel2.Size = new System.Drawing.Size(1548, 806);
+            this.uiPanel2.Size = new System.Drawing.Size(1275, 875);
             this.uiPanel2.TabIndex = 1;
             this.uiPanel2.Text = null;
             this.uiPanel2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
             this.uiPanel2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
             // 
+            // uiLabel11
+            // 
+            this.uiLabel11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiLabel11.Location = new System.Drawing.Point(54, 360);
+            this.uiLabel11.Name = "uiLabel11";
+            this.uiLabel11.Size = new System.Drawing.Size(90, 20);
+            this.uiLabel11.TabIndex = 25;
+            this.uiLabel11.Text = "处理方式";
+            this.uiLabel11.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.uiLabel11.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // tbDspoWay
+            // 
+            this.tbDspoWay.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.tbDspoWay.Enabled = false;
+            this.tbDspoWay.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tbDspoWay.Location = new System.Drawing.Point(432, 358);
+            this.tbDspoWay.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tbDspoWay.MinimumSize = new System.Drawing.Size(1, 16);
+            this.tbDspoWay.Name = "tbDspoWay";
+            this.tbDspoWay.ShowText = false;
+            this.tbDspoWay.Size = new System.Drawing.Size(321, 24);
+            this.tbDspoWay.TabIndex = 24;
+            this.tbDspoWay.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.tbDspoWay.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // uiGroupBox5
+            // 
+            this.uiGroupBox5.Controls.Add(this.rtbDspoWayRea);
+            this.uiGroupBox5.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.uiGroupBox5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiGroupBox5.Location = new System.Drawing.Point(0, 443);
+            this.uiGroupBox5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiGroupBox5.MinimumSize = new System.Drawing.Size(1, 1);
+            this.uiGroupBox5.Name = "uiGroupBox5";
+            this.uiGroupBox5.Padding = new System.Windows.Forms.Padding(0, 24, 0, 0);
+            this.uiGroupBox5.Size = new System.Drawing.Size(1275, 223);
+            this.uiGroupBox5.TabIndex = 23;
+            this.uiGroupBox5.Text = "请填写采用此种处理方式的原因,处理方式为继续执行医嘱时必填";
+            this.uiGroupBox5.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.uiGroupBox5.TitleInterval = 0;
+            this.uiGroupBox5.TitleTop = 8;
+            this.uiGroupBox5.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            // 
+            // rtbDspoWayRea
+            // 
+            this.rtbDspoWayRea.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.rtbDspoWayRea.FillColor = System.Drawing.Color.White;
+            this.rtbDspoWayRea.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.rtbDspoWayRea.Location = new System.Drawing.Point(0, 24);
+            this.rtbDspoWayRea.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.rtbDspoWayRea.MinimumSize = new System.Drawing.Size(1, 1);
+            this.rtbDspoWayRea.Name = "rtbDspoWayRea";
+            this.rtbDspoWayRea.Padding = new System.Windows.Forms.Padding(2);
+            this.rtbDspoWayRea.ShowText = false;
+            this.rtbDspoWayRea.Size = new System.Drawing.Size(1275, 199);
+            this.rtbDspoWayRea.TabIndex = 0;
+            this.rtbDspoWayRea.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
+            this.rtbDspoWayRea.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.rtbDspoWayRea.TextChanged += new System.EventHandler(this.rtbDspoWayRea_TextChanged);
+            // 
+            // cbxDspoWay
+            // 
+            this.cbxDspoWay.DataSource = null;
+            this.cbxDspoWay.FillColor = System.Drawing.Color.White;
+            this.cbxDspoWay.FilterMaxCount = 50;
+            this.cbxDspoWay.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbxDspoWay.Items.AddRange(new object[] {
+            "",
+            "1.继续执行医嘱",
+            "2.返回修改医嘱"});
+            this.cbxDspoWay.Location = new System.Drawing.Point(166, 358);
+            this.cbxDspoWay.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.cbxDspoWay.MinimumSize = new System.Drawing.Size(63, 0);
+            this.cbxDspoWay.Name = "cbxDspoWay";
+            this.cbxDspoWay.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+            this.cbxDspoWay.Size = new System.Drawing.Size(244, 24);
+            this.cbxDspoWay.TabIndex = 22;
+            this.cbxDspoWay.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.cbxDspoWay.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.cbxDspoWay.SelectedIndexChanged += new System.EventHandler(this.cbxDspoWay_SelectedIndexChanged);
+            // 
             // uiGroupBox2
             // 
             this.uiGroupBox2.Controls.Add(this.dgvVolaDetailDtos);
             this.uiGroupBox2.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.uiGroupBox2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiGroupBox2.Location = new System.Drawing.Point(0, 651);
+            this.uiGroupBox2.Location = new System.Drawing.Point(0, 666);
             this.uiGroupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiGroupBox2.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox2.Name = "uiGroupBox2";
             this.uiGroupBox2.Padding = new System.Windows.Forms.Padding(0, 24, 0, 0);
-            this.uiGroupBox2.Size = new System.Drawing.Size(1548, 155);
+            this.uiGroupBox2.Size = new System.Drawing.Size(1275, 209);
             this.uiGroupBox2.TabIndex = 21;
             this.uiGroupBox2.Text = "违规明细";
             this.uiGroupBox2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -180,55 +272,53 @@
             // dgvVolaDetailDtos
             // 
             this.dgvVolaDetailDtos.AllowUserToAddRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
-            this.dgvVolaDetailDtos.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
+            this.dgvVolaDetailDtos.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21;
             this.dgvVolaDetailDtos.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
             this.dgvVolaDetailDtos.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.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvVolaDetailDtos.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle22.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle22.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle22.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvVolaDetailDtos.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22;
             this.dgvVolaDetailDtos.ColumnHeadersHeight = 32;
             this.dgvVolaDetailDtos.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvVolaDetailDtos.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle23.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle23.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle23.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle23.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle23.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvVolaDetailDtos.DefaultCellStyle = dataGridViewCellStyle23;
             this.dgvVolaDetailDtos.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvVolaDetailDtos.EnableHeadersVisualStyles = false;
             this.dgvVolaDetailDtos.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvVolaDetailDtos.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(104)))), ((int)(((byte)(173)))), ((int)(((byte)(255)))));
             this.dgvVolaDetailDtos.Location = new System.Drawing.Point(0, 24);
             this.dgvVolaDetailDtos.Name = "dgvVolaDetailDtos";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((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.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvVolaDetailDtos.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
-            this.dgvVolaDetailDtos.RowHeadersWidth = 62;
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.dgvVolaDetailDtos.RowsDefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle24.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle24.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle24.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle24.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvVolaDetailDtos.RowHeadersDefaultCellStyle = dataGridViewCellStyle24;
+            dataGridViewCellStyle25.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle25.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle25.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle25.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle25.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.dgvVolaDetailDtos.RowsDefaultCellStyle = dataGridViewCellStyle25;
             this.dgvVolaDetailDtos.RowTemplate.Height = 23;
             this.dgvVolaDetailDtos.SelectedIndex = -1;
-            this.dgvVolaDetailDtos.Size = new System.Drawing.Size(1548, 131);
+            this.dgvVolaDetailDtos.Size = new System.Drawing.Size(1275, 185);
             this.dgvVolaDetailDtos.TabIndex = 1;
             this.dgvVolaDetailDtos.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            this.dgvVolaDetailDtos.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.uiDataGridView1_CellContentClick);
             // 
             // tbRuleName
             // 
@@ -519,11 +609,11 @@
             this.uiGroupBox3.Dock = System.Windows.Forms.DockStyle.Left;
             this.uiGroupBox3.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiGroupBox3.Location = new System.Drawing.Point(0, 0);
-            this.uiGroupBox3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
-            this.uiGroupBox3.MinimumSize = new System.Drawing.Size(2, 2);
+            this.uiGroupBox3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.uiGroupBox3.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox3.Name = "uiGroupBox3";
-            this.uiGroupBox3.Padding = new System.Windows.Forms.Padding(0, 39, 0, 0);
-            this.uiGroupBox3.Size = new System.Drawing.Size(405, 806);
+            this.uiGroupBox3.Padding = new System.Windows.Forms.Padding(0, 26, 0, 0);
+            this.uiGroupBox3.Size = new System.Drawing.Size(270, 875);
             this.uiGroupBox3.TabIndex = 2;
             this.uiGroupBox3.Text = "违规项目";
             this.uiGroupBox3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -534,69 +624,68 @@
             // dgvVolaItems
             // 
             this.dgvVolaItems.AllowUserToAddRows = false;
-            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
-            this.dgvVolaItems.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
+            this.dgvVolaItems.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle26;
             this.dgvVolaItems.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
             this.dgvVolaItems.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.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvVolaItems.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle27.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle27.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle27.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvVolaItems.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27;
             this.dgvVolaItems.ColumnHeadersHeight = 32;
             this.dgvVolaItems.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle8.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvVolaItems.DefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle28.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle28.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle28.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle28.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle28.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvVolaItems.DefaultCellStyle = dataGridViewCellStyle28;
             this.dgvVolaItems.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvVolaItems.EnableHeadersVisualStyles = false;
             this.dgvVolaItems.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvVolaItems.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(104)))), ((int)(((byte)(173)))), ((int)(((byte)(255)))));
-            this.dgvVolaItems.Location = new System.Drawing.Point(0, 39);
+            this.dgvVolaItems.Location = new System.Drawing.Point(0, 26);
             this.dgvVolaItems.Name = "dgvVolaItems";
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((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.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvVolaItems.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;
-            this.dgvVolaItems.RowHeadersWidth = 62;
-            dataGridViewCellStyle10.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.dgvVolaItems.RowsDefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(243)))), ((int)(((byte)(249)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle29.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle29.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle29.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle29.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvVolaItems.RowHeadersDefaultCellStyle = dataGridViewCellStyle29;
+            dataGridViewCellStyle30.BackColor = System.Drawing.Color.White;
+            dataGridViewCellStyle30.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle30.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            dataGridViewCellStyle30.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(236)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle30.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.dgvVolaItems.RowsDefaultCellStyle = dataGridViewCellStyle30;
             this.dgvVolaItems.RowTemplate.Height = 23;
             this.dgvVolaItems.SelectedIndex = -1;
-            this.dgvVolaItems.Size = new System.Drawing.Size(405, 767);
+            this.dgvVolaItems.Size = new System.Drawing.Size(270, 849);
             this.dgvVolaItems.TabIndex = 0;
             this.dgvVolaItems.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
-            this.dgvVolaItems.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvVolaItems_CellContentClick);
             this.dgvVolaItems.SelectionChanged += new System.EventHandler(this.dgvVolaItems_SelectionChanged);
             // 
             // PreAndInProcessAnalysisForm
             // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
-            this.ClientSize = new System.Drawing.Size(1953, 886);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1545, 928);
             this.Controls.Add(this.uiPanel2);
             this.Controls.Add(this.uiGroupBox3);
             this.Controls.Add(this.uiPanel1);
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "PreAndInProcessAnalysisForm";
             this.Text = "事前事中智能审核";
             this.uiPanel1.ResumeLayout(false);
             this.uiPanel2.ResumeLayout(false);
+            this.uiGroupBox5.ResumeLayout(false);
             this.uiGroupBox2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvVolaDetailDtos)).EndInit();
             this.uiGroupBox1.ResumeLayout(false);
@@ -632,11 +721,16 @@
         private Sunny.UI.UILabel uiLabel1;
         private Sunny.UI.UIGroupBox uiGroupBox1;
         private Sunny.UI.UIRichTextBox rbtVolaContent;
-        private Sunny.UI.UIGroupBox uiGroupBox2;
         private Sunny.UI.UIButton btnOK;
         private Sunny.UI.UIButton btnCancle;
         private Sunny.UI.UIGroupBox uiGroupBox3;
         private Sunny.UI.UIDataGridView dgvVolaItems;
+        private Sunny.UI.UIGroupBox uiGroupBox2;
         private Sunny.UI.UIDataGridView dgvVolaDetailDtos;
+        private Sunny.UI.UIGroupBox uiGroupBox5;
+        private Sunny.UI.UIRichTextBox rtbDspoWayRea;
+        private Sunny.UI.UIComboBox cbxDspoWay;
+        private Sunny.UI.UILabel uiLabel11;
+        private Sunny.UI.UITextBox tbDspoWay;
     }
 }

+ 157 - 5
Forms/PreAndInProcessAnalysisForm.cs

@@ -1,6 +1,9 @@
-using Newtonsoft.Json.Linq;
+
+using Newtonsoft.Json.Linq;
 using PTMedicalInsurance.FormSetter;
 using PTMedicalInsurance.Helper;
+using PTMedicalInsurance.Variables;
+using Sunny.UI;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -17,12 +20,18 @@ namespace PTMedicalInsurance.Forms
     {
         private DataTable dtVolaItems;
         private DataTable dtVolaDetail;
+        private JObject currentItem;
 
         private GridViewSetter grdSetter = new GridViewSetter();
         private JArray jaVolaItems;
+        public JArray jaWarns ;
+
+        private bool _isUpdatingProgrammatically = false; //使用标志位防止代码触发
         public PreAndInProcessAnalysisForm()
         {
             InitializeComponent();
+            cbxDspoWay.SelectedIndex = 1;
+            
         }
 
         public PreAndInProcessAnalysisForm(JObject jo)
@@ -43,10 +52,15 @@ namespace PTMedicalInsurance.Forms
             //tbVolaEvid.Text = JsonHelper.getDestValue(jo, "output.result[0].vola_evid");
             //tbRuleName.Text = JsonHelper.getDestValue(jo, "output.result[0].rule_name");
             //rbtVolaContent.Text = JsonHelper.getDestValue(jo, "output.result[0].vola_cont");
+
+            this.StartPosition = FormStartPosition.CenterParent;
         }
 
         private void showVolaItemContent(JObject jo)
         {
+            _isUpdatingProgrammatically = true;
+            cbxDspoWay.Text = "";
+            _isUpdatingProgrammatically = false;
             tbJrID.Text = JsonHelper.getDestValue(jo, "jr_id");
             tbRuleID.Text = JsonHelper.getDestValue(jo, "rule_id");
             tbPatID.Text = JsonHelper.getDestValue(jo, "patn_id");
@@ -58,6 +72,8 @@ namespace PTMedicalInsurance.Forms
             tbVolaEvid.Text = JsonHelper.getDestValue(jo, "vola_evid");
             tbRuleName.Text = JsonHelper.getDestValue(jo, "rule_name");
             rbtVolaContent.Text = JsonHelper.getDestValue(jo, "vola_cont");
+            tbDspoWay.Text = JsonHelper.getDestValue(jo, "dspo_way_desc");
+            rtbDspoWayRea.Text = JsonHelper.getDestValue(jo, "dspo_way_rea");
             dtVolaDetail = (DataTable)jo["judge_result_detail_dtos"].ToObject(typeof(DataTable));
             dgvVolaDetailDtos.DataSource = dtVolaDetail;
             grdSetter.SetHeaderTextOfPAIPAVolaDetailDtos(dgvVolaDetailDtos);
@@ -65,6 +81,33 @@ namespace PTMedicalInsurance.Forms
 
         private void btnOK_Click(object sender, EventArgs e)
         {
+            Global.writeLog($"jaVolaItems:{jaVolaItems}");
+            jaWarns = new JArray();
+            foreach (JObject joSub in jaVolaItems)
+            {
+                JObject joTmp = new JObject();
+                string dspo_way = JsonHelper.getDestValue(joSub, "dspo_way");
+                string dspo_way_rea = JsonHelper.getDestValue(joSub, "dspo_way_rea");
+                string warn_rslt_id = JsonHelper.getDestValue(joSub, "jr_id");
+                string rule_name = JsonHelper.getDestValue(joSub, "rule_name");
+                joTmp.Add("warn_rslt_id",warn_rslt_id);
+                joTmp.Add("dspo_way", dspo_way);
+                joTmp.Add("dspo_way_rea",dspo_way_rea );
+                jaWarns.Add(joTmp);
+
+                if (dspo_way == "")
+                {
+                    MessageBox.Show($"检测到违规名称:{rule_name},违规标识:{warn_rslt_id}的违规条目未填写处理方式");
+                    return;
+                }
+
+                if ((dspo_way == "1") && (dspo_way_rea == ""))
+                {
+                    MessageBox.Show($"检测到违规名称:{rule_name},违规标识:{warn_rslt_id}的违规条目处理方式为【继续执行医嘱】,但未填写处理原因");
+                    return;
+                }
+            }
+            Global.writeLog($"jaWarns:{jaWarns}");
             DialogResult = DialogResult.OK;
         }
 
@@ -76,22 +119,131 @@ namespace PTMedicalInsurance.Forms
         private void dgvVolaItems_SelectionChanged(object sender, EventArgs e)
         {
             int i = dgvVolaItems.CurrentRow.Index;
-            showVolaItemContent((JObject)jaVolaItems[i]);
+            currentItem = (JObject)jaVolaItems[i];
+            showVolaItemContent(currentItem);
         }
 
-        private void dgvVolaItems_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        private void btnSave_Click(object sender, EventArgs e)
         {
+            if (cbxDspoWay.SelectedIndex == 1)
+            {
+                if (string.IsNullOrEmpty(rtbDspoWayRea.Text))
+                {
+                    MessageBox.Show("请输入原因");
+                    return;
+                }
+            }
+
+            int i = dgvVolaItems.CurrentRow.Index;
+            JObject jo = (JObject)jaVolaItems[i];
+            JObject joTmp = new JObject();
+            joTmp.Add("warn_rslt_id", JsonHelper.getDestValue(jo, "jr_id"));
+            joTmp.Add("dspo_way", cbxDspoWay.SelectedIndex);
+            joTmp.Add("dspo_way_rea", rtbDspoWayRea.Text);
+
+            Global.writeLog($"joTmp:{joTmp}");
+            Global.writeLog($"jaWarns:{jaWarns}");
+            bool isExist = false;
+            foreach (JObject joSub in jaWarns)
+            {
+                Global.writeLog("1");
+                if (joSub["warn_rslt_id"].ToString() == joTmp["warn_rslt_id"].ToString())
+                {
+                    isExist = true;
+                }
+                Global.writeLog("2");
+            }
+
+            if (!isExist)
+            {
+                Global.writeLog("3");
+                jaWarns.Add(joTmp);
+                Global.writeLog("4");
+                dgvVolaItems.Rows[i].DefaultCellStyle.BackColor = Color.Red;
+                Global.writeLog("5");
+                MessageBox.Show("保存成功,请继续下一条");//如果重复点击,则覆盖,同时有标识标识改数据已经添加成功
+            }
+
+
 
         }
 
-        private void uiRichTextBox1_TextChanged(object sender, EventArgs e)
+       
+
+        private void cbxDspoWay_SelectedIndexChanged(object sender, EventArgs e)
         {
+            if (_isUpdatingProgrammatically)
+            {
+                return;
+            }
+
+            Global.writeLog($"currentItem:{currentItem}");
+            if (currentItem == null)
+            {
+                return;
+            }
+
+            if (cbxDspoWay.SelectedIndex == 1)
+            {
+                if (string.IsNullOrEmpty(rtbDspoWayRea.Text))
+                {
+                    MessageBox.Show(this,"请输入原因");
+                    return;
+                }
+            }
+
+            string dspo_way_desc = "";
+
+            if (currentItem.ContainsKey("dspo_way"))
+            {
+                if (cbxDspoWay.Text != "")
+                {
+                    dspo_way_desc = cbxDspoWay.Text.Substring(2);
+                }
+
+                currentItem["dspo_way"] = cbxDspoWay.SelectedIndex;
+                currentItem["dspo_way_desc"] = dspo_way_desc;
+                tbDspoWay.Text = dspo_way_desc;
+            }
+            else
+            {
+                if (cbxDspoWay.Text != "")
+                {
+                    dspo_way_desc = cbxDspoWay.Text.Substring(2);
+                }
+
+                currentItem.Add("dspo_way", cbxDspoWay.SelectedIndex);
+                currentItem.Add("dspo_way_desc", dspo_way_desc);
+                tbDspoWay.Text = dspo_way_desc;
+            }
+
+            if (currentItem.ContainsKey("dspo_way_rea"))
+            {
+                currentItem["dspo_way_rea"] = rtbDspoWayRea.Text;
+            }
+            else
+            {
+                currentItem.Add("dspo_way_rea", rtbDspoWayRea.Text);
+            }
 
+            Global.writeLog($"currentItemEnd:{currentItem}");
         }
 
-        private void uiDataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        private void rtbDspoWayRea_TextChanged(object sender, EventArgs e)
         {
+            if (currentItem == null)
+            {
+                return;
+            }
 
+            if (currentItem.ContainsKey("dspo_way_rea"))
+            {
+                currentItem["dspo_way_rea"] = rtbDspoWayRea.Text;
+            }
+            else
+            {
+                currentItem.Add("dspo_way_rea", rtbDspoWayRea.Text);
+            }
         }
     }
 }

+ 24 - 16
NanChangMI.csproj

@@ -308,6 +308,18 @@
     <Compile Include="Entity\EntityBase.cs" />
     <Compile Include="Entity\Local\ReadCardInitInfo.cs" />
     <Compile Include="FormSetter\GridViewSetterBase.cs" />
+    <Compile Include="Forms\AddSignleDirectory.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\AddSignleDirectory.designer.cs">
+      <DependentUpon>AddSignleDirectory.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\AddSingleDictionary.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\AddSingleDictionary.designer.cs">
+      <DependentUpon>AddSingleDictionary.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\BasicDatas\BasicData.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -413,6 +425,12 @@
     <Compile Include="Forms\DualChannelRecordForm.Designer.cs">
       <DependentUpon>DualChannelRecordForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\PreAndInProcessAnalysisForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\PreAndInProcessAnalysisForm.Designer.cs">
+      <DependentUpon>PreAndInProcessAnalysisForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\PrescriptionCirculation.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -456,12 +474,6 @@
     <Compile Include="FormSetter\ComboxSetter.cs" />
     <Compile Include="FormSetter\DataTableSetter.cs" />
     <Compile Include="FormSetter\GridViewSetter.cs" />
-    <Compile Include="Forms\AddSignleDirectory.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\AddSignleDirectory.designer.cs">
-      <DependentUpon>AddSignleDirectory.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\CenterResult.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -486,12 +498,6 @@
     <Compile Include="Forms\Clearing.designer.cs">
       <DependentUpon>Clearing.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\PreAndInProcessAnalysisForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\PreAndInProcessAnalysisForm.Designer.cs">
-      <DependentUpon>PreAndInProcessAnalysisForm.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\SearchAdmdvs.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -605,7 +611,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Forms\AddSignleDirectory.resx">
       <DependentUpon>AddSignleDirectory.cs</DependentUpon>
-      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\AddSingleDictionary.resx">
+      <DependentUpon>AddSingleDictionary.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\BasicDatas\BasicData.resx">
       <DependentUpon>BasicData.cs</DependentUpon>
@@ -661,12 +669,12 @@
     <EmbeddedResource Include="Forms\OutpatientRegistration.resx">
       <DependentUpon>OutpatientRegistration.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\PreAndInProcessAnalysisForm.resx">
-      <DependentUpon>PreAndInProcessAnalysisForm.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\DualChannelRecordForm.resx">
       <DependentUpon>DualChannelRecordForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\PreAndInProcessAnalysisForm.resx">
+      <DependentUpon>PreAndInProcessAnalysisForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\PrescriptionCirculation.resx">
       <DependentUpon>PrescriptionCirculation.cs</DependentUpon>
     </EmbeddedResource>