模板增加开始时间 手术医生麻醉医生后可以追加时间 事件图例打印横线去掉

AIMS/AIMS.csproj

@@ -841,6 +841,12 @@
     <Compile Include="DataDictionary\frmUserPurviewDetail.Designer.cs">
       <DependentUpon>frmUserPurviewDetail.cs</DependentUpon>
     </Compile>
+    <Compile Include="PublicUI\frmTemplateSel.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="PublicUI\frmTemplateSel.Designer.cs">
+      <DependentUpon>frmTemplateSel.cs</DependentUpon>
+    </Compile>
     <Compile Include="PublicUI\MainFormManage.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1237,6 +1243,9 @@
     <EmbeddedResource Include="DataDictionary\frmUserPurviewDetail.resx">
       <DependentUpon>frmUserPurviewDetail.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="PublicUI\frmTemplateSel.resx">
+      <DependentUpon>frmTemplateSel.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="PublicUI\MainFormManage.resx">
       <DependentUpon>MainFormManage.cs</DependentUpon>
     </EmbeddedResource>

AIMS/PublicUI/frmTemplate.Designer.cs

@@ -31,14 +31,6 @@
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.panel2 = new System.Windows.Forms.Panel();
             this.dgv = new System.Windows.Forms.DataGridView();
-            this.tsbExit = new System.Windows.Forms.ToolStripButton();
-            this.tsbCreateTemplate = new System.Windows.Forms.ToolStripButton();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
-            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.TemplateNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.OperatorName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.InputColumn = new System.Windows.Forms.DataGridViewButtonColumn();
@@ -47,6 +39,14 @@
             this.IsPublic = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.OperatorNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.InRoomTime2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.tsbExit = new System.Windows.Forms.ToolStripButton();
+            this.tsbCreateTemplate = new System.Windows.Forms.ToolStripButton();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+            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.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit();
             this.panel1.SuspendLayout();
@@ -90,6 +90,74 @@
             this.dgv.TabIndex = 6;
             this.dgv.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv_CellContentClick);
             // 
+            // TemplateNameColumn
+            // 
+            this.TemplateNameColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.TemplateNameColumn.DataPropertyName = "TemplateName";
+            this.TemplateNameColumn.HeaderText = "模板名称";
+            this.TemplateNameColumn.Name = "TemplateNameColumn";
+            this.TemplateNameColumn.ReadOnly = true;
+            // 
+            // OperatorName
+            // 
+            this.OperatorName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.OperatorName.DataPropertyName = "OperatorName";
+            this.OperatorName.HeaderText = "创建人";
+            this.OperatorName.Name = "OperatorName";
+            this.OperatorName.Width = 70;
+            // 
+            // InputColumn
+            // 
+            this.InputColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.InputColumn.HeaderText = "";
+            this.InputColumn.Name = "InputColumn";
+            this.InputColumn.Text = "导入";
+            this.InputColumn.UseColumnTextForButtonValue = true;
+            this.InputColumn.Width = 60;
+            // 
+            // EditColumn
+            // 
+            this.EditColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.EditColumn.HeaderText = "";
+            this.EditColumn.Name = "EditColumn";
+            this.EditColumn.ReadOnly = true;
+            this.EditColumn.Text = "编辑";
+            this.EditColumn.UseColumnTextForButtonValue = true;
+            this.EditColumn.Width = 60;
+            // 
+            // DeleteColumn
+            // 
+            this.DeleteColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.DeleteColumn.HeaderText = "";
+            this.DeleteColumn.Name = "DeleteColumn";
+            this.DeleteColumn.ReadOnly = true;
+            this.DeleteColumn.Text = "删除";
+            this.DeleteColumn.UseColumnTextForButtonValue = true;
+            this.DeleteColumn.Width = 60;
+            // 
+            // IsPublic
+            // 
+            this.IsPublic.DataPropertyName = "IsPublic";
+            this.IsPublic.HeaderText = "公有";
+            this.IsPublic.Name = "IsPublic";
+            this.IsPublic.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.IsPublic.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.IsPublic.Visible = false;
+            // 
+            // OperatorNo
+            // 
+            this.OperatorNo.DataPropertyName = "OperatorNo";
+            this.OperatorNo.HeaderText = "OperatorNo";
+            this.OperatorNo.Name = "OperatorNo";
+            this.OperatorNo.Visible = false;
+            // 
+            // InRoomTime2
+            // 
+            this.InRoomTime2.DataPropertyName = "InRoomTime";
+            this.InRoomTime2.HeaderText = "InRoomTime";
+            this.InRoomTime2.Name = "InRoomTime2";
+            this.InRoomTime2.Visible = false;
+            // 
             // tsbExit
             // 
             this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F);
