收费功能开发

AIMS/AIMS.csproj

@@ -99,6 +99,18 @@
     <Compile Include="DataDictionary\frmBasicDictionary.Designer.cs">
       <DependentUpon>frmBasicDictionary.cs</DependentUpon>
     </Compile>
+    <Compile Include="DataDictionary\frmChargSelect.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DataDictionary\frmChargSelect.designer.cs">
+      <DependentUpon>frmChargSelect.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DataDictionary\frmChargsTemplateNew.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DataDictionary\frmChargsTemplateNew.designer.cs">
+      <DependentUpon>frmChargsTemplateNew.cs</DependentUpon>
+    </Compile>
     <Compile Include="DataDictionary\frmDisease.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -214,6 +226,12 @@
     <Compile Include="FormLogin.designer.cs">
       <DependentUpon>FormLogin.cs</DependentUpon>
     </Compile>
+    <Compile Include="OperationAanesthesia\frmFeesRecord.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="OperationAanesthesia\frmFeesRecord.Designer.cs">
+      <DependentUpon>frmFeesRecord.cs</DependentUpon>
+    </Compile>
     <Compile Include="OperationAanesthesia\oldSystemCode\frmPrescriptionDocument.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -775,6 +793,12 @@
     <EmbeddedResource Include="DataDictionary\frmBasicDictionary.resx">
       <DependentUpon>frmBasicDictionary.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DataDictionary\frmChargSelect.resx">
+      <DependentUpon>frmChargSelect.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DataDictionary\frmChargsTemplateNew.resx">
+      <DependentUpon>frmChargsTemplateNew.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DataDictionary\frmDisease.resx">
       <DependentUpon>frmDisease.cs</DependentUpon>
     </EmbeddedResource>
@@ -835,6 +859,9 @@
       <DependentUpon>FormLogin.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="OperationAanesthesia\frmFeesRecord.resx">
+      <DependentUpon>frmFeesRecord.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="OperationAanesthesia\oldSystemCode\frmPrescriptionDocument.resx">
       <DependentUpon>frmPrescriptionDocument.cs</DependentUpon>
     </EmbeddedResource>
@@ -1133,6 +1160,9 @@
     <None Include="Template\职工出缺勤表.xlt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Template\麻醉收费单.xlt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Content Include="aims.ico" />

AIMS/DataDictionary/frmChargSelect.cs

@@ -0,0 +1,372 @@
+using AIMSBLL;
+using AIMSExtension;
+using AIMSModel;
+using DrawGraph;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Windows.Forms;
+
+namespace AIMS.PublicUI.UI
+{
+    public partial class frmChargSelect : Form
+    {
+        /// <summary>
+        /// 可用的收费
+        /// </summary>
+        public DataTable dt;
+        /// <summary>
+        /// 已选择的收费
+        /// </summary>
+        public DataTable ydt;
+        /// <summary>
+        /// 当前页数
+        /// </summary>
+        int currentPage = 0;
+        /// <summary>
+        /// 总数
+        /// </summary>
+        int total = 0;
+        /// <summary>
+        /// 总页数
+        /// </summary>
+        int pages = 0;
+
+        public ChargsTemplate chargsTemplate;
+        public string DeptId;
+
+        public frmChargSelect()
+        {
+            InitializeComponent();
+        }
+        public frmChargSelect(int chargsTemplateId)
+        {
+            InitializeComponent();
+            chargsTemplate = BChargsTemplate.SelectSingle(chargsTemplateId);
+            if (chargsTemplate.TemplateType == "麻醉")
+            {
+                DeptId = "300001";
+            }
+            if (chargsTemplate.TemplateType == "护士")
+            {
+                DeptId = "300002";
+            }
+        }
+        private void frmApplianceSelect_Load(object sender, EventArgs e)
+        {
+            dgvD.AutoGenerateColumns = false;
+            dgvY.AutoGenerateColumns = false;
+            BindCharsDICT();
+            ydt = BCharges.GetChargsByCodes(chargsTemplate.ConnectId,chargsTemplate.DefaultValue);
+            BindDgvY(ydt);
+        }
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+        private void BindDgvY(DataTable dt)
+        {
+            dgvY.AutoGenerateColumns = false;
+            dgvY.Rows.Clear();
+            foreach (DataRow dr in dt.Rows)
+            {
+                bool isOnly = true;
+                foreach (DataGridViewRow item1 in dgvY.Rows)
+                {
+                    if (item1.Cells["yId"].Value.ToString() == dr["Id"].ToString())
+                    {
+                        isOnly = false;
+                    }
+                }
+                if (isOnly == true)
+                {
+                    int index = this.dgvY.Rows.Add();
+                    this.dgvY.Rows[index].Cells["yId"].Value = dr["Id"].ToString();
+                    this.dgvY.Rows[index].Cells["yName"].Value = dr["Name"].ToString() + " " + dr["Bill"].ToString();
+                    this.dgvY.Rows[index].Cells["yCode"].Value = dr["Code"].ToString();
+                    this.dgvY.Rows[index].Cells["yxmbm"].Value = dr["Code"].ToString();
+                    string ITEMPRICE = dr["Price"].ToString();
+                    try
+                    {
+                        if (ITEMPRICE != null && ITEMPRICE != "")
+                        {
+                            ITEMPRICE = Double.Parse(ITEMPRICE).ToString();
+                        }
+                        this.dgvY.Rows[index].Cells["price"].Value = ITEMPRICE;
+                    }
+                    catch (Exception)
+                    {
+                    }
+                    this.dgvY.Rows[index].Cells["Number"].Value = dr["Number"].ToString();
+                }
+            }
+        }
+        private void BindDgv(DataTable dt)
+        {
+            dgvD.AutoGenerateColumns = false;
+            dgvD.Rows.Clear();
+            int num = 1;
+            foreach (DataRow dr in dt.Rows)
+            {
+                int index = this.dgvD.Rows.Add();
+                this.dgvD.Rows[index].Cells["Id"].Value = dr["Id"].ToString();
+                this.dgvD.Rows[index].Cells["Index"].Value = num;
+                num++;
+                this.dgvD.Rows[index].Cells["oName"].Value = dr["Name"].ToString();
+                this.dgvD.Rows[index].Cells["oCode"].Value = dr["Code"].ToString();
+                this.dgvD.Rows[index].Cells["oxmbm"].Value = dr["Code"].ToString();
+                string ITEMPRICE = dr["Price"].ToString();
+                try
+                {
+                    if (ITEMPRICE != null && ITEMPRICE != "")
+                    {
+                        ITEMPRICE = Double.Parse(ITEMPRICE).ToString();
+                    }
+                    this.dgvD.Rows[index].Cells["oPrice"].Value = ITEMPRICE;
+                }
+                catch (Exception)
+                {
+                }
+            }
+        }
+        private void BindCharsDICT()
+        {
+            currentPage = 0;
+            dt = BCharges.SelectByIdName("", DeptId);
+            SetPageText(dt);
+            BindDgv(GetTableByCurrentPage(currentPage, dt));
+        }
+
+        private void SetPageText(DataTable table)
+        {
+            total = table.Rows.Count;
+            if (total % 20 == 0)
+            {
+                pages = total / 20;
+            }
+            else
+            {
+                pages = total / 20 + 1;
+            }
+            lblPage.Text = currentPage + 1 + "/" + pages + "，共" + total + "条";
+        }
+        /// <summary>
+        /// 得到某页的DataTable
+        /// </summary>
+        /// <param name="currPage">当前页</param>
+        /// <param name="dt">获取数据的DataTable</param>
+        /// <returns>某一页的DataTable</returns>
+        private DataTable GetTableByCurrentPage(int currPage, DataTable dt)
+        {
+            DataTable pdt = dt.Clone();
+            int index = currPage * 20;
+            for (int i = index; i < index + 20; i++)
+            {
+                if (i == total)
+                {
+                    break;
+                }
+                DataRow dr = pdt.NewRow();
+                dr["Id"] = dt.Rows[i]["ID"];
+                dr["Name"] = dt.Rows[i]["Name"].ToString();
+                dr["Code"] = dt.Rows[i]["Code"].ToString();
+                dr["xmbm"] = dt.Rows[i]["xmbm"].ToString();
+                dr["Price"] = dt.Rows[i]["Price"].ToString();
+                pdt.Rows.Add(dr);
+            }
+            return pdt;
+        }
+        private void txtQuery_TextChanged(object sender, EventArgs e)
+        {
+            dt = BCharges.SelectByIdName(txtQuery.Text, DeptId);
+            currentPage = 0;
+            SetPageText(dt);
+            BindDgv(GetTableByCurrentPage(currentPage, dt));
+        }
+
+        private void lkUp_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            if (total == 0 || currentPage == 0)
+            {
+                return;
+            }
+            currentPage--;
+            SetPageText(dt);
+            BindDgv(GetTableByCurrentPage(currentPage, dt));
+        }
+
+        private void lkDown_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+        {
+            if (total == 0 || (currentPage + 1) == pages)
+            {
+                return;
+            }
+            currentPage++;
+            SetPageText(dt);
+            BindDgv(GetTableByCurrentPage(currentPage, dt));
+        }
+
+        private void btnSelectAll_Click(object sender, EventArgs e)
+        {
+            foreach (DataGridViewRow yRow in dgvY.Rows)
+            {
+                if (dgvD.CurrentRow.Cells["Id"].Value.ToString() == yRow.Cells["yId"].Value.ToString())
+                {
+                    MessageBox.Show("已经选过了！", "系统提示");
+                    return;
+                }
+            }
+            List<string> list = new List<string>();
+            list.Add(dgvD.CurrentRow.Cells["Id"].Value.ToString());
+            foreach (string id in list)
+            {
+                DataRow ydr = ydt.NewRow();
+                foreach (DataRow dr in dt.Rows)
+                {
+                    if (dr["Id"].ToString() == id)
+                    {
+                        ydr["Id"] = dr["Id"].ToString();
+                        ydr["Name"] = dr["Name"].ToString();
+                        ydr["Code"] = dr["Code"].ToString(); 
+                        ydr["Price"] = dr["Price"].ToString();
+                        ydr["Number"] = "0";
+                        ydt.Rows.Add(ydr);
+                        break;
+                    }
+                }
+            }
+            BindDgvY(ydt);
+        }
+
+        private void btnCancelAll_Click(object sender, EventArgs e)
+        {
+            List<string> list = new List<string>();
+            list.Add(dgvY.CurrentRow.Cells["yId"].Value.ToString());
+
+            for (int id = 0; id < list.Count; id++)
+            {
+                for (int i = ydt.Rows.Count - 1; i >= 0; i--)
+                {
+                    if (ydt.Rows[i]["Code"].ToString() == list[id])
+                    {
+                        ydt.Rows.Remove(ydt.Rows[i]);
+                    }
+                }
+            }
+            dgvY.Rows.Remove(dgvY.CurrentRow);
+        }
+
+        private void btnSave_Click(object sender, EventArgs e)
+        {
+            List<string> list = new List<string>();
+            List<int> number = new List<int>();
+            foreach (DataGridViewRow row in dgvY.Rows)
+            {
+                list.Add(row.Cells["yId"].Value.ToString());
+                number.Add(Convert.ToInt32(row.Cells["Number"].Value));
+            }
+            string applianceId = string.Join("','", list.ToArray());
+            applianceId = "'" + applianceId + "'";
+            string _Number = string.Join(",", number.ToArray()); 
+            chargsTemplate.ConnectId = applianceId;
+            chargsTemplate.DefaultValue = _Number;
+            chargsTemplate.OperatorId = PublicMethod.OperatorId;
+            chargsTemplate.OperatorTime = DateTime.Now;
+            int num = BChargsTemplate.Update(chargsTemplate);
+            if (num > 0)
+            {
+                new frmMessageBox().Show();
+                this.Close();
+            }
+        }
+
+        private void dgvD_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
+        {
+            DataRow ydr = ydt.NewRow();
+            string id = dgvD.SelectedRows[0].Cells["Id"].Value.ToString();
+            foreach (DataRow row in ydt.Rows)
+            {
+                if (row["Id"].ToString() == id)
+                {
+                    MessageBox.Show("已选择！", "系统提示");
+                    return;
+                }
+            }
+            foreach (DataRow row in dt.Rows)
+            {
+                if (row["Id"].ToString() == id)
+                {
+                    for (int i = 0; i < dt.Columns.Count; i++)
+                    {
+                        ydr["Id"] = row["Id"];
+                        ydr["Name"] = row["Name"].ToString();
+                        ydr["Code"] = row["Code"].ToString(); 
+                        ydr["Price"] = row["Price"].ToString();
+                        ydr["Number"] = "0";
+                    }
+                    ydt.Rows.Add(ydr);
+                    break;
+                }
+            }
+            BindDgvY(ydt);
+
+        }
+        public DataGridViewTextBoxEditingControl dgvTxt = null; // 声明 一个文本 CellEdit
+        public DataGridViewTextBoxEditingControl dgvTxtName = null; // 声明 一个文本 CellEdit
+        private void dgvY_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e)
+        {
+            //判断类型
+            if (dgvY.CurrentCell != null)
+            {
+                if (dgvY.CurrentCell.ColumnIndex == 3)
+                {
+                    dgvTxtName = (DataGridViewTextBoxEditingControl)e.Control; // 得到单元格
+                    dgvTxtName.KeyPress -= new KeyPressEventHandler(dgvTxt_KeyPress); // 绑定事件
+                    dgvTxtName.KeyPress += new KeyPressEventHandler(dgvTxt_KeyPress); // 绑定事件
+                }
+            }
+
+        }
+
+        void dgvTxt_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar < 48 || e.KeyChar > 57)
+            {
+                if (e.KeyChar != 46 && e.KeyChar != 8 && e.KeyChar != 13)
+                {
+                    e.Handled = true;
+                }
+            }
+            TextBox tb = sender as TextBox;
+            if (e.KeyChar == 46)
+            {
+                int n = tb.Text.LastIndexOf(".");
+                if (n > 0) e.Handled = true;
+            }
+        }
+
+        private void dgvY_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
+        {
+            //List<string> list = new List<string>();
+            //list.Add(dgvY.CurrentRow.Cells["yId"].Value.ToString());
+
+            //for (int id = 0; id < list.Count; id++)
+            //{
+            //    for (int i = ydt.Rows.Count - 1; i >= 0; i--)
+            //    {
+            //        if (ydt.Rows[i]["ChargCode"].ToString() == list[id])
+            //        {
+            //            ydt.Rows.Remove(ydt.Rows[i]);
+            //        }
+            //    }
+            //}
+            //dgvY.Rows.Remove(dgvY.CurrentRow);
+        }
+
+        private void txtQuery_Click(object sender, EventArgs e)
+        {
+            txtQuery.Text = "";
+        }
+    }
+}

AIMS/DataDictionary/frmChargSelect.designer.cs

@@ -0,0 +1,539 @@
+namespace AIMS.PublicUI.UI
+{
+    partial class frmChargSelect
+    {
+        /// <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()
+        {
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmChargSelect));
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.txtQuery = new DevComponents.DotNetBar.Controls.TextBoxX();
+            this.label3 = new System.Windows.Forms.Label();
+            this.btnSave = new DevComponents.DotNetBar.ButtonX();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.lblPage = new System.Windows.Forms.Label();
+            this.lkDown = new System.Windows.Forms.LinkLabel();
+            this.lkUp = new System.Windows.Forms.LinkLabel();
+            this.btnCancelAll = new DevComponents.DotNetBar.ButtonX();
+            this.btnSelectAll = new DevComponents.DotNetBar.ButtonX();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.dgvY = new DevComponents.DotNetBar.Controls.DataGridViewX();
+            this.ySelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.yId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.yName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.yCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.yxmbm = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Number = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Price = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX();
+            this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Select = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.oCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.oxmbm = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.oPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.panel1.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvY)).BeginInit();
+            this.groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvD)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // panel1
+            // 
+            this.panel1.BackColor = System.Drawing.Color.AliceBlue;
+            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel1.Controls.Add(this.txtQuery);
+            this.panel1.Controls.Add(this.label3);
+            this.panel1.Controls.Add(this.btnSave);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.panel1.Location = new System.Drawing.Point(0, 0);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(1118, 53);
+            this.panel1.TabIndex = 13;
+            // 
+            // txtQuery
+            // 
+            // 
+            // 
+            // 
+            this.txtQuery.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.txtQuery.Border.BorderBottomColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(227)))), ((int)(((byte)(231)))));
+            this.txtQuery.Border.BorderBottomWidth = 1;
+            this.txtQuery.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.txtQuery.Font = new System.Drawing.Font("微软雅黑", 11F);
+            this.txtQuery.ForeColor = System.Drawing.Color.Black;
+            this.txtQuery.Location = new System.Drawing.Point(195, 16);
+            this.txtQuery.Name = "txtQuery";
+            this.txtQuery.Size = new System.Drawing.Size(295, 22);
+            this.txtQuery.TabIndex = 4;
+            this.txtQuery.Click += new System.EventHandler(this.txtQuery_Click);
+            this.txtQuery.TextChanged += new System.EventHandler(this.txtQuery_TextChanged);
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(103, 16);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(93, 20);
+            this.label3.TabIndex = 3;
+            this.label3.Text = "收费名称检索";
+            // 
+            // btnSave
+            // 
+            this.btnSave.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnSave.Location = new System.Drawing.Point(547, 11);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(75, 30);
+            this.btnSave.TabIndex = 2;
+            this.btnSave.Text = "保存";
+            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+            // 
+            // panel2
+            // 
+            this.panel2.BackColor = System.Drawing.Color.White;
+            this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel2.Controls.Add(this.lblPage);
+            this.panel2.Controls.Add(this.lkDown);
+            this.panel2.Controls.Add(this.lkUp);
+            this.panel2.Controls.Add(this.btnCancelAll);
+            this.panel2.Controls.Add(this.btnSelectAll);
+            this.panel2.Controls.Add(this.groupBox2);
+            this.panel2.Controls.Add(this.groupBox1);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.panel2.Location = new System.Drawing.Point(0, 53);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(1118, 554);
+            this.panel2.TabIndex = 14;
+            // 
+            // lblPage
+            // 
+            this.lblPage.AutoSize = true;
+            this.lblPage.Location = new System.Drawing.Point(122, 11);
+            this.lblPage.Name = "lblPage";
+            this.lblPage.Size = new System.Drawing.Size(39, 20);
+            this.lblPage.TabIndex = 4;
+            this.lblPage.Text = "1/25";
+            // 
+            // lkDown
+            // 
+            this.lkDown.AutoSize = true;
+            this.lkDown.Location = new System.Drawing.Point(231, 11);
+            this.lkDown.Name = "lkDown";
+            this.lkDown.Size = new System.Drawing.Size(51, 20);
+            this.lkDown.TabIndex = 3;
+            this.lkDown.TabStop = true;
+            this.lkDown.Text = "下一页";
+            this.lkDown.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lkDown_LinkClicked);
+            // 
+            // lkUp
+            // 
+            this.lkUp.AutoSize = true;
+            this.lkUp.Location = new System.Drawing.Point(61, 11);
+            this.lkUp.Name = "lkUp";
+            this.lkUp.Size = new System.Drawing.Size(51, 20);
+            this.lkUp.TabIndex = 3;
+            this.lkUp.TabStop = true;
+            this.lkUp.Text = "上一页";
+            this.lkUp.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lkUp_LinkClicked);
+            // 
+            // btnCancelAll
+            // 
+            this.btnCancelAll.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnCancelAll.Location = new System.Drawing.Point(558, 195);
+            this.btnCancelAll.Margin = new System.Windows.Forms.Padding(0);
+            this.btnCancelAll.Name = "btnCancelAll";
+            this.btnCancelAll.Size = new System.Drawing.Size(39, 110);
+            this.btnCancelAll.TabIndex = 2;
+            this.btnCancelAll.Text = "<<";
+            this.btnCancelAll.Click += new System.EventHandler(this.btnCancelAll_Click);
+            // 
+            // btnSelectAll
+            // 
+            this.btnSelectAll.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnSelectAll.Location = new System.Drawing.Point(558, 79);
+            this.btnSelectAll.Margin = new System.Windows.Forms.Padding(0);
+            this.btnSelectAll.Name = "btnSelectAll";
+            this.btnSelectAll.Size = new System.Drawing.Size(39, 110);
+            this.btnSelectAll.TabIndex = 2;
+            this.btnSelectAll.Text = ">>";
+            this.btnSelectAll.Click += new System.EventHandler(this.btnSelectAll_Click);
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.dgvY);
+            this.groupBox2.Location = new System.Drawing.Point(600, 24);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(511, 525);
+            this.groupBox2.TabIndex = 0;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "已选";
+            // 
+            // dgvY
+            // 
+            this.dgvY.AllowUserToAddRows = false;
+            this.dgvY.AllowUserToDeleteRows = false;
+            this.dgvY.BackgroundColor = System.Drawing.Color.Snow;
+            this.dgvY.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.dgvY.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dgvY.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.ySelect,
+            this.yId,
+            this.yName,
+            this.yCode,
+            this.yxmbm,
+            this.Number,
+            this.Price});
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvY.DefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvY.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvY.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
+            this.dgvY.Location = new System.Drawing.Point(3, 22);
+            this.dgvY.Name = "dgvY";
+            this.dgvY.RowHeadersVisible = false;
+            this.dgvY.RowTemplate.Height = 23;
+            this.dgvY.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvY.Size = new System.Drawing.Size(505, 500);
+            this.dgvY.TabIndex = 0;
+            this.dgvY.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvY_CellDoubleClick);
+            this.dgvY.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.dgvY_EditingControlShowing);
+            // 
+            // ySelect
+            // 
+            this.ySelect.HeaderText = "选择";
+            this.ySelect.Name = "ySelect";
+            this.ySelect.Visible = false;
+            this.ySelect.Width = 60;
+            // 
+            // yId
+            // 
+            this.yId.DataPropertyName = "Id";
+            this.yId.HeaderText = "编号";
+            this.yId.Name = "yId";
+            this.yId.Visible = false;
+            // 
+            // yName
+            // 
+            this.yName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.yName.DataPropertyName = "Name";
+            this.yName.HeaderText = "收费名称";
+            this.yName.Name = "yName";
+            // 
+            // yCode
+            // 
+            this.yCode.HeaderText = "收费编码";
+            this.yCode.Name = "yCode";
+            // 
+            // yxmbm
+            // 
+            this.yxmbm.HeaderText = "收费编码";
+            this.yxmbm.Name = "yxmbm";
+            this.yxmbm.Visible = false;
+            // 
+            // Number
+            // 
+            this.Number.HeaderText = "数量";
+            this.Number.Name = "Number";
+            this.Number.Width = 60;
+            // 
+            // Price
+            // 
+            this.Price.HeaderText = "单价";
+            this.Price.Name = "Price";
+            this.Price.Width = 80;
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.dgvD);
+            this.groupBox1.Location = new System.Drawing.Point(12, 24);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(542, 525);
+            this.groupBox1.TabIndex = 0;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "待选";
+            // 
+            // dgvD
+            // 
+            this.dgvD.AllowUserToAddRows = false;
+            this.dgvD.AllowUserToDeleteRows = false;
+            this.dgvD.BackgroundColor = System.Drawing.Color.Snow;
+            this.dgvD.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.dgvD.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Id,
+            this.Index,
+            this.Select,
+            this.oName,
+            this.oCode,
+            this.oxmbm,
+            this.oPrice});
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvD.DefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvD.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvD.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
+            this.dgvD.Location = new System.Drawing.Point(3, 22);
+            this.dgvD.Name = "dgvD";
+            this.dgvD.RowHeadersVisible = false;
+            this.dgvD.RowTemplate.Height = 23;
+            this.dgvD.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvD.Size = new System.Drawing.Size(536, 500);
+            this.dgvD.TabIndex = 0;
+            this.dgvD.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvD_CellDoubleClick);
+            // 
+            // Id
+            // 
+            this.Id.DataPropertyName = "Id";
+            this.Id.HeaderText = "编号";
+            this.Id.Name = "Id";
+            this.Id.Visible = false;
+            // 
+            // Index
+            // 
+            this.Index.HeaderText = "序号";
+            this.Index.Name = "Index";
+            this.Index.Visible = false;
+            this.Index.Width = 65;
+            // 
+            // Select
+            // 
+            this.Select.HeaderText = "选择";
+            this.Select.Name = "Select";
+            this.Select.Visible = false;
+            this.Select.Width = 65;
+            // 
+            // oName
+            // 
+            this.oName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.oName.DataPropertyName = "Name";
+            this.oName.HeaderText = "收费名称";
+            this.oName.Name = "oName";
+            this.oName.ReadOnly = true;
+            // 
+            // oCode
+            // 
+            this.oCode.DataPropertyName = "Code";
+            this.oCode.HeaderText = "收费类别";
+            this.oCode.Name = "oCode";
+            this.oCode.ReadOnly = true;
+            this.oCode.Visible = false;
+            // 
+            // oxmbm
+            // 
+            this.oxmbm.DataPropertyName = "xmbm";
+            this.oxmbm.HeaderText = "收费编码";
+            this.oxmbm.Name = "oxmbm";
+            this.oxmbm.ReadOnly = true;
+            // 
+            // oPrice
+            // 
+            this.oPrice.HeaderText = "单价";
+            this.oPrice.Name = "oPrice";
+            this.oPrice.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "Id";
+            this.dataGridViewTextBoxColumn1.HeaderText = "编号";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "Name";
+            this.dataGridViewTextBoxColumn2.HeaderText = "收费名称";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.HeaderText = "收费编码";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.HeaderText = "收费编码";
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            this.dataGridViewTextBoxColumn4.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "Id";
+            this.dataGridViewTextBoxColumn5.HeaderText = "编号";
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.Visible = false;
+            this.dataGridViewTextBoxColumn5.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.DataPropertyName = "Id";
+            this.dataGridViewTextBoxColumn6.HeaderText = "序号";
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.Visible = false;
+            this.dataGridViewTextBoxColumn6.Width = 65;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.dataGridViewTextBoxColumn7.DataPropertyName = "Name";
+            this.dataGridViewTextBoxColumn7.HeaderText = "收费名称";
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.ReadOnly = true;
+            this.dataGridViewTextBoxColumn7.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.dataGridViewTextBoxColumn8.DataPropertyName = "Code";
+            this.dataGridViewTextBoxColumn8.HeaderText = "收费编码";
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.ReadOnly = true;
+            this.dataGridViewTextBoxColumn8.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn9
+            // 
+            this.dataGridViewTextBoxColumn9.DataPropertyName = "xmbm";
+            this.dataGridViewTextBoxColumn9.HeaderText = "收费编码";
+            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.ReadOnly = true;
+            this.dataGridViewTextBoxColumn9.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn10
+            // 
+            this.dataGridViewTextBoxColumn10.DataPropertyName = "xmbm";
+            this.dataGridViewTextBoxColumn10.HeaderText = "收费编码";
+            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+            this.dataGridViewTextBoxColumn10.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn11
+            // 
+            this.dataGridViewTextBoxColumn11.HeaderText = "单价";
+            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
+            this.dataGridViewTextBoxColumn11.Width = 80;
+            // 
+            // frmChargSelect
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1118, 607);
+            this.Controls.Add(this.panel2);
+            this.Controls.Add(this.panel1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "frmChargSelect";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "选择收费";
+            this.Load += new System.EventHandler(this.frmApplianceSelect_Load);
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvY)).EndInit();
+            this.groupBox1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvD)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Label lblPage;
+        private System.Windows.Forms.LinkLabel lkDown;
+        private System.Windows.Forms.LinkLabel lkUp;
+        private DevComponents.DotNetBar.ButtonX btnCancelAll;
+        private DevComponents.DotNetBar.ButtonX btnSelectAll;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private DevComponents.DotNetBar.Controls.DataGridViewX dgvY;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private DevComponents.DotNetBar.Controls.DataGridViewX dgvD;
+        private DevComponents.DotNetBar.ButtonX btnSave;
+        private DevComponents.DotNetBar.Controls.TextBoxX txtQuery;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Id;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Index;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn Select;
+        private System.Windows.Forms.DataGridViewTextBoxColumn oName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn oCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn oxmbm;
+        private System.Windows.Forms.DataGridViewTextBoxColumn oPrice;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn ySelect;
+        private System.Windows.Forms.DataGridViewTextBoxColumn yId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn yName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn yCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn yxmbm;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Number;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Price;
+    }
+}

AIMS/DataDictionary/frmChargsTemplateNew.cs

@@ -0,0 +1,276 @@
+using AIMSBLL;
+using AIMSExtension;
+using AIMSModel;
+using DrawGraph;
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+namespace AIMS.PublicUI.UI
+{
+    public partial class frmChargsTemplateNew : Form
+    {
+        /// <summary>
+        /// 收费类型集合
+        /// </summary>
+        public List<ChargsTemplate> list;
+        /// <summary>
+        /// 声明保存数据时的状态
+        /// </summary>
+        public EditState _state;
+
+        public string TemplateType;
+        public frmChargsTemplateNew()
+        {
+            InitializeComponent();
+        }
+
+        private void frmApplianceUseType_Load(object sender, EventArgs e)
+        {
+            if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("创建收费模板"))
+            {
+                chkAll.Visible = true;
+                tsbAdd.Visible = true;
+                tsbModify.Visible = true;
+                tsbSave.Visible = true;
+                toolStripSeparator2.Visible = true;
+                toolStripSeparator4.Visible = true;
+                panel1.Visible = true;
+                dgvApplianceUseType.Columns["IsValid"].Visible = true;
+                dgvApplianceUseType.Columns["Select"].Visible = true;
+            }
+
+            ControlExtension.EnabledControl(panel1, false);
+            txtName.Enabled = true;
+            BindDgv();
+            txtName.TextChanged += new EventHandler(txtName_TextChanged);
+        }
+        /// <summary>
+        /// 为DataGridView绑定数据
+        /// </summary>
+        private void BindDgv()
+        {
+            string IsValid = chkAll.Checked == false ? "0" : "1";
+            if (IsValid == "1")
+            {
+                list = BChargsTemplate.Select(" TemplateType='" + TemplateType + "' and  TemplateName like '%" + txtName.Text.Trim() + "%' or HCode like '%" + txtName.Text.Trim() + "%'", new ParameterList(), RecursiveType.None, 0);
+            }
+            else
+            {
+                list = BChargsTemplate.Select(" TemplateType='" + TemplateType + "' and  IsValid= 1 and ( TemplateName like '%" + txtName.Text.Trim() + "%' or HCode like '%" + txtName.Text.Trim() + "%' )", new ParameterList(), RecursiveType.None, 0);
+            }
+
+            dgvApplianceUseType.AutoGenerateColumns = false;
+            dgvApplianceUseType.Rows.Clear();
+            int num = 1;
+            foreach (ChargsTemplate item in list)
+            {
+                int index = this.dgvApplianceUseType.Rows.Add();
+                this.dgvApplianceUseType.Rows[index].Cells["Id"].Value = item.Id;
+                this.dgvApplianceUseType.Rows[index].Cells["Index"].Value = num;
+                num++;
+                this.dgvApplianceUseType.Rows[index].Cells["oName"].Value = item.TemplateName;
+                this.dgvApplianceUseType.Rows[index].Cells["HCode"].Value = item.HCode;
+                this.dgvApplianceUseType.Rows[index].Cells["IsValid"].Value = item.IsValid == 1 ? "有效" : "无效";
+            }
+            dgvApplianceUseType.ClearSelection();
+        }
+        /// <summary>
+        /// 退出收费
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbExit_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+        /// <summary>
+        /// 新增收费
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbAdd_Click(object sender, EventArgs e)
+        {
+            //设置状态为新增
+            _state = EditState.ADD;
+            txtName.TextChanged -= new EventHandler(txtName_TextChanged);
+            txtName.TextChanged += new EventHandler(txtName_TextChanged_1);
+            ControlExtension.EnabledControl(panel1, true);
+            ControlExtension.ClearControl(panel1);
+            chkIsValid.Checked = true;
+        }
+
+        int autid;
+        /// <summary>
+        /// 修改收费
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbModify_Click(object sender, EventArgs e)
+        {
+            //设置状态为修改
+            _state = EditState.EDIT;
+            if (!(dgvApplianceUseType.SelectedRows.Count > 0))
+            {
+                MessageBox.Show("请选择列表中的一项！");
+                return;
+            }
+            txtName.TextChanged -= new EventHandler(txtName_TextChanged);
+            txtName.TextChanged -= new EventHandler(txtName_TextChanged);
+            txtName.TextChanged += new EventHandler(txtName_TextChanged_1);
+            ControlExtension.EnabledControl(panel1, true);
+            autid = Convert.ToInt32(dgvApplianceUseType.SelectedRows[0].Cells["Id"].Value);
+            txtName.Text = dgvApplianceUseType.SelectedRows[0].Cells["oName"].Value.ToString();
+            txtHCode.Text = dgvApplianceUseType.SelectedRows[0].Cells["HCode"].Value.ToString();
+            chkIsValid.Checked = dgvApplianceUseType.SelectedRows[0].Cells["IsValid"].Value.ToString() == "有效" ? true : false;
+        }
+        /// <summary>
+        /// 取消收费
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbCancel_Click(object sender, EventArgs e)
+        {
+            ControlExtension.ClearControl(panel1);
+            ControlExtension.EnabledControl(panel1, false);
+            txtName.Enabled = true;
+            txtName.TextChanged -= new EventHandler(txtName_TextChanged_1);
+            txtName.TextChanged -= new EventHandler(txtName_TextChanged);
+            txtName.TextChanged += new EventHandler(txtName_TextChanged);
+            BindDgv();
+        }
+        /// <summary>
+        /// 保存数据收费
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbSave_Click(object sender, EventArgs e)
+        {
+            if (!ValidInput())
+            {
+                return;
+            }
+            if (_state == EditState.ADD)
+            {
+                ChargsTemplate temp = BChargsTemplate.SelectSingle(" TemplateName='" + txtName.Text.Trim() + "'", null);
+                if (temp != null && temp.Id > 0)
+                {
+                    MessageBox.Show("该模板已存在，请重新输入！");
+                    txtName.Focus();
+                    return;
+                }
+            }
+            ChargsTemplate aut = new ChargsTemplate();
+            if (_state == EditState.EDIT) aut = BChargsTemplate.SelectSingle(autid);
+            aut.TemplateType = TemplateType;
+            aut.TemplateName = txtName.Text.Trim();
+            aut.HCode = txtHCode.Text.Trim();
+            aut.IsValid = chkIsValid.Checked == true ? 1 : 0;
+            aut.OperatorId = PublicMethod.OperatorId;
+            aut.OperatorTime = DateTime.Now;
+            int num = 0;
+            if (_state == EditState.ADD)
+            {
+                num = BChargsTemplate.Insert(aut);
+            }
+            else if (_state == EditState.EDIT)
+            {
+                aut.Id = autid;
+                num = BChargsTemplate.Update(aut);
+            }
+            if (num > 0)
+            {
+                new frmMessageBox().Show();
+                tsbCancel_Click(null, null);
+            }
+        }
+        /// <summary>
+        /// 输入验证
+        /// </summary>
+        /// <returns></returns>
+        private bool ValidInput()
+        {
+            bool key = false;
+            if (txtName.Text.Trim().Length < 1)
+            {
+                MessageBox.Show("请输入收费名称！");
+            }
+            else if (txtHCode.Text.Trim().Length < 1)
+            {
+                MessageBox.Show("请输入助记码！");
+            }
+            else
+            {
+                key = true;
+            }
+            return key;
+        }
+        /// <summary>
+        /// 输入字典名称时为助记码文本框赋值
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void txtName_TextChanged(object sender, EventArgs e)
+        {
+            BindDgv();
+        }
+        /// <summary>
+        /// 输入字典名称时为助记码文本框赋值
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void txtName_TextChanged_1(object sender, EventArgs e)
+        {
+            txtHCode.Text = PublicMethod.GetFirstLetter(txtName.Text);
+        }
+        /// <summary>
+        /// 判断DataGridView是否显示全部记录
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void chkAll_CheckedChanged(object sender, EventArgs e)
+        {
+            BindDgv();
+        }
+
+        private void dgvApplianceUseType_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            if (dgvApplianceUseType.Columns[e.ColumnIndex] is DataGridViewButtonColumn && e.RowIndex > -1)
+            {
+                int id = Convert.ToInt32(dgvApplianceUseType.CurrentRow.Cells["Id"].Value);
+                dgvApplianceUseType.CurrentRow.Cells["check"].Value = false;
+                this.Tag = null;
+                frmChargSelect fs = new frmChargSelect(id);
+                fs.ShowDialog();
+                dgvApplianceUseType.ClearSelection();
+            }
+        }
+
+        public List<string> SelTemps;
+        private void dgvApplianceUseType_Click(object sender, EventArgs e)
+        {
+            if (dgvApplianceUseType.CurrentRow == null) return;
+            string oName = dgvApplianceUseType.CurrentRow.Cells["oName"].Value.ToString();
+            if (SelTemps == null) SelTemps = new List<string>();
+            string id = dgvApplianceUseType.CurrentRow.Cells["Id"].Value.ToString();
+            if (dgvApplianceUseType.CurrentRow.Cells["check"].EditedFormattedValue.ToString() == "True")
+            {
+                dgvApplianceUseType.CurrentRow.Cells["check"].Value = false;
+                if (SelTemps.Contains(oName)) SelTemps.Remove(oName);
+                this.Tag = SelTemps;
+            }
+            else
+            {
+                dgvApplianceUseType.CurrentRow.Cells["check"].Value = true;
+                if (!SelTemps.Contains(oName)) SelTemps.Add(oName);
+                this.Tag = SelTemps;
+
+            }
+        }
+
+        private void dgvApplianceUseType_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
+        {
+            //this.Close();
+        }
+    }
+}

AIMS/DataDictionary/frmChargsTemplateNew.designer.cs

@@ -0,0 +1,438 @@
+namespace AIMS.PublicUI.UI
+{
+    partial class frmChargsTemplateNew
+    {
+        /// <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()
+        {
+            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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmChargsTemplateNew));
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.chkIsValid = new System.Windows.Forms.CheckBox();
+            this.txtHCode = new DevComponents.DotNetBar.Controls.TextBoxX();
+            this.txtName = new DevComponents.DotNetBar.Controls.TextBoxX();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.chkAll = new System.Windows.Forms.CheckBox();
+            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+            this.tsbAdd = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.tsbModify = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+            this.tsbSave = new System.Windows.Forms.ToolStripButton();
+            this.tsbCancel = new System.Windows.Forms.ToolStripButton();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.dgvApplianceUseType = new DevComponents.DotNetBar.Controls.DataGridViewX();
+            this.check = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.HCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.IsValid = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Select = new System.Windows.Forms.DataGridViewButtonColumn();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.panel1.SuspendLayout();
+            this.toolStrip1.SuspendLayout();
+            this.panel2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvApplianceUseType)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // panel1
+            // 
+            this.panel1.BackColor = System.Drawing.SystemColors.Control;
+            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel1.Controls.Add(this.chkIsValid);
+            this.panel1.Controls.Add(this.txtHCode);
+            this.panel1.Controls.Add(this.txtName);
+            this.panel1.Controls.Add(this.label4);
+            this.panel1.Controls.Add(this.label1);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.panel1.Location = new System.Drawing.Point(0, 28);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(534, 42);
+            this.panel1.TabIndex = 12;
+            this.panel1.Visible = false;
+            // 
+            // chkIsValid
+            // 
+            this.chkIsValid.AutoSize = true;
+            this.chkIsValid.Location = new System.Drawing.Point(474, 10);
+            this.chkIsValid.Name = "chkIsValid";
+            this.chkIsValid.Size = new System.Drawing.Size(56, 24);
+            this.chkIsValid.TabIndex = 8;
+            this.chkIsValid.Text = "有效";
+            this.chkIsValid.UseVisualStyleBackColor = true;
+            // 
+            // txtHCode
+            // 
+            // 
+            // 
+            // 
+            this.txtHCode.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.txtHCode.Location = new System.Drawing.Point(348, 10);
+            this.txtHCode.Name = "txtHCode";
+            this.txtHCode.Size = new System.Drawing.Size(112, 20);
+            this.txtHCode.TabIndex = 2;
+            // 
+            // txtName
+            // 
+            // 
+            // 
+            // 
+            this.txtName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.txtName.Location = new System.Drawing.Point(83, 10);
+            this.txtName.Name = "txtName";
+            this.txtName.Size = new System.Drawing.Size(186, 20);
+            this.txtName.TabIndex = 1;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(294, 10);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(51, 20);
+            this.label4.TabIndex = 0;
+            this.label4.Text = "助记码";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(15, 10);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(65, 20);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "模板名称";
+            // 
+            // chkAll
+            // 
+            this.chkAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkAll.AutoSize = true;
+            this.chkAll.Location = new System.Drawing.Point(344, 6);
+            this.chkAll.Name = "chkAll";
+            this.chkAll.Size = new System.Drawing.Size(72, 16);
+            this.chkAll.TabIndex = 364;
+            this.chkAll.Text = "显示全部";
+            this.chkAll.UseVisualStyleBackColor = true;
+            this.chkAll.Visible = false;
+            this.chkAll.CheckedChanged += new System.EventHandler(this.chkAll_CheckedChanged);
+            // 
+            // toolStrip1
+            // 
+            this.toolStrip1.BackColor = System.Drawing.Color.Transparent;
+            this.toolStrip1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.toolStrip1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
+            this.toolStrip1.ImageScalingSize = new System.Drawing.Size(35, 35);
+            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsbAdd,
+            this.toolStripSeparator2,
+            this.tsbModify,
+            this.toolStripSeparator4,
+            this.tsbSave,
+            this.tsbCancel});
+            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+            this.toolStrip1.Name = "toolStrip1";
+            this.toolStrip1.Size = new System.Drawing.Size(534, 28);
+            this.toolStrip1.TabIndex = 11;
+            this.toolStrip1.Text = "toolStrip1";
+            // 
+            // tsbAdd
+            // 
+            this.tsbAdd.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbAdd.Name = "tsbAdd";
+            this.tsbAdd.Size = new System.Drawing.Size(76, 25);
+            this.tsbAdd.Text = "   新建   ";
+            this.tsbAdd.Visible = false;
+            this.tsbAdd.Click += new System.EventHandler(this.tsbAdd_Click);
+            // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 28);
+            this.toolStripSeparator2.Visible = false;
+            // 
+            // tsbModify
+            // 
+            this.tsbModify.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.tsbModify.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbModify.Name = "tsbModify";
+            this.tsbModify.Size = new System.Drawing.Size(76, 25);
+            this.tsbModify.Text = "   修改   ";
+            this.tsbModify.Visible = false;
+            this.tsbModify.Click += new System.EventHandler(this.tsbModify_Click);
+            // 
+            // toolStripSeparator4
+            // 
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
+            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 28);
+            this.toolStripSeparator4.Visible = false;
+            // 
+            // tsbSave
+            // 
+            this.tsbSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.tsbSave.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbSave.Name = "tsbSave";
+            this.tsbSave.Size = new System.Drawing.Size(76, 25);
+            this.tsbSave.Text = "   保存   ";
+            this.tsbSave.Visible = false;
+            this.tsbSave.Click += new System.EventHandler(this.tsbSave_Click);
+            // 
+            // tsbCancel
+            // 
+            this.tsbCancel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.tsbCancel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbCancel.Name = "tsbCancel";
+            this.tsbCancel.Size = new System.Drawing.Size(93, 25);
+            this.tsbCancel.Text = "  使用模板 ";
+            this.tsbCancel.Click += new System.EventHandler(this.tsbExit_Click);
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.dgvApplianceUseType);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.panel2.Location = new System.Drawing.Point(0, 70);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(534, 721);
+            this.panel2.TabIndex = 13;
+            // 
+            // dgvApplianceUseType
+            // 
+            this.dgvApplianceUseType.AllowUserToAddRows = false;
+            this.dgvApplianceUseType.AllowUserToDeleteRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(247)))), ((int)(((byte)(255)))));
+            this.dgvApplianceUseType.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvApplianceUseType.BackgroundColor = System.Drawing.Color.Snow;
+            this.dgvApplianceUseType.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvApplianceUseType.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvApplianceUseType.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dgvApplianceUseType.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.check,
+            this.Id,
+            this.Index,
+            this.oName,
+            this.HCode,
+            this.IsValid,
+            this.Select});
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvApplianceUseType.DefaultCellStyle = dataGridViewCellStyle3;
+            this.dgvApplianceUseType.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvApplianceUseType.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
+            this.dgvApplianceUseType.Location = new System.Drawing.Point(0, 0);
+            this.dgvApplianceUseType.MultiSelect = false;
+            this.dgvApplianceUseType.Name = "dgvApplianceUseType";
+            this.dgvApplianceUseType.ReadOnly = true;
+            this.dgvApplianceUseType.RowHeadersVisible = false;
+            this.dgvApplianceUseType.RowHeadersWidth = 30;
+            this.dgvApplianceUseType.RowTemplate.Height = 23;
+            this.dgvApplianceUseType.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvApplianceUseType.Size = new System.Drawing.Size(534, 721);
+            this.dgvApplianceUseType.TabIndex = 0;
+            this.dgvApplianceUseType.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvApplianceUseType_CellContentClick);
+            this.dgvApplianceUseType.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvApplianceUseType_CellDoubleClick);
+            this.dgvApplianceUseType.Click += new System.EventHandler(this.dgvApplianceUseType_Click);
+            // 
+            // check
+            // 
+            this.check.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.check.HeaderText = "选择";
+            this.check.Name = "check";
+            this.check.ReadOnly = true;
+            this.check.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.check.Width = 60;
+            // 
+            // Id
+            // 
+            this.Id.DataPropertyName = "Id";
+            this.Id.HeaderText = "编号";
+            this.Id.Name = "Id";
+            this.Id.ReadOnly = true;
+            this.Id.Visible = false;
+            this.Id.Width = 40;
+            // 
+            // Index
+            // 
+            this.Index.DataPropertyName = "Index";
+            this.Index.HeaderText = "序号";
+            this.Index.Name = "Index";
+            this.Index.ReadOnly = true;
+            this.Index.Visible = false;
+            this.Index.Width = 80;
+            // 
+            // oName
+            // 
+            this.oName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.oName.DataPropertyName = "oName";
+            this.oName.HeaderText = "名称";
+            this.oName.Name = "oName";
+            this.oName.ReadOnly = true;
+            // 
+            // HCode
+            // 
+            this.HCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.HCode.DataPropertyName = "HCode";
+            this.HCode.HeaderText = "助记码";
+            this.HCode.Name = "HCode";
+            this.HCode.ReadOnly = true;
+            this.HCode.Visible = false;
+            // 
+            // IsValid
+            // 
+            this.IsValid.DataPropertyName = "IsValid";
+            this.IsValid.HeaderText = "是否有效";
+            this.IsValid.Name = "IsValid";
+            this.IsValid.ReadOnly = true;
+            this.IsValid.Visible = false;
+            // 
+            // Select
+            // 
+            this.Select.HeaderText = "项目维护";
+            this.Select.Name = "Select";
+            this.Select.ReadOnly = true;
+            this.Select.Text = "项目维护";
+            this.Select.UseColumnTextForButtonValue = true;
+            this.Select.Visible = false;
+            this.Select.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "Id";
+            this.dataGridViewTextBoxColumn1.HeaderText = "编号";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.Visible = false;
+            this.dataGridViewTextBoxColumn1.Width = 60;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "Index";
+            this.dataGridViewTextBoxColumn2.HeaderText = "序号";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "oName";
+            this.dataGridViewTextBoxColumn3.HeaderText = "名称";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "HCode";
+            this.dataGridViewTextBoxColumn4.HeaderText = "助记码";
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "IsValid";
+            this.dataGridViewTextBoxColumn5.HeaderText = "是否有效";
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.Visible = false;
+            // 
+            // frmChargsTemplateNew
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(534, 791);
+            this.Controls.Add(this.chkAll);
+            this.Controls.Add(this.panel2);
+            this.Controls.Add(this.panel1);
+            this.Controls.Add(this.toolStrip1);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "frmChargsTemplateNew";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "收费模板";
+            this.Load += new System.EventHandler(this.frmApplianceUseType_Load);
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            this.toolStrip1.ResumeLayout(false);
+            this.toolStrip1.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvApplianceUseType)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.CheckBox chkAll;
+        private System.Windows.Forms.CheckBox chkIsValid;
+        private DevComponents.DotNetBar.Controls.TextBoxX txtHCode;
+        private DevComponents.DotNetBar.Controls.TextBoxX txtName;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.ToolStrip toolStrip1;
+        private System.Windows.Forms.ToolStripButton tsbAdd;
+        private System.Windows.Forms.ToolStripButton tsbModify;
+        private System.Windows.Forms.ToolStripButton tsbCancel;
+        private System.Windows.Forms.ToolStripButton tsbSave;
+        private System.Windows.Forms.Panel panel2;
+        private DevComponents.DotNetBar.Controls.DataGridViewX dgvApplianceUseType;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn check;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Id;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Index;
+        private System.Windows.Forms.DataGridViewTextBoxColumn oName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn HCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn IsValid;
+        private System.Windows.Forms.DataGridViewButtonColumn Select;
+    }
+}

AIMS/FormMainManage.resx

@@ -178,6 +178,30 @@
         MwW6KkGb9Hmsq0MogxZksYGRWGdJ3RrGveY7/uufywXhBhmZbeQU/ileAAAAAElFTkSuQmCC
 </value>
   </data>
+  <metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="expandablePanel6.ButtonImageCollapse" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAAsAAAALCAYAAACprHcmAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
@@ -250,30 +274,6 @@
         MwW6KkGb9Hmsq0MogxZksYGRWGdJ3RrGveY7/uufywXhBhmZbeQU/ileAAAAAElFTkSuQmCC
 </value>
   </data>
-  <metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs

@@ -85,6 +85,7 @@
             this.spTabBM = new DevComponents.DotNetBar.SuperTabItem();
             this.panel7 = new System.Windows.Forms.Panel();
             this.panel21 = new System.Windows.Forms.Panel();
+            this.txtIndex = new DevComponents.DotNetBar.Controls.TextBoxX();
             this.panel17 = new System.Windows.Forms.Panel();
             this.btnNextPage = new System.Windows.Forms.Panel();
             this.panel18 = new System.Windows.Forms.Panel();
@@ -658,7 +659,7 @@
             this.lblDia.AutoSize = true;
             this.lblDia.Font = new System.Drawing.Font("微软雅黑", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblDia.ForeColor = System.Drawing.Color.Red;
-            this.lblDia.Location = new System.Drawing.Point(27, 224);
+            this.lblDia.Location = new System.Drawing.Point(20, 224);
             this.lblDia.Name = "lblDia";
             this.lblDia.Size = new System.Drawing.Size(125, 46);
             this.lblDia.TabIndex = 5;
@@ -1060,6 +1061,7 @@
             // 
             // panel21
             // 
+            this.panel21.Controls.Add(this.txtIndex);
             this.panel21.Controls.Add(this.panel17);
             this.panel21.Controls.Add(this.btnNextPage);
             this.panel21.Controls.Add(this.panel18);
@@ -1073,6 +1075,19 @@
             this.panel21.Size = new System.Drawing.Size(354, 40);
             this.panel21.TabIndex = 10;
             // 
+            // txtIndex
+            // 
+            // 
+            // 
+            // 
+            this.txtIndex.Border.Class = "TextBoxBorder";
+            this.txtIndex.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.txtIndex.Location = new System.Drawing.Point(300, 8);
+            this.txtIndex.Name = "txtIndex";
+            this.txtIndex.PreventEnterBeep = true;
+            this.txtIndex.Size = new System.Drawing.Size(27, 21);
+            this.txtIndex.TabIndex = 9;
+            // 
             // panel17
             // 
             this.panel17.BackgroundImage = global::AIMS.Properties.Resources.图标_末尾页;
@@ -2127,5 +2142,6 @@
         private System.Windows.Forms.Panel panel18;
         private System.Windows.Forms.Panel btnUpPage;
         private System.Windows.Forms.ToolTip toolTip1;
+        private DevComponents.DotNetBar.Controls.TextBoxX txtIndex;
     }
 }

AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs

@@ -83,6 +83,10 @@ namespace AIMS.OperationAanesthesia
             labOperatorName.Text = "(" + AIMSExtension.PublicMethod.OperatorNo + ")" + "  " + AIMSExtension.PublicMethod.OperatorName;
             if (NowRoom != null) lblRoom.Text = NowRoom.Name;
             circularProgress1.Location = new Point((panel8.Width - circularProgress1.Width) / 2, (panel8.Height - circularProgress1.Height) / 2);
+            if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("麻醉收费记录"))
+            {
+                btnChage.Visible = true;
+            }
             //this.MaximizeBox = false;
             this.MinimizeBox = false;
             LoadAnesRescue();
@@ -101,15 +105,16 @@ namespace AIMS.OperationAanesthesia
         private void plPrint_Click(object sender, EventArgs e)
         {
             if (_record == null || _record.Id == 0) return;
-            if (txtOutRoom.Focused)
+            plPrint.Select();
-            {
-                zgcAnaesRecord.Focus();
-            }
 
             SelectWorkerValue.Hidden();
             SelectDictValue.Hidden();
             SelectDictText.Hidden();
 
+            if (_record.SAreaObj != null && _record.SAreaObj.Selected == true)
+            {
+                _record.SAreaObj.Clear();
+            }
             if (_record.SelPhysioConfig != null)
             {
                 _record.SelPhysioConfig.IsClick = false;
@@ -183,14 +188,15 @@ namespace AIMS.OperationAanesthesia
         private void plPrintBrowse_Click(object sender, EventArgs e)
         {
             if (_record == null || _record.Id == 0) return;
-            if (txtOutRoom.Focused)
+            plPrintBrowse.Select();
-            {
-                zgcAnaesRecord.Focus();
-            }
 
             SelectWorkerValue.Hidden();
             SelectDictValue.Hidden();
             SelectDictText.Hidden();
+            if (_record.SAreaObj != null && _record.SAreaObj.Selected == true)
+            {
+                _record.SAreaObj.Clear();
+            }
 
             if (_record.SelPhysioConfig != null)
             {
@@ -1461,6 +1467,7 @@ namespace AIMS.OperationAanesthesia
                     _record.currentPage++;
                     btnNextPage_Click(null, null);
                 }
+                zgcAnaesRecord.Refresh();
 
             }
             catch (Exception ex)
@@ -2284,8 +2291,7 @@ namespace AIMS.OperationAanesthesia
         }
         private void btnChage_Click(object sender, EventArgs e)
         {
-            frmChargRecordPrint frmchargRecord = new frmChargRecordPrint(_record);
+            frmFeesRecord frmchargRecord = new frmFeesRecord(_record, "麻醉");
-            frmchargRecord.TemplateType = "麻醉";
             frmchargRecord.Show();
             frmchargRecord.BringToFront();
         }

AIMS/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs

@@ -44,16 +44,11 @@
             this.btnOperationInfo = new System.Windows.Forms.Button();
             this.btnSelectPatient = new System.Windows.Forms.Button();
             this.panel4 = new System.Windows.Forms.Panel();
-            this.btnChage = new System.Windows.Forms.Button();
             this.lblSpo2 = new System.Windows.Forms.Label();
             this.lblRESP = new System.Windows.Forms.Label();
             this.lblDia = new System.Windows.Forms.Label();
             this.lblPR = new System.Windows.Forms.Label();
             this.lblHR = new System.Windows.Forms.Label();
-            this.btnsjzx = new System.Windows.Forms.Button();
-            this.btnzsk = new System.Windows.Forms.Button();
-            this.btndptz = new System.Windows.Forms.Button();
-            this.btnsbwh = new System.Windows.Forms.Button();
             this.label9 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
@@ -64,8 +59,17 @@
             this.label2 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
+            this.button1 = new System.Windows.Forms.Button();
+            this.btnChage = new System.Windows.Forms.Button();
+            this.btnsjzx = new System.Windows.Forms.Button();
+            this.btnzsk = new System.Windows.Forms.Button();
+            this.btndptz = new System.Windows.Forms.Button();
+            this.btnsbwh = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel5 = new System.Windows.Forms.Panel();
+            this.panel8 = new AIMS.PublicUI.UI.DrawPanel();
+            this.circularProgress1 = new DevComponents.DotNetBar.Controls.CircularProgress();
+            this.zgcAnaesRecord = new DrawGraph.ZedGraphControl();
             this.panel7 = new System.Windows.Forms.Panel();
             this.panel21 = new System.Windows.Forms.Panel();
             this.panel17 = new System.Windows.Forms.Panel();
@@ -97,15 +101,12 @@
             this.picInRoom = new System.Windows.Forms.PictureBox();
             this.txtInRoom1 = new System.Windows.Forms.Button();
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
-            this.button1 = new System.Windows.Forms.Button();
-            this.panel8 = new AIMS.PublicUI.UI.DrawPanel();
-            this.circularProgress1 = new DevComponents.DotNetBar.Controls.CircularProgress();
-            this.zgcAnaesRecord = new DrawGraph.ZedGraphControl();
             this.panel3.SuspendLayout();
             this.panel14.SuspendLayout();
             this.panel4.SuspendLayout();
             this.panel1.SuspendLayout();
             this.panel5.SuspendLayout();
+            this.panel8.SuspendLayout();
             this.panel7.SuspendLayout();
             this.panel21.SuspendLayout();
             this.plTitleEventTime.SuspendLayout();
@@ -121,7 +122,6 @@
             this.panel6.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txtInRoom)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picInRoom)).BeginInit();
-            this.panel8.SuspendLayout();
             this.SuspendLayout();
             // 
             // panel2
@@ -367,17 +367,11 @@
             // panel4
             // 
             this.panel4.BackColor = System.Drawing.Color.White;
-            this.panel4.Controls.Add(this.button1);
-            this.panel4.Controls.Add(this.btnChage);
             this.panel4.Controls.Add(this.lblSpo2);
             this.panel4.Controls.Add(this.lblRESP);
             this.panel4.Controls.Add(this.lblDia);
             this.panel4.Controls.Add(this.lblPR);
             this.panel4.Controls.Add(this.lblHR);
-            this.panel4.Controls.Add(this.btnsjzx);
-            this.panel4.Controls.Add(this.btnzsk);
-            this.panel4.Controls.Add(this.btndptz);
-            this.panel4.Controls.Add(this.btnsbwh);
             this.panel4.Controls.Add(this.label9);
             this.panel4.Controls.Add(this.label8);
             this.panel4.Controls.Add(this.label6);
@@ -388,6 +382,12 @@
             this.panel4.Controls.Add(this.label2);
             this.panel4.Controls.Add(this.label4);
             this.panel4.Controls.Add(this.label1);
+            this.panel4.Controls.Add(this.button1);
+            this.panel4.Controls.Add(this.btnChage);
+            this.panel4.Controls.Add(this.btnsjzx);
+            this.panel4.Controls.Add(this.btnzsk);
+            this.panel4.Controls.Add(this.btndptz);
+            this.panel4.Controls.Add(this.btnsbwh);
             this.panel4.Dock = System.Windows.Forms.DockStyle.Right;
             this.panel4.Font = new System.Drawing.Font("宋体", 10.5F);
             this.panel4.Location = new System.Drawing.Point(1200, 10);
@@ -395,6 +395,201 @@
             this.panel4.Size = new System.Drawing.Size(160, 859);
             this.panel4.TabIndex = 3;
             // 