@@ -167,74 +235,6 @@
             this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
             this.dataGridViewTextBoxColumn4.Visible = false;
             // 
-            // TemplateNameColumn
-            // 
-            this.TemplateNameColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.TemplateNameColumn.DataPropertyName = "TemplateName";
-            this.TemplateNameColumn.HeaderText = "模板名称";
-            this.TemplateNameColumn.Name = "TemplateNameColumn";
-            this.TemplateNameColumn.ReadOnly = true;
-            // 
-            // OperatorName
-            // 
-            this.OperatorName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.OperatorName.DataPropertyName = "OperatorName";
-            this.OperatorName.HeaderText = "创建人";
-            this.OperatorName.Name = "OperatorName";
-            this.OperatorName.Width = 70;
-            // 
-            // InputColumn
-            // 
-            this.InputColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.InputColumn.HeaderText = "";
-            this.InputColumn.Name = "InputColumn";
-            this.InputColumn.Text = "导入";
-            this.InputColumn.UseColumnTextForButtonValue = true;
-            this.InputColumn.Width = 60;
-            // 
-            // EditColumn
-            // 
-            this.EditColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.EditColumn.HeaderText = "";
-            this.EditColumn.Name = "EditColumn";
-            this.EditColumn.ReadOnly = true;
-            this.EditColumn.Text = "编辑";
-            this.EditColumn.UseColumnTextForButtonValue = true;
-            this.EditColumn.Width = 60;
-            // 
-            // DeleteColumn
-            // 
-            this.DeleteColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.DeleteColumn.HeaderText = "";
-            this.DeleteColumn.Name = "DeleteColumn";
-            this.DeleteColumn.ReadOnly = true;
-            this.DeleteColumn.Text = "删除";
-            this.DeleteColumn.UseColumnTextForButtonValue = true;
-            this.DeleteColumn.Width = 60;
-            // 
-            // IsPublic
-            // 
-            this.IsPublic.DataPropertyName = "IsPublic";
-            this.IsPublic.HeaderText = "公有";
-            this.IsPublic.Name = "IsPublic";
-            this.IsPublic.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.IsPublic.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.IsPublic.Visible = false;
-            // 
-            // OperatorNo
-            // 
-            this.OperatorNo.DataPropertyName = "OperatorNo";
-            this.OperatorNo.HeaderText = "OperatorNo";
-            this.OperatorNo.Name = "OperatorNo";
-            this.OperatorNo.Visible = false;
-            // 
-            // InRoomTime2
-            // 
-            this.InRoomTime2.DataPropertyName = "InRoomTime";
-            this.InRoomTime2.HeaderText = "InRoomTime";
-            this.InRoomTime2.Name = "InRoomTime2";
-            this.InRoomTime2.Visible = false;
-            // 
             // frmTemplate
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

AIMS/PublicUI/frmTemplate.cs