+            // lblSpo2
+            // 
+            this.lblSpo2.AutoSize = true;
+            this.lblSpo2.Font = new System.Drawing.Font("微软雅黑", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblSpo2.ForeColor = System.Drawing.Color.Cyan;
+            this.lblSpo2.Location = new System.Drawing.Point(38, 411);
+            this.lblSpo2.Name = "lblSpo2";
+            this.lblSpo2.Size = new System.Drawing.Size(50, 46);
+            this.lblSpo2.TabIndex = 39;
+            this.lblSpo2.Text = "--";
+            // 
+            // lblRESP
+            // 
+            this.lblRESP.AutoSize = true;
+            this.lblRESP.Font = new System.Drawing.Font("微软雅黑", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblRESP.ForeColor = System.Drawing.Color.DarkOrange;
+            this.lblRESP.Location = new System.Drawing.Point(48, 318);
+            this.lblRESP.Name = "lblRESP";
+            this.lblRESP.Size = new System.Drawing.Size(50, 46);
+            this.lblRESP.TabIndex = 37;
+            this.lblRESP.Text = "--";
+            // 
+            // lblDia
+            // 
+            this.lblDia.AutoSize = true;
+            this.lblDia.Font = new System.Drawing.Font("微软雅黑", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblDia.ForeColor = System.Drawing.Color.Red;
+            this.lblDia.Location = new System.Drawing.Point(15, 225);
+            this.lblDia.Name = "lblDia";
+            this.lblDia.Size = new System.Drawing.Size(125, 46);
+            this.lblDia.TabIndex = 36;
+            this.lblDia.Text = "---/---";
+            // 
+            // lblPR
+            // 
+            this.lblPR.AutoSize = true;
+            this.lblPR.Font = new System.Drawing.Font("微软雅黑", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblPR.ForeColor = System.Drawing.Color.Green;
+            this.lblPR.Location = new System.Drawing.Point(48, 132);
+            this.lblPR.Name = "lblPR";
+            this.lblPR.Size = new System.Drawing.Size(50, 46);
+            this.lblPR.TabIndex = 34;
+            this.lblPR.Text = "--";
+            // 
+            // lblHR
+            // 
+            this.lblHR.AutoSize = true;
+            this.lblHR.Font = new System.Drawing.Font("微软雅黑", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblHR.ForeColor = System.Drawing.Color.Green;
+            this.lblHR.Location = new System.Drawing.Point(48, 39);
+            this.lblHR.Name = "lblHR";
+            this.lblHR.Size = new System.Drawing.Size(50, 46);
+            this.lblHR.TabIndex = 27;
+            this.lblHR.Text = "--";
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.BackColor = System.Drawing.Color.White;
+            this.label9.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label9.ForeColor = System.Drawing.Color.DimGray;
+            this.label9.Location = new System.Drawing.Point(32, 385);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(95, 24);
+            this.label9.TabIndex = 40;
+            this.label9.Text = "SPO2( % )";
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.BackColor = System.Drawing.Color.White;
+            this.label8.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label8.ForeColor = System.Drawing.Color.DimGray;
+            this.label8.Location = new System.Drawing.Point(24, 292);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(110, 24);
+            this.label8.TabIndex = 38;
+            this.label8.Text = "呼吸( 次/分 )";
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.BackColor = System.Drawing.Color.White;
+            this.label6.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label6.ForeColor = System.Drawing.Color.DimGray;
+            this.label6.Location = new System.Drawing.Point(16, 199);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(127, 24);
+            this.label6.TabIndex = 35;
+            this.label6.Text = "血压( mmHg )";
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.BackColor = System.Drawing.Color.White;
+            this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label10.ForeColor = System.Drawing.Color.DimGray;
+            this.label10.Location = new System.Drawing.Point(42, 459);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(70, 17);
+            this.label10.TabIndex = 28;
+            this.label10.Text = "90%-100%";
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.BackColor = System.Drawing.Color.White;
+            this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label7.ForeColor = System.Drawing.Color.DimGray;
+            this.label7.Location = new System.Drawing.Point(42, 366);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(74, 17);
+            this.label7.TabIndex = 29;
+            this.label7.Text = "16-20 次/分";
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.BackColor = System.Drawing.Color.White;
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label5.ForeColor = System.Drawing.Color.DimGray;
+            this.label5.Location = new System.Drawing.Point(34, 273);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(91, 17);
+            this.label5.TabIndex = 30;
+            this.label5.Text = "60-140 mmHg";
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.BackColor = System.Drawing.Color.White;
+            this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label3.ForeColor = System.Drawing.Color.DimGray;
+            this.label3.Location = new System.Drawing.Point(39, 180);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(81, 17);
+            this.label3.TabIndex = 31;
+            this.label3.Text = "60-100 次/分";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.BackColor = System.Drawing.Color.White;
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.ForeColor = System.Drawing.Color.DimGray;
+            this.label2.Location = new System.Drawing.Point(39, 87);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(81, 17);
+            this.label2.TabIndex = 32;
+            this.label2.Text = "60-100 次/分";
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.BackColor = System.Drawing.Color.White;
+            this.label4.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label4.ForeColor = System.Drawing.Color.DimGray;
+            this.label4.Location = new System.Drawing.Point(24, 106);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(110, 24);
+            this.label4.TabIndex = 33;
+            this.label4.Text = "脉搏( 次/分 )";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.BackColor = System.Drawing.Color.White;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.ForeColor = System.Drawing.Color.DimGray;
+            this.label1.Location = new System.Drawing.Point(24, 13);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(110, 24);
+            this.label1.TabIndex = 26;
+            this.label1.Text = "心率( 次/分 )";
+            // 
+            // button1
+            // 
+            this.button1.BackColor = System.Drawing.Color.Transparent;
+            this.button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+            this.button1.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.button1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.button1.FlatAppearance.BorderSize = 0;
+            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.button1.Font = new System.Drawing.Font("微软雅黑", 11F);
+            this.button1.ForeColor = System.Drawing.Color.DimGray;
+            this.button1.Image = global::AIMS.Properties.Resources.打印苏醒记录;
+            this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.button1.Location = new System.Drawing.Point(0, 559);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(160, 50);
+            this.button1.TabIndex = 25;
+            this.button1.Text = "     麻醉记录";
+            this.button1.UseVisualStyleBackColor = false;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
             // btnChage
             // 
             this.btnChage.BackColor = System.Drawing.Color.Transparent;
@@ -416,61 +611,6 @@
             this.btnChage.Visible = false;
             this.btnChage.Click += new System.EventHandler(this.btnChage_Click);
             // 
-            // lblSpo2
-            // 
-            this.lblSpo2.AutoSize = true;
-            this.lblSpo2.Font = new System.Drawing.Font("微软雅黑", 23F);
-            this.lblSpo2.ForeColor = System.Drawing.Color.Teal;
-            this.lblSpo2.Location = new System.Drawing.Point(63, 399);
-            this.lblSpo2.Name = "lblSpo2";
-            this.lblSpo2.Size = new System.Drawing.Size(43, 40);
-            this.lblSpo2.TabIndex = 9;
-            this.lblSpo2.Text = "--";
-            // 
-            // lblRESP
-            // 
-            this.lblRESP.AutoSize = true;
-            this.lblRESP.Font = new System.Drawing.Font("微软雅黑", 23F);
-            this.lblRESP.ForeColor = System.Drawing.Color.Teal;
-            this.lblRESP.Location = new System.Drawing.Point(63, 308);
-            this.lblRESP.Name = "lblRESP";
-            this.lblRESP.Size = new System.Drawing.Size(43, 40);
-            this.lblRESP.TabIndex = 7;
-            this.lblRESP.Text = "--";
-            // 
-            // lblDia
-            // 
-            this.lblDia.AutoSize = true;
-            this.lblDia.Font = new System.Drawing.Font("微软雅黑", 23F);
-            this.lblDia.ForeColor = System.Drawing.Color.Teal;
-            this.lblDia.Location = new System.Drawing.Point(43, 217);
-            this.lblDia.Name = "lblDia";
-            this.lblDia.Size = new System.Drawing.Size(82, 40);
-            this.lblDia.TabIndex = 5;
-            this.lblDia.Text = "--/--";
-            // 
-            // lblPR
-            // 
-            this.lblPR.AutoSize = true;
-            this.lblPR.Font = new System.Drawing.Font("微软雅黑", 23F);
-            this.lblPR.ForeColor = System.Drawing.Color.Teal;
-            this.lblPR.Location = new System.Drawing.Point(63, 126);
-            this.lblPR.Name = "lblPR";
-            this.lblPR.Size = new System.Drawing.Size(43, 40);
-            this.lblPR.TabIndex = 3;
-            this.lblPR.Text = "--";
-            // 
-            // lblHR
-            // 
-            this.lblHR.AutoSize = true;
-            this.lblHR.Font = new System.Drawing.Font("微软雅黑", 23F);
-            this.lblHR.ForeColor = System.Drawing.Color.Teal;
-            this.lblHR.Location = new System.Drawing.Point(63, 35);
-            this.lblHR.Name = "lblHR";
-            this.lblHR.Size = new System.Drawing.Size(43, 40);
-            this.lblHR.TabIndex = 1;
-            this.lblHR.Text = "--";
-            // 
             // btnsjzx
             // 
             this.btnsjzx.BackColor = System.Drawing.Color.Transparent;
@@ -551,126 +691,6 @@
             this.btnsbwh.UseVisualStyleBackColor = false;
             this.btnsbwh.Click += new System.EventHandler(this.btnsbwh_Click);
             // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.BackColor = System.Drawing.Color.White;
-            this.label9.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.ForeColor = System.Drawing.Color.DimGray;
-            this.label9.Location = new System.Drawing.Point(37, 376);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(95, 24);
-            this.label9.TabIndex = 10;
-            this.label9.Text = "SPO2( % )";
-            // 
-            // label8
-            // 
-            this.label8.AutoSize = true;
-            this.label8.BackColor = System.Drawing.Color.White;
-            this.label8.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.ForeColor = System.Drawing.Color.DimGray;
-            this.label8.Location = new System.Drawing.Point(29, 285);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(110, 24);
-            this.label8.TabIndex = 8;
-            this.label8.Text = "呼吸( 次/分 )";
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.BackColor = System.Drawing.Color.White;
-            this.label6.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.ForeColor = System.Drawing.Color.DimGray;
-            this.label6.Location = new System.Drawing.Point(21, 194);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(127, 24);
-            this.label6.TabIndex = 4;
-            this.label6.Text = "血压( mmHg )";
-            // 
-            // label10
-            // 
-            this.label10.AutoSize = true;
-            this.label10.BackColor = System.Drawing.Color.White;
-            this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.ForeColor = System.Drawing.Color.DimGray;
-            this.label10.Location = new System.Drawing.Point(49, 441);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(70, 17);
-            this.label10.TabIndex = 2;
-            this.label10.Text = "90%-100%";
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.BackColor = System.Drawing.Color.White;
-            this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.ForeColor = System.Drawing.Color.DimGray;
-            this.label7.Location = new System.Drawing.Point(47, 350);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(74, 17);
-            this.label7.TabIndex = 2;
-            this.label7.Text = "16-20 次/分";
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.BackColor = System.Drawing.Color.White;
-            this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.ForeColor = System.Drawing.Color.DimGray;
-            this.label5.Location = new System.Drawing.Point(39, 259);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(91, 17);
-            this.label5.TabIndex = 2;
-            this.label5.Text = "60-140 mmHg";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.BackColor = System.Drawing.Color.White;
-            this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.ForeColor = System.Drawing.Color.DimGray;
-            this.label3.Location = new System.Drawing.Point(44, 168);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(81, 17);
-            this.label3.TabIndex = 2;
-            this.label3.Text = "60-100 次/分";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.BackColor = System.Drawing.Color.White;
-            this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.ForeColor = System.Drawing.Color.DimGray;
-            this.label2.Location = new System.Drawing.Point(44, 77);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(81, 17);
-            this.label2.TabIndex = 2;
-            this.label2.Text = "60-100 次/分";
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.BackColor = System.Drawing.Color.White;
-            this.label4.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.ForeColor = System.Drawing.Color.DimGray;
-            this.label4.Location = new System.Drawing.Point(29, 103);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(110, 24);
-            this.label4.TabIndex = 2;
-            this.label4.Text = "脉搏( 次/分 )";
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.BackColor = System.Drawing.Color.White;
-            this.label1.Font = new System.Drawing.Font("微软雅黑", 12.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.ForeColor = System.Drawing.Color.DimGray;
-            this.label1.Location = new System.Drawing.Point(29, 12);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(110, 24);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "心率( 次/分 )";
-            // 
             // panel1
             // 
             this.panel1.Controls.Add(this.panel5);
@@ -696,6 +716,60 @@
             this.panel5.Size = new System.Drawing.Size(1040, 859);
             this.panel5.TabIndex = 4;
             // 
+            // panel8
+            // 
+            this.panel8.AutoScroll = true;
+            this.panel8.BackColor = System.Drawing.Color.White;
+            this.panel8.Controls.Add(this.circularProgress1);
+            this.panel8.Controls.Add(this.zgcAnaesRecord);
+            this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel8.Location = new System.Drawing.Point(0, 58);
+            this.panel8.Name = "panel8";
+            this.panel8.Size = new System.Drawing.Size(1038, 759);
+            this.panel8.TabIndex = 2;
+            this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll);
+            // 
+            // circularProgress1
+            // 
+            this.circularProgress1.AnimationSpeed = 50;
+            // 
+            // 
+            // 
+            this.circularProgress1.BackgroundStyle.BackgroundImageAlpha = ((byte)(0));
+            this.circularProgress1.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom;
+            this.circularProgress1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.circularProgress1.FocusCuesEnabled = false;
+            this.circularProgress1.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.circularProgress1.Location = new System.Drawing.Point(361, 252);
+            this.circularProgress1.Margin = new System.Windows.Forms.Padding(4);
+            this.circularProgress1.Name = "circularProgress1";
+            this.circularProgress1.ProgressColor = System.Drawing.Color.DodgerBlue;
+            this.circularProgress1.Size = new System.Drawing.Size(389, 239);
+            this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP;
+            this.circularProgress1.TabIndex = 6;
+            this.circularProgress1.Value = 100;
+            // 
+            // zgcAnaesRecord
+            // 
+            this.zgcAnaesRecord.Location = new System.Drawing.Point(3, 0);
+            this.zgcAnaesRecord.Name = "zgcAnaesRecord";
+            this.zgcAnaesRecord.ScrollGrace = 0D;
+            this.zgcAnaesRecord.ScrollMaxX = 0D;
+            this.zgcAnaesRecord.ScrollMaxY = 0D;
+            this.zgcAnaesRecord.ScrollMaxY2 = 0D;
+            this.zgcAnaesRecord.ScrollMinX = 0D;
+            this.zgcAnaesRecord.ScrollMinY = 0D;
+            this.zgcAnaesRecord.ScrollMinY2 = 0D;
+            this.zgcAnaesRecord.Size = new System.Drawing.Size(800, 1000);
+            this.zgcAnaesRecord.TabIndex = 0;
+            this.zgcAnaesRecord.Visible = false;
+            this.zgcAnaesRecord.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord_ContextMenuBuilder);
+            this.zgcAnaesRecord.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseDownEvent);
+            this.zgcAnaesRecord.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseUpEvent);
+            this.zgcAnaesRecord.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseMoveEvent);
+            this.zgcAnaesRecord.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord_KeyUp);
+            this.zgcAnaesRecord.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord_MouseDoubleClick);
+            // 
             // panel7
             // 
             this.panel7.BackColor = System.Drawing.SystemColors.Control;
@@ -865,7 +939,7 @@
             this.panel13.Controls.Add(this.txtOutRoom);
             this.panel13.Controls.Add(this.picOutRoom);
             this.panel13.Controls.Add(this.button5);
-            this.panel13.Location = new System.Drawing.Point(491, 3);
+            this.panel13.Location = new System.Drawing.Point(333, 3);
             this.panel13.Name = "panel13";
             this.panel13.Padding = new System.Windows.Forms.Padding(3, 0, 3, 6);
             this.panel13.Size = new System.Drawing.Size(150, 53);
@@ -1051,11 +1125,12 @@
             this.panel12.Controls.Add(this.txtAnaesthesiaEnd);
             this.panel12.Controls.Add(this.picAnesEnd);
             this.panel12.Controls.Add(this.button4);
-            this.panel12.Location = new System.Drawing.Point(329, 3);
+            this.panel12.Location = new System.Drawing.Point(660, 5);
             this.panel12.Name = "panel12";
             this.panel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 6);
             this.panel12.Size = new System.Drawing.Size(150, 53);
             this.panel12.TabIndex = 51;
+            this.panel12.Visible = false;
             // 
             // txtAnaesthesiaEnd
             // 
@@ -1238,80 +1313,6 @@
             this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71);
             this.flowLayoutPanel1.TabIndex = 0;
             // 
-            // button1
-            // 
-            this.button1.BackColor = System.Drawing.Color.Transparent;
-            this.button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
-            this.button1.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.button1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.button1.FlatAppearance.BorderSize = 0;
-            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.button1.Font = new System.Drawing.Font("微软雅黑", 11F);
-            this.button1.ForeColor = System.Drawing.Color.DimGray;
-            this.button1.Image = global::AIMS.Properties.Resources.打印苏醒记录;
-            this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.button1.Location = new System.Drawing.Point(0, 559);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(160, 50);
-            this.button1.TabIndex = 25;
-            this.button1.Text = "     麻醉记录";
-            this.button1.UseVisualStyleBackColor = false;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // panel8
-            // 
-            this.panel8.AutoScroll = true;
-            this.panel8.BackColor = System.Drawing.Color.White;
-            this.panel8.Controls.Add(this.circularProgress1);
-            this.panel8.Controls.Add(this.zgcAnaesRecord);
-            this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel8.Location = new System.Drawing.Point(0, 58);
-            this.panel8.Name = "panel8";
-            this.panel8.Size = new System.Drawing.Size(1038, 759);
-            this.panel8.TabIndex = 2;
-            this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll);
-            // 
-            // circularProgress1
-            // 
-            this.circularProgress1.AnimationSpeed = 50;
-            // 
-            // 
-            // 
-            this.circularProgress1.BackgroundStyle.BackgroundImageAlpha = ((byte)(0));
-            this.circularProgress1.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom;
-            this.circularProgress1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.circularProgress1.FocusCuesEnabled = false;
-            this.circularProgress1.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.circularProgress1.Location = new System.Drawing.Point(361, 252);
-            this.circularProgress1.Margin = new System.Windows.Forms.Padding(4);
-            this.circularProgress1.Name = "circularProgress1";
-            this.circularProgress1.ProgressColor = System.Drawing.Color.DodgerBlue;
-            this.circularProgress1.Size = new System.Drawing.Size(389, 239);
-            this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP;
-            this.circularProgress1.TabIndex = 6;
-            this.circularProgress1.Value = 100;
-            // 
-            // zgcAnaesRecord
-            // 
-            this.zgcAnaesRecord.Location = new System.Drawing.Point(3, 0);
-            this.zgcAnaesRecord.Name = "zgcAnaesRecord";
-            this.zgcAnaesRecord.ScrollGrace = 0D;
-            this.zgcAnaesRecord.ScrollMaxX = 0D;
-            this.zgcAnaesRecord.ScrollMaxY = 0D;
-            this.zgcAnaesRecord.ScrollMaxY2 = 0D;
-            this.zgcAnaesRecord.ScrollMinX = 0D;
-            this.zgcAnaesRecord.ScrollMinY = 0D;
-            this.zgcAnaesRecord.ScrollMinY2 = 0D;
-            this.zgcAnaesRecord.Size = new System.Drawing.Size(800, 1000);
-            this.zgcAnaesRecord.TabIndex = 0;
-            this.zgcAnaesRecord.Visible = false;
-            this.zgcAnaesRecord.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord_ContextMenuBuilder);
-            this.zgcAnaesRecord.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseDownEvent);
-            this.zgcAnaesRecord.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseUpEvent);
-            this.zgcAnaesRecord.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseMoveEvent);
-            this.zgcAnaesRecord.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord_KeyUp);
-            this.zgcAnaesRecord.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord_MouseDoubleClick);
-            // 
             // frmAanesthesiaRecover
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1330,6 +1331,7 @@
             this.panel4.PerformLayout();
             this.panel1.ResumeLayout(false);
             this.panel5.ResumeLayout(false);
+            this.panel8.ResumeLayout(false);
             this.panel7.ResumeLayout(false);
             this.panel7.PerformLayout();
             this.panel21.ResumeLayout(false);
@@ -1346,7 +1348,6 @@
             this.panel6.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txtInRoom)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picInRoom)).EndInit();
-            this.panel8.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -1363,14 +1364,6 @@
         private PublicUI.UI.DrawPanel panel8; 
         private System.Windows.Forms.Panel btnNextPage;
         private System.Windows.Forms.Panel btnUpPage;
-        private System.Windows.Forms.Label label9;
-        private System.Windows.Forms.Label lblSpo2;
-        private System.Windows.Forms.Label lblDia;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.Label lblPR;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Label lblHR;
-        private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label lblRoom;
         private System.Windows.Forms.Label label22;
         private System.Windows.Forms.Label labOperatorName;
@@ -1415,14 +1408,22 @@
         private System.Windows.Forms.Panel panel17;
         private System.Windows.Forms.Panel panel18;
         private System.Windows.Forms.Button btnsjzx;
-        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Button btnChage;
+        private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.Label lblSpo2;
         private System.Windows.Forms.Label lblRESP;
+        private System.Windows.Forms.Label lblDia;
+        private System.Windows.Forms.Label lblPR;
+        private System.Windows.Forms.Label lblHR;
+        private System.Windows.Forms.Label label9;
         private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Label label10;
         private System.Windows.Forms.Label label7;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Button btnChage;
+        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label1;
     }
 }

AIMS/OperationAanesthesia/frmAanesthesiaRecover.cs

@@ -58,14 +58,13 @@ namespace AIMS.OperationAanesthesia
 
         private void frmAnasRecordBillNew_Load(object sender, EventArgs e)
         {
-            if (PublicMethod.OperatorNo == "admin")
-            {
-                btnChage.Visible = true;
-            }
-
             labOperatorName.Text = "(" + AIMSExtension.PublicMethod.OperatorNo + ")" + "  " + AIMSExtension.PublicMethod.OperatorName;
             if (NowRoom != null) lblRoom.Text = NowRoom.Name;
             circularProgress1.Location = new Point((panel8.Width - circularProgress1.Width) / 2, (panel8.Height - circularProgress1.Height) / 2);
+            if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("恢复收费记录"))
+            {
+                btnChage.Visible = true;
+            }
 
             LoadAnesRescue();
         }
@@ -104,6 +103,19 @@ namespace AIMS.OperationAanesthesia
         private void plPrintBrowse_Click(object sender, EventArgs e)
         {
             int pylWidth = 3;
+            plPrintBrowse.Select();
+
+            if (_record.SAreaObj != null && _record.SAreaObj.Selected == true)
+            {
+                _record.SAreaObj.Clear();
+            }
+
+            if (_record.SelPhysioConfig != null)
+            {
+                _record.SelPhysioConfig.IsClick = false;
+                _record.SelPhysioConfig.onClick(e);
+                _record.SelPhysioConfig = null;
+            }
 
             System.Drawing.Printing.PrintDocument pDoc = new System.Drawing.Printing.PrintDocument();
             pDoc.DefaultPageSettings.Landscape = false;
@@ -161,10 +173,20 @@ namespace AIMS.OperationAanesthesia
         private void plPrint_Click(object sender, EventArgs e)
         {
             if (_record == null || _record.Id == 0) return;
-            if (txtOutRoom.Focused)
+
+            plPrint.Select();
+
+            if (_record.SAreaObj != null && _record.SAreaObj.Selected == true)
             {
-                zgcAnaesRecord.Focus();
+                _record.SAreaObj.Clear();
             }
+            if (_record.SelPhysioConfig != null)
+            {
+                _record.SelPhysioConfig.IsClick = false;
+                _record.SelPhysioConfig.onClick(e);
+                _record.SelPhysioConfig = null;
+            }
+
             if (_record.StateName == "麻醉恢复中")
             {
                 if (txtOutRoom.CustomFormat == " ")
@@ -795,8 +817,18 @@ namespace AIMS.OperationAanesthesia
         }
         void frmFactEventsNew_FormClosed(object sender, FormClosedEventArgs e)
         {
-            plRefresh_Click(null, null);
+            DateTime EndTime = getOpeMaxTime(_record);
-        }
+            if (EndTime > _record.lastPageBegin)
+            {
+                ReviewEvent();
+            }
+            else
+            {
+                templateManage.Bind("DrugsManage");
+                templateManage.Bind("SapManage");
+                templateManage.Bind("RemarkManage");
+            }
+        } 
         private void btnCancelOperation_Click(object sender, EventArgs e)
         {
             if (PatientId == 0)
@@ -925,7 +957,7 @@ namespace AIMS.OperationAanesthesia
 
         #region 采集程序
         public DateTime? LastMonitorDataTime = null;
-        private void timerGetCollectorData_Tick(bool isOpen)
+        private void timerGetCollectorData_Tick()
         {
             if (State == AIMSExtension.EditState.BROWSE || _record.StateName != "麻醉恢复中" || NowRoom == null || isReadOnly == true) return;
             //if (!PublicMethod.RoleId.Operator.RoleRef.Name.Contains("麻醉") && PublicMethod.Operator.Id != _record.OperatorId
@@ -1021,7 +1053,12 @@ namespace AIMS.OperationAanesthesia
                     _record.currentPage++;
                     btnNextPage_Click(null, null);
                 }
-
+                else
+                {
+                    templateManage.Bind("DrugsManage");
+                    templateManage.Bind("SapManage"); 
+                    DrawEvent();
+                } 
             }
             catch (Exception)
             {
@@ -1037,8 +1074,9 @@ namespace AIMS.OperationAanesthesia
             try
             {
                 if (((TimeSpan)(DateTime.Now - _record.lastPageBegin)).TotalHours > 24 || NowRoom == null) return;
-                timerGetCollectorData_Tick(false);
+                timerGetCollectorData_Tick();
-                ShowMonitorDataToRight();
+                if (State != AIMSExtension.EditState.BROWSE)
+                    ShowMonitorDataToRight();
             }
             catch (Exception)
             {
@@ -1069,91 +1107,64 @@ namespace AIMS.OperationAanesthesia
             {
                 DeviceCacheData deviceCacheData = lists[0];
                 NowPhysioData nowPhysioData = JsonConvert.DeserializeObject<NowPhysioData>(deviceCacheData.JsonData);
-                foreach (PropertyInfo p in nowPhysioData.GetType().GetProperties())
-                {
-                    bool iswar = false;
-                    foreach (PhysioDataConfig keyValuePair in _record.PhysioConfigList)
-                    {
-                        if (keyValuePair.Enname.ToUpper() == p.Name.ToUpper())
-                        {
-                            try
-                            {
-                                object paramValue = p.GetValue(nowPhysioData, null);
-                                if (paramValue != null && paramValue.ToString() != string.Empty && paramValue.ToString() != "NaN" && paramValue.ToString() != "NULL")
-                                {
-                                    double value = Double.Parse(paramValue.ToString());
-                                    value = Convert.ToInt32(value);
-                                    if (value < keyValuePair.WarningLowLimit || value > keyValuePair.WarningHighLimit)
-                                    {
-                                        iswar = true;
-                                    }
 
-                                    if (keyValuePair.Name == "心率")
+                if (nowPhysioData.HR != null && nowPhysioData.HR.ToString() != string.Empty && nowPhysioData.HR.ToString() != "NaN" && nowPhysioData.HR.ToString() != "NULL")
-                                    {
+                {
-                                        lblHR.Text = value <= 0 ? "- -" : value.ToString();
+                    double value = Double.Parse(nowPhysioData.HR.ToString());
-                                        if (iswar == true) lblHR.ForeColor = Color.Red; else lblHR.ForeColor = Color.Green;
+                    lblHR.Text = value <= 0 ? "- -" : value.ToString();
-                                    }
-                                    if (keyValuePair.Name == "自主呼吸")
-                                    {
-                                        lblRESP.Text = value <= 0 ? "- -" : value.ToString();
-                                        if (iswar == true) lblRESP.ForeColor = Color.Red; else lblRESP.ForeColor = Color.Green;
-                                    }
-                                    if (keyValuePair.Name == "氧饱和度")
-                                    {
-                                        lblSpo2.Text = value <= 0 ? "- -" : value.ToString();
-                                        if (iswar == true) lblSpo2.ForeColor = Color.Red; else lblSpo2.ForeColor = Color.Green;
-                                    }
-                                    if (keyValuePair.Name == "脉率")
-                                    {
-                                        lblPR.Text = value <= 0 ? "- -" : value.ToString();
-                                        if (iswar == true) lblPR.ForeColor = Color.Red; else lblPR.ForeColor = Color.Green;
-                                    }
-                                    if (keyValuePair.Name == "无创舒张压")
-                                    {
-                                        szy = value <= 0 ? "" : value.ToString();
-                                        if (iswar == true) lblDia.ForeColor = Color.Red; else lblDia.ForeColor = Color.Green;
-                                    }
-                                    if (keyValuePair.Name == "无创收缩压")
-                                    {
-                                        ssy = value <= 0 ? "" : value.ToString();
-                                        if (iswar == true) lblDia.ForeColor = Color.Red; else lblDia.ForeColor = Color.Green;
-                                    }
-                                    if (keyValuePair.Name == "有创舒张压")
-                                    {
-                                        szy = value <= 0 ? "" : value.ToString();
-                                        if (iswar == true) lblDia.ForeColor = Color.Red; else lblDia.ForeColor = Color.Green;
-                                    }
-                                    if (keyValuePair.Name == "有创收缩压")
-                                    {
-                                        ssy = value <= 0 ? "" : value.ToString();
-                                        if (iswar == true) lblDia.ForeColor = Color.Red; else lblDia.ForeColor = Color.Green;
-                                    }
-                                    break;
-                                }
-                            }
-                            catch (Exception)
-                            {
-                                //PublicMethod.WriteLog(ex);
-                            }
-                        }
-                    }
                 }
+                if (nowPhysioData.Resp != null && nowPhysioData.Resp.ToString() != string.Empty && nowPhysioData.Resp.ToString() != "NaN" && nowPhysioData.Resp.ToString() != "NULL")
+                {
+                    double value = Double.Parse(nowPhysioData.Resp.ToString());
+                    lblRESP.Text = value <= 0 ? "- -" : value.ToString();
+                }
+                if (nowPhysioData.SPO2 != null && nowPhysioData.SPO2.ToString() != string.Empty && nowPhysioData.SPO2.ToString() != "NaN" && nowPhysioData.SPO2.ToString() != "NULL")
+                {
+                    double value = Double.Parse(nowPhysioData.SPO2.ToString());
+                    lblSpo2.Text = value <= 0 ? "- -" : value.ToString();
+                }
+                if (nowPhysioData.PR != null && nowPhysioData.PR.ToString() != string.Empty && nowPhysioData.PR.ToString() != "NaN" && nowPhysioData.PR.ToString() != "NULL")
+                {
+                    double value = Double.Parse(nowPhysioData.PR.ToString());
+                    lblPR.Text = value <= 0 ? "- -" : value.ToString();
+                }
+                if (nowPhysioData.Dia != null && nowPhysioData.Dia.ToString() != string.Empty && nowPhysioData.Dia.ToString() != "NaN" && nowPhysioData.Dia.ToString() != "NULL")
+                {
+                    double value = Double.Parse(nowPhysioData.Dia.ToString());
+                    szy = value <= 0 ? "" : value.ToString();
+                }
+                if (nowPhysioData.Sys != null && nowPhysioData.Sys.ToString() != string.Empty && nowPhysioData.Sys.ToString() != "NaN" && nowPhysioData.Sys.ToString() != "NULL")
+                {
+                    double value = Double.Parse(nowPhysioData.Sys.ToString());
+                    ssy = value <= 0 ? "" : value.ToString();
+                }
+                if (nowPhysioData.Dia_H != null && nowPhysioData.Dia_H.ToString() != string.Empty && nowPhysioData.Dia_H.ToString() != "NaN" && nowPhysioData.Dia_H.ToString() != "NULL")
+                {
+                    double value = Double.Parse(nowPhysioData.Dia_H.ToString());
+                    szy = value <= 0 ? "" : value.ToString();
+                }
+                if (nowPhysioData.Sys_H != null && nowPhysioData.Sys_H.ToString() != string.Empty && nowPhysioData.Sys_H.ToString() != "NaN" && nowPhysioData.Sys_H.ToString() != "NULL")
+                {
+                    double value = Double.Parse(nowPhysioData.Sys_H.ToString());
+                    ssy = value <= 0 ? "" : value.ToString();
+                }
+
                 string szyssy = ssy + "/" + szy;
                 if (szyssy != "/")
                     lblDia.Text = szyssy;
             }
             else
             {
-                lblHR.Text = "- -";
+                lblHR.Text = "--";
-                lblRESP.Text = "- -";
+                lblRESP.Text = "--";
-                lblSpo2.Text = "- -";
+                lblSpo2.Text = "--";
-                lblPR.Text = "- -";
+                lblPR.Text = "--";
-                lblDia.Text = "--/--";
+                lblDia.Text = "---/---";
                 lblHR.ForeColor = Color.Green;
-                lblRESP.ForeColor = Color.Green;
+                lblRESP.ForeColor = Color.DarkOrange;
-                lblSpo2.ForeColor = Color.Green;
+                lblSpo2.ForeColor = Color.Cyan;
                 lblPR.ForeColor = Color.Green;
-                lblDia.ForeColor = Color.Green;
+                lblDia.ForeColor = Color.Red;
             }
         }
 

AIMS/OperationAanesthesia/frmFeesRecord.resx

@@ -0,0 +1,207 @@
+<?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>
+  <metadata name="type.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="frees.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn29.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>132, 17</value>
+  </metadata>
+  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>957, 91</value>
+  </metadata>
+  <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAa
+        CAAAAk1TRnQBSQFMAgEBAgEAAZABBwGQAQcBFAEAARQBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFQ
+        AwABFAMAAQEBAAEgBgABGS4AA1UBrwOAAf4DKwH8AysB/AGZAYsBQAH9AaEBkgEAAf8BkwGCAQAB/wGW
+        AYcBQAH9AaMBlAEAAf8BowGUAQAB/wGjAZQBAAH/AysB/ANgAej/AA0AAZMBggEAAf8DYgH2A20B9wNt
+        AfcDXAH4A4AB/gGXAYYBAAH/A20B9wHsAecB5AH/AewB5wHkAf8B7AHnAeQB/wNtAfcBkwGCAQAB//8A
+        DQABkwGCAQAB/wNnAfIB/wL9Av8C/QL/Av0C/wL9Af8BmwGLAQAB/wMrAfwB/wL9Av8C/QL/Av0C/wL+
+        Af8BkwGCAQAB//8ADQABkwGCAQAB/wMrAfwBpgGVAYMB/wGmAZUBgwH/AaYBlQGDAf8BpgGVAYMB/wGV
+        AYQBAAH/A4AB/gGmAZUBgwH/AaYBlQGDAf8BpgGVAYMB/wGnAZUBhAH/AZMBggEAAf//AA0AAZMBggEA
+        Af8BkAIAAf8DXAH4A1wB+ANcAfgDYgH2AZMBggEAAf8DKwH8A1wB+ANcAfgDXAH4A00B+gGTAYIBAAH/
+        /wANAAGTAYIBAAH/A2AB8wH/AfwB/QL/AfwB/QL/AfwB/QL/AfwB/QH/AZsBiwEAAf8DKwH8Af8B/AH9
+        Av8B/AH9Av8B/AH9Av8C/gH/AZMBggEAAf//AA0AAZMBggEAAf8DYAHzAf4B+wH8Af8B/gH7AfwB/wH+
+        AfsB/AH/Af4B+wH8Af8BmwGLAQAB/wMrAfwB/gH7AfwB/wH+AfsB/AH/Af4B+wH8Av8C/QH/AZMBggEA
+        Af/0AANHAYEDRwGCA0cBggNHAYIDRwGCA0cBggGJAgAB/wNNAfoDXwH7A18B+wNfAfsDXwH7AY0CAAH/
+        AacBoAGQAf0DXwH7A18B+wNfAfsCqAGfAf0BkwGCAQAB//AAAwYBCANgAfMBbQFSAVEB9wNaAfUDWgH1
+        A1oB9QNaAfUBgQIAAf8DAAH/AV8BXgEyAfsBXwFeATIB+wFfAV4BMgH7Al8BMgH7AYECAAH/A2AB4wNe
+        AdMDXgHTA14B0wNdAdEDYAHU8AADCQELA00B+gJtAVEB9wHwAaIBAAH/AfABogEAAf8B8AGiAQAB/wHw
+        AaIBAAH/AYcCAAH/A1wB+AHwAaIBAAH/AfABogEAAf8B8AGiAQAB/wHwAaIBAAH/AwAB/wM4AVwMAAM+
+        AWoDDgES8AADCQELA00B+gNcAfgB6gGeAQAB/wHqAZ4BAAH/AeoBngEAAf8B6gGeAQAB/wGMAgAB/wNN
+        AfoB6gGeAQAB/wHqAZ4BAAH/AeoBngEAAf8B6gGeAQAB/wMAAf8DOAFcDAADOAFcA18B1fAAAwkBCwNN
+        AfoBagFoAUcB+QNqAfkDagH5A2oB+QNqAfkBhwIAAf8CbQFsAfcDagH5A2oB+QNqAfkDagH5AwAB/wM4
+        AVwMAAM1AVYDRgF98AADBwEJA00B+gGDAkAB/QFqAWgBRwH5AWoBaAFHAfkBagFoAUcB+QFqAWgBRwH5
+        AYECAAH/A00B+gFqAWgBRwH5AWoBaAFHAfkBagFoAUcB+QFqAWkBRgH5AYECAAH/A1kBvgNPAZkDTwGZ
+        A08BmQNYAbcDUQGf8AAEAgNJAYUDSQGIA0kBiANJAYgDSQGIA0kBiAGLAgAB/wGPAkAB/QOAAf4DgAH+
+        A4AB/gGkAY0BQAH9AYsCAAH/AaYBmQGDAf0BqAGlAZYB/QGoAaUBlgH9AagBpQGWAf0DgAH+AZMBggEA
+        Af//AA0AAZMBggEAAf8DYAHzAf4B+gH7Af8B/gH6AfsB/wH+AfoB+wH/Af4B+gH7Af8BmwGLAQAB/wMr
+        AfwB/gH6AfsB/wH+AfoB+wH/Af4B+gH7Av8C/QH/AZMBggEAAf//AA0AAZMBggEAAf8DYAHzAf4B+wH8
+        Af8B/gH7AfwB/wH+AfsB/AH/AfsB+AH5Af8BmwGLAQAB/wMrAfwB/gH7AfwB/wH+AfsB/AH/Af4B+wH8
+        Av8C/QH/AZMBggEAAf//AA0AAm0BbAH3A1wB+AOAAf4DgAH+A4AB/gOAAf4BmAGHAQAB/wMrAfwB1AHN
+        AcIB/wHUAc0BwgH/AdQBzQHCAf8DgAH+AZMBggEAAf//AAkAAwMBBANQAZoBkgGCAQAB/wOAAf4DgAH+
+        A4AB/gGTAYIBAAH/AZMBggEAAf8BjgGBAQAB/wGTAYIBAAH/AZMBggEAAf8BkwGCAQAB/wOAAf4DWgG9
+        /wAJAAMDAQQDEgEXAyMBMwMjATMDIwEzAyMBMwMjATMDIwEzAyMBMwMjATMDIwEzAyMBMwMjATMDFgEe
+        /wANAAMFAQYDBAEFAwQBBQMEAQUDBAQFAQYDBQEGAwUBBgMFAQYDBQEGAwUBBgMFAQYDAwEE8AABQgFN
+        AT4HAAE+AwABKAMAAVADAAEUAwABAQEAAQEFAAHwFwAD/wEAAf4BAAEPAv8HAAH+AQABDwL/BwAB/gEA
+        AQ8C/wcAAf4BAAEPAv8HAAH+AQABDwL/BwAB/gEAAQ8C/wcAAf4BAAEPAv8HAAGAAQABDwL/CQABDwL/
+        CAABAQHPAv8IAAEBAc8C/wgAAQEBzwL/CQABDwL/CQABDwL/BwAB/gEAAQ8C/wcAAf4BAAEPAv8HAAH+
+        AQABDwL/BwAB/AEAAQ8C/wcAAfwBAAEPAv8HAAH+AQABDwL/BwAL
+</value>
+  </data>
+  <metadata name="Unit.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Price.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Factroy.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Channel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ZFBL.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>37</value>
+  </metadata>
+</root>

AIMS/OperationAanesthesia/frmInstrumentRecord.cs

@@ -61,6 +61,10 @@ namespace AIMS.OperationAanesthesia
             //this.MaximizeBox = false;
             this.MinimizeBox = false;
 
+            if (PublicMethod.OperatorNo == "admin" || PublicMethod.RoleName.Contains("护士收费记录"))
+            {
+                btnChage.Visible = true;
+            }
             LoadAnesRescue();
         }
 

AIMS/OperationAanesthesia/frmRecoverPatient.Designer.cs

@@ -29,13 +29,20 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmRecoverPatient));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.btnFind = new System.Windows.Forms.Button();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.dtpEndTime = new System.Windows.Forms.DateTimePicker();
+            this.dtpBeginTime = new System.Windows.Forms.DateTimePicker();
+            this.panel2 = new System.Windows.Forms.Panel();
             this.label1 = new System.Windows.Forms.Label();
+            this.dtpSelectPatientTime = new System.Windows.Forms.DateTimePicker();
             this.btnFrontDay = new System.Windows.Forms.Button();
             this.btnNextDay = new System.Windows.Forms.Button();
-            this.dtpSelectPatientTime = new System.Windows.Forms.DateTimePicker();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.supTabPatient = new DevComponents.DotNetBar.SuperTabControl();
             this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel();
@@ -51,9 +58,6 @@
             this.待恢复 = new DevComponents.DotNetBar.SuperTabItem();
             this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel();
             this.dgv2 = new System.Windows.Forms.DataGridView();
-            this.已恢复 = new DevComponents.DotNetBar.SuperTabItem();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.panel3 = new System.Windows.Forms.Panel();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.PatientIdColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ApplyIdColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -61,7 +65,12 @@
             this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.已恢复 = new DevComponents.DotNetBar.SuperTabItem();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.panel3 = new System.Windows.Forms.Panel();
             this.panel1.SuspendLayout();
+            this.panel4.SuspendLayout();
+            this.panel2.SuspendLayout();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.supTabPatient)).BeginInit();
             this.supTabPatient.SuspendLayout();
@@ -75,10 +84,8 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.AliceBlue;
-            this.panel1.Controls.Add(this.label1);
+            this.panel1.Controls.Add(this.panel4);
-            this.panel1.Controls.Add(this.btnFrontDay);
+            this.panel1.Controls.Add(this.panel2);
-            this.panel1.Controls.Add(this.btnNextDay);
-            this.panel1.Controls.Add(this.dtpSelectPatientTime);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Font = new System.Drawing.Font("宋体", 10.5F);
             this.panel1.Location = new System.Drawing.Point(0, 0);
@@ -86,16 +93,100 @@
             this.panel1.Size = new System.Drawing.Size(999, 39);
             this.panel1.TabIndex = 0;
             // 
+            // panel4
+            // 
+            this.panel4.Controls.Add(this.btnFind);
+            this.panel4.Controls.Add(this.label3);
+            this.panel4.Controls.Add(this.label2);
+            this.panel4.Controls.Add(this.dtpEndTime);
+            this.panel4.Controls.Add(this.dtpBeginTime);
+            this.panel4.Dock = System.Windows.Forms.DockStyle.Left;
+            this.panel4.Location = new System.Drawing.Point(310, 0);
+            this.panel4.Name = "panel4";
+            this.panel4.Size = new System.Drawing.Size(450, 39);
+            this.panel4.TabIndex = 10;
+            this.panel4.Visible = false;
+            // 
+            // btnFind
+            // 
+            this.btnFind.Location = new System.Drawing.Point(376, 10);
+            this.btnFind.Name = "btnFind";
+            this.btnFind.Size = new System.Drawing.Size(66, 23);
+            this.btnFind.TabIndex = 17;
+            this.btnFind.Text = "查询";
+            this.btnFind.UseVisualStyleBackColor = true;
+            this.btnFind.Click += new System.EventHandler(this.btnFind_Click);
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label3.Location = new System.Drawing.Point(234, 12);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(15, 20);
+            this.label3.TabIndex = 4;
+            this.label3.Text = "-";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Location = new System.Drawing.Point(16, 10);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(93, 20);
+            this.label2.TabIndex = 4;
+            this.label2.Text = "恢复日期查询";
+            // 
+            // dtpEndTime
+            // 
+            this.dtpEndTime.CustomFormat = "yyyy-MM-dd";
+            this.dtpEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpEndTime.Location = new System.Drawing.Point(256, 10);
+            this.dtpEndTime.Name = "dtpEndTime";
+            this.dtpEndTime.Size = new System.Drawing.Size(111, 23);
+            this.dtpEndTime.TabIndex = 0;
+            // 
+            // dtpBeginTime
+            // 
+            this.dtpBeginTime.CustomFormat = "yyyy-MM-dd";
+            this.dtpBeginTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpBeginTime.Location = new System.Drawing.Point(117, 10);
+            this.dtpBeginTime.Name = "dtpBeginTime";
+            this.dtpBeginTime.Size = new System.Drawing.Size(111, 23);
+            this.dtpBeginTime.TabIndex = 0;
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.label1);
+            this.panel2.Controls.Add(this.dtpSelectPatientTime);
+            this.panel2.Controls.Add(this.btnFrontDay);
+            this.panel2.Controls.Add(this.btnNextDay);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Left;
+            this.panel2.Location = new System.Drawing.Point(0, 0);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(310, 39);
+            this.panel2.TabIndex = 9;
+            // 
             // label1
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(12, 12);
+            this.label1.Location = new System.Drawing.Point(16, 10);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(65, 20);
             this.label1.TabIndex = 4;
             this.label1.Text = "恢复日期";
             // 
+            // dtpSelectPatientTime
+            // 
+            this.dtpSelectPatientTime.CustomFormat = "yyyy-MM-dd";
+            this.dtpSelectPatientTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpSelectPatientTime.Location = new System.Drawing.Point(89, 10);
+            this.dtpSelectPatientTime.Name = "dtpSelectPatientTime";
+            this.dtpSelectPatientTime.Size = new System.Drawing.Size(111, 23);
+            this.dtpSelectPatientTime.TabIndex = 0;
+            this.dtpSelectPatientTime.ValueChanged += new System.EventHandler(this.dtpSelectPatientTime_ValueChanged);
+            // 
             // btnFrontDay
             // 
             this.btnFrontDay.BackColor = System.Drawing.Color.Transparent;
@@ -104,7 +195,7 @@
             this.btnFrontDay.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnFrontDay.FlatAppearance.BorderSize = 0;
             this.btnFrontDay.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnFrontDay.Location = new System.Drawing.Point(219, 10);
+            this.btnFrontDay.Location = new System.Drawing.Point(220, 8);
             this.btnFrontDay.Name = "btnFrontDay";
             this.btnFrontDay.Size = new System.Drawing.Size(34, 24);
             this.btnFrontDay.TabIndex = 2;
@@ -119,23 +210,13 @@
             this.btnNextDay.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnNextDay.FlatAppearance.BorderSize = 0;
             this.btnNextDay.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnNextDay.Location = new System.Drawing.Point(257, 10);
+            this.btnNextDay.Location = new System.Drawing.Point(258, 8);
             this.btnNextDay.Name = "btnNextDay";
             this.btnNextDay.Size = new System.Drawing.Size(34, 24);
             this.btnNextDay.TabIndex = 1;
             this.btnNextDay.UseVisualStyleBackColor = false;
             this.btnNextDay.Click += new System.EventHandler(this.btnNext_Click);
             // 
-            // dtpSelectPatientTime
-            // 
-            this.dtpSelectPatientTime.CustomFormat = "yyyy-MM-dd";
-            this.dtpSelectPatientTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpSelectPatientTime.Location = new System.Drawing.Point(85, 12);
-            this.dtpSelectPatientTime.Name = "dtpSelectPatientTime";
-            this.dtpSelectPatientTime.Size = new System.Drawing.Size(111, 23);
-            this.dtpSelectPatientTime.TabIndex = 0;
-            this.dtpSelectPatientTime.ValueChanged += new System.EventHandler(this.dtpSelectPatientTime_ValueChanged);
-            // 
             // groupBox1
             // 
             this.groupBox1.BackColor = System.Drawing.Color.AliceBlue;
@@ -164,8 +245,8 @@
             this.supTabPatient.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.supTabPatient.ControlBox.MenuBox,
             this.supTabPatient.ControlBox.CloseBox});
-            this.supTabPatient.Controls.Add(this.superTabControlPanel2);
             this.supTabPatient.Controls.Add(this.superTabControlPanel1);
+            this.supTabPatient.Controls.Add(this.superTabControlPanel2);
             this.supTabPatient.Dock = System.Windows.Forms.DockStyle.Fill;
             this.supTabPatient.Location = new System.Drawing.Point(3, 17);
             this.supTabPatient.Name = "supTabPatient";
@@ -179,6 +260,7 @@
             this.待恢复,
             this.已恢复});
             this.supTabPatient.Text = "superTabControl1";
+            this.supTabPatient.SelectedTabChanged += new System.EventHandler<DevComponents.DotNetBar.SuperTabStripSelectedTabChangedEventArgs>(this.supTabPatient_SelectedTabChanged);
             // 
             // superTabControlPanel1
             // 
@@ -204,14 +286,14 @@
             this.OutRoomTime,
             this.OperationDoctorColumn,
             this.AnesthesiaDoctorColumn});
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 10.5F);
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 10.5F);
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgv.DefaultCellStyle = dataGridViewCellStyle2;
+            this.dgv.DefaultCellStyle = dataGridViewCellStyle1;
             this.dgv.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgv.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
             this.dgv.Location = new System.Drawing.Point(0, 0);
@@ -314,14 +396,14 @@
             this.dataGridViewTextBoxColumn5,
             this.dataGridViewTextBoxColumn6,
             this.dataGridViewTextBoxColumn8});
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 10.5F);
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 10.5F);
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgv2.DefaultCellStyle = dataGridViewCellStyle1;
+            this.dgv2.DefaultCellStyle = dataGridViewCellStyle2;
             this.dgv2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgv2.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
             this.dgv2.Location = new System.Drawing.Point(0, 0);
@@ -333,33 +415,6 @@
             this.dgv2.TabIndex = 5;
             this.dgv2.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv2_CellContentDoubleClick);
             // 
-            // 已恢复
-            // 
-            this.已恢复.AttachedControl = this.superTabControlPanel2;
-            this.已恢复.GlobalItem = false;
-            this.已恢复.Name = "已恢复";
-            this.已恢复.Text = "已恢复";
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.BackColor = System.Drawing.Color.AliceBlue;
-            this.groupBox2.Controls.Add(this.panel3);
-            this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBox2.Location = new System.Drawing.Point(253, 39);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(746, 598);
-            this.groupBox2.TabIndex = 2;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "恢复床位";
-            // 
-            // panel3
-            // 
-            this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel3.Location = new System.Drawing.Point(3, 17);
-            this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(740, 578);
-            this.panel3.TabIndex = 0;
-            // 
             // dataGridViewTextBoxColumn1
             // 
             this.dataGridViewTextBoxColumn1.DataPropertyName = "Id";
@@ -413,6 +468,33 @@
             this.dataGridViewTextBoxColumn8.ReadOnly = true;
             this.dataGridViewTextBoxColumn8.Width = 120;
             // 
+            // 已恢复
+            // 
+            this.已恢复.AttachedControl = this.superTabControlPanel2;
+            this.已恢复.GlobalItem = false;
+            this.已恢复.Name = "已恢复";
+            this.已恢复.Text = "已恢复";
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.BackColor = System.Drawing.Color.AliceBlue;
+            this.groupBox2.Controls.Add(this.panel3);
+            this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.groupBox2.Location = new System.Drawing.Point(253, 39);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(746, 598);
+            this.groupBox2.TabIndex = 2;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "恢复床位";
+            // 
+            // panel3
+            // 
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel3.Location = new System.Drawing.Point(3, 17);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(740, 578);
+            this.panel3.TabIndex = 0;
+            // 
             // frmRecoverPatient
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -429,7 +511,10 @@
             this.Text = "选择患者";
             this.Load += new System.EventHandler(this.frmRecoverPatientNew_Load);
             this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
+            this.panel4.ResumeLayout(false);
+            this.panel4.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
             this.groupBox1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.supTabPatient)).EndInit();
             this.supTabPatient.ResumeLayout(false);
@@ -474,5 +559,12 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+        private System.Windows.Forms.Panel panel4;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.DateTimePicker dtpEndTime;
+        private System.Windows.Forms.DateTimePicker dtpBeginTime;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Button btnFind;
     }
 }

AIMS/OperationAanesthesia/frmRecoverPatient.cs

@@ -59,70 +59,75 @@ namespace AIMS.OperationAanesthesia
         }
 
         private void FillDgv()
-        {
+        { 
-            dgv.Rows.Clear();
+            if (supTabPatient.SelectedTab.Name == "待恢复")
-            DataTable dt = SelectPatient.GetRecoverPatientDataTable
-                                                            (DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()));
-            foreach (DataRow dr in dt.Rows)
             {
-                dgv.Rows.Add(dr["Id"].ToString(),
+                DateTime dateTime = DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString());
-                             dr["PatientId"].ToString(),
+                dgv.Rows.Clear();
-                             dr["ApplyId"].ToString(),
+                DataTable dt = SelectPatient.GetRecoverPatientDataTable(dateTime);
-                             dr["OperationRoom"].ToString(),
+                foreach (DataRow dr in dt.Rows)
-                             //dr["MdrecNo"].ToString()+" "+
-                             dr["PatientName"].ToString(),
-                             DateTime.Parse(dr["OutRoomTime"].ToString()).ToString("MM-dd HH:mm"),
-                             dr["OperationDoctor"].ToString(),
-                             dr["AnesthesiaDoctor"].ToString()
-                             );
-            }
-
-            panel3.Controls.Clear();
-            DataTable dt2 = SelectPatient.GetRecoverLockingPatientDataTable
-                                                            (DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()));
-
-            int i = 0, j = 0;
-            foreach (OperationRoom room in rooms)
-            {
-                ucPatientRecoverCard uc = new ucPatientRecoverCard(room);
-                uc.InRoom += Uc_InRoom;
-                uc.Clicks += Uc_Clicks;
-                uc.Location = new Point((uc.Width + 9) * j, (uc.Height + 10) * i + 30);
-                foreach (DataRow dr in dt2.Rows)
                 {
-                    if (dr["OperationRoom"].ToString() == uc.labelName.Text)
+                    dgv.Rows.Add(dr["Id"].ToString(),
+                                 dr["PatientId"].ToString(),
+                                 dr["ApplyId"].ToString(),
+                                 dr["OperationRoom"].ToString(),
+                                 //dr["MdrecNo"].ToString()+" "+
+                                 dr["PatientName"].ToString(),
+                                 DateTime.Parse(dr["OutRoomTime"].ToString()).ToString("MM-dd HH:mm"),
+                                 dr["OperationDoctor"].ToString(),
+                                 dr["AnesthesiaDoctor"].ToString()
+                                 );
+                }
+
+                panel3.Controls.Clear();
+                DataTable dt2 = SelectPatient.GetRecoverLockingPatientDataTable(dateTime);
+
+                int i = 0, j = 0;
+                foreach (OperationRoom room in rooms)
+                {
+                    ucPatientRecoverCard uc = new ucPatientRecoverCard(room);
+                    uc.InRoom += Uc_InRoom;
+                    uc.Clicks += Uc_Clicks;
+                    uc.Location = new Point((uc.Width + 9) * j, (uc.Height + 10) * i + 30);
+                    foreach (DataRow dr in dt2.Rows)
                     {
-                        uc.SetucPatientRecoverCard(dr);
+                        if (dr["OperationRoom"].ToString() == uc.labelName.Text)
-                        break;
+                        {
+                            uc.SetucPatientRecoverCard(dr);
+                            break;
+                        }
                     }
+                    panel3.Controls.Add(uc);
+                    j++;
+                    if (j == 4)
+                    {
+                        i++;
+                        j = 0;
+                    }
+                    //防止显示全部卡顿
+                    if (i >= 10) break;
                 }
-                panel3.Controls.Add(uc);
+            }
-                j++;
+            else
-                if (j == 4)
+            {
+                dgv2.Rows.Clear();
+                DataTable dtt = SelectPatient.GetRecoverPatientOutDataTable
+                                                                (DateTime.Parse(dtpBeginTime.Value.ToString("yyyy-MM-dd 00:00:00").ToString()),DateTime.Parse(dtpEndTime.Value.ToString("yyyy-MM-dd 23:59:59").ToString()));
+                foreach (DataRow dr in dtt.Rows)
                 {
-                    i++;
+                    dgv2.Rows.Add(dr["Id"].ToString(),
-                    j = 0;
+                                 dr["PatientId"].ToString(),
+                                 dr["ApplyId"].ToString(),
+                                 dr["OperationRoom"].ToString(),
+                                 //dr["MdrecNo"].ToString()+" "+
+                                 dr["PatientName"].ToString(),
+                                 DateTime.Parse(dr["OutRoomTime"].ToString()).ToString("MM-dd HH:mm"),
+                                 dr["OperationDoctor"].ToString(),
+                                 dr["AnesthesiaDoctor"].ToString()
+                                 );
                 }
-                //防止显示全部卡顿
-                if (i >= 10) break;
             }
 
-            dgv2.Rows.Clear();
-            DataTable dtt = SelectPatient.GetRecoverPatientOutDataTable
-                                                            (DateTime.Parse(dtpSelectPatientTime.Value.ToString("yyyy-MM-dd").ToString()));
-            foreach (DataRow dr in dtt.Rows)
-            {
-                dgv2.Rows.Add(dr["Id"].ToString(),
-                             dr["PatientId"].ToString(),
-                             dr["ApplyId"].ToString(),
-                             dr["OperationRoom"].ToString(),
-                             //dr["MdrecNo"].ToString()+" "+
-                             dr["PatientName"].ToString(),
-                             DateTime.Parse(dr["OutRoomTime"].ToString()).ToString("MM-dd HH:mm"),
-                             dr["OperationDoctor"].ToString(),
-                             dr["AnesthesiaDoctor"].ToString()
-                             );
-            }
         }
 
         private void dgv_CellContentClick(object sender, DataGridViewCellEventArgs e)
@@ -208,5 +213,24 @@ namespace AIMS.OperationAanesthesia
             frmAnasRecord.State = AIMSExtension.EditState.BROWSE;
             frmAnasRecord.ShowDialog();
         }
+
+        private void supTabPatient_SelectedTabChanged(object sender, DevComponents.DotNetBar.SuperTabStripSelectedTabChangedEventArgs e)
+        {
+            if (supTabPatient.SelectedTab.Name == "待恢复")
+            {
+                panel2.Visible = true;
+                panel4.Visible = false;
+            }
+            else
+            {
+                panel4.Visible = true;
+                panel2.Visible = false;
+            }
+        }
+
+        private void btnFind_Click(object sender, EventArgs e)
+        {
+            FillDgv();
+        }
     }
 }

AIMS/OperationAanesthesia/frmRecoverPatient.resx

@@ -233,27 +233,6 @@
         RK5CYII=
 </value>
   </data>
-  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="PatientIdColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ApplyIdColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="Id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -278,6 +257,27 @@
   <metadata name="AnesthesiaDoctorColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="PatientIdColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ApplyIdColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAQEAAAAEAIAAoQgAAFgAAACgAAABAAAAAgAAAAAEAIAAAAAAAAEAAABMLAAATCwAAAAAAAAAA

AIMS/OperationAanesthesia/oldSystemCode/frmChargRecordPrint.cs

@@ -25,7 +25,6 @@ namespace AIMS.OperationAanesthesia
 
         private void frmChargRecordPrint_Load(object sender, EventArgs e)
         {
-
             lblName.Text = _operationRecord.Name;
             lblInHospitalNo.Text = _operationRecord.InHospitalNo;
             labsex.Text = _operationRecord.Sex;

AIMS/OperationAfter/frmOperationManage.Designer.cs

@@ -110,6 +110,7 @@
             this.OperationDoctorColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Assistant1Column = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.AnesthesiaDoctorColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.AnesthesiaDoctor2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.TourNurseColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.InstrumentNurseColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.OperationRoomColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -268,6 +269,7 @@
             this.OperationDoctorColumn,
             this.Assistant1Column,
             this.AnesthesiaDoctorColumn,
+            this.AnesthesiaDoctor2,
             this.TourNurseColumn,
             this.InstrumentNurseColumn,
             this.OperationRoomColumn,
@@ -975,11 +977,19 @@
             // AnesthesiaDoctorColumn
             // 
             this.AnesthesiaDoctorColumn.DataPropertyName = "AnesthesiaDoctor";
-            this.AnesthesiaDoctorColumn.HeaderText = "麻醉";
+            this.AnesthesiaDoctorColumn.HeaderText = "主麻";
             this.AnesthesiaDoctorColumn.Name = "AnesthesiaDoctorColumn";
             this.AnesthesiaDoctorColumn.ReadOnly = true;
             this.AnesthesiaDoctorColumn.Width = 60;
             // 
+            // AnesthesiaDoctor2
+            // 
+            this.AnesthesiaDoctor2.DataPropertyName = "AnesthesiaDoctor2";
+            this.AnesthesiaDoctor2.HeaderText = "副麻";
+            this.AnesthesiaDoctor2.Name = "AnesthesiaDoctor2";
+            this.AnesthesiaDoctor2.ReadOnly = true;
+            this.AnesthesiaDoctor2.Width = 60;
+            // 
             // TourNurseColumn
             // 
             this.TourNurseColumn.DataPropertyName = "TourNurse";
@@ -1143,6 +1153,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn OperationDoctorColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn Assistant1Column;
         private System.Windows.Forms.DataGridViewTextBoxColumn AnesthesiaDoctorColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn AnesthesiaDoctor2;
         private System.Windows.Forms.DataGridViewTextBoxColumn TourNurseColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn InstrumentNurseColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn OperationRoomColumn;

AIMS/OperationAfter/frmOperationManage.cs

@@ -254,7 +254,7 @@ namespace AIMS.OperationAfter.UI
             kk.FilterIndex = 1;
             if (kk.ShowDialog() == DialogResult.OK)
             {
-                string FileName = kk.FileName + ".xls";
+                string FileName = kk.FileName ;
                 if (File.Exists(FileName))
                     File.Delete(FileName);
                 FileStream objFileStream;

AIMS/OperationAfter/frmOperationManage.resx

@@ -225,6 +225,9 @@
   <metadata name="AnesthesiaDoctorColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="AnesthesiaDoctor2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="TourNurseColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

AIMS/OperationFront/frmOperationApply.cs

@@ -183,32 +183,32 @@ namespace AIMS.OperationFront.UI
 
         private void tsbDelete_Click(object sender, EventArgs e)
         {
-            if (dgv.RowCount > 0)
+            if (dgv.Rows.Count > 0)
             {
+                int ApplyId = int.Parse(dgv.CurrentRow.Cells["ApplyId"].Value.ToString());
                 string MdrecNo = dgv.CurrentRow.Cells["MdrecNoColumn"].Value.ToString();
                 string PatientName = dgv.CurrentRow.Cells["PatientNameColumn"].Value.ToString();
-                int ApplyId = int.Parse(dgv.CurrentRow.Cells["ApplyId"].Value.ToString());
 
-                for (int i = 0; i < dgv.Rows.Count; i++)
+                bool isDelete = false;
+                if (AIMSExtension.PublicMethod.RoleId == 7 || AIMSExtension.PublicMethod.RoleId == 1 || AIMSExtension.PublicMethod.RoleId == 10)
                 {
-                    if (bool.Parse(this.dgv.Rows[i].Cells["CheckBoxColumn"].EditedFormattedValue.ToString()))
+                    isDelete = true;
-                    {
-                        if (MessageBox.Show("您确定要作废 (住院号：" + MdrecNo + " 患者姓名：" + PatientName + ")？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-                        {
-                            try
-                            {
-                                BOperationApply.UpdateApplyState(ApplyId, 11);
-                                MessageBox.Show("作废成功!");
-                                btnFind_Click(null, null);
-                            }
-                            catch (Exception ex)
-                            {
-                                MessageBox.Show("作废失败!" + ex.Message);
-                            }
-
-                        }
-                    }
                 }
+                if (isDelete == true)
+                    if (MessageBox.Show("您确定要作废 (住院号：" + MdrecNo + " 患者姓名：" + PatientName + ")？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                    {
+                        try
+                        {
+                            BOperationApply.UpdateApplyState(ApplyId, 11);
+                            MessageBox.Show("作废成功!");
+                            btnFind_Click(null, null);
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show("作废失败!" + ex.Message);
+                        }
+
+                    }
             }
 
         }

AIMS/OperationFront/frmOperationApplyDetail.cs

@@ -1311,7 +1311,7 @@ namespace AIMS.OperationFront.UI
                     if (dt != null && dt.Rows.Count > 0)
                     {
                         DataRow row = dt.Rows[0];
-                        txtArchivesNo.Text = row["PATIENT_ID"].ToString();//HIS患者ID  
+                        txtArchivesNo.Text = row["IPD_NO"].ToString();//HIS患者ID  
                         cboDepartment.Text = row["名称"].ToString(); //申请手术科室编码 
                         cboApplyDepId.Text = row["名称"].ToString(); //申请手术科室编码 
                         txtName.Text = row["PATIENT_NAME"].ToString();
@@ -1329,7 +1329,7 @@ namespace AIMS.OperationFront.UI
                         cboRHBloodType.Text = row["PATINET_BLOODTYPE_RH"].ToString();
                         txtIdentityCard.Text = row["IDNO"].ToString();
                         cboPatientKind.Text = row["PATIENT_CHARGE_TYPE"].ToString();
-                        txtIlldistrict.Text = row["ROOM_NO"].ToString();
+                        txtIlldistrict.Text = row["WARD_NO"].ToString();
                         txtSickBed.Text = row["ROOM_NO"].ToString();
                         //patient.ADDRESS = row["PATIENT_ADDRESS"].ToString();
                         txtContacts.Text = row["PATIENT_CONTACTOR"].ToString();

AIMS/OperationFront/frmSelectiveOperationsPrint.cs

@@ -75,11 +75,13 @@ namespace AIMS.OperationFront.UI
         private void btnBeforeDay_Click(object sender, EventArgs e)
         {
             dtpTime.Value = dtpTime.Value.AddDays(-1);
+            checkBoxX1.Checked = false;
         }
 
         private void btnAfterDay_Click(object sender, EventArgs e)
         {
             dtpTime.Value = dtpTime.Value.AddDays(1);
+            checkBoxX1.Checked = false;
         }
 
         private void dtpTime_ValueChanged(object sender, EventArgs e)
@@ -101,6 +103,8 @@ namespace AIMS.OperationFront.UI
             }
             if (dt == null) return;
             FullDgv(dt);
+
+            checkBoxX1.Checked= true;
             dgvApplyOrDoctor.ClearSelection();
         }
 
@@ -260,5 +264,23 @@ namespace AIMS.OperationFront.UI
             if (flag == "end") return dt.Date.AddHours(23).AddMinutes(59).AddSeconds(59);
             return dt;
         }
+
+        private void checkBoxX1_CheckedChanged(object sender, EventArgs e)
+        {
+            if (checkBoxX1.Checked==true )
+            { 
+                foreach (DataGridViewRow item in dgvApplyOrDoctor.Rows)
+                {
+                    item.Cells[0].Value = true;
+                }
+            }
+            else
+            {
+                foreach (DataGridViewRow item in dgvApplyOrDoctor.Rows)
+                {
+                    item.Cells[0].Value = false;
+                } 
+            }
+        }
     }
 }

AIMS/OperationFront/frmSelectiveOperationsPrint.designer.cs

@@ -32,6 +32,12 @@ namespace AIMS.OperationFront.UI
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = 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 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 dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -42,12 +48,6 @@ namespace AIMS.OperationFront.UI
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSelectiveOperationsPrint));
             this.panel1 = new System.Windows.Forms.Panel();
             this.rbosh = new System.Windows.Forms.RadioButton();
@@ -64,24 +64,6 @@ namespace AIMS.OperationFront.UI
             this.panel2 = new System.Windows.Forms.Panel();
             this.dgvApplyOrDoctor = new DevComponents.DotNetBar.Controls.DataGridViewX();
             this.Column1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn15 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn16 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn17 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn18 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.PlanOperationRoomName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -100,6 +82,25 @@ namespace AIMS.OperationFront.UI
             this.InstrumentNurse = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.TourNurse = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Remark = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn15 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn16 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn17 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn18 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.checkBoxX1 = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dtpTime)).BeginInit();
             this.panel2.SuspendLayout();
@@ -284,6 +285,7 @@ namespace AIMS.OperationFront.UI
             // 
             // panel2
             // 
+            this.panel2.Controls.Add(this.checkBoxX1);
             this.panel2.Controls.Add(this.dgvApplyOrDoctor);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel2.Location = new System.Drawing.Point(12, 59);
@@ -364,6 +366,141 @@ namespace AIMS.OperationFront.UI
             this.Column1.TrueValue = "1";
             this.Column1.Width = 30;
             // 