@@ -61,12 +61,18 @@ namespace AIMS.PublicUI.UI
         {
             if (this.dgv.Columns[e.ColumnIndex].Name == "InputColumn")
             {
-                if (MessageBox.Show("确认要导入[" + dgv.CurrentRow.Cells["TemplateNameColumn"].Value.ToString() + "]模板吗？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes)
+                frmTemplateSel templateSel = new frmTemplateSel();
+                templateSel.InRoomTime = InRoomTime;
+                if (templateSel.ShowDialog() == System.Windows.Forms.DialogResult.OK)
                 {
-                    //BOperationTemplate.ClearData(PatientId, TypeId);
+                    BOperationTemplate.InputData(dgv.CurrentRow.Cells["TemplateNameColumn"].Value.ToString(), PatientId, templateSel.InRoomTime, TypeId, _record);
-                    BOperationTemplate.InputData(dgv.CurrentRow.Cells["TemplateNameColumn"].Value.ToString(), PatientId, InRoomTime, TypeId,_record);
                     this.DialogResult = System.Windows.Forms.DialogResult.OK;
                 }
+                //if (MessageBox.Show("确认要导入[" + dgv.CurrentRow.Cells["TemplateNameColumn"].Value.ToString() + "]模板吗?\n模板开始时间："+ InRoomTime, "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes)
+                //{
+                //    //BOperationTemplate.ClearData(PatientId, TypeId);
+                //    BOperationTemplate.InputData(dgv.CurrentRow.Cells["TemplateNameColumn"].Value.ToString(), PatientId,  InRoomTime, TypeId,_record);
+                //}
             }
             else if (this.dgv.Columns[e.ColumnIndex].Name == "EditColumn")
             {

AIMS/PublicUI/frmTemplateSel.Designer.cs

@@ -0,0 +1,96 @@
+namespace AIMS.PublicUI
+{
+    partial class frmTemplateSel
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.label1 = new System.Windows.Forms.Label();
+            this.dtpStartTempTime = new System.Windows.Forms.DateTimePicker();
+            this.btnQuery = new DevComponents.DotNetBar.ButtonX();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.BackColor = System.Drawing.Color.Transparent;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(15, 23);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(56, 17);
+            this.label1.TabIndex = 12;
+            this.label1.Text = "开始时间";
+            // 
+            // dtpStartTempTime
+            // 
+            this.dtpStartTempTime.CustomFormat = "yyyy-MM-dd HH:mm";
+            this.dtpStartTempTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtpStartTempTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.dtpStartTempTime.Location = new System.Drawing.Point(74, 19);
+            this.dtpStartTempTime.Name = "dtpStartTempTime";
+            this.dtpStartTempTime.Size = new System.Drawing.Size(145, 23);
+            this.dtpStartTempTime.TabIndex = 11;
+            // 
+            // btnQuery
+            // 
+            this.btnQuery.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnQuery.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnQuery.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnQuery.Location = new System.Drawing.Point(225, 19);
+            this.btnQuery.Name = "btnQuery";
+            this.btnQuery.Size = new System.Drawing.Size(80, 23);
+            this.btnQuery.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnQuery.TabIndex = 13;
+            this.btnQuery.Text = "确定";
+            this.btnQuery.Click += new System.EventHandler(this.btnQuery_Click);
+            // 
+            // frmTemplateSel
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(308, 67);
+            this.Controls.Add(this.btnQuery);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.dtpStartTempTime);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "frmTemplateSel";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "模板开始时间";
+            this.Load += new System.EventHandler(this.frmTemplateSel_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.DateTimePicker dtpStartTempTime;
+        private DevComponents.DotNetBar.ButtonX btnQuery;
+    }
+}

AIMS/PublicUI/frmTemplateSel.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace AIMS.PublicUI
+{
+    public partial class frmTemplateSel : Form
+    {
+        public DateTime InRoomTime;
+        public frmTemplateSel()
+        {
+            InitializeComponent();
+        }
+
+        private void btnQuery_Click(object sender, EventArgs e)
+        {
+            InRoomTime = dtpStartTempTime.Value; 
+            this.DialogResult = System.Windows.Forms.DialogResult.OK;
+        }
+
+        private void frmTemplateSel_Load(object sender, EventArgs e)
+        {
+            dtpStartTempTime.Value = InRoomTime;
+        }
+    }
+}

AIMS/PublicUI/frmTemplateSel.resx

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

AIMSEntity/BLL/Extension/BOperationRecord.cs

@@ -59,6 +59,8 @@ namespace AIMSBLL
                 _record.Age = OperationFrontdt.Rows[0]["Age"].ToString();
                 _record.Identity = OperationFrontdt.Rows[0]["IdentityCard"].ToString();
                 _record.FareType = OperationFrontdt.Rows[0]["PatientKind"].ToString();
+                _record.BloodType = OperationFrontdt.Rows[0]["BloodType"].ToString();
+                _record.RHBloodType = OperationFrontdt.Rows[0]["RHBloodType"].ToString();
                 ASALevel = OperationFrontdt.Rows[0]["ASA"].ToString();
                 if (OperationFrontdt.Rows[0]["Height"].ToString() != "")
                 {
@@ -136,7 +138,7 @@ namespace AIMSBLL
                 }
 
                 _record.OpeRecordInfo.InfoRemark = "-";
-                _record.OpeRecordInfo.RuleNurse = "-";
+                _record.OpeRecordInfo.NeedleDirection = "-";
 
                 _record.OpeRecordInfo.OperatorId = PublicMethod.OperatorName;
                 _record.OpeRecordInfo.OperatorTime = DateTime.Now;

DrawGraph/AreaManage/AnalgesiaDataBottonManage.cs

@@ -270,11 +270,12 @@ namespace DrawGraph
                         tokenEditor.Leave -= TokenEditor_Leave;
                         tokenEditor.Leave += TokenEditor_Leave;
 
-                        if (ableEdit.ControlTitleText == "手术" || ableEdit.ControlTitleText == "诊断")
+                        if ((PublicMethod.RoleName.Contains("增加诊断") && ableEdit.ControlTitleText == "诊断") || (AIMSExtension.PublicMethod.RoleName.Contains("增加手术") && ableEdit.ControlTitleText == "手术"))
                         {
                             tokenEditor.ValidateToken -= new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken);
                             tokenEditor.ValidateToken += new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken);
                         }
+
                     }
                     else if (ableEdit.ControlType == EControlType.CheckBox)
                     {

DrawGraph/AreaManage/AnalgesiaDataManage.cs

@@ -272,11 +272,12 @@ namespace DrawGraph
                         tokenEditor.Leave -= TokenEditor_Leave;
                         tokenEditor.Leave += TokenEditor_Leave;
 
-                        if (ableEdit.ControlTitleText == "手术" || ableEdit.ControlTitleText == "诊断")
+                        if ((PublicMethod.RoleName.Contains("增加诊断") && ableEdit.ControlTitleText == "诊断") || (AIMSExtension.PublicMethod.RoleName.Contains("增加手术") && ableEdit.ControlTitleText == "手术"))
                         {
                             tokenEditor.ValidateToken -= new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken);
                             tokenEditor.ValidateToken += new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken);
                         }