+            // Id
+            // 
+            this.Id.HeaderText = "编号";
+            this.Id.Name = "Id";
+            this.Id.ReadOnly = true;
+            this.Id.Visible = false;
+            // 
+            // Index
+            // 
+            this.Index.HeaderText = "序号";
+            this.Index.Name = "Index";
+            this.Index.ReadOnly = true;
+            this.Index.Visible = false;
+            this.Index.Width = 40;
+            // 
+            // PlanOperationRoomName
+            // 
+            this.PlanOperationRoomName.HeaderText = "术间";
+            this.PlanOperationRoomName.Name = "PlanOperationRoomName";
+            this.PlanOperationRoomName.ReadOnly = true;
+            this.PlanOperationRoomName.Width = 60;
+            // 
+            // PlanOrder
+            // 
+            this.PlanOrder.HeaderText = "台次";
+            this.PlanOrder.Name = "PlanOrder";
+            this.PlanOrder.ReadOnly = true;
+            this.PlanOrder.Width = 30;
+            // 
+            // OrderOperationTime
+            // 
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.OrderOperationTime.DefaultCellStyle = dataGridViewCellStyle2;
+            this.OrderOperationTime.HeaderText = "时间";
+            this.OrderOperationTime.Name = "OrderOperationTime";
+            this.OrderOperationTime.ReadOnly = true;
+            this.OrderOperationTime.Width = 65;
+            // 
+            // DepartmentId
+            // 
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.DepartmentId.DefaultCellStyle = dataGridViewCellStyle3;
+            this.DepartmentId.HeaderText = "科室";
+            this.DepartmentId.Name = "DepartmentId";
+            this.DepartmentId.ReadOnly = true;
+            this.DepartmentId.Width = 120;
+            // 
+            // SickBed
+            // 
+            this.SickBed.HeaderText = "床号";
+            this.SickBed.Name = "SickBed";
+            this.SickBed.ReadOnly = true;
+            this.SickBed.Width = 50;
+            // 
+            // InHospitalNo
+            // 
+            this.InHospitalNo.HeaderText = "住院号";
+            this.InHospitalNo.Name = "InHospitalNo";
+            this.InHospitalNo.ReadOnly = true;
+            this.InHospitalNo.Width = 80;
+            // 
+            // PatientName
+            // 
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 11F);
+            this.PatientName.DefaultCellStyle = dataGridViewCellStyle4;
+            this.PatientName.HeaderText = "姓名";
+            this.PatientName.Name = "PatientName";
+            this.PatientName.ReadOnly = true;
+            this.PatientName.Width = 160;
+            // 
+            // ApplyDiagnoseInfoName
+            // 
+            this.ApplyDiagnoseInfoName.HeaderText = "诊断";
+            this.ApplyDiagnoseInfoName.Name = "ApplyDiagnoseInfoName";
+            this.ApplyDiagnoseInfoName.ReadOnly = true;
+            // 
+            // Operation
+            // 
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 11F);
+            this.Operation.DefaultCellStyle = dataGridViewCellStyle5;
+            this.Operation.HeaderText = "手术";
+            this.Operation.Name = "Operation";
+            this.Operation.ReadOnly = true;
+            // 
+            // OperationDoctor
+            // 
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.OperationDoctor.DefaultCellStyle = dataGridViewCellStyle6;
+            this.OperationDoctor.HeaderText = "医师";
+            this.OperationDoctor.Name = "OperationDoctor";
+            this.OperationDoctor.ReadOnly = true;
+            this.OperationDoctor.Width = 65;
+            // 
+            // Assistant
+            // 
+            this.Assistant.HeaderText = "助手";
+            this.Assistant.Name = "Assistant";
+            this.Assistant.ReadOnly = true;
+            this.Assistant.Width = 65;
+            // 
+            // AnaesthesiaMethodId
+            // 
+            this.AnaesthesiaMethodId.HeaderText = "拟施麻醉";
+            this.AnaesthesiaMethodId.Name = "AnaesthesiaMethodId";
+            this.AnaesthesiaMethodId.ReadOnly = true;
+            this.AnaesthesiaMethodId.Visible = false;
+            // 
+            // AnesthesiaDoctor
+            // 
+            this.AnesthesiaDoctor.HeaderText = "麻醉医生";
+            this.AnesthesiaDoctor.Name = "AnesthesiaDoctor";
+            this.AnesthesiaDoctor.ReadOnly = true;
+            // 
+            // InstrumentNurse
+            // 
+            this.InstrumentNurse.HeaderText = "洗手护士";
+            this.InstrumentNurse.Name = "InstrumentNurse";
+            this.InstrumentNurse.ReadOnly = true;
+            this.InstrumentNurse.Width = 65;
+            // 
+            // TourNurse
+            // 
+            this.TourNurse.HeaderText = "巡回护士";
+            this.TourNurse.Name = "TourNurse";
+            this.TourNurse.ReadOnly = true;
+            this.TourNurse.Width = 65;
+            // 
+            // Remark
+            // 
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.Remark.DefaultCellStyle = dataGridViewCellStyle7;
+            this.Remark.HeaderText = "备注";
+            this.Remark.Name = "Remark";
+            this.Remark.ReadOnly = true;
+            // 
             // dataGridViewTextBoxColumn1
             // 
             this.dataGridViewTextBoxColumn1.HeaderText = "编号";
@@ -506,140 +643,18 @@ namespace AIMS.OperationFront.UI
             this.dataGridViewTextBoxColumn18.HeaderText = "备注";
             this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18";
             // 
-            // Id
+            // checkBoxX1
             // 
-            this.Id.HeaderText = "编号";
-            this.Id.Name = "Id";
-            this.Id.ReadOnly = true;
-            this.Id.Visible = false;
             // 
-            // Index
             // 
-            this.Index.HeaderText = "序号";
-            this.Index.Name = "Index";
-            this.Index.ReadOnly = true;
-            this.Index.Visible = false;
-            this.Index.Width = 40;
             // 
-            // PlanOperationRoomName
+            this.checkBoxX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
+            this.checkBoxX1.Location = new System.Drawing.Point(4, 7);
-            this.PlanOperationRoomName.HeaderText = "术间";
+            this.checkBoxX1.Name = "checkBoxX1";
-            this.PlanOperationRoomName.Name = "PlanOperationRoomName";
+            this.checkBoxX1.Size = new System.Drawing.Size(21, 23);
-            this.PlanOperationRoomName.ReadOnly = true;
+            this.checkBoxX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.PlanOperationRoomName.Width = 60;
+            this.checkBoxX1.TabIndex = 63;
-            // 
+            this.checkBoxX1.CheckedChanged += new System.EventHandler(this.checkBoxX1_CheckedChanged);
-            // PlanOrder
-            // 
-            this.PlanOrder.HeaderText = "台次";
-            this.PlanOrder.Name = "PlanOrder";
-            this.PlanOrder.ReadOnly = true;
-            this.PlanOrder.Width = 30;
-            // 
-            // OrderOperationTime
-            // 
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.OrderOperationTime.DefaultCellStyle = dataGridViewCellStyle2;
-            this.OrderOperationTime.HeaderText = "时间";
-            this.OrderOperationTime.Name = "OrderOperationTime";
-            this.OrderOperationTime.ReadOnly = true;
-            this.OrderOperationTime.Width = 65;
-            // 
-            // DepartmentId
-            // 
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.DepartmentId.DefaultCellStyle = dataGridViewCellStyle3;
-            this.DepartmentId.HeaderText = "科室";
-            this.DepartmentId.Name = "DepartmentId";
-            this.DepartmentId.ReadOnly = true;
-            this.DepartmentId.Width = 120;
-            // 
-            // SickBed
-            // 
-            this.SickBed.HeaderText = "床号";
-            this.SickBed.Name = "SickBed";
-            this.SickBed.ReadOnly = true;
-            this.SickBed.Width = 50;
-            // 
-            // InHospitalNo
-            // 
-            this.InHospitalNo.HeaderText = "住院号";
-            this.InHospitalNo.Name = "InHospitalNo";
-            this.InHospitalNo.ReadOnly = true;
-            this.InHospitalNo.Width = 80;
-            // 
-            // PatientName
-            // 
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 11F);
-            this.PatientName.DefaultCellStyle = dataGridViewCellStyle4;
-            this.PatientName.HeaderText = "姓名";
-            this.PatientName.Name = "PatientName";
-            this.PatientName.ReadOnly = true;
-            this.PatientName.Width = 160;
-            // 
-            // ApplyDiagnoseInfoName
-            // 
-            this.ApplyDiagnoseInfoName.HeaderText = "诊断";
-            this.ApplyDiagnoseInfoName.Name = "ApplyDiagnoseInfoName";
-            this.ApplyDiagnoseInfoName.ReadOnly = true;
-            // 
-            // Operation
-            // 
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 11F);
-            this.Operation.DefaultCellStyle = dataGridViewCellStyle5;
-            this.Operation.HeaderText = "手术";
-            this.Operation.Name = "Operation";
-            this.Operation.ReadOnly = true;
-            // 
-            // OperationDoctor
-            // 
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.OperationDoctor.DefaultCellStyle = dataGridViewCellStyle6;
-            this.OperationDoctor.HeaderText = "医师";
-            this.OperationDoctor.Name = "OperationDoctor";
-            this.OperationDoctor.ReadOnly = true;
-            this.OperationDoctor.Width = 65;
-            // 
-            // Assistant
-            // 
-            this.Assistant.HeaderText = "助手";
-            this.Assistant.Name = "Assistant";
-            this.Assistant.ReadOnly = true;
-            this.Assistant.Width = 65;
-            // 
-            // AnaesthesiaMethodId
-            // 
-            this.AnaesthesiaMethodId.HeaderText = "拟施麻醉";
-            this.AnaesthesiaMethodId.Name = "AnaesthesiaMethodId";
-            this.AnaesthesiaMethodId.ReadOnly = true;
-            this.AnaesthesiaMethodId.Visible = false;
-            // 
-            // AnesthesiaDoctor
-            // 
-            this.AnesthesiaDoctor.HeaderText = "麻醉医生";
-            this.AnesthesiaDoctor.Name = "AnesthesiaDoctor";
-            this.AnesthesiaDoctor.ReadOnly = true;
-            // 
-            // InstrumentNurse
-            // 
-            this.InstrumentNurse.HeaderText = "洗手护士";
-            this.InstrumentNurse.Name = "InstrumentNurse";
-            this.InstrumentNurse.ReadOnly = true;
-            this.InstrumentNurse.Width = 65;
-            // 
-            // TourNurse
-            // 
-            this.TourNurse.HeaderText = "巡回护士";
-            this.TourNurse.Name = "TourNurse";
-            this.TourNurse.ReadOnly = true;
-            this.TourNurse.Width = 65;
-            // 
-            // Remark
-            // 
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.Remark.DefaultCellStyle = dataGridViewCellStyle7;
-            this.Remark.HeaderText = "备注";
-            this.Remark.Name = "Remark";
-            this.Remark.ReadOnly = true;
             // 
             // frmSelectiveOperationsPrint
             // 
@@ -717,5 +732,6 @@ namespace AIMS.OperationFront.UI
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn16;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn17;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn18;
+        private DevComponents.DotNetBar.Controls.CheckBoxX checkBoxX1;
     }
 }

AIMS/OremrUserControl/ucPatientRecoverCard.Designer.cs

@@ -72,10 +72,10 @@
             // labPatientName
             // 
             this.labPatientName.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labPatientName.Location = new System.Drawing.Point(47, 13);
+            this.labPatientName.Location = new System.Drawing.Point(57, 13);
             this.labPatientName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.labPatientName.Name = "labPatientName";
-            this.labPatientName.Size = new System.Drawing.Size(115, 20);
+            this.labPatientName.Size = new System.Drawing.Size(105, 20);
             this.labPatientName.TabIndex = 7;
             this.labPatientName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.labPatientName.Click += new System.EventHandler(this.labTabindex_Click);
@@ -99,7 +99,7 @@
             this.labelName.Location = new System.Drawing.Point(2, 13);
             this.labelName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.labelName.Name = "labelName";
-            this.labelName.Size = new System.Drawing.Size(45, 20);
+            this.labelName.Size = new System.Drawing.Size(73, 20);
             this.labelName.TabIndex = 6;
             this.labelName.Click += new System.EventHandler(this.labTabindex_Click);
             // 

AIMS/PublicUI/frmDrugSel.Designer.cs

@@ -36,7 +36,6 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmDrugSel));
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel5 = new System.Windows.Forms.Panel();
@@ -66,9 +65,6 @@
             this.superTabItem3 = new DevComponents.DotNetBar.SuperTabItem();
             this.superTabItem4 = new DevComponents.DotNetBar.SuperTabItem();
             this.dgvYP = new System.Windows.Forms.DataGridView();
-            this.dgvDosage = new System.Windows.Forms.DataGridView();
-            this.Dosage = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.imageList1 = new System.Windows.Forms.ImageList(this.components);
             this.id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Code = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.TypeId = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -84,6 +80,7 @@
             this.Channel = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Remark = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ZFBL = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.imageList1 = new System.Windows.Forms.ImageList(this.components);
             this.panel1.SuspendLayout();
             this.panel5.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.tabDrugs)).BeginInit();
@@ -94,7 +91,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.TabSelDrugs)).BeginInit();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvYP)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvDosage)).BeginInit();
             this.SuspendLayout();
             // 
             // panel1
@@ -480,53 +476,6 @@
             this.dgvYP.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.dgvYP_KeyPress);
             this.dgvYP.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.dgvYP_PreviewKeyDown);
             // 
-            // dgvDosage
-            // 
-            this.dgvDosage.AllowUserToAddRows = false;
-            this.dgvDosage.AllowUserToDeleteRows = false;
-            this.dgvDosage.BackgroundColor = System.Drawing.Color.White;
-            this.dgvDosage.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle8.BackColor = System.Drawing.Color.White;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvDosage.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
-            this.dgvDosage.ColumnHeadersHeight = 30;
-            this.dgvDosage.ColumnHeadersVisible = false;
-            this.dgvDosage.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Dosage});
-            this.dgvDosage.EnableHeadersVisualStyles = false;
-            this.dgvDosage.Location = new System.Drawing.Point(317, 148);
-            this.dgvDosage.Name = "dgvDosage";
-            this.dgvDosage.ReadOnly = true;
-            this.dgvDosage.RowHeadersVisible = false;
-            this.dgvDosage.RowTemplate.Height = 30;
-            this.dgvDosage.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvDosage.Size = new System.Drawing.Size(60, 90);
-            this.dgvDosage.TabIndex = 18;
-            this.dgvDosage.Visible = false;
-            this.dgvDosage.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvDosage_CellClick);
-            this.dgvDosage.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dgvDosage_KeyDown);
-            this.dgvDosage.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.dgvDosage_KeyPress);
-            this.dgvDosage.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.dgvDosage_PreviewKeyDown);
-            // 
-            // Dosage
-            // 
-            this.Dosage.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.Dosage.HeaderText = "剂量";
-            this.Dosage.Name = "Dosage";
-            this.Dosage.ReadOnly = true;
-            // 
-            // imageList1
-            // 
-            this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
-            this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
-            this.imageList1.Images.SetKeyName(0, "插入列.png");
-            this.imageList1.Images.SetKeyName(1, "未插入列 .png");
-            // 
             // id
             // 
             this.id.DataPropertyName = "Id";
@@ -647,12 +596,18 @@
             this.ZFBL.ReadOnly = true;
             this.ZFBL.Visible = false;
             // 
+            // imageList1
+            // 
+            this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
+            this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
+            this.imageList1.Images.SetKeyName(0, "插入列.png");
+            this.imageList1.Images.SetKeyName(1, "未插入列 .png");
+            // 
             // frmDrugSel
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.AutoScroll = true;
             this.ClientSize = new System.Drawing.Size(1195, 677);
-            this.Controls.Add(this.dgvDosage);
             this.Controls.Add(this.dgvYP);
             this.Controls.Add(this.panel1);
             this.DoubleBuffered = true;
@@ -676,7 +631,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.TabSelDrugs)).EndInit();
             this.panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvYP)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvDosage)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -702,8 +656,6 @@
         public DevComponents.DotNetBar.SuperTabControl tabDrugs;
         private DevComponents.DotNetBar.Controls.DataGridViewX dgvDrugsSZ;
         private System.Windows.Forms.DataGridView dgvYP;
-        private System.Windows.Forms.DataGridView dgvDosage;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Dosage;
         private System.Windows.Forms.ImageList imageList1;
         private System.Windows.Forms.DataGridViewImageColumn dataGridViewImageColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;

AIMS/PublicUI/frmDrugSel.resx

@@ -146,7 +146,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAa
-        CAAAAk1TRnQBSQFMAgEBAgEAAdABBgHQAQYBFAEAARQBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFQ
+        CAAAAk1TRnQBSQFMAgEBAgEAAdgBBgHYAQYBFAEAARQBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFQ
         AwABFAMAAQEBAAEgBgABGS4AA1UBrwOAAf4DKwH8AysB/AGZAYsBQAH9AaEBkgEAAf8BkwGCAQAB/wGW
         AYcBQAH9AaMBlAEAAf8BowGUAQAB/wGjAZQBAAH/AysB/ANgAej/AA0AAZMBggEAAf8DYgH2A20B9wNt
         AfcDXAH4A4AB/gGXAYYBAAH/A20B9wHsAecB5AH/AewB5wHkAf8B7AHnAeQB/wNtAfcBkwGCAQAB//8A

AIMSEntity/AIMSEntity.csproj

@@ -51,6 +51,11 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BLL\AutoGenerate\BFeesRecord.cs" />
+    <Compile Include="BLL\Extension\BFeesRecord.cs" />
+    <Compile Include="DAL\AutoGenerate\DFeesRecord.cs" />
+    <Compile Include="DAL\Extension\DFeesRecord.cs" />
+    <Compile Include="Model\AutoGenerate\FeesRecord.cs" />
     <Compile Include="BLL\AutoGenerate\BAdverseEvent.cs" />
     <Compile Include="BLL\AutoGenerate\BAnaesthesiaEvents.cs" />
     <Compile Include="BLL\AutoGenerate\BAnaesthesiaMethod.cs" />
@@ -67,6 +72,7 @@
     <Compile Include="BLL\AutoGenerate\BBasicDictionary.cs" />
     <Compile Include="BLL\AutoGenerate\BBloodGasAnalysisDict.cs" />
     <Compile Include="BLL\AutoGenerate\BCharges.cs" />
+    <Compile Include="BLL\AutoGenerate\BChargsTemplate.cs" />
     <Compile Include="BLL\AutoGenerate\BDepartment.cs" />
     <Compile Include="BLL\AutoGenerate\BDisease.cs" />
     <Compile Include="BLL\AutoGenerate\BDosageKind.cs" />
@@ -188,6 +194,7 @@
     <Compile Include="BLL\Extension\BSysConfig.cs" />
     <Compile Include="BLL\Extension\BUserPurview.cs" />
     <Compile Include="DAL\AutoGenerate\DCharges.cs" />
+    <Compile Include="DAL\AutoGenerate\DChargsTemplate.cs" />
     <Compile Include="DAL\AutoGenerate\DOperationRecord.cs" />
     <Compile Include="DAL\AutoGenerate\DOperationRecoverInInfo.cs" />
     <Compile Include="DAL\AutoGenerate\DOperationRecoverOutInfo.cs" />
@@ -325,6 +332,7 @@
     <Compile Include="DAL\Extension\DStockPile.cs" />
     <Compile Include="DAL\Extension\DSysConfig.cs" />
     <Compile Include="DAL\Extension\DUserPurview.cs" />
+    <Compile Include="Model\Extension\FeesRecord.cs" />
     <Compile Include="Model\AutoGenerate\AnaesthesiaEvents.cs" />
     <Compile Include="Model\AutoGenerate\AnaesthesiaMethod.cs" />
     <Compile Include="Model\AutoGenerate\Appliance.cs" />
@@ -337,6 +345,7 @@
     <Compile Include="Model\AutoGenerate\ApplyPersonDuty.cs" />
     <Compile Include="Model\AutoGenerate\BasicDictionary.cs" />
     <Compile Include="Model\AutoGenerate\Charges.cs" />
+    <Compile Include="Model\AutoGenerate\ChargsTemplate.cs" />
     <Compile Include="Model\AutoGenerate\Department.cs" />
     <Compile Include="Extensions\DeviceCacheData.cs" />
     <Compile Include="Model\AutoGenerate\Disease.cs" />
@@ -457,6 +466,7 @@
     <Compile Include="ObjectQuery\BasicDictionaryMap.cs" />
     <Compile Include="ObjectQuery\BloodGasAnalysisDictMap.cs" />
     <Compile Include="ObjectQuery\ChargesMap.cs" />
+    <Compile Include="ObjectQuery\ChargsTemplateMap.cs" />
     <Compile Include="ObjectQuery\DepartmentMap.cs" />
     <Compile Include="ObjectQuery\DiseaseMap.cs" />
     <Compile Include="ObjectQuery\DosageKindMap.cs" />
@@ -478,6 +488,7 @@
     <Compile Include="ObjectQuery\FactOperationPositionMap.cs" />
     <Compile Include="ObjectQuery\FactOutputLiquidsMap.cs" />
     <Compile Include="ObjectQuery\FactPersonDutyMap.cs" />
+    <Compile Include="ObjectQuery\FeesRecordMap.cs" />
     <Compile Include="ObjectQuery\HospitalInfoMap.cs" />
     <Compile Include="ObjectQuery\InstrumentRegistrationMap.cs" />
     <Compile Include="ObjectQuery\KBITEMMap.cs" />

AIMSEntity/BLL/AutoGenerate/BChargsTemplate.cs

@@ -0,0 +1,166 @@
+using AIMSDAL;
+using AIMSModel;
+using System; 
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+
+namespace AIMSBLL
+{
+    public partial class BChargsTemplate
+    {
+        #region 插入实体操作部份
+        /// <summary>
+        /// 插入实体
+        /// </summary>
+        /// <param name="chargsTemplate">实体类对象</param>
+        /// <returns>标识列值或影响的记录行数</returns>
+        public static int Insert(ChargsTemplate chargsTemplate)
+        {
+            return DChargsTemplate.Insert(chargsTemplate);
+        }
+        #endregion
+
+        #region 删除实体操作
+        /// <summary>
+        /// 删除实体
+        /// </summary>
+        /// <param name="chargsTemplate">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+        public static int Delete(ChargsTemplate chargsTemplate)
+        {
+            return DChargsTemplate.Delete(chargsTemplate);
+        }
+        /// <summary>
+        /// 根据对象查询语句删除
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        public static int Delete(string oql, ParameterList parameters)
+        {
+            return DChargsTemplate.Delete(oql, parameters);
+        }
+        #endregion
+
+        #region 更新实体操作
+
+        /// <summary>
+        /// 更新实体
+        /// </summary>
+        /// <param name="chargsTemplate">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+        public static int Update(ChargsTemplate chargsTemplate)
+        {
+            return DChargsTemplate.Update(chargsTemplate);
+        }
+
+        /// <summary>
+        /// 根据对象查询语句更新实体
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        public static int Update(string oql, ParameterList parameters)
+        {
+            return DChargsTemplate.Update(oql, parameters);
+        }
+        #endregion
+
+        #region 查询实体集合
+        /// <summary>
+        /// \查询实体集合
+        /// </summary>
+        /// <returns>实体类对象集合</returns>
+        public static List<ChargsTemplate> Select()
+        {
+            return DChargsTemplate.Select();
+        }
+        /// <summary>
+        /// 递归查询实体集合
+        /// </summary>
+        /// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象集合</returns>
+        public static List<ChargsTemplate> Select(RecursiveType recursiveType, int recursiveDepth)
+        {
+            return DChargsTemplate.Select(recursiveType, recursiveDepth);
+        }
+
+        /// <summary>
+        /// 根据对象查询语句查询实体集合
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>实体类对象集合</returns>
+        public static List<ChargsTemplate> Select(string oql, ParameterList parameters)
+        {
+            return DChargsTemplate.Select(oql, parameters);
+        }
+
+        /// <summary>
+        /// 根据对象查询语句递归查询实体集合
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象集合</returns>
+        public static List<ChargsTemplate> Select(string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth)
+        {
+            return DChargsTemplate.Select(oql, parameters, recursiveType, recursiveDepth);
+        }
+        #endregion
+
+        #region 查询单个实体
+        /// <summary>
+        /// 更据对象查询语句查询单个实体
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>实体对象</returns>
+        public static ChargsTemplate SelectSingle(string oql, ParameterList parameters)
+        {
+            return DChargsTemplate.SelectSingle(oql, parameters);
+        }
+        /// <summary>
+        /// 更据对象查询语句递归查询单个实体
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体对象</returns>
+        public static ChargsTemplate SelectSingle(string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth)
+        {
+            return DChargsTemplate.SelectSingle(oql, parameters, recursiveType, recursiveDepth);
+        }
+
+        /// <summary>
+        /// 按主键字段查询特定实体
+        /// </summary>
+        /// <param name="id">主键值</param>
+        /// <returns>实体类对象</returns>
+        public static ChargsTemplate SelectSingle(int? id)
+        {
+            return DChargsTemplate.SelectSingle(id);
+        }
+
+        /// <summary>
+        /// 更据主键递归查询单个实体
+        /// </summary>
+        /// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体对象</returns>
+        public static ChargsTemplate SelectSingle(int? id, RecursiveType recursiveType, int recursiveDepth)
+        {
+            return DChargsTemplate.SelectSingle(id, recursiveType, recursiveDepth);
+        }
+        #endregion
+
+        public static DataTable GetChargsTemplate(string type, string name)
+        {
+            return DChargsTemplate.GetChargsTemplate(type, name);
+        }
+    }
+}

AIMSEntity/BLL/AutoGenerate/BFeesRecord.cs

@@ -0,0 +1,160 @@
+using System;
+using AIMSDAL;
+using AIMSModel;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace AIMSBLL
+{
+    public partial class BFeesRecord
+	{
+	    #region 插入实体操作部份
+	    /// <summary>
+        /// 插入实体
+        /// </summary>
+        /// <param name="feesRecord">实体类对象</param>
+        /// <returns>标识列值或影响的记录行数</returns>
+	    public static int Insert(FeesRecord feesRecord)
+		{
+			return DFeesRecord.Insert(feesRecord);
+		}
+		#endregion
+		
+		#region 删除实体操作
+		/// <summary>
+        /// 删除实体
+        /// </summary>
+        /// <param name="feesRecord">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+        public static int Delete(FeesRecord feesRecord)
+        {
+            return DFeesRecord.Delete(feesRecord);
+        }
+		/// <summary>
+        /// 根据对象查询语句删除
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        public static int Delete(string oql, ParameterList parameters)
+        {
+            return DFeesRecord.Delete(oql,parameters);
+        }
+		#endregion
+		
+		#region 更新实体操作
+				
+		/// <summary>
+        /// 更新实体
+        /// </summary>
+        /// <param name="feesRecord">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+	    public static int Update(FeesRecord feesRecord)
+		{
+		    return DFeesRecord.Update(feesRecord);
+		}
+		
+		/// <summary>
+        /// 根据对象查询语句更新实体
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        public static int Update(string oql, ParameterList parameters)
+        {
+            return DFeesRecord.Update(oql,parameters);
+        }
+		#endregion
+		
+		#region 查询实体集合
+		/// <summary>
+        /// \查询实体集合
+        /// </summary>
+        /// <returns>实体类对象集合</returns>
+        public static List<FeesRecord> Select()
+        {
+			return DFeesRecord.Select();
+        }
+		/// <summary>
+        /// 递归查询实体集合
+        /// </summary>
+		/// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象集合</returns>
+        public static List<FeesRecord> Select(RecursiveType recursiveType, int recursiveDepth)
+        {
+			return DFeesRecord.Select(recursiveType, recursiveDepth);
+        }
+		
+		/// <summary>
+        /// 根据对象查询语句查询实体集合
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>实体类对象集合</returns>
+        public static List<FeesRecord> Select(string oql, ParameterList parameters)
+        {
+			return DFeesRecord.Select(oql, parameters);
+        }
+		
+		/// <summary>
+        /// 根据对象查询语句递归查询实体集合
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+		/// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象集合</returns>
+        public static List<FeesRecord> Select(string oql, ParameterList parameters,RecursiveType recursiveType, int recursiveDepth)
+        {
+			return DFeesRecord.Select(oql, parameters, recursiveType, recursiveDepth);
+        }
+		#endregion
+		
+		#region 查询单个实体
+		/// <summary>
+        /// 更据对象查询语句查询单个实体
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>实体对象</returns>
+        public static FeesRecord SelectSingle(string oql, ParameterList parameters)
+        {
+             return DFeesRecord.SelectSingle(oql, parameters);
+        }
+		/// <summary>
+        /// 更据对象查询语句递归查询单个实体
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+		/// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体对象</returns>
+        public static FeesRecord SelectSingle(string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth)
+        {
+		    return DFeesRecord.SelectSingle(oql, parameters, recursiveType, recursiveDepth);
+		}
+		
+		/// <summary>
+        /// 按主键字段查询特定实体
+        /// </summary>
+        /// <param name="id">主键值</param>
+        /// <returns>实体类对象</returns>
+        public static FeesRecord SelectSingle(int? id)
+        {
+            return DFeesRecord.SelectSingle(id);
+        }
+		
+		/// <summary>
+        /// 更据主键递归查询单个实体
+        /// </summary>
+		/// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体对象</returns>
+        public static FeesRecord SelectSingle(int? id, RecursiveType recursiveType, int recursiveDepth)
+        {
+		    return DFeesRecord.SelectSingle(id, recursiveType, recursiveDepth);
+		}
+		#endregion
+    }
+}

AIMSEntity/BLL/Extension/BCharges.cs

@@ -1,11 +1,11 @@
-using System;
+using AIMSDAL;
-using AIMSDAL;
 using AIMSModel;
-using AIMSObjectQuery;
+using DrawGraph;
-using System.Collections;
+using HelperDB;
+using System;
 using System.Collections.Generic;
 using System.Data;
-using HelperDB;
+using System.Data.SqlClient;
 
 namespace AIMSBLL
 {
@@ -24,6 +24,11 @@ namespace AIMSBLL
                 return DBHelper.GetDataTable(sql);
             }
         }
+        public static DataTable GetAllChargesByCondition(string Condition)
+        {
+            string strSql = "SELECT top 20 d.*, Bill Stand,unit DosageUnit,Form Factory,d.Class as TypeName FROM Charges d where d.IsValid=1 and (d.HelpCode like'%" + Condition.ToUpper() + "%' or d.Name like'%" + Condition + "%')  ";
+            return DBHelper.GetDataTable(strSql);
+        }
 
         public static DataTable SelectIdName(string str)
         {
@@ -38,5 +43,71 @@ namespace AIMSBLL
             }
             return DBHelper.GetDataTable(sql);
         }
+
+        public static DataTable GetChargsByCodes(string ids, string numbers)
+        {
+            DataTable dt = BCharges.GetChargsByCodes(ids);
+            dt.Columns.Add(new DataColumn("Number", typeof(string)));
+            string[] numbes = new string[0];
+            if (numbers != null && numbers != "") numbes = numbers.Split(',');
+            for (int i = 0; i < dt.Rows.Count; i++)
+            {
+                if (numbes.Length != 0 && numbes.Length <= dt.Rows.Count) dt.Rows[i]["Number"] = numbes[i].ToString();
+                else dt.Rows[i]["Number"] = "0";
+            }
+            return dt;
+        }
+        public static DataTable GetChargsByCodes(string ChargCodes)
+        {
+            if (ChargCodes != null && ChargCodes.Length > 0)
+            {
+                string sql = string.Format("select * from Charges where Id in({0})  order by charindex(','+rtrim(Id)+',',',{1},') ", ChargCodes, ChargCodes.Replace("'", "")); 
+                return DBHelper.GetDataTable(sql);
+            }
+            else
+            {
+                string sql = string.Format("select * from Charges  where 1<>1 ");
+                return DBHelper.GetDataTable(sql);
+            }
+        }
+
+        /// <summary>
+        /// 模糊查询事件
+        /// </summary>
+        /// <returns></returns>
+        public static DataTable SelectByIdName(string str, string deptid)
+        {
+            string sql = string.Empty;
+            if (str == "")
+            {
+                sql = string.Format("select Top 40 Id ID,name+' '+ISNULL(Bill,'') Name, Code,code xmbm,Form,Price from Charges where Class <>  '药品'");
+            }
+            else
+            {
+                sql = string.Format("select Top 40 Id ID,name+' '+ISNULL(Bill,'') Name, Code,code xmbm,Form,Price from Charges where Class <>  '药品' and ( Code like '%{0}%' OR name like '%{0}%'   ) ", str); 
+            }
+            try
+            {
+                return DBHelper.GetDataTable(sql);
+            }
+            catch (SqlException ex)
+            {
+                throw new Exception(ex.Message);
+            }
+        }
+
+        public static List<Charges> GetChargsListByCodes(string ids, string numbers)
+        { 
+            List<Charges> dt = DCharges.GetChargsListByCodes(ids);
+            string[] numbes = new string[0];
+            if (numbers != null && numbers != "") numbes = numbers.Split(',');
+            for (int i = 0; i < dt.Count; i++)
+            {
+                if (numbes.Length != 0 && numbes.Length <= dt.Count) dt[i].Number = numbes[i].ToString();
+                else dt[i].Number = "1";
+            }
+            return dt;
+        }
+
     }
-}
+} 

AIMSEntity/BLL/Extension/BDrugs.cs

@@ -14,7 +14,7 @@ namespace AIMSBLL
     { 
         public static DataTable GetAllDrugsByCondition(string Condition)
         {
-            string strSql = "SELECT top 20 d.*, d.DrugKind as TypeName,Stand,DosageUnit,Unit,Dosage,Factory,Channel,Remark,ZFBL FROM Drugs d where d.IsValid=1 and (d.HelpCode like'%" + Condition.ToUpper() + "%' or d.Name like'%" + Condition + "%') Order By UseRate desc";
+            string strSql = "SELECT top 20 d.*, d.DrugKind as TypeName FROM Drugs d where d.IsValid=1 and (d.HelpCode like'%" + Condition.ToUpper() + "%' or d.Name like'%" + Condition + "%') Order By UseRate desc";
             return DBHelper.GetDataTable(strSql);
         }
 

AIMSEntity/BLL/Extension/BFeesRecord.cs

@@ -0,0 +1,12 @@
+using System;
+using AIMSDAL;
+using AIMSModel;
+using AIMSObjectQuery;
+using System.Collections;
+using System.Collections.Generic;
+namespace AIMSBLL
+{
+    public partial class BFeesRecord
+    {
+    }
+}

AIMSEntity/DAL/AutoGenerate/DChargsTemplate.cs

@@ -0,0 +1,634 @@
+using System;
+using System.Data;
+using System.Data.SqlClient;
+using System.Collections; 
+using System.Collections.Generic;
+using AIMSModel;
+using AIMSObjectQuery;
+using HelperDB;
+
+namespace AIMSDAL
+{
+    public partial class DChargsTemplate
+    {
+        #region 插入实体操作部份
+        /// <summary>
+        /// 插入
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="chargsTemplate">实体类对象</param>
+        /// <returns>标识列值或影响的记录行数</returns>
+        public static int Insert(SqlCommand cmd, ChargsTemplate chargsTemplate)
+        {
+            cmd.Parameters.Clear();
+            cmd.CommandText = "insert into ChargsTemplate (TemplateType,TemplateName,HCode,ConnectId,DefaultValue,IsValid,OperatorId,OperatorTime) values (@TemplateType,@TemplateName,@HCode,@ConnectId,@DefaultValue,@IsValid,@OperatorId,@OperatorTime);select @@identity";
+            //从实体中取出值放入Command的参数列表
+            cmd.Parameters.Add(new SqlParameter("@TemplateType", chargsTemplate.TemplateType == null ? (object)DBNull.Value : (object)chargsTemplate.TemplateType));
+            cmd.Parameters.Add(new SqlParameter("@TemplateName", chargsTemplate.TemplateName == null ? (object)DBNull.Value : (object)chargsTemplate.TemplateName));
+            cmd.Parameters.Add(new SqlParameter("@HCode", chargsTemplate.HCode == null ? (object)DBNull.Value : (object)chargsTemplate.HCode));
+            cmd.Parameters.Add(new SqlParameter("@ConnectId", chargsTemplate.ConnectId == null ? (object)DBNull.Value : (object)chargsTemplate.ConnectId));
+            cmd.Parameters.Add(new SqlParameter("@DefaultValue", chargsTemplate.DefaultValue == null ? (object)DBNull.Value : (object)chargsTemplate.DefaultValue));
+            cmd.Parameters.Add(new SqlParameter("@IsValid", chargsTemplate.IsValid.HasValue ? (object)chargsTemplate.IsValid.Value : (object)DBNull.Value));
+            cmd.Parameters.Add(new SqlParameter("@OperatorId", chargsTemplate.OperatorId.HasValue ? (object)chargsTemplate.OperatorId.Value : (object)DBNull.Value));
+            cmd.Parameters.Add(new SqlParameter("@OperatorTime", chargsTemplate.OperatorTime.HasValue ? (object)chargsTemplate.OperatorTime.Value : (object)DBNull.Value));
+            return Convert.ToInt32(cmd.ExecuteScalar());
+        }
+        /// <summary>
+        /// 不使用事务的插入方法
+        /// </summary>
+        /// <param name="chargsTemplate">实体类对象</param>
+        /// <returns>标识列值或影响的记录行数</returns>
+        public static int Insert(ChargsTemplate chargsTemplate)
+        {
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return Insert(cmd, chargsTemplate);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 使用事务的插入方法
+        /// </summary>
+        /// <param name="connection">实现共享Connection的对象</param>
+        /// <param name="chargsTemplate">实体类对象</param>
+        /// <returns>标识列值或影响的记录行数</returns>
+        public static int Insert(Connection connection, ChargsTemplate chargsTemplate)
+        {
+            return Insert(connection.Command, chargsTemplate);
+        }
+        #endregion
+
+        #region 删除实体操作
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="chargsTemplate">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+        public static int ExcuteDeleteCommand(SqlCommand cmd, ChargsTemplate chargsTemplate)
+        {
+            cmd.Parameters.Clear();
+            cmd.CommandText = "delete from ChargsTemplate where Id=@Id";
+            //从实体中取出值放入Command的参数列表
+            cmd.Parameters.Add(new SqlParameter("@Id", chargsTemplate.Id));
+            return cmd.ExecuteNonQuery();
+        }
+        /// <summary>
+        /// 不使用事务的删除方法
+        /// </summary>
+        /// <param name="chargsTemplate">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+        public static int Delete(ChargsTemplate chargsTemplate)
+        {
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return ExcuteDeleteCommand(cmd, chargsTemplate);
+                }
+            }
+        }
+        /// <summary>
+        /// 使用事务的删除方法
+        /// </summary>
+        /// <param name="connection">实现共享Connection的对象</param>
+        /// <param name="chargsTemplate">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+        public static int Delete(Connection connection, ChargsTemplate chargsTemplate)
+        {
+            return ExcuteDeleteCommand(connection.Command, chargsTemplate);
+        }
+
+        /// <summary>
+        /// 执行删除命令
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        public static int ExcuteDeleteCommand(SqlCommand cmd, string oql, ParameterList parameters)
+        {
+            //解析过滤部份Sql语句
+            string filterString = SyntaxAnalyzer.ParseSql(oql, new ChargsTemplateMap());
+            if (filterString != string.Empty)
+            {
+                filterString = " where " + filterString;
+            }
+            cmd.Parameters.Clear();
+            cmd.CommandText = "delete from ChargsTemplate " + filterString;
+            //添加参数
+            if (parameters != null)
+            {
+                foreach (string key in parameters.Keys)
+                {
+                    cmd.Parameters.Add(new SqlParameter(key, parameters[key]));
+                }
+            }
+            return cmd.ExecuteNonQuery();
+        }
+
+        /// <summary>
+        /// 不使用事务的删除方法
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        public static int Delete(string oql, ParameterList parameters)
+        {
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return ExcuteDeleteCommand(cmd, oql, parameters);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 使用事务的删除方法
+        /// </summary>
+        /// <param name="connection">实现共享Connection的对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        public static int Delete(Connection connection, string oql, ParameterList parameters)
+        {
+            return ExcuteDeleteCommand(connection.Command, oql, parameters);
+        }
+
+        #endregion
+
+        #region 更新实体操作
+
+        /// <summary>
+        /// 更新
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="chargsTemplate">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+        public static int ExcuteUpdateCommand(SqlCommand cmd, ChargsTemplate chargsTemplate)
+        {
+            cmd.CommandText = "update ChargsTemplate set TemplateType=@TemplateType,TemplateName=@TemplateName,HCode=@HCode,ConnectId=@ConnectId,DefaultValue=@DefaultValue,IsValid=@IsValid,OperatorId=@OperatorId,OperatorTime=@OperatorTime where Id=@Id";
+            //从实体中取出值放入Command的参数列表
+            cmd.Parameters.Add(new SqlParameter("@TemplateType", chargsTemplate.TemplateType == null ? (object)DBNull.Value : (object)chargsTemplate.TemplateType));
+            cmd.Parameters.Add(new SqlParameter("@TemplateName", chargsTemplate.TemplateName == null ? (object)DBNull.Value : (object)chargsTemplate.TemplateName));
+            cmd.Parameters.Add(new SqlParameter("@HCode", chargsTemplate.HCode == null ? (object)DBNull.Value : (object)chargsTemplate.HCode));
+            cmd.Parameters.Add(new SqlParameter("@ConnectId", chargsTemplate.ConnectId == null ? (object)DBNull.Value : (object)chargsTemplate.ConnectId));
+            cmd.Parameters.Add(new SqlParameter("@DefaultValue", chargsTemplate.DefaultValue == null ? (object)DBNull.Value : (object)chargsTemplate.DefaultValue));
+            cmd.Parameters.Add(new SqlParameter("@IsValid", chargsTemplate.IsValid.HasValue ? (object)chargsTemplate.IsValid.Value : (object)DBNull.Value));
+            cmd.Parameters.Add(new SqlParameter("@OperatorId", chargsTemplate.OperatorId.HasValue ? (object)chargsTemplate.OperatorId.Value : (object)DBNull.Value));
+            cmd.Parameters.Add(new SqlParameter("@OperatorTime", chargsTemplate.OperatorTime.HasValue ? (object)chargsTemplate.OperatorTime.Value : (object)DBNull.Value));
+            cmd.Parameters.Add(new SqlParameter("@Id", chargsTemplate.Id));
+            return cmd.ExecuteNonQuery();
+        }
+
+        /// <summary>
+        /// 不使用事务的更新方法
+        /// </summary>
+        /// <param name="chargsTemplate">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+        public static int Update(ChargsTemplate chargsTemplate)
+        {
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return ExcuteUpdateCommand(cmd, chargsTemplate);
+                }
+            }
+        }
+        /// <summary>
+        /// 使用事务的更新方法
+        /// </summary>
+        /// <param name="connection">实现共享Connection的对象</param>
+        /// <param name="chargsTemplate">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+        public static int Update(Connection connection, ChargsTemplate chargsTemplate)
+        {
+            return ExcuteUpdateCommand(connection.Command, chargsTemplate);
+        }
+        /// <summary>
+        /// 执行更新命令
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        public static int ExcuteUpdateCommand(SqlCommand cmd, string oql, ParameterList parameters)
+        {
+            //解析过滤部份Sql语句
+            string updateString = SyntaxAnalyzer.ParseSql(oql, new ChargsTemplateMap());
+            cmd.CommandText = "update ChargsTemplate set " + updateString;
+            cmd.Parameters.Clear();
+            //添加参数
+            if (parameters != null)
+            {
+                foreach (string key in parameters.Keys)
+                {
+                    cmd.Parameters.Add(new SqlParameter(key, parameters[key]));
+                }
+            }
+            return cmd.ExecuteNonQuery();
+        }
+
+        /// <summary>
+        /// 不使用事务的更新方法
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        public static int Update(string oql, ParameterList parameters)
+        {
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return ExcuteUpdateCommand(cmd, oql, parameters);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 使用事务的更新方法
+        /// </summary>
+        /// <param name="connection">实现共享Connection的对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        public static int Update(Connection connection, string oql, ParameterList parameters)
+        {
+            return ExcuteUpdateCommand(connection.Command, oql, parameters);
+        }
+        #endregion
+
+        #region 查询实体集合
+        /// <summary>
+        /// 执行Command获取对象列表
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象列表</returns>
+        public static List<ChargsTemplate> ExcuteSelectCommand(SqlCommand cmd, RecursiveType recursiveType, int recursiveDepth)
+        {
+            List<ChargsTemplate> chargsTemplateList = new List<ChargsTemplate>();
+            using (SqlDataReader dr = cmd.ExecuteReader())
+            {
+                while (dr.Read())
+                {
+                    ChargsTemplate chargsTemplate = DataReaderToEntity(dr);
+                    chargsTemplateList.Add(chargsTemplate);
+                }
+            }
+            return chargsTemplateList;
+        }
+        /// <summary>
+        /// 执行查询命令
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象集合</returns>
+        public static List<ChargsTemplate> ExcuteSelectCommand(SqlCommand cmd, string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth)
+        {
+            //解析过滤部份Sql语句
+            string filterString = SyntaxAnalyzer.ParseSql(oql, new ChargsTemplateMap());
+            if (filterString != string.Empty)
+            {
+                if (filterString.Trim().ToLower().IndexOf("order ") != 0)
+                    filterString = " where " + filterString;
+            }
+            cmd.Parameters.Clear();
+            cmd.CommandText = "select * from ChargsTemplate " + filterString;
+            //添加参数
+            if (parameters != null)
+            {
+                foreach (string key in parameters.Keys)
+                {
+                    cmd.Parameters.Add(new SqlParameter(key, parameters[key]));
+                }
+            }
+            return ExcuteSelectCommand(cmd, recursiveType, recursiveDepth);
+        }
+
+        /// <summary>
+        /// 根据对象查询语句查询实体集合
+        /// </summary>
+        /// <returns>实体类对象集合</returns>
+        public static List<ChargsTemplate> Select()
+        {
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    cmd.CommandText = "select * from ChargsTemplate";
+                    return ExcuteSelectCommand(cmd, RecursiveType.Parent, 1);
+                }
+            }
+        }
+        /// <summary>
+        /// 根据对象查询语句查询实体集合
+        /// </summary>
+        /// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象集合</returns>
+        public static List<ChargsTemplate> Select(RecursiveType recursiveType, int recursiveDepth)
+        {
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    cmd.CommandText = "select * from ChargsTemplate";
+                    return ExcuteSelectCommand(cmd, recursiveType, recursiveDepth);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 根据对象查询语句查询实体集合
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>实体类对象集合</returns>
+        public static List<ChargsTemplate> Select(string oql, ParameterList parameters)
+        {
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return ExcuteSelectCommand(cmd, oql, parameters, RecursiveType.Parent, 1);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 根据对象查询语句查询实体集合
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象集合</returns>
+        public static List<ChargsTemplate> Select(string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth)
+        {
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return ExcuteSelectCommand(cmd, oql, parameters, recursiveType, recursiveDepth);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 根据对象查询语句查询实体集合（启用事务）
+        /// </summary>
+        /// <param name="connection">连接对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象集合</returns>
+        public static List<ChargsTemplate> Select(Connection connection, string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth)
+        {
+            return ExcuteSelectCommand(connection.Command, oql, parameters, recursiveType, recursiveDepth);
+        }
+        #endregion
+
+        #region 查询单个实体
+
+        /// <summary>
+        /// 递归查询单个实体
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体对象</returns>
+        public static ChargsTemplate ExcuteSelectSingleCommand(SqlCommand cmd, RecursiveType recursiveType, int recursiveDepth)
+        {
+            ChargsTemplate chargsTemplate = null;
+            using (SqlDataReader dr = cmd.ExecuteReader())
+            {
+                if (dr.Read())
+                    chargsTemplate = DataReaderToEntity(dr);
+            }
+            if (chargsTemplate == null)
+                return chargsTemplate;
+            return chargsTemplate;
+        }
+        /// <summary>
+        /// 更据对象查询语句递归查询单个实体
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体对象</returns>
+        public static ChargsTemplate ExcuteSelectSingleCommand(SqlCommand cmd, string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth)
+        {
+            //解析过滤部份Sql语句
+            string filterString = SyntaxAnalyzer.ParseSql(oql, new ChargsTemplateMap());
+            if (filterString != string.Empty)
+            {
+                filterString = " where " + filterString;
+            }
+            cmd.CommandText = "select * from ChargsTemplate " + filterString;
+            cmd.Parameters.Clear();
+            //添加参数
+            if (parameters != null)
+            {
+                foreach (string key in parameters.Keys)
+                {
+                    cmd.Parameters.Add(new SqlParameter(key, parameters[key]));
+                }
+            }
+            return ExcuteSelectSingleCommand(cmd, recursiveType, recursiveDepth);
+        }
+
+        /// <summary>
+        /// 更据对象查询语句递归查询单个实体
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体对象</returns>
+        public static ChargsTemplate SelectSingle(string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth)
+        {
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return ExcuteSelectSingleCommand(cmd, oql, parameters, recursiveType, recursiveDepth);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 更据对象查询语句查询单个实体
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>实体对象</returns>
+        public static ChargsTemplate SelectSingle(string oql, ParameterList parameters)
+        {
+            return SelectSingle(oql, parameters, RecursiveType.Parent, 1);
+        }
+
+        /// <summary>
+        /// 更据对象查询语句并启用事务查询单个实体
+        /// </summary>
+        /// <param name="connection">连接对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>实体对象</returns>
+        public static ChargsTemplate SelectSingle(Connection connection, string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth)
+        {
+            return ExcuteSelectSingleCommand(connection.Command, oql, parameters, recursiveType, recursiveDepth);
+        }
+
+        /// <summary>
+        /// 更据主键值递归查询单个实体
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="id">主键值</param>
+        /// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体对象</returns>
+        public static ChargsTemplate SelectSingle(SqlCommand cmd, int? id, RecursiveType recursiveType, int recursiveDepth)
+        {
+            cmd.Parameters.Clear();
+            if (id.HasValue)
+            {
+                cmd.CommandText = "select * from ChargsTemplate where Id=@pk";
+                cmd.Parameters.Add(new SqlParameter("@pk", id.Value));
+            }
+            else
+            {
+                cmd.CommandText = "select * from ChargsTemplate where Id is null";
+            }
+            return ExcuteSelectSingleCommand(cmd, recursiveType, recursiveDepth);
+        }
+
+        /// <summary>
+        /// 按主键字段查询特定实体
+        /// </summary>
+        /// <param name="id">主键值</param>
+        /// <returns>实体类对象</returns>
+        public static ChargsTemplate SelectSingle(int? id)
+        {
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return SelectSingle(cmd, id, RecursiveType.Parent, 1);
+                }
+            }
+        }
+        /// <summary>
+        /// 按主键字段查询特定实体
+        /// </summary>
+        /// <param name="id">主键值</param>
+        /// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象</returns>
+        public static ChargsTemplate SelectSingle(int? id, RecursiveType recursiveType, int recursiveDepth)
+        {
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return SelectSingle(cmd, id, recursiveType, recursiveDepth);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 使用事务并按主键字段查询特定实体
+        /// </summary>
+        /// <param name="connection">连接对象</param>
+        /// <param name="id">主键值</param>
+        /// <returns>实体类对象</returns>
+        public static ChargsTemplate SelectSingle(Connection connection, int? id, RecursiveType recursiveType, int recursiveDepth)
+        {
+            return SelectSingle(connection.Command, id, recursiveType, recursiveDepth);
+        }
+        #endregion
+
+
+        /// <summary>
+        /// 从DataReader中取出值生成实体对象
+        /// </summary>
+        /// <param name="searcher">查询对象</param>
+        /// <returns>过滤条件字符串</returns>
+        private static ChargsTemplate DataReaderToEntity(SqlDataReader dr)
+        {
+            ChargsTemplate entity = new ChargsTemplate();
+            if (dr["Id"] != System.DBNull.Value)
+            {
+                entity.Id = Convert.ToInt32(dr["Id"]);
+            }
+            if (dr["TemplateType"] != System.DBNull.Value)
+            {
+                entity.TemplateType = dr["TemplateType"].ToString();
+            }
+            if (dr["TemplateName"] != System.DBNull.Value)
+            {
+                entity.TemplateName = dr["TemplateName"].ToString();
+            }
+            if (dr["HCode"] != System.DBNull.Value)
+            {
+                entity.HCode = dr["HCode"].ToString();
+            }
+            if (dr["ConnectId"] != System.DBNull.Value)
+            {
+                entity.ConnectId = dr["ConnectId"].ToString();
+            }
+            if (dr["DefaultValue"] != System.DBNull.Value)
+            {
+                entity.DefaultValue = dr["DefaultValue"].ToString();
+            }
+            if (dr["IsValid"] != System.DBNull.Value)
+            {
+                entity.IsValid = Convert.ToInt32(dr["IsValid"]);
+            }
+            if (dr["OperatorId"] != System.DBNull.Value)
+            {
+                entity.OperatorId = Convert.ToInt32(dr["OperatorId"]);
+            }
+            if (dr["OperatorTime"] != System.DBNull.Value)
+            {
+                entity.OperatorTime = Convert.ToDateTime(dr["OperatorTime"]);
+            }
+            return entity;
+        }
+
+        public static DataTable GetChargsTemplate(string type, string name)
+        {
+            string sql = string.Format("select * FROM ChargsTemplate where TemplateType='{0}' AND TemplateName LIKE '%{1}%'", type, name);
+            return DBHelper.GetDataTable(sql);
+        }
+    }
+}
+

AIMSEntity/DAL/AutoGenerate/DDrugs.cs

@@ -678,6 +678,14 @@ namespace AIMSDAL
             {
                 entity.Price = dr["Price"].ToString();
             }
+            if (dr["Code"] != System.DBNull.Value)
+            {
+                entity.Code = dr["Code"].ToString();
+            }
+            if (dr["Dosage"] != System.DBNull.Value)
+            {
+                entity.Dosage = dr["Dosage"].ToString();
+            }
             return entity;
         }
     }

AIMSEntity/DAL/AutoGenerate/DFeesRecord.cs