+
                     }
                     else if (ableEdit.ControlType == EControlType.CheckBox)
                     {

DrawGraph/AreaManage/BaseInfoBottomManage.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using DevComponents.DotNetBar.Controls;
+using Newtonsoft.Json.Linq;
 
 namespace DrawGraph
 {
@@ -85,7 +86,19 @@ namespace DrawGraph
                         break;
                     case EControlType.Directorys:
                         value = ableEdit.PackValue;
-                        text = DBManage.GetDictionaryValuesById(ableEdit.PackValue, ableEdit.ControlTitleText);
+
+                        if (ableEdit.ClassDataSourceName == "OperationRecord.OperationDoctor" && myOpeRecord.OpeRecordInfo.Extend4 != null && myOpeRecord.OpeRecordInfo.Extend4 != "" && myOpeRecord.OpeRecordInfo.Extend4 != "|")
+                        {
+                            text = DBManage.GetDictionaryValuesById(ableEdit.PackValue, ableEdit.ControlTitleText, myOpeRecord.OpeRecordInfo.Extend4 );
+                        }
+                        else if (ableEdit.ClassDataSourceName == "OperationRecord.AnesthesiaDoctor" && myOpeRecord.OpeRecordInfo.Extend5 != null && myOpeRecord.OpeRecordInfo.Extend5 != "" && myOpeRecord.OpeRecordInfo.Extend5 != "|")
+                        {
+                            text = DBManage.GetDictionaryValuesById(ableEdit.PackValue, ableEdit.ControlTitleText, myOpeRecord.OpeRecordInfo.Extend5 );
+                        }
+                        else
+                        {
+                            text = DBManage.GetDictionaryValuesById(ableEdit.PackValue, ableEdit.ControlTitleText);
+                        }
                         //设置属性的值
                         template.SetObjValue(OpeRecord, ableEdit.ClassDataSourceName, text, value);
                         break;
@@ -518,11 +531,20 @@ namespace DrawGraph
             tokenEditor.Leave -= TokenEditor_Leave;
             tokenEditor.Leave += TokenEditor_Leave;
 
-            if (ableEdit.ControlTitleText == "手术" || ableEdit.ControlTitleText == "诊断")
+            if ((PublicMethod.RoleName.Contains("增加诊断") && ableEdit.ControlTitleText == "诊断") || (AIMSExtension.PublicMethod.RoleName.Contains("增加手术") && ableEdit.ControlTitleText == "手术"))
             {
                 tokenEditor.ValidateToken -= new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken);
                 tokenEditor.ValidateToken += new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken);
             }