@@ -0,0 +1,891 @@
+using System;
+using System.Data;
+using System.Data.SqlClient;
+using System.Collections;
+using AIMSModel;
+using AIMSObjectQuery;
+using System.Collections.Generic;
+
+namespace AIMSDAL
+{
+    internal partial class DFeesRecord
+	{
+	    #region 插入实体操作部份
+	    /// <summary>
+        /// 插入
+        /// </summary>
+		/// <param name="cmd">Command对象</param>
+        /// <param name="feesRecord">实体类对象</param>
+        /// <returns>标识列值或影响的记录行数</returns>
+		internal static int Insert(SqlCommand cmd, FeesRecord feesRecord)
+		{
+		    cmd.Parameters.Clear();
+			cmd.CommandText = "insert into FeesRecord (PatientId,ApplyId,OperationRecordId,ApplyOrderNo,FeeIsDrug,FeeType,BillCode,GroupID,FeeTypeId,FeeId,FeeCode,FeeSerial,Unit,FeeNum,DrugSite,FeeId2,FeeClass,UnitPrice,ChargePrice,ActualPrice,ChargeFee,Valuer,BillingDeptId,BillingDept,BillingWorkId,BillingWork,HappenTime,EnrollTime,ExecDeptId,ExecDept,ExecWorkId,ExecWork,ExecState,ExecTime,Conclusion,IsInsure,InsureNO,LimitDrug,DrugType,IsUpLoad,Remark,EmergencyFlag,OrderNo,Extend1,Extend2,Extend3,Extend4,Extend5,OrderState,OperatorId,OperatorNo,OperatorName) values (@PatientId,@ApplyId,@OperationRecordId,@ApplyOrderNo,@FeeIsDrug,@FeeType,@BillCode,@GroupID,@FeeTypeId,@FeeId,@FeeCode,@FeeSerial,@Unit,@FeeNum,@DrugSite,@FeeId2,@FeeClass,@UnitPrice,@ChargePrice,@ActualPrice,@ChargeFee,@Valuer,@BillingDeptId,@BillingDept,@BillingWorkId,@BillingWork,@HappenTime,@EnrollTime,@ExecDeptId,@ExecDept,@ExecWorkId,@ExecWork,@ExecState,@ExecTime,@Conclusion,@IsInsure,@InsureNO,@LimitDrug,@DrugType,@IsUpLoad,@Remark,@EmergencyFlag,@OrderNo,@Extend1,@Extend2,@Extend3,@Extend4,@Extend5,@OrderState,@OperatorId,@OperatorNo,@OperatorName);select @@identity";
+			//从实体中取出值放入Command的参数列表
+			cmd.Parameters.Add(new SqlParameter("@PatientId",feesRecord.PatientId.HasValue?(object)feesRecord.PatientId.Value:(object)DBNull.Value));
+			cmd.Parameters.Add(new SqlParameter("@ApplyId",feesRecord.ApplyId.HasValue?(object)feesRecord.ApplyId.Value:(object)DBNull.Value));
+			cmd.Parameters.Add(new SqlParameter("@OperationRecordId",feesRecord.OperationRecordId.HasValue?(object)feesRecord.OperationRecordId.Value:(object)DBNull.Value));
+			cmd.Parameters.Add(new SqlParameter("@ApplyOrderNo",feesRecord.ApplyOrderNo==null?(object)DBNull.Value:(object)feesRecord.ApplyOrderNo));
+			cmd.Parameters.Add(new SqlParameter("@FeeIsDrug",feesRecord.FeeIsDrug==null?(object)DBNull.Value:(object)feesRecord.FeeIsDrug));
+			cmd.Parameters.Add(new SqlParameter("@FeeType",feesRecord.FeeType==null?(object)DBNull.Value:(object)feesRecord.FeeType));
+			cmd.Parameters.Add(new SqlParameter("@BillCode",feesRecord.BillCode==null?(object)DBNull.Value:(object)feesRecord.BillCode));
+			cmd.Parameters.Add(new SqlParameter("@GroupID",feesRecord.GroupID==null?(object)DBNull.Value:(object)feesRecord.GroupID));
+			cmd.Parameters.Add(new SqlParameter("@FeeTypeId",feesRecord.FeeTypeId==null?(object)DBNull.Value:(object)feesRecord.FeeTypeId));
+			cmd.Parameters.Add(new SqlParameter("@FeeId",feesRecord.FeeId==null?(object)DBNull.Value:(object)feesRecord.FeeId));
+			cmd.Parameters.Add(new SqlParameter("@FeeCode",feesRecord.FeeCode==null?(object)DBNull.Value:(object)feesRecord.FeeCode));
+			cmd.Parameters.Add(new SqlParameter("@FeeSerial",feesRecord.FeeSerial==null?(object)DBNull.Value:(object)feesRecord.FeeSerial));
+			cmd.Parameters.Add(new SqlParameter("@Unit",feesRecord.Unit==null?(object)DBNull.Value:(object)feesRecord.Unit));
+			cmd.Parameters.Add(new SqlParameter("@FeeNum",feesRecord.FeeNum==null?(object)DBNull.Value:(object)feesRecord.FeeNum));
+			cmd.Parameters.Add(new SqlParameter("@DrugSite",feesRecord.DrugSite==null?(object)DBNull.Value:(object)feesRecord.DrugSite));
+			cmd.Parameters.Add(new SqlParameter("@FeeId2",feesRecord.FeeId2==null?(object)DBNull.Value:(object)feesRecord.FeeId2));
+			cmd.Parameters.Add(new SqlParameter("@FeeClass",feesRecord.FeeClass==null?(object)DBNull.Value:(object)feesRecord.FeeClass));
+			cmd.Parameters.Add(new SqlParameter("@UnitPrice",feesRecord.UnitPrice==null?(object)DBNull.Value:(object)feesRecord.UnitPrice));
+			cmd.Parameters.Add(new SqlParameter("@ChargePrice",feesRecord.ChargePrice==null?(object)DBNull.Value:(object)feesRecord.ChargePrice));
+			cmd.Parameters.Add(new SqlParameter("@ActualPrice",feesRecord.ActualPrice==null?(object)DBNull.Value:(object)feesRecord.ActualPrice));
+			cmd.Parameters.Add(new SqlParameter("@ChargeFee",feesRecord.ChargeFee==null?(object)DBNull.Value:(object)feesRecord.ChargeFee));
+			cmd.Parameters.Add(new SqlParameter("@Valuer",feesRecord.Valuer==null?(object)DBNull.Value:(object)feesRecord.Valuer));
+			cmd.Parameters.Add(new SqlParameter("@BillingDeptId",feesRecord.BillingDeptId==null?(object)DBNull.Value:(object)feesRecord.BillingDeptId));
+			cmd.Parameters.Add(new SqlParameter("@BillingDept",feesRecord.BillingDept==null?(object)DBNull.Value:(object)feesRecord.BillingDept));
+			cmd.Parameters.Add(new SqlParameter("@BillingWorkId",feesRecord.BillingWorkId==null?(object)DBNull.Value:(object)feesRecord.BillingWorkId));
+			cmd.Parameters.Add(new SqlParameter("@BillingWork",feesRecord.BillingWork==null?(object)DBNull.Value:(object)feesRecord.BillingWork));
+			cmd.Parameters.Add(new SqlParameter("@HappenTime",feesRecord.HappenTime.HasValue?(object)feesRecord.HappenTime.Value:(object)DBNull.Value));
+			cmd.Parameters.Add(new SqlParameter("@EnrollTime",feesRecord.EnrollTime.HasValue?(object)feesRecord.EnrollTime.Value:(object)DBNull.Value));
+			cmd.Parameters.Add(new SqlParameter("@ExecDeptId",feesRecord.ExecDeptId==null?(object)DBNull.Value:(object)feesRecord.ExecDeptId));
+			cmd.Parameters.Add(new SqlParameter("@ExecDept",feesRecord.ExecDept==null?(object)DBNull.Value:(object)feesRecord.ExecDept));
+			cmd.Parameters.Add(new SqlParameter("@ExecWorkId",feesRecord.ExecWorkId==null?(object)DBNull.Value:(object)feesRecord.ExecWorkId));
+			cmd.Parameters.Add(new SqlParameter("@ExecWork",feesRecord.ExecWork==null?(object)DBNull.Value:(object)feesRecord.ExecWork));
+			cmd.Parameters.Add(new SqlParameter("@ExecState",feesRecord.ExecState==null?(object)DBNull.Value:(object)feesRecord.ExecState));
+			cmd.Parameters.Add(new SqlParameter("@ExecTime",feesRecord.ExecTime==null?(object)DBNull.Value:(object)feesRecord.ExecTime));
+			cmd.Parameters.Add(new SqlParameter("@Conclusion",feesRecord.Conclusion==null?(object)DBNull.Value:(object)feesRecord.Conclusion));
+			cmd.Parameters.Add(new SqlParameter("@IsInsure",feesRecord.IsInsure==null?(object)DBNull.Value:(object)feesRecord.IsInsure));
+			cmd.Parameters.Add(new SqlParameter("@InsureNO",feesRecord.InsureNO==null?(object)DBNull.Value:(object)feesRecord.InsureNO));
+			cmd.Parameters.Add(new SqlParameter("@LimitDrug",feesRecord.LimitDrug==null?(object)DBNull.Value:(object)feesRecord.LimitDrug));
+			cmd.Parameters.Add(new SqlParameter("@DrugType",feesRecord.DrugType==null?(object)DBNull.Value:(object)feesRecord.DrugType));
+			cmd.Parameters.Add(new SqlParameter("@IsUpLoad",feesRecord.IsUpLoad==null?(object)DBNull.Value:(object)feesRecord.IsUpLoad));
+			cmd.Parameters.Add(new SqlParameter("@Remark",feesRecord.Remark==null?(object)DBNull.Value:(object)feesRecord.Remark));
+			cmd.Parameters.Add(new SqlParameter("@EmergencyFlag",feesRecord.EmergencyFlag==null?(object)DBNull.Value:(object)feesRecord.EmergencyFlag));
+			cmd.Parameters.Add(new SqlParameter("@OrderNo",feesRecord.OrderNo==null?(object)DBNull.Value:(object)feesRecord.OrderNo));
+			cmd.Parameters.Add(new SqlParameter("@Extend1",feesRecord.Extend1==null?(object)DBNull.Value:(object)feesRecord.Extend1));
+			cmd.Parameters.Add(new SqlParameter("@Extend2",feesRecord.Extend2==null?(object)DBNull.Value:(object)feesRecord.Extend2));
+			cmd.Parameters.Add(new SqlParameter("@Extend3",feesRecord.Extend3==null?(object)DBNull.Value:(object)feesRecord.Extend3));
+			cmd.Parameters.Add(new SqlParameter("@Extend4",feesRecord.Extend4==null?(object)DBNull.Value:(object)feesRecord.Extend4));
+			cmd.Parameters.Add(new SqlParameter("@Extend5",feesRecord.Extend5==null?(object)DBNull.Value:(object)feesRecord.Extend5));
+			cmd.Parameters.Add(new SqlParameter("@OrderState",feesRecord.OrderState==null?(object)DBNull.Value:(object)feesRecord.OrderState));
+			cmd.Parameters.Add(new SqlParameter("@OperatorId",feesRecord.OperatorId.HasValue?(object)feesRecord.OperatorId.Value:(object)DBNull.Value));
+			cmd.Parameters.Add(new SqlParameter("@OperatorNo",feesRecord.OperatorNo==null?(object)DBNull.Value:(object)feesRecord.OperatorNo));
+			cmd.Parameters.Add(new SqlParameter("@OperatorName",feesRecord.OperatorName==null?(object)DBNull.Value:(object)feesRecord.OperatorName));
+			return Convert.ToInt32(cmd.ExecuteScalar());
+		}
+	    /// <summary>
+        /// 不使用事务的插入方法
+        /// </summary>
+        /// <param name="feesRecord">实体类对象</param>
+        /// <returns>标识列值或影响的记录行数</returns>
+	    internal static int Insert(FeesRecord feesRecord)
+		{
+			using(SqlConnection conn=new SqlConnection(Connection.ConnectionString))
+			{
+				conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return Insert(cmd, feesRecord);
+                }
+			}
+		}
+		
+		/// <summary>
+        /// 使用事务的插入方法
+        /// </summary>
+        /// <param name="connection">实现共享Connection的对象</param>
+        /// <param name="feesRecord">实体类对象</param>
+        /// <returns>标识列值或影响的记录行数</returns>
+        internal static int Insert(Connection connection,FeesRecord feesRecord)
+        {
+            return Insert(connection.Command, feesRecord);
+        }
+		#endregion
+		
+		#region 删除实体操作
+		
+		/// <summary>
+        /// 删除
+        /// </summary>
+		/// <param name="cmd">Command对象</param>
+        /// <param name="feesRecord">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+		internal static int ExcuteDeleteCommand(SqlCommand cmd, FeesRecord feesRecord)
+        {
+			cmd.Parameters.Clear();
+            cmd.CommandText = "delete from FeesRecord where Id=@Id";
+            //从实体中取出值放入Command的参数列表
+		    cmd.Parameters.Add(new SqlParameter("@Id", feesRecord.Id));
+            return cmd.ExecuteNonQuery();
+        }
+		/// <summary>
+        /// 不使用事务的删除方法
+        /// </summary>
+        /// <param name="feesRecord">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+        internal static int Delete(FeesRecord feesRecord)
+        {
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return ExcuteDeleteCommand(cmd, feesRecord);
+                }
+            }
+        }
+		/// <summary>
+        /// 使用事务的删除方法
+        /// </summary>
+        /// <param name="connection">实现共享Connection的对象</param>
+        /// <param name="feesRecord">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+        internal static int Delete(Connection connection,FeesRecord feesRecord)
+        {
+            return  ExcuteDeleteCommand(connection.Command, feesRecord);
+		}
+		
+		/// <summary>
+        /// 执行删除命令
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        internal static int ExcuteDeleteCommand(SqlCommand cmd, string oql, ParameterList parameters)
+        {
+            //解析过滤部份Sql语句
+            string filterString = SyntaxAnalyzer.ParseSql(oql, new FeesRecordMap());
+            if (filterString != string.Empty)
+            {
+                filterString = " where " + filterString;
+            }
+            cmd.Parameters.Clear();
+            cmd.CommandText = "delete from FeesRecord " + filterString;
+            //添加参数
+            if (parameters != null)
+            {
+                foreach (string key in parameters.Keys)
+                {
+                    cmd.Parameters.Add(new SqlParameter(key, parameters[key]));
+                }
+            }
+            return cmd.ExecuteNonQuery();
+        }
+		
+		/// <summary>
+        /// 不使用事务的删除方法
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        internal static int Delete(string oql, ParameterList parameters)
+        {
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return ExcuteDeleteCommand(cmd, oql, parameters);
+                }
+            }
+        }
+		
+		/// <summary>
+        /// 使用事务的删除方法
+        /// </summary>
+        /// <param name="connection">实现共享Connection的对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        internal static int Delete(Connection connection, string oql, ParameterList parameters)
+        {
+            return ExcuteDeleteCommand(connection.Command, oql, parameters);
+        }
+		
+		#endregion
+		
+		#region 更新实体操作
+		
+		/// <summary>
+        /// 更新
+        /// </summary>
+		/// <param name="cmd">Command对象</param>
+        /// <param name="feesRecord">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+		internal static int ExcuteUpdateCommand(SqlCommand cmd, FeesRecord feesRecord)
+		{
+		    cmd.CommandText = "update FeesRecord set PatientId=@PatientId,ApplyId=@ApplyId,OperationRecordId=@OperationRecordId,ApplyOrderNo=@ApplyOrderNo,FeeIsDrug=@FeeIsDrug,FeeType=@FeeType,BillCode=@BillCode,GroupID=@GroupID,FeeTypeId=@FeeTypeId,FeeId=@FeeId,FeeCode=@FeeCode,FeeSerial=@FeeSerial,Unit=@Unit,FeeNum=@FeeNum,DrugSite=@DrugSite,FeeId2=@FeeId2,FeeClass=@FeeClass,UnitPrice=@UnitPrice,ChargePrice=@ChargePrice,ActualPrice=@ActualPrice,ChargeFee=@ChargeFee,Valuer=@Valuer,BillingDeptId=@BillingDeptId,BillingDept=@BillingDept,BillingWorkId=@BillingWorkId,BillingWork=@BillingWork,HappenTime=@HappenTime,EnrollTime=@EnrollTime,ExecDeptId=@ExecDeptId,ExecDept=@ExecDept,ExecWorkId=@ExecWorkId,ExecWork=@ExecWork,ExecState=@ExecState,ExecTime=@ExecTime,Conclusion=@Conclusion,IsInsure=@IsInsure,InsureNO=@InsureNO,LimitDrug=@LimitDrug,DrugType=@DrugType,IsUpLoad=@IsUpLoad,Remark=@Remark,EmergencyFlag=@EmergencyFlag,OrderNo=@OrderNo,Extend1=@Extend1,Extend2=@Extend2,Extend3=@Extend3,Extend4=@Extend4,Extend5=@Extend5,OrderState=@OrderState,OperatorId=@OperatorId,OperatorNo=@OperatorNo,OperatorName=@OperatorName where Id=@Id";
+			//从实体中取出值放入Command的参数列表
+			cmd.Parameters.Add(new SqlParameter("@PatientId",feesRecord.PatientId.HasValue?(object)feesRecord.PatientId.Value:(object)DBNull.Value));
+			cmd.Parameters.Add(new SqlParameter("@ApplyId",feesRecord.ApplyId.HasValue?(object)feesRecord.ApplyId.Value:(object)DBNull.Value));
+			cmd.Parameters.Add(new SqlParameter("@OperationRecordId",feesRecord.OperationRecordId.HasValue?(object)feesRecord.OperationRecordId.Value:(object)DBNull.Value));
+			cmd.Parameters.Add(new SqlParameter("@ApplyOrderNo",feesRecord.ApplyOrderNo==null?(object)DBNull.Value:(object)feesRecord.ApplyOrderNo));
+			cmd.Parameters.Add(new SqlParameter("@FeeIsDrug",feesRecord.FeeIsDrug==null?(object)DBNull.Value:(object)feesRecord.FeeIsDrug));
+			cmd.Parameters.Add(new SqlParameter("@FeeType",feesRecord.FeeType==null?(object)DBNull.Value:(object)feesRecord.FeeType));
+			cmd.Parameters.Add(new SqlParameter("@BillCode",feesRecord.BillCode==null?(object)DBNull.Value:(object)feesRecord.BillCode));
+			cmd.Parameters.Add(new SqlParameter("@GroupID",feesRecord.GroupID==null?(object)DBNull.Value:(object)feesRecord.GroupID));
+			cmd.Parameters.Add(new SqlParameter("@FeeTypeId",feesRecord.FeeTypeId==null?(object)DBNull.Value:(object)feesRecord.FeeTypeId));
+			cmd.Parameters.Add(new SqlParameter("@FeeId",feesRecord.FeeId==null?(object)DBNull.Value:(object)feesRecord.FeeId));
+			cmd.Parameters.Add(new SqlParameter("@FeeCode",feesRecord.FeeCode==null?(object)DBNull.Value:(object)feesRecord.FeeCode));
+			cmd.Parameters.Add(new SqlParameter("@FeeSerial",feesRecord.FeeSerial==null?(object)DBNull.Value:(object)feesRecord.FeeSerial));
+			cmd.Parameters.Add(new SqlParameter("@Unit",feesRecord.Unit==null?(object)DBNull.Value:(object)feesRecord.Unit));
+			cmd.Parameters.Add(new SqlParameter("@FeeNum",feesRecord.FeeNum==null?(object)DBNull.Value:(object)feesRecord.FeeNum));
+			cmd.Parameters.Add(new SqlParameter("@DrugSite",feesRecord.DrugSite==null?(object)DBNull.Value:(object)feesRecord.DrugSite));
+			cmd.Parameters.Add(new SqlParameter("@FeeId2",feesRecord.FeeId2==null?(object)DBNull.Value:(object)feesRecord.FeeId2));
+			cmd.Parameters.Add(new SqlParameter("@FeeClass",feesRecord.FeeClass==null?(object)DBNull.Value:(object)feesRecord.FeeClass));
+			cmd.Parameters.Add(new SqlParameter("@UnitPrice",feesRecord.UnitPrice==null?(object)DBNull.Value:(object)feesRecord.UnitPrice));
+			cmd.Parameters.Add(new SqlParameter("@ChargePrice",feesRecord.ChargePrice==null?(object)DBNull.Value:(object)feesRecord.ChargePrice));
+			cmd.Parameters.Add(new SqlParameter("@ActualPrice",feesRecord.ActualPrice==null?(object)DBNull.Value:(object)feesRecord.ActualPrice));
+			cmd.Parameters.Add(new SqlParameter("@ChargeFee",feesRecord.ChargeFee==null?(object)DBNull.Value:(object)feesRecord.ChargeFee));
+			cmd.Parameters.Add(new SqlParameter("@Valuer",feesRecord.Valuer==null?(object)DBNull.Value:(object)feesRecord.Valuer));
+			cmd.Parameters.Add(new SqlParameter("@BillingDeptId",feesRecord.BillingDeptId==null?(object)DBNull.Value:(object)feesRecord.BillingDeptId));
+			cmd.Parameters.Add(new SqlParameter("@BillingDept",feesRecord.BillingDept==null?(object)DBNull.Value:(object)feesRecord.BillingDept));
+			cmd.Parameters.Add(new SqlParameter("@BillingWorkId",feesRecord.BillingWorkId==null?(object)DBNull.Value:(object)feesRecord.BillingWorkId));
+			cmd.Parameters.Add(new SqlParameter("@BillingWork",feesRecord.BillingWork==null?(object)DBNull.Value:(object)feesRecord.BillingWork));
+			cmd.Parameters.Add(new SqlParameter("@HappenTime",feesRecord.HappenTime.HasValue?(object)feesRecord.HappenTime.Value:(object)DBNull.Value));
+			cmd.Parameters.Add(new SqlParameter("@EnrollTime",feesRecord.EnrollTime.HasValue?(object)feesRecord.EnrollTime.Value:(object)DBNull.Value));
+			cmd.Parameters.Add(new SqlParameter("@ExecDeptId",feesRecord.ExecDeptId==null?(object)DBNull.Value:(object)feesRecord.ExecDeptId));
+			cmd.Parameters.Add(new SqlParameter("@ExecDept",feesRecord.ExecDept==null?(object)DBNull.Value:(object)feesRecord.ExecDept));
+			cmd.Parameters.Add(new SqlParameter("@ExecWorkId",feesRecord.ExecWorkId==null?(object)DBNull.Value:(object)feesRecord.ExecWorkId));
+			cmd.Parameters.Add(new SqlParameter("@ExecWork",feesRecord.ExecWork==null?(object)DBNull.Value:(object)feesRecord.ExecWork));
+			cmd.Parameters.Add(new SqlParameter("@ExecState",feesRecord.ExecState==null?(object)DBNull.Value:(object)feesRecord.ExecState));
+			cmd.Parameters.Add(new SqlParameter("@ExecTime",feesRecord.ExecTime==null?(object)DBNull.Value:(object)feesRecord.ExecTime));
+			cmd.Parameters.Add(new SqlParameter("@Conclusion",feesRecord.Conclusion==null?(object)DBNull.Value:(object)feesRecord.Conclusion));
+			cmd.Parameters.Add(new SqlParameter("@IsInsure",feesRecord.IsInsure==null?(object)DBNull.Value:(object)feesRecord.IsInsure));
+			cmd.Parameters.Add(new SqlParameter("@InsureNO",feesRecord.InsureNO==null?(object)DBNull.Value:(object)feesRecord.InsureNO));
+			cmd.Parameters.Add(new SqlParameter("@LimitDrug",feesRecord.LimitDrug==null?(object)DBNull.Value:(object)feesRecord.LimitDrug));
+			cmd.Parameters.Add(new SqlParameter("@DrugType",feesRecord.DrugType==null?(object)DBNull.Value:(object)feesRecord.DrugType));
+			cmd.Parameters.Add(new SqlParameter("@IsUpLoad",feesRecord.IsUpLoad==null?(object)DBNull.Value:(object)feesRecord.IsUpLoad));
+			cmd.Parameters.Add(new SqlParameter("@Remark",feesRecord.Remark==null?(object)DBNull.Value:(object)feesRecord.Remark));
+			cmd.Parameters.Add(new SqlParameter("@EmergencyFlag",feesRecord.EmergencyFlag==null?(object)DBNull.Value:(object)feesRecord.EmergencyFlag));
+			cmd.Parameters.Add(new SqlParameter("@OrderNo",feesRecord.OrderNo==null?(object)DBNull.Value:(object)feesRecord.OrderNo));
+			cmd.Parameters.Add(new SqlParameter("@Extend1",feesRecord.Extend1==null?(object)DBNull.Value:(object)feesRecord.Extend1));
+			cmd.Parameters.Add(new SqlParameter("@Extend2",feesRecord.Extend2==null?(object)DBNull.Value:(object)feesRecord.Extend2));
+			cmd.Parameters.Add(new SqlParameter("@Extend3",feesRecord.Extend3==null?(object)DBNull.Value:(object)feesRecord.Extend3));
+			cmd.Parameters.Add(new SqlParameter("@Extend4",feesRecord.Extend4==null?(object)DBNull.Value:(object)feesRecord.Extend4));
+			cmd.Parameters.Add(new SqlParameter("@Extend5",feesRecord.Extend5==null?(object)DBNull.Value:(object)feesRecord.Extend5));
+			cmd.Parameters.Add(new SqlParameter("@OrderState",feesRecord.OrderState==null?(object)DBNull.Value:(object)feesRecord.OrderState));
+			cmd.Parameters.Add(new SqlParameter("@OperatorId",feesRecord.OperatorId.HasValue?(object)feesRecord.OperatorId.Value:(object)DBNull.Value));
+			cmd.Parameters.Add(new SqlParameter("@OperatorNo",feesRecord.OperatorNo==null?(object)DBNull.Value:(object)feesRecord.OperatorNo));
+			cmd.Parameters.Add(new SqlParameter("@OperatorName",feesRecord.OperatorName==null?(object)DBNull.Value:(object)feesRecord.OperatorName));
+			cmd.Parameters.Add(new SqlParameter("@Id", feesRecord.Id));
+            return cmd.ExecuteNonQuery();
+		}
+		
+		/// <summary>
+        /// 不使用事务的更新方法
+        /// </summary>
+        /// <param name="feesRecord">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+	    internal static int Update(FeesRecord feesRecord)
+		{
+			using(SqlConnection conn=new SqlConnection(Connection.ConnectionString))
+			{
+				conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return ExcuteUpdateCommand(cmd, feesRecord);
+                }
+			}
+		}
+		/// <summary>
+        /// 使用事务的更新方法
+        /// </summary>
+        /// <param name="connection">实现共享Connection的对象</param>
+        /// <param name="feesRecord">实体类对象</param>
+        /// <returns>影响的记录行数</returns>
+        internal static int Update(Connection connection,FeesRecord feesRecord)
+        {
+            return ExcuteUpdateCommand(connection.Command, feesRecord);
+		}
+		/// <summary>
+        /// 执行更新命令
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        internal static int ExcuteUpdateCommand(SqlCommand cmd, string oql, ParameterList parameters)
+        {
+            //解析过滤部份Sql语句
+            string updateString = SyntaxAnalyzer.ParseSql(oql, new FeesRecordMap());
+            cmd.CommandText = "update FeesRecord set " + updateString;
+			cmd.Parameters.Clear();
+            //添加参数
+            if (parameters != null)
+            {
+                foreach (string key in parameters.Keys)
+                {
+                    cmd.Parameters.Add(new SqlParameter(key, parameters[key]));
+                }
+            }
+            return cmd.ExecuteNonQuery();
+        }
+		
+		/// <summary>
+        /// 不使用事务的更新方法
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        internal static int Update(string oql, ParameterList parameters)
+        {
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return ExcuteUpdateCommand(cmd, oql, parameters);
+                }
+            }
+        }
+		
+		/// <summary>
+        /// 使用事务的更新方法
+        /// </summary>
+        /// <param name="connection">实现共享Connection的对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>影响的记录行数</returns>
+        internal static int Update(Connection connection, string oql, ParameterList parameters)
+        {
+            return ExcuteUpdateCommand(connection.Command, oql, parameters);
+        }
+		#endregion
+		
+		#region 查询实体集合
+		/// <summary>
+        /// 执行Command获取对象列表
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+		/// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象列表</returns>
+        internal static List<FeesRecord> ExcuteSelectCommand(SqlCommand cmd,RecursiveType recursiveType,int recursiveDepth)
+        {
+            List<FeesRecord> feesRecordList = new List<FeesRecord>();
+            using (SqlDataReader dr = cmd.ExecuteReader())
+            {
+                while (dr.Read())
+                {
+                    FeesRecord feesRecord = DataReaderToEntity(dr);
+                    feesRecordList.Add(feesRecord);
+                }
+            }
+			return feesRecordList;
+        }
+		/// <summary>
+        /// 执行查询命令
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+		/// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象集合</returns>
+        internal static List<FeesRecord> ExcuteSelectCommand(SqlCommand cmd, string oql, ParameterList parameters,RecursiveType recursiveType,int recursiveDepth)
+        {
+            //解析过滤部份Sql语句
+            string filterString = SyntaxAnalyzer.ParseSql(oql, new FeesRecordMap());
+            if (filterString != string.Empty)
+            {
+				if(filterString.Trim().ToLower().IndexOf("order ")!=0)
+                	filterString = " where " + filterString;
+            }
+            cmd.Parameters.Clear();
+            cmd.CommandText = "select * from FeesRecord " + filterString;
+            //添加参数
+            if (parameters != null)
+            {
+                foreach (string key in parameters.Keys)
+                {
+                    cmd.Parameters.Add(new SqlParameter(key, parameters[key]));
+                }
+            }
+            return ExcuteSelectCommand(cmd, recursiveType, recursiveDepth);
+        }
+		
+		/// <summary>
+        /// 根据对象查询语句查询实体集合
+        /// </summary>
+        /// <returns>实体类对象集合</returns>
+        internal static List<FeesRecord> Select()
+        {
+			using(SqlConnection conn=new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    cmd.CommandText = "select * from FeesRecord";
+                    return ExcuteSelectCommand(cmd, RecursiveType.Parent, 1);
+                }
+            }
+        }
+		/// <summary>
+        /// 根据对象查询语句查询实体集合
+        /// </summary>
+		/// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象集合</returns>
+        internal static List<FeesRecord> Select(RecursiveType recursiveType, int recursiveDepth)
+        {
+			using(SqlConnection conn=new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    cmd.CommandText = "select * from FeesRecord";
+                    return ExcuteSelectCommand(cmd, recursiveType, recursiveDepth);
+                }
+            }
+        }
+		
+		/// <summary>
+        /// 根据对象查询语句查询实体集合
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>实体类对象集合</returns>
+        internal static List<FeesRecord> Select(string oql, ParameterList parameters)
+        {
+			using(SqlConnection conn=new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return ExcuteSelectCommand(cmd, oql, parameters, RecursiveType.Parent, 1);
+                }
+            }
+        }
+		
+		/// <summary>
+        /// 根据对象查询语句查询实体集合
+        /// </summary>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+		/// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象集合</returns>
+        internal static List<FeesRecord> Select(string oql, ParameterList parameters,RecursiveType recursiveType, int recursiveDepth)
+        {
+			using(SqlConnection conn=new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return ExcuteSelectCommand(cmd, oql, parameters, recursiveType, recursiveDepth);
+                }
+            }
+        }
+		
+		/// <summary>
+        /// 根据对象查询语句查询实体集合（启用事务）
+        /// </summary>
+        /// <param name="connection">连接对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+		/// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象集合</returns>
+        internal static List<FeesRecord> Select(Connection connection, string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth)
+        {
+            return ExcuteSelectCommand(connection.Command, oql, parameters,recursiveType, recursiveDepth);
+        }
+		#endregion
+		
+		#region 查询单个实体
+		
+		/// <summary>
+        /// 递归查询单个实体
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+		/// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体对象</returns>
+		internal static FeesRecord ExcuteSelectSingleCommand(SqlCommand cmd,RecursiveType recursiveType,int recursiveDepth)
+		{
+			FeesRecord feesRecord=null;
+			using (SqlDataReader dr = cmd.ExecuteReader())
+            {
+			    if(dr.Read())
+				    feesRecord = DataReaderToEntity(dr);
+			}
+			if(feesRecord==null)
+			    return feesRecord;
+            return feesRecord;
+		}
+		/// <summary>
+        /// 更据对象查询语句递归查询单个实体
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+		/// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体对象</returns>
+        internal static FeesRecord ExcuteSelectSingleCommand(SqlCommand cmd, string oql, ParameterList parameters,RecursiveType recursiveType,int recursiveDepth)
+        {
+            //解析过滤部份Sql语句
+            string filterString = SyntaxAnalyzer.ParseSql(oql, new FeesRecordMap());
+			if(filterString!=string.Empty)
+			{
+			    filterString=" where "+filterString;
+			}
+            cmd.CommandText = "select * from FeesRecord " + filterString;
+			cmd.Parameters.Clear();
+            //添加参数
+            if (parameters != null)
+            {
+                foreach (string key in parameters.Keys)
+                {
+                    cmd.Parameters.Add(new SqlParameter(key, parameters[key]));
+                }
+            }
+            return ExcuteSelectSingleCommand(cmd, recursiveType, recursiveDepth);
+        }
+				
+		/// <summary>
+        /// 更据对象查询语句递归查询单个实体
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+		/// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体对象</returns>
+        internal static FeesRecord SelectSingle(string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth)
+        {
+            using(SqlConnection conn=new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return ExcuteSelectSingleCommand(cmd, oql, parameters, recursiveType, recursiveDepth);
+                }   
+            } 
+        }
+		
+		/// <summary>
+        /// 更据对象查询语句查询单个实体
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>实体对象</returns>
+        internal static FeesRecord SelectSingle(string oql, ParameterList parameters)
+        {
+            return SelectSingle(oql,parameters,RecursiveType.Parent,1);
+        }
+		
+		/// <summary>
+        /// 更据对象查询语句并启用事务查询单个实体
+        /// </summary>
+        /// <param name="connection">连接对象</param>
+        /// <param name="oql">对象查询语句</param>
+        /// <param name="parameters">参数列表</param>
+        /// <returns>实体对象</returns>
+        internal static FeesRecord SelectSingle(Connection connection, string oql, ParameterList parameters, RecursiveType recursiveType, int recursiveDepth)
+        {
+            return ExcuteSelectSingleCommand(connection.Command, oql, parameters, recursiveType, recursiveDepth);
+        }
+		
+		/// <summary>
+        /// 更据主键值递归查询单个实体
+        /// </summary>
+        /// <param name="cmd">Command对象</param>
+        /// <param name="id">主键值</param>
+		/// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体对象</returns>
+        internal static FeesRecord SelectSingle(SqlCommand cmd, int? id,RecursiveType recursiveType,int recursiveDepth)
+		{
+		    cmd.Parameters.Clear();
+			if(id.HasValue)
+			{
+		    	cmd.CommandText = "select * from FeesRecord where Id=@pk";
+				cmd.Parameters.Add(new SqlParameter("@pk",id.Value));
+			}
+			else
+			{
+			    cmd.CommandText = "select * from FeesRecord where Id is null";
+			}
+			return ExcuteSelectSingleCommand(cmd, recursiveType, recursiveDepth);
+		}
+		
+		/// <summary>
+        /// 按主键字段查询特定实体
+        /// </summary>
+        /// <param name="id">主键值</param>
+        /// <returns>实体类对象</returns>
+        internal static FeesRecord SelectSingle(int? id)
+        {
+            using(SqlConnection conn=new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return SelectSingle(cmd,id,RecursiveType.Parent,1);
+                }   
+            } 
+        }
+		/// <summary>
+        /// 按主键字段查询特定实体
+        /// </summary>
+        /// <param name="id">主键值</param>
+		/// <param name="recursiveType">递归类型</param>
+        /// <param name="recursiveDepth">递归深度</param>
+        /// <returns>实体类对象</returns>
+        internal static FeesRecord SelectSingle(int? id, RecursiveType recursiveType, int recursiveDepth)
+        {
+            using(SqlConnection conn=new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    return SelectSingle(cmd,id, recursiveType, recursiveDepth);
+                }   
+            } 
+        }
+		
+		/// <summary>
+        /// 使用事务并按主键字段查询特定实体
+        /// </summary>
+		/// <param name="connection">连接对象</param>
+        /// <param name="id">主键值</param>
+        /// <returns>实体类对象</returns>
+        internal static FeesRecord SelectSingle(Connection connection,int? id, RecursiveType recursiveType, int recursiveDepth)
+        {
+			return SelectSingle(connection.Command, id, recursiveType, recursiveDepth);
+        }
+		#endregion
+		
+				
+		/// <summary>
+        /// 从DataReader中取出值生成实体对象
+        /// </summary>
+        /// <param name="searcher">查询对象</param>
+        /// <returns>过滤条件字符串</returns>
+		private static FeesRecord DataReaderToEntity(SqlDataReader dr)
+		{
+		    FeesRecord entity = new FeesRecord ();
+			if(dr["Id"]!=System.DBNull.Value)
+			{
+			    entity.Id=Convert.ToInt32(dr["Id"]);
+			}
+			if(dr["PatientId"]!=System.DBNull.Value)
+			{
+			    entity.PatientId=Convert.ToInt32(dr["PatientId"]);
+			}
+			if(dr["ApplyId"]!=System.DBNull.Value)
+			{
+			    entity.ApplyId=Convert.ToInt32(dr["ApplyId"]);
+			}
+			if(dr["OperationRecordId"]!=System.DBNull.Value)
+			{
+			    entity.OperationRecordId=Convert.ToInt32(dr["OperationRecordId"]);
+			}
+			if(dr["ApplyOrderNo"]!=System.DBNull.Value)
+			{
+			    entity.ApplyOrderNo=dr["ApplyOrderNo"].ToString();
+			}
+			if(dr["FeeIsDrug"]!=System.DBNull.Value)
+			{
+			    entity.FeeIsDrug=dr["FeeIsDrug"].ToString();
+			}
+			if(dr["FeeType"]!=System.DBNull.Value)
+			{
+			    entity.FeeType=dr["FeeType"].ToString();
+			}
+			if(dr["BillCode"]!=System.DBNull.Value)
+			{
+			    entity.BillCode=dr["BillCode"].ToString();
+			}
+			if(dr["GroupID"]!=System.DBNull.Value)
+			{
+			    entity.GroupID=dr["GroupID"].ToString();
+			}
+			if(dr["FeeTypeId"]!=System.DBNull.Value)
+			{
+			    entity.FeeTypeId=dr["FeeTypeId"].ToString();
+			}
+			if(dr["FeeId"]!=System.DBNull.Value)
+			{
+			    entity.FeeId=dr["FeeId"].ToString();
+			}
+			if(dr["FeeCode"]!=System.DBNull.Value)
+			{
+			    entity.FeeCode=dr["FeeCode"].ToString();
+			}
+			if(dr["FeeSerial"]!=System.DBNull.Value)
+			{
+			    entity.FeeSerial=dr["FeeSerial"].ToString();
+			}
+			if(dr["Unit"]!=System.DBNull.Value)
+			{
+			    entity.Unit=dr["Unit"].ToString();
+			}
+			if(dr["FeeNum"]!=System.DBNull.Value)
+			{
+			    entity.FeeNum=dr["FeeNum"].ToString();
+			}
+			if(dr["DrugSite"]!=System.DBNull.Value)
+			{
+			    entity.DrugSite=dr["DrugSite"].ToString();
+			}
+			if(dr["FeeId2"]!=System.DBNull.Value)
+			{
+			    entity.FeeId2=dr["FeeId2"].ToString();
+			}
+			if(dr["FeeClass"]!=System.DBNull.Value)
+			{
+			    entity.FeeClass=dr["FeeClass"].ToString();
+			}
+			if(dr["UnitPrice"]!=System.DBNull.Value)
+			{
+			    entity.UnitPrice=dr["UnitPrice"].ToString();
+			}
+			if(dr["ChargePrice"]!=System.DBNull.Value)
+			{
+			    entity.ChargePrice=dr["ChargePrice"].ToString();
+			}
+			if(dr["ActualPrice"]!=System.DBNull.Value)
+			{
+			    entity.ActualPrice=dr["ActualPrice"].ToString();
+			}
+			if(dr["ChargeFee"]!=System.DBNull.Value)
+			{
+			    entity.ChargeFee=dr["ChargeFee"].ToString();
+			}
+			if(dr["Valuer"]!=System.DBNull.Value)
+			{
+			    entity.Valuer=dr["Valuer"].ToString();
+			}
+			if(dr["BillingDeptId"]!=System.DBNull.Value)
+			{
+			    entity.BillingDeptId=dr["BillingDeptId"].ToString();
+			}
+			if(dr["BillingDept"]!=System.DBNull.Value)
+			{
+			    entity.BillingDept=dr["BillingDept"].ToString();
+			}
+			if(dr["BillingWorkId"]!=System.DBNull.Value)
+			{
+			    entity.BillingWorkId=dr["BillingWorkId"].ToString();
+			}
+			if(dr["BillingWork"]!=System.DBNull.Value)
+			{
+			    entity.BillingWork=dr["BillingWork"].ToString();
+			}
+			if(dr["HappenTime"]!=System.DBNull.Value)
+			{
+			    entity.HappenTime=Convert.ToDateTime(dr["HappenTime"]);
+			}
+			if(dr["EnrollTime"]!=System.DBNull.Value)
+			{
+			    entity.EnrollTime=Convert.ToDateTime(dr["EnrollTime"]);
+			}
+			if(dr["ExecDeptId"]!=System.DBNull.Value)
+			{
+			    entity.ExecDeptId=dr["ExecDeptId"].ToString();
+			}
+			if(dr["ExecDept"]!=System.DBNull.Value)
+			{
+			    entity.ExecDept=dr["ExecDept"].ToString();
+			}
+			if(dr["ExecWorkId"]!=System.DBNull.Value)
+			{
+			    entity.ExecWorkId=dr["ExecWorkId"].ToString();
+			}
+			if(dr["ExecWork"]!=System.DBNull.Value)
+			{
+			    entity.ExecWork=dr["ExecWork"].ToString();
+			}
+			if(dr["ExecState"]!=System.DBNull.Value)
+			{
+			    entity.ExecState=dr["ExecState"].ToString();
+			}
+			if(dr["ExecTime"]!=System.DBNull.Value)
+			{
+			    entity.ExecTime=dr["ExecTime"].ToString();
+			}
+			if(dr["Conclusion"]!=System.DBNull.Value)
+			{
+			    entity.Conclusion=dr["Conclusion"].ToString();
+			}
+			if(dr["IsInsure"]!=System.DBNull.Value)
+			{
+			    entity.IsInsure=dr["IsInsure"].ToString();
+			}
+			if(dr["InsureNO"]!=System.DBNull.Value)
+			{
+			    entity.InsureNO=dr["InsureNO"].ToString();
+			}
+			if(dr["LimitDrug"]!=System.DBNull.Value)
+			{
+			    entity.LimitDrug=dr["LimitDrug"].ToString();
+			}
+			if(dr["DrugType"]!=System.DBNull.Value)
+			{
+			    entity.DrugType=dr["DrugType"].ToString();
+			}
+			if(dr["IsUpLoad"]!=System.DBNull.Value)
+			{
+			    entity.IsUpLoad=dr["IsUpLoad"].ToString();
+			}
+			if(dr["Remark"]!=System.DBNull.Value)
+			{
+			    entity.Remark=dr["Remark"].ToString();
+			}
+			if(dr["EmergencyFlag"]!=System.DBNull.Value)
+			{
+			    entity.EmergencyFlag=dr["EmergencyFlag"].ToString();
+			}
+			if(dr["OrderNo"]!=System.DBNull.Value)
+			{
+			    entity.OrderNo=dr["OrderNo"].ToString();
+			}
+			if(dr["Extend1"]!=System.DBNull.Value)
+			{
+			    entity.Extend1=dr["Extend1"].ToString();
+			}
+			if(dr["Extend2"]!=System.DBNull.Value)
+			{
+			    entity.Extend2=dr["Extend2"].ToString();
+			}
+			if(dr["Extend3"]!=System.DBNull.Value)
+			{
+			    entity.Extend3=dr["Extend3"].ToString();
+			}
+			if(dr["Extend4"]!=System.DBNull.Value)
+			{
+			    entity.Extend4=dr["Extend4"].ToString();
+			}
+			if(dr["Extend5"]!=System.DBNull.Value)
+			{
+			    entity.Extend5=dr["Extend5"].ToString();
+			}
+			if(dr["OrderState"]!=System.DBNull.Value)
+			{
+			    entity.OrderState=dr["OrderState"].ToString();
+			}
+			if(dr["OperatorId"]!=System.DBNull.Value)
+			{
+			    entity.OperatorId=Convert.ToInt32(dr["OperatorId"]);
+			}
+			if(dr["OperatorNo"]!=System.DBNull.Value)
+			{
+			    entity.OperatorNo=dr["OperatorNo"].ToString();
+			}
+			if(dr["OperatorName"]!=System.DBNull.Value)
+			{
+			    entity.OperatorName=dr["OperatorName"].ToString();
+			}
+			return entity;
+		}
+	}
+}
+