+            if (ableEdit.ClassDataSourceName == "OperationRecord.OperationDoctor" || ableEdit.ClassDataSourceName == "OperationRecord.AnesthesiaDoctor")
+            {
+                tokenEditor.ValidateToken -= new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken1);
+                tokenEditor.ValidateToken += new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken1);
+                tokenEditor.Leave -= TokenEditor_Leave;
+                tokenEditor.Leave -= TokenEditor_Leave2;
+                tokenEditor.Leave += TokenEditor_Leave2;
+            }
+
             EditTextBox_DoubleClick(tokenEditor.EditTextBox, null);
             tokenEditor.EditTextBox.Select();
         }
@@ -554,12 +576,39 @@ namespace DrawGraph
             }
         }
 
+        private void tokenEditor_ValidateToken1(object sender, DevComponents.DotNetBar.Controls.ValidateTokenEventArgs ea)
+        {
+            DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = sender as DevComponents.DotNetBar.Controls.TokenEditor;
+            AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj;
+            if (ea.IsNewToken)
+            {
+                if (tokenEditor.SelectedTokens.Count > 0)
+                {
+                    tokenEditor.EditTextBox.TextChanged -= EditTextBox_TextChanged;
+                    EditToken token = tokenEditor.SelectedTokens[tokenEditor.SelectedTokens.Count - 1];
+                    string Tokentxt = ea.Token.Value.Replace("：", ":");
+                    token.Text += Tokentxt;
+                    ea.Token = null;
+                    tokenEditor.EditTextBox.Text = "";
+                    tokenEditor.IsPopupOpen = false;
+                    tokenEditor.EditTextBox.TextChanged += EditTextBox_TextChanged;
+
+                }
+            }
+        }
+
         private void TokenEditor_Leave(object sender, EventArgs e)
         {
             DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = sender as DevComponents.DotNetBar.Controls.TokenEditor;
             AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj;
             TokenEditorManage.SaveDictItem(template, OpeRecord as OperationRecord, tokenEditor, aEdit, true);
         }
+        private void TokenEditor_Leave2(object sender, EventArgs e)
+        {
+            DevComponents.DotNetBar.Controls.TokenEditor tokenEditor = sender as DevComponents.DotNetBar.Controls.TokenEditor;
+            AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj;
+            TokenEditorManage.SaveDictItem2(template, OpeRecord as OperationRecord, tokenEditor, aEdit, true);
+        }
 
     }
 }

DrawGraph/AreaManage/BaseInfoTopManage.cs

@@ -394,7 +394,10 @@ namespace DrawGraph
                             conl.DoubleClick += Conl_DoubleClick;
                             break;
                         case "OperationRecord.BloodType": //血型 
-                            TYZD_Click(aEdit1, e);
+                            TYZD_Click(aEdit1, e, true);
+                            break;
+                        case "OperationRecord.RHBloodType": //血型 
+                            TYZD_Click(aEdit1, e, true);
                             break;
                         case "OperationRecord.Applydiagnose": //手术诊断 
                             opeDisease_Click(aEdit1, e);
@@ -435,20 +438,20 @@ namespace DrawGraph
         #region 可编辑区域响应事件
         //通用字典分组窗体打开
         private void TYZD_Click(AbleEditPackObj sender, EventArgs e, bool isRadio = false)
-        { 
+        {
             try
             {
                 AbleEditPackObj ableEdit = sender;
                 if (ableEdit == null) return;
                 if (myOpeRecord == null) return;
-                if (ableEdit.ControlType == EControlType.Directory)
+                if (ableEdit.ControlType == EControlType.Directorys)
-                {
-                    SelDict(sender, e, ableEdit.ControlTitleText, isRadio); 
-                }
-                else if (ableEdit.ControlType == EControlType.Directorys)
                 {
                     SetDirectorysMethod(ableEdit);
                 }
+                else
+                {
+                    SelDict(sender, e, ableEdit.ControlTitleText, isRadio);
+                }
             }
             catch (Exception ex)
             {
@@ -598,13 +601,14 @@ namespace DrawGraph
             tokenEditor.Leave -= TokenEditor_Leave;
             tokenEditor.Leave += TokenEditor_Leave;
 
-            if (ableEdit.ControlTitleText == "手术" || ableEdit.ControlTitleText == "诊断")
+            if ((PublicMethod.RoleName.Contains("增加诊断") && ableEdit.ControlTitleText == "诊断") || (AIMSExtension.PublicMethod.RoleName.Contains("增加手术") && ableEdit.ControlTitleText == "手术"))
             {
                 tokenEditor.ValidateToken -= new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken);
                 tokenEditor.ValidateToken += new DevComponents.DotNetBar.Controls.ValidateTokenEventHandler(this.tokenEditor_ValidateToken);
             }
+
             EditTextBox_DoubleClick(tokenEditor.EditTextBox, null);
-            tokenEditor.EditTextBox.Select(); 
+            tokenEditor.EditTextBox.Select();
         }
 
         private void opeDisease_Click(AbleEditPackObj sender, EventArgs e)
@@ -820,6 +824,5 @@ namespace DrawGraph
             AbleEditPackObj aEdit = tokenEditor.Tag as AbleEditPackObj;
             TokenEditorManage.SaveDictItem(template, OpeRecord as OperationRecord, tokenEditor, aEdit, true);
         }
-
     }
 }

DrawGraph/AreaManage/DBManage.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
+using System.Net;
 using System.Text;
 
 namespace DrawGraph
@@ -76,14 +77,14 @@ namespace DrawGraph
                     break;
                 default:
                     strSql = "SELECT top 30 p.Id,p.Name,p.Remark Code FROM BasicDictionary p WHERE p.IsValid=1 and ParentId in(select Id from BasicDictionary where Name='" + _title + "') AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%' )";
-                    if (SelPerson != "") strSql += " AND p.Id not in (" + SelPerson + ") ";
+                    //if (SelPerson != "" && ) strSql += " AND p.Id not in (" + SelPerson + ") ";
                     strSql += " order by p.[Order]  asc";
                     break;
 
             }
             return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString());
         }
-        public static int SetOperationRecordValue(object operationRecord, string propertyName, string value)
+        public static int SetOperationRecordValue(object operationRecord, string propertyName, string value, string Text)
         {
             int i = 0;
             OperationRecord _operationRecord = operationRecord as OperationRecord;
@@ -181,6 +182,10 @@ namespace DrawGraph
                     {
                         i += UpdatePatient(items[1] + "='" + value + "'  where Id= " + _operationRecord.PatientId);
                     }
+                    else if (items[1] == "BloodType" || items[1] == "RHBloodType")
+                    {
+                        i += UpdatePatient(items[1] + "='" + Text + "'  where Id= " + _operationRecord.PatientId);
+                    }
                     else if (items[1] == "OperationType")
                     {
                         i += UpdateApply(items[1] + "='" + value + "'  where Id= " + _operationRecord.PatientId);
@@ -399,7 +404,7 @@ namespace DrawGraph
                     strSql.Append("" + DiagnoseId + ",");
                     strSql.Append("'" + AIMSExtension.PublicMethod.OperatorNo + "',");
                     strSql.Append("'" + AIMSExtension.PublicMethod.OperatorName + "',");
-                    strSql.Append("'" + DateTime.Now + "'"); 
+                    strSql.Append("'" + DateTime.Now + "'");
                     strSql.Append(")");
                     i += HelperDB.DbHelperSQL.ExecNonQuery(strSql.ToString());
                 }
@@ -706,5 +711,62 @@ namespace DrawGraph
             return Explain;
         }
 