AIMSEntity/DAL/Extension/DCharges.cs

@@ -9,5 +9,29 @@ namespace AIMSDAL
 {
     internal partial class DCharges
     {
+
+        public static List<Charges> GetChargsListByCodes(string ids)
+        {
+            string sql = "";
+            if (ids != null && ids.Length > 0)
+            {
+                sql = string.Format("select * from Charges where Id in({0})  order by charindex(','+rtrim(Id)+',',',{1},') ", ids, ids.Replace("'", ""));
+            }
+            else
+            {
+                sql = string.Format("select * from Charges  where 1<>1 ");
+            }
+
+            using (SqlConnection conn = new SqlConnection(Connection.ConnectionString))
+            {
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
+                {
+                    cmd.CommandText = sql;
+                    return ExcuteSelectCommand(cmd, RecursiveType.None, 0);
+                }
+            }
+        }
+
     }
 }

AIMSEntity/DAL/Extension/DFeesRecord.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Data;
+using System.Data.SqlClient;
+using System.Collections;
+using System.Collections.Generic;
+using AIMSModel;
+using AIMSObjectQuery;
+namespace AIMSDAL
+{
+    internal partial class DFeesRecord
+    {
+    }
+}

AIMSEntity/Extensions/SelectPatient.cs

@@ -56,9 +56,9 @@ namespace AIMSBLL
             string strSql = "SELECT  of2.Id,of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, of2.OperationInfoNames ApplyOperationInfoName, of2.OperationDoctor, of2.AnesthesiaDoctor,of2.OperationRoomId,of2.State ,of1.Sex,Age,of2.OutRoomTime  ,of2.Nurse InstrumentNurse,of2.Nurse2 TourNurse,of2.DiagnoseInfoName ApplyDiagnoseInfoName ,of2.OperationRoom,of2.Whereabouts FROM V_OperationDoing of2 left join[dbo].[V_OperationFront] of1 on of1.PatientId = of2.PatientId WHERE of1.State in( '手术结束') and of2.Pulse='恢复室' and of2.OutRoomTime >= '" + BeginDate + "' AND of2.OutRoomTime<'" + BeginDate.AddDays(1) + "' and RecoverId=1 and of2.Id not in (select iD from OperationRecord where RecoverId<>1)";
             return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString());
         }
-        public static DataTable GetRecoverPatientOutDataTable(DateTime BeginDate)
+        public static DataTable GetRecoverPatientOutDataTable(DateTime BeginDate,DateTime EndDate)
         {
-            string strSql = "SELECT  of2.Id,of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, of2.OperationInfoNames ApplyOperationInfoName, of2.OperationDoctor, of2.AnesthesiaDoctor,of2.OperationRoomId,of2.State ,of1.Sex,Age,of2.OutRoomTime  ,of2.Nurse InstrumentNurse,of2.Nurse2 TourNurse,of2.DiagnoseInfoName ApplyDiagnoseInfoName ,of2.OperationRoom FROM V_OperationDoing of2 left join[dbo].[V_OperationFront] of1 on of1.PatientId = of2.PatientId WHERE of1.State in( '麻醉恢复结束') and of2.OutRoomTime >= '" + BeginDate + "' AND of2.OutRoomTime<'" + BeginDate.AddDays(1) + "' and RecoverId=2   order by OutRoomTime desc ";
+            string strSql = "SELECT  of2.Id,of1.PatientId, of1.ApplyId, of1.ApplyDepName, of1.OperationType, of1.MdrecNo, of1.PatientName, of2.OperationInfoNames ApplyOperationInfoName, of2.OperationDoctor, of2.AnesthesiaDoctor,of2.OperationRoomId,of2.State ,of1.Sex,Age,of2.OutRoomTime  ,of2.Nurse InstrumentNurse,of2.Nurse2 TourNurse,of2.DiagnoseInfoName ApplyDiagnoseInfoName ,of2.OperationRoom FROM V_OperationDoing of2 left join[dbo].[V_OperationFront] of1 on of1.PatientId = of2.PatientId WHERE of1.State in( '麻醉恢复结束') and of2.OutRoomTime >= '" + BeginDate + "' AND of2.OutRoomTime<'" + EndDate + "' and RecoverId=2   order by OutRoomTime desc ";
             return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString());
         }
         public static DataTable GetSelectPatientDataTable(DateTime BeginDate, DateTime EndDate, bool isLoginPerson, string person, bool isEnOpe)

AIMSEntity/Model/AutoGenerate/ChargsTemplate.cs

@@ -0,0 +1,96 @@
+using System;
+using System.Collections;
+using System.Collections.Generic; 
+
+namespace AIMSModel
+{
+	[Serializable]
+    public partial class ChargsTemplate
+	{
+        private int? id; 
+        private string templateType; 
+        private string templateName; 
+        private string hCode; 
+        private string connectId; 
+        private string defaultValue; 
+        private int? isValid; 
+        private int? operatorId; 
+        private DateTime? operatorTime;
+
+
+		/// <summary>
+		/// 编号，自增
+		/// </summary>
+		public int? Id
+		{
+		    get{ return id; }
+			set{ id=value; }
+		}
+	    /// <summary>
+        /// 模板类型
+        /// 1.麻醉师
+        /// 2.护士
+        /// </summary>
+		public string TemplateType
+		{
+		    get{ return templateType; }
+			set{ templateType=value; }
+		}
+		/// <summary>
+		/// 模板名称
+		/// </summary>
+		public string TemplateName
+		{
+		    get{ return templateName; }
+			set{ templateName=value; }
+		}
+	    /// <summary>
+        /// 助记码
+        /// </summary>
+		public string HCode
+		{
+		    get{ return hCode; }
+			set{ hCode=value; }
+		}
+		/// <summary>
+		/// 所属费用编号,用','分隔
+		/// </summary>
+		public string ConnectId
+		{
+		    get{ return connectId; }
+			set{ connectId=value; }
+		}
+		/// <summary>
+		/// 所属费用数量,用','分隔
+		/// </summary>
+		public string DefaultValue
+		{
+		    get{ return defaultValue; }
+			set{ defaultValue=value; }
+		}
+		/// <summary>
+		/// 是否有效
+		/// </summary>
+		public int? IsValid
+		{
+		    get{ return isValid; }
+			set{ isValid=value; }
+		}
+		/// <summary>
+		/// 操作员编号
+		/// </summary>
+		public int? OperatorId
+		{
+		    get{ return operatorId; }
+			set{ operatorId=value; }
+		}
+		/// <summary>
+		/// 操作时间
+		/// </summary>
+		public DateTime? OperatorTime
+		{
+		    get{ return operatorTime; }
+			set{ operatorTime=value; }
+		}
+	}
+}

AIMSEntity/Model/AutoGenerate/Drugs.cs

@@ -30,6 +30,7 @@ namespace AIMSModel
 		public string UseDose3 { get; set; }
 		public string Price { get; set; }
 		public string ZFBL { get; set; }
+		public string Dosage { get; set; }
 		/// <summary>
 		/// 
 		/// </summary>

AIMSEntity/Model/AutoGenerate/FeesRecord.cs

@@ -0,0 +1,491 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using AIMSDAL;
+
+namespace AIMSModel
+{
+	[Serializable]
+    public partial class FeesRecord
+	{
+        private int? id; 
+        private int? patientId; 
+        private int? applyId; 
+        private int? operationRecordId; 
+        private string applyOrderNo; 
+        private string feeIsDrug; 
+        private string feeType; 
+        private string billCode; 
+        private string groupID; 
+        private string feeTypeId; 
+        private string feeId; 
+        private string feeCode; 
+        private string feeSerial; 
+        private string unit; 
+        private string feeNum; 
+        private string drugSite; 
+        private string feeId2; 
+        private string feeClass; 
+        private string unitPrice; 
+        private string chargePrice; 
+        private string actualPrice; 
+        private string chargeFee; 
+        private string valuer; 
+        private string billingDeptId; 
+        private string billingDept; 
+        private string billingWorkId; 
+        private string billingWork; 
+        private DateTime? happenTime; 
+        private DateTime? enrollTime; 
+        private string execDeptId; 
+        private string execDept; 
+        private string execWorkId; 
+        private string execWork; 
+        private string execState; 
+        private string execTime; 
+        private string conclusion; 
+        private string isInsure; 
+        private string insureNO; 
+        private string limitDrug; 
+        private string drugType; 
+        private string isUpLoad; 
+        private string remark; 
+        private string emergencyFlag; 
+        private string orderNo; 
+        private string extend1; 
+        private string extend2; 
+        private string extend3; 
+        private string extend4; 
+        private string extend5; 
+        private string orderState; 
+        private int? operatorId; 
+        private string operatorNo; 
+        private string operatorName; 
+	
+	
+	    /// <summary>
+        /// 
+        /// </summary>
+		public int? Id
+		{
+		    get{ return id; }
+			set{ id=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public int? PatientId
+		{
+		    get{ return patientId; }
+			set{ patientId=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public int? ApplyId
+		{
+		    get{ return applyId; }
+			set{ applyId=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public int? OperationRecordId
+		{
+		    get{ return operationRecordId; }
+			set{ operationRecordId=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string ApplyOrderNo
+		{
+		    get{ return applyOrderNo; }
+			set{ applyOrderNo=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string FeeIsDrug
+		{
+		    get{ return feeIsDrug; }
+			set{ feeIsDrug=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string FeeType
+		{
+		    get{ return feeType; }
+			set{ feeType=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string BillCode
+		{
+		    get{ return billCode; }
+			set{ billCode=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string GroupID
+		{
+		    get{ return groupID; }
+			set{ groupID=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string FeeTypeId
+		{
+		    get{ return feeTypeId; }
+			set{ feeTypeId=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string FeeId
+		{
+		    get{ return feeId; }
+			set{ feeId=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string FeeCode
+		{
+		    get{ return feeCode; }
+			set{ feeCode=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string FeeSerial
+		{
+		    get{ return feeSerial; }
+			set{ feeSerial=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string Unit
+		{
+		    get{ return unit; }
+			set{ unit=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string FeeNum
+		{
+		    get{ return feeNum; }
+			set{ feeNum=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string DrugSite
+		{
+		    get{ return drugSite; }
+			set{ drugSite=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string FeeId2
+		{
+		    get{ return feeId2; }
+			set{ feeId2=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string FeeClass
+		{
+		    get{ return feeClass; }
+			set{ feeClass=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string UnitPrice
+		{
+		    get{ return unitPrice; }
+			set{ unitPrice=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string ChargePrice
+		{
+		    get{ return chargePrice; }
+			set{ chargePrice=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string ActualPrice
+		{
+		    get{ return actualPrice; }
+			set{ actualPrice=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string ChargeFee
+		{
+		    get{ return chargeFee; }
+			set{ chargeFee=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string Valuer
+		{
+		    get{ return valuer; }
+			set{ valuer=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string BillingDeptId
+		{
+		    get{ return billingDeptId; }
+			set{ billingDeptId=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string BillingDept
+		{
+		    get{ return billingDept; }
+			set{ billingDept=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string BillingWorkId
+		{
+		    get{ return billingWorkId; }
+			set{ billingWorkId=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string BillingWork
+		{
+		    get{ return billingWork; }
+			set{ billingWork=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public DateTime? HappenTime
+		{
+		    get{ return happenTime; }
+			set{ happenTime=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public DateTime? EnrollTime
+		{
+		    get{ return enrollTime; }
+			set{ enrollTime=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string ExecDeptId
+		{
+		    get{ return execDeptId; }
+			set{ execDeptId=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string ExecDept
+		{
+		    get{ return execDept; }
+			set{ execDept=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string ExecWorkId
+		{
+		    get{ return execWorkId; }
+			set{ execWorkId=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string ExecWork
+		{
+		    get{ return execWork; }
+			set{ execWork=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string ExecState
+		{
+		    get{ return execState; }
+			set{ execState=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string ExecTime
+		{
+		    get{ return execTime; }
+			set{ execTime=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string Conclusion
+		{
+		    get{ return conclusion; }
+			set{ conclusion=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string IsInsure
+		{
+		    get{ return isInsure; }
+			set{ isInsure=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string InsureNO
+		{
+		    get{ return insureNO; }
+			set{ insureNO=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string LimitDrug
+		{
+		    get{ return limitDrug; }
+			set{ limitDrug=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string DrugType
+		{
+		    get{ return drugType; }
+			set{ drugType=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string IsUpLoad
+		{
+		    get{ return isUpLoad; }
+			set{ isUpLoad=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string Remark
+		{
+		    get{ return remark; }
+			set{ remark=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string EmergencyFlag
+		{
+		    get{ return emergencyFlag; }
+			set{ emergencyFlag=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string OrderNo
+		{
+		    get{ return orderNo; }
+			set{ orderNo=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string Extend1
+		{
+		    get{ return extend1; }
+			set{ extend1=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string Extend2
+		{
+		    get{ return extend2; }
+			set{ extend2=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string Extend3
+		{
+		    get{ return extend3; }
+			set{ extend3=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string Extend4
+		{
+		    get{ return extend4; }
+			set{ extend4=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string Extend5
+		{
+		    get{ return extend5; }
+			set{ extend5=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string OrderState
+		{
+		    get{ return orderState; }
+			set{ orderState=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public int? OperatorId
+		{
+		    get{ return operatorId; }
+			set{ operatorId=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string OperatorNo
+		{
+		    get{ return operatorNo; }
+			set{ operatorNo=value; }
+		}
+	    /// <summary>
+        /// 
+        /// </summary>
+		public string OperatorName
+		{
+		    get{ return operatorName; }
+			set{ operatorName=value; }
+		}
+	}
+}

AIMSEntity/Model/Extension/Charges.cs

@@ -6,5 +6,6 @@ namespace AIMSModel
 {
     public partial class Charges
     {
+        public string Number { get; set; }
     }
 }

AIMSEntity/Model/Extension/FeesRecord.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using AIMSDAL;
+namespace AIMSModel
+{
+    public partial class FeesRecord
+    {
+    }
+}

AIMSEntity/ObjectQuery/ChargsTemplateMap.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace AIMSObjectQuery
+{
+    internal partial class ChargsTemplateMap:IMap
+	{
+	    private Dictionary<string, string> dictionary = new Dictionary<string, string>();
+        public ChargsTemplateMap()
+        {
+        	dictionary.Add("id", "Id");
+        	dictionary.Add("templatetype", "TemplateType");
+        	dictionary.Add("templatename", "TemplateName");
+        	dictionary.Add("hcode", "HCode");
+        	dictionary.Add("connectid", "ConnectId");
+        	dictionary.Add("defaultvalue", "DefaultValue");
+        	dictionary.Add("isvalid", "IsValid");
+        	dictionary.Add("operatorid", "OperatorId");
+        	dictionary.Add("operatortime", "OperatorTime");
+        }
+
+        #region IMap 成员
+
+        public string this[string propertyName]
+        {
+            get
+			{ 
+				try
+				{
+					return dictionary[propertyName.ToLower()]; 
+				}
+				catch (KeyNotFoundException)
+				{
+					throw new Exception(propertyName + "属性不存在");
+				}
+			}
+        }
+
+        #endregion
+	}
+}

AIMSEntity/ObjectQuery/FeesRecordMap.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace AIMSObjectQuery
+{
+    internal partial class FeesRecordMap:IMap
+	{
+	    private Dictionary<string, string> dictionary = new Dictionary<string, string>();
+        public FeesRecordMap()
+        {
+        	dictionary.Add("id", "Id");
+        	dictionary.Add("patientid", "PatientId");
+        	dictionary.Add("applyid", "ApplyId");
+        	dictionary.Add("operationrecordid", "OperationRecordId");
+        	dictionary.Add("applyorderno", "ApplyOrderNo");
+        	dictionary.Add("feeisdrug", "FeeIsDrug");
+        	dictionary.Add("feetype", "FeeType");
+        	dictionary.Add("billcode", "BillCode");
+        	dictionary.Add("groupid", "GroupID");
+        	dictionary.Add("feetypeid", "FeeTypeId");
+        	dictionary.Add("feeid", "FeeId");
+        	dictionary.Add("feecode", "FeeCode");
+        	dictionary.Add("feeserial", "FeeSerial");
+        	dictionary.Add("unit", "Unit");
+        	dictionary.Add("feenum", "FeeNum");
+        	dictionary.Add("drugsite", "DrugSite");
+        	dictionary.Add("feeid2", "FeeId2");
+        	dictionary.Add("feeclass", "FeeClass");
+        	dictionary.Add("unitprice", "UnitPrice");
+        	dictionary.Add("chargeprice", "ChargePrice");
+        	dictionary.Add("actualprice", "ActualPrice");
+        	dictionary.Add("chargefee", "ChargeFee");
+        	dictionary.Add("valuer", "Valuer");
+        	dictionary.Add("billingdeptid", "BillingDeptId");
+        	dictionary.Add("billingdept", "BillingDept");
+        	dictionary.Add("billingworkid", "BillingWorkId");
+        	dictionary.Add("billingwork", "BillingWork");
+        	dictionary.Add("happentime", "HappenTime");
+        	dictionary.Add("enrolltime", "EnrollTime");
+        	dictionary.Add("execdeptid", "ExecDeptId");
+        	dictionary.Add("execdept", "ExecDept");
+        	dictionary.Add("execworkid", "ExecWorkId");
+        	dictionary.Add("execwork", "ExecWork");
+        	dictionary.Add("execstate", "ExecState");
+        	dictionary.Add("exectime", "ExecTime");
+        	dictionary.Add("conclusion", "Conclusion");
+        	dictionary.Add("isinsure", "IsInsure");
+        	dictionary.Add("insureno", "InsureNO");
+        	dictionary.Add("limitdrug", "LimitDrug");
+        	dictionary.Add("drugtype", "DrugType");
+        	dictionary.Add("isupload", "IsUpLoad");
+        	dictionary.Add("remark", "Remark");
+        	dictionary.Add("emergencyflag", "EmergencyFlag");
+        	dictionary.Add("orderno", "OrderNo");
+        	dictionary.Add("extend1", "Extend1");
+        	dictionary.Add("extend2", "Extend2");
+        	dictionary.Add("extend3", "Extend3");
+        	dictionary.Add("extend4", "Extend4");
+        	dictionary.Add("extend5", "Extend5");
+        	dictionary.Add("orderstate", "OrderState");
+        	dictionary.Add("operatorid", "OperatorId");
+        	dictionary.Add("operatorno", "OperatorNo");
+        	dictionary.Add("operatorname", "OperatorName");
+        }
+
+        #region IMap 成员
+
+        public string this[string propertyName]
+        {
+            get
+			{ 
+				try
+				{
+					return dictionary[propertyName.ToLower()]; 
+				}
+				catch (KeyNotFoundException)
+				{
+					throw new Exception(propertyName + "属性不存在");
+				}
+			}
+        }
+
+        #endregion
+	}
+}

DocumentManagement/DocumentEntity/PatientLisResult.cs

@@ -54,10 +54,14 @@ namespace DocumentManagement
         public string Item39 { get; set; }
         public string Item40 { get; set; }
 
-        public static PatientLisResult GetLisResult(string patientNo)
+        public static PatientLisResult GetLisResult(PatientRecord pat)
         {
             PatientLisResult patient = new PatientLisResult();
-            DataTable dt = GetLisResultSources(patientNo);
+            DataTable dt = GetLisResultSources(pat.MdrecNo);
+            if (dt == null || dt.Rows.Count <= 0)
+            {
+                dt = GetLisResultSources(pat.HISPatientId);
+            }
             if (dt.Rows.Count > 0)
             {
                 patient.PATIENT_ID = dt.Rows[0]["PATIENT_ID"].ToString();

DocumentManagement/DocumentEntity/PatientRecord.cs

@@ -107,6 +107,7 @@ namespace DocumentManagement
         public String OpeTime { get; set; }
         public String MedicalRecord { get; set; }
         public String MedicalHistory { get; set; }
+        public String InHosDate { get; set; }
         public PatientLisResult LisResult { get; set; }
 
         public static PatientRecord GetPatientRecord(int patientId)
@@ -217,8 +218,9 @@ namespace DocumentManagement
                 patient.OpeTime = dt.Rows[0]["OpeTime"].ToString();
                 patient.MedicalRecord = dt.Rows[0]["MedicalRecord"].ToString();
                 patient.MedicalHistory = dt.Rows[0]["MedicalHistory"].ToString();
+                patient.InHosDate = dt.Rows[0]["InHosDate"].ToString();
             }
-            patient.LisResult = PatientLisResult.GetLisResult(patient.MdrecNo);
+            patient.LisResult = PatientLisResult.GetLisResult(patient);
             #endregion
             return patient;
         }

DrawGraph/AreaManage/FactDrug.cs

@@ -115,10 +115,14 @@ namespace DrawGraph
         {
             try
             {
-                if ((this.DosageUnit == ((FactDrug)drug1).DosageUnit) && (this.DrugChannel == ((FactDrug)drug1).DrugChannel) && (this.DrugName == ((FactDrug)drug1).DrugName) && (this.Access == ((FactDrug)drug1).Access))//  && (this.DrugEffect == ((DrugsRecord)drug1).DrugEffect)&& (this.Remark == ((DrugsRecord)drug1).Remark)
+                if ((this.DosageUnit == ((FactDrug)drug1).DosageUnit) && (this.DrugChannel == ((FactDrug)drug1).DrugChannel) && (this.DrugName == ((FactDrug)drug1).DrugName) && (this.Access == ((FactDrug)drug1).Access))
                 {
                     return true;
                 }
+                //if ((this.DrugChannel == ((FactDrug)drug1).DrugChannel) && (this.DrugName == ((FactDrug)drug1).DrugName) && (this.Access == ((FactDrug)drug1).Access))
+                //{
+                //    return true;
+                //}
                 return false;
             }
             catch (Exception)
@@ -170,6 +174,7 @@ namespace DrawGraph
             {
                 if (Dosage != 0)
                     EqualDose = ((double)Dosage).ToString();
+                //if (this.DosageUnit != null && this.DosageUnit != "") EqualDose += this.DosageUnit;
             }
             DateTime dt = DrugEndTime;
             DateTime drugDt = this.DrugBeginTime;
@@ -241,6 +246,7 @@ namespace DrawGraph
                 //if (this.Remark != null && this.Remark != "") DrName += "(" + this.Remark + ")"; 
                 if (this.DrugChannel != null && this.DrugChannel != "") DrName += "(" + this.DrugChannel + ")";
                 if (this.DosageUnit != null && this.DosageUnit != "") DrName += "(" + this.DosageUnit + ")";
+                if (this.BloodType != null && this.BloodType != "") DrName += "(" + this.BloodType + ")";
                 if (DrugKind.Contains("麻醉") || DrugKind.Contains("精神"))
                     ZUtil.DrawText(DrName, x1, y, zgcAnas, TextPrefix.DN + this.DrugName + this.Id.ToString(), Color.Red, 5.75f);
                 else

DrawGraph/AreaManage/SelectDictText.cs

@@ -230,9 +230,21 @@ namespace DrawGraph
                 //设置属性的值
                 //aEdit.IsVisible = !aEdit.IsVisible;
                 //template.SetObjValue(OpeRecord, aEdit.ClassDataSourceName, Value,  true); 
-                aEdit.PackValue = Value;
+                if (aEdit.ClassDataSourceName == "OperationRecord.OpeRecordInfo.NeuroPlexusAround")
-                aEdit.PackText = Value;
+                {
-                SetValue(Value, aEdit);
+                    if (!aEdit.PackValue.Contains(Value))
+                    {
+                        aEdit.PackValue += (aEdit.PackValue == "" ? "" : "+") + Value;
+                        aEdit.PackText += (aEdit.PackText == "" ? "" : "+") + Value;
+                        SetValue(aEdit.PackValue, aEdit);
+                    }
+                }
+                else
+                {
+                    aEdit.PackValue = Value;
+                    aEdit.PackText = Value;
+                    SetValue(aEdit.PackValue, aEdit);
+                }
             }
         }
 

DrawGraph/AreaManage/TempDataManage.cs

@@ -103,6 +103,8 @@ namespace DrawGraph
                 if (ableEdit != null)
                 {
                     ableEdit.IsVisible = true;
+                    ableEdit.CControl.Click -= new EventHandler(txt_Click);
+                    ableEdit.CControl.Click += new EventHandler(txt_Click);
                     if (ableEdit.ControlType == EControlType.DateTimePicker)
                     {
                         ableEdit.CControl.Leave -= new EventHandler(txt_Leave);
@@ -147,32 +149,36 @@ namespace DrawGraph
                             }
                         }
                     }
+                    else    if (ableEdit.ControlType == EControlType.TextBox)
+                    {
+                        ableEdit.CControl.KeyDown -= new KeyEventHandler(text_keyDown);
+                        ableEdit.CControl.KeyDown += new KeyEventHandler(text_keyDown); 
+                        ableEdit.CControl.GotFocus -= new EventHandler(txt_Focus);
+                        ableEdit.CControl.GotFocus += new EventHandler(txt_Focus);
+                        ((TextBox)ableEdit.CControl).BorderStyle = BorderStyle.Fixed3D;
+
+                        ableEdit.CControl.MouseWheel += new MouseEventHandler(numericUpDown1_MouseWheel);
+                        ableEdit.CControl.Leave -= new EventHandler(txt_Leave);
+                        ableEdit.CControl.Leave += new EventHandler(txt_Leave);
+                    }
                     else
                     {
-                        if (ableEdit.ControlType == EControlType.TextBox)
-                        {
-                            ableEdit.CControl.KeyDown -= new KeyEventHandler(text_keyDown);
-                            ableEdit.CControl.KeyDown += new KeyEventHandler(text_keyDown);
-                            ableEdit.CControl.GotFocus -= new EventHandler(txt_Focus);
-                            ableEdit.CControl.GotFocus += new EventHandler(txt_Focus);
-                            ((TextBox)ableEdit.CControl).BorderStyle = BorderStyle.Fixed3D;
 
-                            ableEdit.CControl.MouseWheel += new MouseEventHandler(numericUpDown1_MouseWheel);
-                        }
                         ableEdit.CControl.Leave -= new EventHandler(txt_Leave);
                         ableEdit.CControl.Leave += new EventHandler(txt_Leave);
                     }
                     SetAbleEditView(ableEdit);
                 }
             }
-        } 
+        }
+         
 
         ////取消滚轮事件
         //void numericUpDown1_MouseWheel(object sender, MouseEventArgs e)
         //{
         //    base.MouseWheelParam();
         //}
-         
+
         private void txt_Focus(object sender, EventArgs e)
         {
             TextBox control = (TextBox)sender;
@@ -181,7 +187,7 @@ namespace DrawGraph
             if (ableEdit == null) return;
             if (control.Focused == true && (ableEdit.PackValue == ableEdit.DefaultValue || ableEdit.PackValue == ""))
                 control.Clear();
-        }
+        } 
         private void text_keyDown(object sender, KeyEventArgs e)
         {
             ((TextBox)sender).Enabled = true;
@@ -274,7 +280,7 @@ namespace DrawGraph
                         {
                             int.Parse(ablePack.PackValue);
                         }
-                        catch (Exception  )
+                        catch (Exception)
                         {
                             MessageBox.Show(pack.Descript + "不能为空且必须是数值型");
                             return false;
@@ -419,6 +425,18 @@ namespace DrawGraph
             }
         }
 
+        private void txt_Click(object sender, EventArgs e)
+        {
+            Control control = (Control)sender;
+            if (control == null) return;
+            AbleEditPackObj ableEdit = control.Tag as AbleEditPackObj;
+            if (ableEdit == null) return;
+            string DataSourceName = ableEdit.ClassDataSourceName;
+            if (SelectDictText.dgvZd.Visible == true)
+            {
+                SelectDictText.Hidden();
+            }
+        }
         private void txt_Leave(object sender, EventArgs e)
         {
             Control control = (Control)sender;
@@ -495,7 +513,7 @@ namespace DrawGraph
             AbleEditPackObj ableEdit = sender;
             if (ableEdit == null) return;
 
-            ableEdit.CControl.Leave -= new EventHandler(txt_Leave); 
+            ableEdit.CControl.Leave -= new EventHandler(txt_Leave);
             ableEdit.CControl.KeyUp -= new KeyEventHandler(CControl_KeyUp);
             ableEdit.CControl.KeyUp += new KeyEventHandler(CControl_KeyUp);
             ableEdit.CControl.KeyPress -= new KeyPressEventHandler(CControl_KeyPress);
@@ -517,7 +535,7 @@ namespace DrawGraph
                 }
 
                 aSyncSelectDict.Show(template, OpeRecord, sender, _DictType, isRadio);
-                ableEdit.CControl.Leave += new EventHandler(txt_Leave); 
+                ableEdit.CControl.Leave += new EventHandler(txt_Leave);
             }
         }
         private void ASyncSelectDict_SetValue(string Text, AbleEditPackObj aEdit)
@@ -527,7 +545,7 @@ namespace DrawGraph
             template.SetObjValue(OpeRecord, aEdit.ClassDataSourceName, Text, Text, true);
             aEdit.CControl.Leave -= new EventHandler(txt_Leave);
             aEdit.CControl.Leave += new EventHandler(txt_Leave);
-        } 
+        }
         private void CControl_KeyUp(object sender, KeyEventArgs e)
         {
             if (myOpeRecord != null)
@@ -558,6 +576,6 @@ namespace DrawGraph
                     SelectDictText.SetContent(SelectDictText.dgvZd.SelectedRows[0].Index);
                 }
             }
-        } 
+        }
     }
 }

DrawGraph/BoardPack/AbleEditPackObj.cs

@@ -43,7 +43,7 @@ namespace DrawGraph
 
         private int textLength = 0;
 
-        private EIsBool isDateNull = EIsBool.False;
+        private EIsBool isDateNull = EIsBool.False; 
 
         [method: CompilerGenerated]
         //[DebuggerBrowsable(DebuggerBrowsableState.Never), CompilerGenerated]