+        public static string GetDictionaryValuesById(string Ids, string DictionaryName, string Tags)
+        {
+            if (Ids == null || Ids.Trim() == "") return "";
+            string Explain = "";
+            try
+            {
+                string sql = "";
+                switch (DictionaryName)
+                {
+                    case "手术":
+                        sql = "select dbo.GetOperation('" + Ids + "') value";
+                        break;
+                    case "CA人员":
+                        sql = "select dbo.GetPersons('" + Ids + "') value";
+                        break;
+                    case "人员":
+                        sql = "select dbo.GetPersons('" + Ids + "') value";
+                        break;
+                    case "诊断":
+                        sql = "select dbo.GetDisease('" + Ids + "') value";
+                        break;
+                    case "麻醉方式":
+                        sql = "select dbo.GetAnaesthesiaMethod('" + Ids + "') value";
+                        break;
+                    case "手术体位":
+                        sql = "select dbo.GetOperationBodyPosition('" + Ids + "') value";
+                        break;
+                    case "手术部位":
+                        sql = "select dbo.GetOperationPosition('" + Ids + "') value";
+                        break;
+                    default:
+                        sql = "select dbo.funBasicDictionary('" + Ids + "') value";
+                        break;
+                }
+                if (sql != "")
+                {
+                    object dt = DBHelper.ExecuteScalar(sql);
+                    if (dt != null)
+                    {
+                        string namestr = dt.ToString();
+                        List<string> list = namestr.Split(',').ToList();
+                        List<string> tags = Tags.Split('|').ToList();
+                        for (int i = 0; i < list.Count; i++)
+                        {
+                            list[i] = list[i] + tags[i];
+                        }
+                        Explain = string.Join(",", list);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                PublicMethod.WriteLog(ex);
+                Explain = "";
+            }
+            return Explain;
+        }
     }
 }

DrawGraph/AreaManage/PhysioDataManage.cs

@@ -648,12 +648,14 @@ namespace DrawGraph
                     pp.ConfigType = "事件";
                     pp.ConveColor = System.Drawing.Color.White;
 
-                    pp.IsValid = true;
+                    if (pp.IsDefalultShow == true)
-                    pp.ClearTagstr(ZedControl);
+                    {
-                    pp.phListPack = phListPack;
+                        pp.IsValid = true;
-                    pp.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.PageBegin,
+                        pp.phListPack = phListPack;
-                                        myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); 
+                        pp.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.PageBegin,
-                    pp.initCurve(); 
+                                            myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN));
+                        pp.initCurve();
+                    }
                 }
             }
             catch (Exception ex)
@@ -744,6 +746,21 @@ namespace DrawGraph
                     }
                 }
             }
+            //加载事件图标
+            //IList<PhysioDataConfig> dtevent = PhysioDataConfig.GetEventList();
+            //for (int i = 0; i < dtevent.Count; i++)
+            //{
+            //    PhysioDataConfig pp = dtevent[i];
+            //    pp.ConfigType = "事件";
+            //    pp.ConveColor = System.Drawing.Color.White;
+
+            //    pp.IsValid = true;
+            //    pp.ClearTagstr(ZedControl);
+            //    pp.phListPack = phListPack;
+            //    pp.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.PageBegin,
+            //                        myOpeRecord.PageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN));
+            //    pp.initCurve();
+            //}
 
             if (phListPack != null)
             {

DrawGraph/AreaManage/TemplateManage.cs

@@ -37,7 +37,7 @@ namespace DrawGraph
         //private XmlUtil xmlOpe = new XmlUtil(System.Windows.Forms.Application.StartupPath + "\\AIMS.xml");
         private TypesettingEnum typesetting = TypesettingEnum.Vertical;
         private PageTypeEnum pageType = PageTypeEnum.A4;
-          
+
         public int LocationY
         {
             set
@@ -103,7 +103,7 @@ namespace DrawGraph
             if (isUpdate && t != null)
             {
                 //为真时更新数据库
-                i = DBManage.SetOperationRecordValue(t, propertyName, newValue);
+                i = DBManage.SetOperationRecordValue(t, propertyName, newValue, newText);
             }
             if (isUpdate && i <= 0) return i;
 

DrawGraph/AreaManage/TokenEditorManage.cs

@@ -27,7 +27,7 @@ namespace DrawGraph
                     PersonType = "0";
                     break;
                 case "OperationRecord.InstrumentNurse":
-                    tokenEditor.DropDownHeight = 120;
+                    tokenEditor.DropDownHeight = 250;
                     PersonType = "3";
                     break;
                 case "OperationRecord.Assistant1":
@@ -35,7 +35,7 @@ namespace DrawGraph
                     PersonType = "0";
                     break;
                 case "OperationRecord.TourNurse":
-                    tokenEditor.DropDownHeight = 120;
+                    tokenEditor.DropDownHeight = 250;
                     PersonType = "3";
                     break;
                 case "OperationRecord.OrtherDoctorId":
@@ -94,6 +94,18 @@ namespace DrawGraph
             }
             return Id;
         }
+        public static string GetWorkerTags(string text, string value)
+        {
+            string result = "";
+            string sql = string.Format("select Name from Person where Id = '{0}'", value);
+            object dt = DBHelper.ExecuteScalar(sql);
+            if (dt != null)
+            {
+                string name = dt.ToString();
+                result = text.Replace(name, "");
+            }
+            return result;
+        }
         public static void SaveDictItem(TemplateManage _template, OperationRecord OpeRecord, TokenEditor tokenEditor, AbleEditPackObj aEdit, bool IsVisible = false)
         {
             string SplitChar = ",";
@@ -126,6 +138,7 @@ namespace DrawGraph
             if (aEdit.PackValue != Value)
                 //设置属性的值
                 _template.SetObjValue(OpeRecord, aEdit.ClassDataSourceName, Value, Key, true);
+
         }
         public static void SaveDictItemText(TemplateManage _template, OperationRecord OpeRecord, TokenEditor tokenEditor, AbleEditPackObj aEdit, bool IsVisible = false)
         {
@@ -155,5 +168,52 @@ namespace DrawGraph
                 //设置属性的值
                 _template.SetObjValue(OpeRecord, aEdit.ClassDataSourceName, Value, Value, true);
         }
+        public static void SaveDictItem2(TemplateManage _template, OperationRecord OpeRecord, TokenEditor tokenEditor, AbleEditPackObj aEdit, bool IsVisible = false)
+        {
+            string SplitChar = ",";
+            if (aEdit.ClassDataSourceName == "OperationRecord.AnaesthesiaMethodName")
+            {
+                SplitChar = "+";
+            }
+            string Value = "";
+            string Key = "";
+            string Tag = "";
+            List<string> namevalue = new List<string>();
+            List<string> idvalue = new List<string>();
+            List<string> tagvalue = new List<string>();
+
+            foreach (var item in tokenEditor.SelectedTokens)
+            {
+                namevalue.Add(item.Text);
+                idvalue.Add(item.Value);
+                tagvalue.Add(GetWorkerTags(item.Text,item.Value));
+            }
+            if (idvalue.Count > 0)
+            {
+                Value = string.Join(SplitChar, namevalue);
+                Key = string.Join(SplitChar, idvalue);
+                Tag = string.Join("|", tagvalue);
+            }
+            else
+            {
+                Value = "";
+                Key = "";
+                Tag = "";
+            }
+            if (IsVisible == true)
+                aEdit.IsVisible = !aEdit.IsVisible;
+            if (aEdit.PackValue != Value)
+                //设置属性的值
+                _template.SetObjValue(OpeRecord, aEdit.ClassDataSourceName, Value, Key, true);
+
+            if (aEdit.ClassDataSourceName == "OperationRecord.OperationDoctor")
+            {
+                _template.SetObjValue(OpeRecord, "OperationRecord.OpeRecordInfo.Extend4", Tag, Tag, true);
+            }
+            else if (aEdit.ClassDataSourceName == "OperationRecord.AnesthesiaDoctor")
+            {
+                _template.SetObjValue(OpeRecord, "OperationRecord.OpeRecordInfo.Extend5", Tag, Tag, true);
+            }
+        }
     }
 }

DrawGraph/Graph/MasterPane.cs

@@ -573,9 +573,8 @@ namespace DrawGraph
 			
 			// Recalculate the legend rect, just in case it has not yet been done
 			// innerRect is the area for the GraphPane's
-			RectangleF innerRect = CalcClientRect( g, scaleFactor );
+			RectangleF innerRect = CalcClientRect( g, scaleFactor ); 
-			_legend.CalcRect( g, this, scaleFactor, ref innerRect );
+			_legend.CalcRect( g, this, scaleFactor, ref innerRect ); 
-			//this.legend.SetLocation( this, 
 			
 			_legend.Draw( g, this, scaleFactor );