入室流程修改完善

AIMS/DocManager/frmTemplateD.cs

@@ -250,5 +250,10 @@ namespace AIMS.DocManager
                 MessageBox.Show(ex.Message);
             }
         }
+
+        private void frmTemplateD_Load(object sender, EventArgs e)
+        {
+
+        }
     }
 }

AIMS/DocManager/frmTemplateD.designer.cs

@@ -36,29 +36,33 @@
             // 
             this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
             this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.MaximumSize = new System.Drawing.Size(300, 0);
+            this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.panel1.MinimumSize = new System.Drawing.Size(220, 0);
+            this.panel1.MaximumSize = new System.Drawing.Size(225, 0);
+            this.panel1.MinimumSize = new System.Drawing.Size(165, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(220, 593);
+            this.panel1.Size = new System.Drawing.Size(165, 474);
             this.panel1.TabIndex = 7;
             // 
             // panel2
             // 
             this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel2.Location = new System.Drawing.Point(220, 0);
+            this.panel2.Location = new System.Drawing.Point(165, 0);
+            this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1016, 593);
+            this.panel2.Size = new System.Drawing.Size(762, 474);
             this.panel2.TabIndex = 8;
             // 
             // frmTemplateD
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1236, 593);
+            this.ClientSize = new System.Drawing.Size(927, 474);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.panel1);
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Name = "frmTemplateD";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Load += new System.EventHandler(this.frmTemplateD_Load);
             this.ResumeLayout(false);
 
         }

AIMS/Extensions/EMRExtension.cs

@@ -25,8 +25,6 @@ namespace AIMS
             {
                 frmFeesRecord frmchargRecord = new frmFeesRecord(_record, "麻醉");
                 frmchargRecord.Show(); 
-                frmchargRecord.BringToFront();
-                frmchargRecord.TopMost = true;
             }
         }
         public static void OpenEMRS(int patientid, int applyid)

AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs

@@ -270,7 +270,6 @@ namespace AIMS.OperationAanesthesia
             pdg.PrintPreviewControl.Zoom = 1;
             pdg.ShowDialog();
             pdg.Focus(); 
-            pdg.BringToFront();
 
         }
         private void PageSetting_Click(object sender, EventArgs e)
@@ -1121,21 +1120,24 @@ namespace AIMS.OperationAanesthesia
             timerLoadAnesRescue.Tick -= TimerLoadAnesRescue_Tick;
             timerLoadAnesRescue.Tick += TimerLoadAnesRescue_Tick;
             timerLoadAnesRescue.Start();
+
+            //TimerLoadAnesRescue_Tick(null, null);
         }
         private void TimerLoadAnesRescue_Tick(object sender, EventArgs e)
         {
             timerLoadAnesRescue.Dispose();
+            try
+            {
                 if (PatientId > 0 && State == AIMSExtension.EditState.ADD)
                 {
                     try
                     { 
-                    HelperDB.DbHelperSQL.BeginTrans();
                         _record = new OperationRecord();
                         _record.OperationApplyId = ApplyId;
                         _record.PatientId = PatientId;
                         _record.RecoverId = RecoverId;
                         _record.Id = BOperationRecord.AddTitleTime(PatientId, ApplyId, RecoverId, 1, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd HH:mm:00")), NowRoom.Id.Value);
-                    HelperDB.DbHelperSQL.CommitTrans();
+                        SelectPatient.UpdateApplyState(PatientId,  ApplyId); //修改状态
                         ClearTimeText();
                         btnSelectPatient.Enabled = false;
                         btnCancelOperation.Enabled = true;
@@ -1218,6 +1220,11 @@ namespace AIMS.OperationAanesthesia
                 zgcAnaesRecord2.Visible = true;
 
             }
+            catch (Exception ex)
+            {
+                PublicMethod.WriteLog(ex);
+            }
+        }
         private void _record_SpeedyDrugsParam(List<FactDrug> factDrugs)
         {
             frmFactSpeedyDrug frmFact = new frmFactSpeedyDrug();

AIMS/OperationAanesthesia/frmSelectPatientNew2.cs

@@ -298,7 +298,6 @@ namespace AIMS.OperationAanesthesia
                     frmAnasRecord.ApplyId = applyId;
                     frmAnasRecord.NowRoom = AIMSBLL.BOperationRoom.SelectSingle(RoomId);
                     frmAnasRecord.State = AIMSExtension.EditState.ADD;
-                    SelectPatient.UpdateApplyState(PatientId, applyId); //修改状态
 
                     uc.label2.Text = "手术中";
                     uc.label2.ForeColor = Color.Red;

AIMS/OperationAfter/frmOperationManage.Designer.cs

@@ -50,6 +50,7 @@
             this.SexColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Age = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ApplyDepNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.OperationGroup = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.SickBedColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.PatientType = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.MdrecNoColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -87,6 +88,7 @@
             this.RemarkColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.OperatorName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.cboDept = new DevComponents.DotNetBar.Controls.ComboBoxEx();
             this.AgeEnd = new System.Windows.Forms.NumericUpDown();
             this.AgeBegin = new System.Windows.Forms.NumericUpDown();
             this.label14 = new System.Windows.Forms.Label();
@@ -105,6 +107,7 @@
             this.label12 = new System.Windows.Forms.Label();
             this.label11 = new System.Windows.Forms.Label();
             this.label15 = new System.Windows.Forms.Label();
+            this.label16 = new System.Windows.Forms.Label();
             this.label20 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
@@ -114,15 +117,58 @@
             this.label3 = new System.Windows.Forms.Label();
             this.dtpEndDate = new System.Windows.Forms.DateTimePicker();
             this.cmbPatType = new System.Windows.Forms.ComboBox();
+            this.cboOperationGroup = new System.Windows.Forms.ComboBox();
             this.txtASALevel = new System.Windows.Forms.ComboBox();
             this.txtOperationCut = new System.Windows.Forms.ComboBox();
             this.cboOperationLevel = new System.Windows.Forms.ComboBox();
             this.cmbOpeType = new System.Windows.Forms.ComboBox();
-            this.cboDepartment = new System.Windows.Forms.ComboBox();
             this.label1 = new System.Windows.Forms.Label();
             this.btnFind = new System.Windows.Forms.Button();
             this.CboOperationSite = new DevComponents.DotNetBar.Controls.ComboBoxEx();
             this.labelSite = new System.Windows.Forms.Label();
+            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.dataGridViewTextBoxColumn19 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn20 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn21 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn23 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn24 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn25 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn26 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn27 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn28 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn29 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn30 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn31 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn32 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn33 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn34 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn35 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn36 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn37 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn38 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn39 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn40 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn41 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn42 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn43 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.toolStrip1.SuspendLayout();
             this.panel1.SuspendLayout();
             this.panel3.SuspendLayout();
@@ -270,6 +316,7 @@
             this.SexColumn,
             this.Age,
             this.ApplyDepNameColumn,
+            this.OperationGroup,
             this.SickBedColumn,
             this.PatientType,
             this.MdrecNoColumn,
@@ -315,7 +362,7 @@
             dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
             this.dgv.DefaultCellStyle = dataGridViewCellStyle1;
             this.dgv.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dgv.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
+            this.dgv.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170)))));
             this.dgv.Location = new System.Drawing.Point(0, 0);
             this.dgv.Name = "dgv";
             this.dgv.ReadOnly = true;
@@ -383,6 +430,13 @@
             this.ApplyDepNameColumn.ReadOnly = true;
             this.ApplyDepNameColumn.Width = 80;
             // 
+            // OperationGroup
+            // 
+            this.OperationGroup.DataPropertyName = "OperationGroup";
+            this.OperationGroup.HeaderText = "专业组";
+            this.OperationGroup.Name = "OperationGroup";
+            this.OperationGroup.ReadOnly = true;
+            // 
             // SickBedColumn
             // 
             this.SickBedColumn.DataPropertyName = "SickBed";
@@ -669,6 +723,7 @@
             // 
             // panel2
             // 
+            this.panel2.Controls.Add(this.cboDept);
             this.panel2.Controls.Add(this.AgeEnd);
             this.panel2.Controls.Add(this.AgeBegin);
             this.panel2.Controls.Add(this.label14);
@@ -687,6 +742,7 @@
             this.panel2.Controls.Add(this.label12);
             this.panel2.Controls.Add(this.label11);
             this.panel2.Controls.Add(this.label15);
+            this.panel2.Controls.Add(this.label16);
             this.panel2.Controls.Add(this.label20);
             this.panel2.Controls.Add(this.label8);
             this.panel2.Controls.Add(this.label7);
@@ -696,11 +752,11 @@
             this.panel2.Controls.Add(this.label3);
             this.panel2.Controls.Add(this.dtpEndDate);
             this.panel2.Controls.Add(this.cmbPatType);
+            this.panel2.Controls.Add(this.cboOperationGroup);
             this.panel2.Controls.Add(this.txtASALevel);
             this.panel2.Controls.Add(this.txtOperationCut);
             this.panel2.Controls.Add(this.cboOperationLevel);
             this.panel2.Controls.Add(this.cmbOpeType);
-            this.panel2.Controls.Add(this.cboDepartment);
             this.panel2.Controls.Add(this.label1);
             this.panel2.Controls.Add(this.btnFind);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
@@ -710,6 +766,18 @@
             this.panel2.Size = new System.Drawing.Size(1187, 112);
             this.panel2.TabIndex = 0;
             // 
+            // cboDept
+            // 
+            this.cboDept.Font = new System.Drawing.Font("宋体", 11F);
+            this.cboDept.ForeColor = System.Drawing.Color.Black;
+            this.cboDept.FormattingEnabled = true;
+            this.cboDept.Location = new System.Drawing.Point(59, 41);
+            this.cboDept.Name = "cboDept";
+            this.cboDept.Size = new System.Drawing.Size(217, 23);
+            this.cboDept.TabIndex = 105;
+            this.cboDept.SelectedIndexChanged += new System.EventHandler(this.cboDept_SelectedIndexChanged);
+            this.cboDept.TextUpdate += new System.EventHandler(this.cboDept_TextUpdate);
+            // 
             // AgeEnd
             // 
             this.AgeEnd.Location = new System.Drawing.Point(990, 42);
@@ -749,7 +817,7 @@
             // 
             // 
             this.cboIsNotPlanReturnOperation.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.cboIsNotPlanReturnOperation.Location = new System.Drawing.Point(917, 13);
+            this.cboIsNotPlanReturnOperation.Location = new System.Drawing.Point(887, 17);
             this.cboIsNotPlanReturnOperation.Name = "cboIsNotPlanReturnOperation";
             this.cboIsNotPlanReturnOperation.Size = new System.Drawing.Size(123, 23);
             this.cboIsNotPlanReturnOperation.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -908,6 +976,16 @@
             this.label15.TabIndex = 86;
             this.label15.Text = "年龄";
             // 
+            // label16
+            // 
+            this.label16.AutoSize = true;
+            this.label16.Location = new System.Drawing.Point(1038, 19);
+            this.label16.Name = "label16";
+            this.label16.Size = new System.Drawing.Size(49, 14);
+            this.label16.TabIndex = 82;
+            this.label16.Text = "专业组";
+            this.label16.Visible = false;
+            // 
             // label20
             // 
             this.label20.AutoSize = true;
@@ -994,6 +1072,20 @@
             this.cmbPatType.Size = new System.Drawing.Size(80, 22);
             this.cmbPatType.TabIndex = 77;
             // 
+            // cboOperationGroup
+            // 
+            this.cboOperationGroup.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.cboOperationGroup.FormattingEnabled = true;
+            this.cboOperationGroup.Items.AddRange(new object[] {
+            "",
+            "择期",
+            "急诊"});
+            this.cboOperationGroup.Location = new System.Drawing.Point(1093, 13);
+            this.cboOperationGroup.Name = "cboOperationGroup";
+            this.cboOperationGroup.Size = new System.Drawing.Size(94, 22);
+            this.cboOperationGroup.TabIndex = 76;
+            this.cboOperationGroup.Visible = false;
+            // 
             // txtASALevel
             // 
             this.txtASALevel.ForeColor = System.Drawing.SystemColors.WindowText;
@@ -1045,14 +1137,6 @@
             this.cmbOpeType.Size = new System.Drawing.Size(80, 22);
             this.cmbOpeType.TabIndex = 73;
             // 
-            // cboDepartment
-            // 
-            this.cboDepartment.FormattingEnabled = true;
-            this.cboDepartment.Location = new System.Drawing.Point(59, 42);
-            this.cboDepartment.Name = "cboDepartment";
-            this.cboDepartment.Size = new System.Drawing.Size(217, 22);
-            this.cboDepartment.TabIndex = 78;
-            // 
             // label1
             // 
             this.label1.AutoSize = true;
@@ -1065,9 +1149,9 @@
             // btnFind
             // 
             this.btnFind.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnFind.Location = new System.Drawing.Point(1070, 33);
+            this.btnFind.Location = new System.Drawing.Point(1051, 44);
             this.btnFind.Name = "btnFind";
-            this.btnFind.Size = new System.Drawing.Size(105, 63);
+            this.btnFind.Size = new System.Drawing.Size(124, 51);
             this.btnFind.TabIndex = 18;
             this.btnFind.Text = "查询";
             this.btnFind.UseVisualStyleBackColor = true;
@@ -1079,6 +1163,7 @@
             this.CboOperationSite.DisplayMember = "Text";
             this.CboOperationSite.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
             this.CboOperationSite.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.CboOperationSite.ForeColor = System.Drawing.Color.Black;
             this.CboOperationSite.FormattingEnabled = true;
             this.CboOperationSite.ItemHeight = 19;
             this.CboOperationSite.Location = new System.Drawing.Point(1041, 7);
@@ -1100,6 +1185,303 @@
             this.labelSite.Text = "手术地点";
             this.labelSite.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "ApplyId";
+            this.dataGridViewTextBoxColumn1.HeaderText = "序号";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "State";
+            this.dataGridViewTextBoxColumn2.HeaderText = "状态";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.Width = 60;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "PatientName";
+            this.dataGridViewTextBoxColumn3.HeaderText = "姓名";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.Width = 60;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "Sex";
+            this.dataGridViewTextBoxColumn4.HeaderText = "性别";
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.Width = 40;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "Age";
+            this.dataGridViewTextBoxColumn5.HeaderText = "年龄";
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.Width = 40;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.DataPropertyName = "PatientDept";
+            this.dataGridViewTextBoxColumn6.HeaderText = "科室";
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.DataPropertyName = "OperationGroup";
+            this.dataGridViewTextBoxColumn7.HeaderText = "专业组";
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.Visible = false; 
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.DataPropertyName = "SickBed";
+            this.dataGridViewTextBoxColumn8.HeaderText = "床位";
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.Width = 40;
+            // 
+            // dataGridViewTextBoxColumn9
+            // 
+            this.dataGridViewTextBoxColumn9.DataPropertyName = "PatientType";
+            this.dataGridViewTextBoxColumn9.HeaderText = "患者类别";
+            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn10
+            // 
+            this.dataGridViewTextBoxColumn10.DataPropertyName = "MdrecNo";
+            this.dataGridViewTextBoxColumn10.HeaderText = "住院号";
+            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+            this.dataGridViewTextBoxColumn10.Width = 70;
+            // 
+            // dataGridViewTextBoxColumn11
+            // 
+            this.dataGridViewTextBoxColumn11.DataPropertyName = "OperationType";
+            this.dataGridViewTextBoxColumn11.HeaderText = "手术类型";
+            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
+            this.dataGridViewTextBoxColumn11.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn12
+            // 
+            this.dataGridViewTextBoxColumn12.DataPropertyName = "ApplyOperatorNo";
+            this.dataGridViewTextBoxColumn12.HeaderText = "申请人";
+            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
+            this.dataGridViewTextBoxColumn12.Width = 70;
+            // 
+            // dataGridViewTextBoxColumn13
+            // 
+            this.dataGridViewTextBoxColumn13.DataPropertyName = "ApplyTime";
+            this.dataGridViewTextBoxColumn13.HeaderText = "申请时间";
+            this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13";
+            this.dataGridViewTextBoxColumn13.Width = 110;
+            // 
+            // dataGridViewTextBoxColumn14
+            // 
+            this.dataGridViewTextBoxColumn14.DataPropertyName = "OrderOperationTime";
+            this.dataGridViewTextBoxColumn14.HeaderText = "预约时间";
+            this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14";
+            this.dataGridViewTextBoxColumn14.Width = 110;
+            // 
+            // dataGridViewTextBoxColumn15
+            // 
+            this.dataGridViewTextBoxColumn15.DataPropertyName = "ApplyDiagnoseInfoName";
+            this.dataGridViewTextBoxColumn15.HeaderText = "术前诊断";
+            this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15";
+            this.dataGridViewTextBoxColumn15.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn16
+            // 
+            this.dataGridViewTextBoxColumn16.DataPropertyName = "ApplyOperationInfoName";
+            this.dataGridViewTextBoxColumn16.HeaderText = "拟施手术";
+            this.dataGridViewTextBoxColumn16.Name = "dataGridViewTextBoxColumn16";
+            this.dataGridViewTextBoxColumn16.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn17
+            // 
+            this.dataGridViewTextBoxColumn17.DataPropertyName = "InRoomTime";
+            this.dataGridViewTextBoxColumn17.HeaderText = "入室时间";
+            this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17";
+            this.dataGridViewTextBoxColumn17.Width = 110;
+            // 
+            // dataGridViewTextBoxColumn18
+            // 
+            this.dataGridViewTextBoxColumn18.DataPropertyName = "OutRoomTime";
+            this.dataGridViewTextBoxColumn18.HeaderText = "出室时间";
+            this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18";
+            this.dataGridViewTextBoxColumn18.Width = 110;
+            // 
+            // dataGridViewTextBoxColumn19
+            // 
+            this.dataGridViewTextBoxColumn19.DataPropertyName = "RoomHourTimeSpan";
+            this.dataGridViewTextBoxColumn19.HeaderText = "总时长";
+            this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19";
+            this.dataGridViewTextBoxColumn19.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn20
+            // 
+            this.dataGridViewTextBoxColumn20.DataPropertyName = "AnesthesiaBeginTime";
+            this.dataGridViewTextBoxColumn20.HeaderText = "麻醉开始时间";
+            this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20";
+            this.dataGridViewTextBoxColumn20.Width = 110;
+            // 
+            // dataGridViewTextBoxColumn21
+            // 
+            this.dataGridViewTextBoxColumn21.DataPropertyName = "AnesthesiaEndTime";
+            this.dataGridViewTextBoxColumn21.HeaderText = "麻醉结束时间";
+            this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21";
+            this.dataGridViewTextBoxColumn21.Width = 110;
+            // 
+            // dataGridViewTextBoxColumn22
+            // 
+            this.dataGridViewTextBoxColumn22.DataPropertyName = "AnaesthesiaHourTimeSpan";
+            this.dataGridViewTextBoxColumn22.HeaderText = "麻醉时长";
+            this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22";
+            this.dataGridViewTextBoxColumn22.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn23
+            // 
+            this.dataGridViewTextBoxColumn23.DataPropertyName = "OperationBeginTime";
+            this.dataGridViewTextBoxColumn23.HeaderText = "手术开始时间";
+            this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23";
+            this.dataGridViewTextBoxColumn23.Width = 110;
+            // 
+            // dataGridViewTextBoxColumn24
+            // 
+            this.dataGridViewTextBoxColumn24.DataPropertyName = "OperationEndTime";
+            this.dataGridViewTextBoxColumn24.HeaderText = "手术结束时间";
+            this.dataGridViewTextBoxColumn24.Name = "dataGridViewTextBoxColumn24";
+            this.dataGridViewTextBoxColumn24.Width = 110;
+            // 
+            // dataGridViewTextBoxColumn25
+            // 
+            this.dataGridViewTextBoxColumn25.DataPropertyName = "OperationHourTimeSpan";
+            this.dataGridViewTextBoxColumn25.HeaderText = "手术时长";
+            this.dataGridViewTextBoxColumn25.Name = "dataGridViewTextBoxColumn25";
+            this.dataGridViewTextBoxColumn25.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn26
+            // 
+            this.dataGridViewTextBoxColumn26.DataPropertyName = "AnaesthesiaMethodName";
+            this.dataGridViewTextBoxColumn26.HeaderText = "麻醉方式";
+            this.dataGridViewTextBoxColumn26.Name = "dataGridViewTextBoxColumn26";
+            // 
+            // dataGridViewTextBoxColumn27
+            // 
+            this.dataGridViewTextBoxColumn27.DataPropertyName = "OperationInfoName";
+            this.dataGridViewTextBoxColumn27.HeaderText = "实施手术";
+            this.dataGridViewTextBoxColumn27.Name = "dataGridViewTextBoxColumn27";
+            // 
+            // dataGridViewTextBoxColumn28
+            // 
+            this.dataGridViewTextBoxColumn28.DataPropertyName = "OperationCut";
+            this.dataGridViewTextBoxColumn28.HeaderText = "切口类型";
+            this.dataGridViewTextBoxColumn28.Name = "dataGridViewTextBoxColumn28";
+            this.dataGridViewTextBoxColumn28.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn29
+            // 
+            this.dataGridViewTextBoxColumn29.DataPropertyName = "OperationPositionName";
+            this.dataGridViewTextBoxColumn29.HeaderText = "手术部位";
+            this.dataGridViewTextBoxColumn29.Name = "dataGridViewTextBoxColumn29";
+            this.dataGridViewTextBoxColumn29.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn30
+            // 
+            this.dataGridViewTextBoxColumn30.DataPropertyName = "OperationBodyPositionName";
+            this.dataGridViewTextBoxColumn30.HeaderText = "手术体位";
+            this.dataGridViewTextBoxColumn30.Name = "dataGridViewTextBoxColumn30";
+            this.dataGridViewTextBoxColumn30.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn31
+            // 
+            this.dataGridViewTextBoxColumn31.DataPropertyName = "OperationLevel";
+            this.dataGridViewTextBoxColumn31.HeaderText = "手术分级";
+            this.dataGridViewTextBoxColumn31.Name = "dataGridViewTextBoxColumn31";
+            this.dataGridViewTextBoxColumn31.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn32
+            // 
+            this.dataGridViewTextBoxColumn32.DataPropertyName = "ASALevelName";
+            this.dataGridViewTextBoxColumn32.HeaderText = "ASA等级";
+            this.dataGridViewTextBoxColumn32.Name = "dataGridViewTextBoxColumn32";
+            this.dataGridViewTextBoxColumn32.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn33
+            // 
+            this.dataGridViewTextBoxColumn33.DataPropertyName = "OperationDoctor";
+            this.dataGridViewTextBoxColumn33.HeaderText = "术者";
+            this.dataGridViewTextBoxColumn33.Name = "dataGridViewTextBoxColumn33";
+            this.dataGridViewTextBoxColumn33.Width = 60;
+            // 
+            // dataGridViewTextBoxColumn34
+            // 
+            this.dataGridViewTextBoxColumn34.DataPropertyName = "Assistant";
+            this.dataGridViewTextBoxColumn34.HeaderText = "助手";
+            this.dataGridViewTextBoxColumn34.Name = "dataGridViewTextBoxColumn34";
+            this.dataGridViewTextBoxColumn34.Width = 90;
+            // 
+            // dataGridViewTextBoxColumn35
+            // 
+            this.dataGridViewTextBoxColumn35.DataPropertyName = "AnesthesiaDoctor";
+            this.dataGridViewTextBoxColumn35.HeaderText = "主麻";
+            this.dataGridViewTextBoxColumn35.Name = "dataGridViewTextBoxColumn35";
+            this.dataGridViewTextBoxColumn35.Width = 60;
+            // 
+            // dataGridViewTextBoxColumn36
+            // 
+            this.dataGridViewTextBoxColumn36.DataPropertyName = "AnesthesiaDoctor2";
+            this.dataGridViewTextBoxColumn36.HeaderText = "副麻";
+            this.dataGridViewTextBoxColumn36.Name = "dataGridViewTextBoxColumn36";
+            this.dataGridViewTextBoxColumn36.Width = 60;
+            // 
+            // dataGridViewTextBoxColumn37
+            // 
+            this.dataGridViewTextBoxColumn37.DataPropertyName = "TourNurse";
+            this.dataGridViewTextBoxColumn37.HeaderText = "巡回";
+            this.dataGridViewTextBoxColumn37.Name = "dataGridViewTextBoxColumn37";
+            this.dataGridViewTextBoxColumn37.Width = 60;
+            // 
+            // dataGridViewTextBoxColumn38
+            // 
+            this.dataGridViewTextBoxColumn38.DataPropertyName = "InstrumentNurse";
+            this.dataGridViewTextBoxColumn38.HeaderText = "器械";
+            this.dataGridViewTextBoxColumn38.Name = "dataGridViewTextBoxColumn38";
+            this.dataGridViewTextBoxColumn38.Width = 60;
+            // 
+            // dataGridViewTextBoxColumn39
+            // 
+            this.dataGridViewTextBoxColumn39.DataPropertyName = "OperationRoom";
+            this.dataGridViewTextBoxColumn39.HeaderText = "术间";
+            this.dataGridViewTextBoxColumn39.Name = "dataGridViewTextBoxColumn39";
+            this.dataGridViewTextBoxColumn39.Width = 40;
+            // 
+            // dataGridViewTextBoxColumn40
+            // 
+            this.dataGridViewTextBoxColumn40.DataPropertyName = "PlanOrder";
+            this.dataGridViewTextBoxColumn40.HeaderText = "台次";
+            this.dataGridViewTextBoxColumn40.Name = "dataGridViewTextBoxColumn40";
+            this.dataGridViewTextBoxColumn40.Width = 40;
+            // 
+            // dataGridViewTextBoxColumn41
+            // 
+            this.dataGridViewTextBoxColumn41.DataPropertyName = "IsNotPlanReturnOperation";
+            this.dataGridViewTextBoxColumn41.HeaderText = "非计划二次手术";
+            this.dataGridViewTextBoxColumn41.Name = "dataGridViewTextBoxColumn41";
+            // 
+            // dataGridViewTextBoxColumn42
+            // 
+            this.dataGridViewTextBoxColumn42.DataPropertyName = "Remark";
+            this.dataGridViewTextBoxColumn42.HeaderText = "停止原因";
+            this.dataGridViewTextBoxColumn42.Name = "dataGridViewTextBoxColumn42";
+            // 
+            // dataGridViewTextBoxColumn43
+            // 
+            this.dataGridViewTextBoxColumn43.DataPropertyName = "OperatorName";
+            this.dataGridViewTextBoxColumn43.HeaderText = "停止人";
+            this.dataGridViewTextBoxColumn43.Name = "dataGridViewTextBoxColumn43";
+            this.dataGridViewTextBoxColumn43.Width = 80;
+            // 
             // frmOperationManage
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1173,10 +1555,14 @@
         private System.Windows.Forms.ComboBox txtOperationCut;
         private System.Windows.Forms.ComboBox cboOperationLevel;
         private System.Windows.Forms.ComboBox cmbOpeType;
-        private System.Windows.Forms.ComboBox cboDepartment;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.ToolStripButton tspSetting;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+        private System.Windows.Forms.ToolStripButton toolStripButton1;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+        private DevComponents.DotNetBar.Controls.ComboBoxEx CboOperationSite;
+        private System.Windows.Forms.Label labelSite;
+        private DevComponents.DotNetBar.Controls.ComboBoxEx cboDept;
         private System.Windows.Forms.DataGridViewCheckBoxColumn CheckBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn ApplyId;
         private System.Windows.Forms.DataGridViewTextBoxColumn StateColumn;
@@ -1184,6 +1570,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn SexColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn Age;
         private System.Windows.Forms.DataGridViewTextBoxColumn ApplyDepNameColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn OperationGroup;
         private System.Windows.Forms.DataGridViewTextBoxColumn SickBedColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn PatientType;
         private System.Windows.Forms.DataGridViewTextBoxColumn MdrecNoColumn;
@@ -1220,9 +1607,50 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn IsNotPlanReturnOperation;
         private System.Windows.Forms.DataGridViewTextBoxColumn RemarkColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn OperatorName;
-        private System.Windows.Forms.ToolStripButton toolStripButton1;
+        private System.Windows.Forms.Label label16;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+        private System.Windows.Forms.ComboBox cboOperationGroup;
-        private DevComponents.DotNetBar.Controls.ComboBoxEx CboOperationSite;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
-        private System.Windows.Forms.Label labelSite;
+        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 dataGridViewTextBoxColumn10;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn13;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn14;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn15;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn16;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn17;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn18;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn19;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn20;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn21;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn22;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn23;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn24;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn25;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn26;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn27;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn28;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn29;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn30;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn31;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn32;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn33;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn34;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn35;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn36;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn37;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn38;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn39;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn40;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn41;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn42;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn43;
     }
 }

AIMS/OperationAfter/frmOperationManage.cs

@@ -24,6 +24,8 @@ namespace AIMS.OperationAfter.UI
         }
         public SysConfig exportConfig;
         public string DataGridViewPath = "";
+        public List<Department> listNew = new List<Department>();
+        public List<Department> listOnit = new List<Department>();
         private void frmOperationManage_Load(object sender, EventArgs e)
         {
             //1.系统管理员 7.麻醉主任 8.麻醉护士 9.麻醉医生 
@@ -32,6 +34,12 @@ namespace AIMS.OperationAfter.UI
                 tsbReviewApply.Visible = true;
                 toolStripSeparator1.Visible = true;
             }
+            if (PublicMethod.HospitalName.Contains("漳浦天福"))
+            {
+                label16.Visible = true;
+                cboOperationGroup.Visible = true;
+                this.dataGridViewTextBoxColumn7.Visible = true;
+            }
             dgv.AutoGenerateColumns = false;
             dgv.BackgroundColor = System.Drawing.Color.Snow;
             ControlExtension.SetDgvAttribute(dgv);
@@ -39,18 +47,22 @@ namespace AIMS.OperationAfter.UI
             exportConfig = BSysConfig.SelectSingle(" Note='" + DataGridViewPath + "' and (Extend1 = null or Extend1='" + PublicMethod.RoleId + "')", null, RecursiveType.None, 0);// 
             if (exportConfig != null)
                 ConfigDataGridView(exportConfig);
-            List<Department> list = new List<Department>();
+
-            list = BDepartment.GetDepartmentAllList();
+            listOnit = BDepartment.GetDepartmentAllListBYSql("");
-            list.Insert(0, new Department
+            listOnit.Insert(0, new Department() { Id = -1, Name = "全部科室" });
+            this.cboDept.Items.AddRange(listOnit.ToArray());
+            cboDept.ValueMember = "Id";
+            cboDept.DisplayMember = "Name";
+            cboDept.SelectedIndex = -1;
+
+            if (cboOperationGroup.Visible == true)
             {
-                Id = -1,
+                System.Data.DataTable OperationGroups = BDepartment.GetOperationGroups();
-                Name = "全部科室"
+                cboOperationGroup.DataSource = OperationGroups;
-            });
+                cboOperationGroup.DisplayMember = "Names";
-            cboDepartment.DataSource = list;
+                cboOperationGroup.ValueMember = "Names";
-            cboDepartment.DisplayMember = "Name";
+                cboOperationGroup.SelectedIndex = -1;
-            cboDepartment.ValueMember = "Id";
+            }
-            cboDepartment.SelectedIndex = -1;
-            cboDepartment.Text = "全部科室";
 
             dtpBegInDate.Value = DateTime.Parse(dtpBegInDate.Value.ToString("yyyy-MM-dd"));
             dtpEndDate.Value = DateTime.Parse(dtpEndDate.Value.ToString("yyyy-MM-dd")).AddDays(4);
@@ -87,7 +99,6 @@ namespace AIMS.OperationAfter.UI
             cboOperationLevel.SelectedIndex = -1;
 
             ControlExtension.GetOperationSite(labelSite, CboOperationSite);
-            //this.CboOperationSite.SelectedIndexChanged += new System.EventHandler(this.CboOperationSite_SelectedIndexChanged);
 
             btnFind_Click(null, null);
 
@@ -109,19 +120,14 @@ namespace AIMS.OperationAfter.UI
             loadCbo.ValueMember = "Id";
             loadCbo.SelectedIndex = -1;
         }
-
-        private void tsbExit_Click(object sender, EventArgs e)
-        {
-            Close();
-        }
-
         private void btnFind_Click(object sender, EventArgs e)
         {
-            string Department = cboDepartment.Text;
+            string Department = cboDept.Text;
-            if (cboDepartment.Text == "全部科室")
+            if (Department == "全部科室")
             {
                 Department = "";
             }
+            string OperationGroup = cboOperationGroup.Text;
             string state = "";
             for (int i = 0; i < tokenEditor1.SelectedTokens.Count; i++)
             {
@@ -172,6 +178,8 @@ namespace AIMS.OperationAfter.UI
                 Where += " and StateId IN (" + state + ")  ";
             if (Department != "")
                 Where += " and PatientDept LIKE  '%" + Department + "%' ";
+            if (OperationGroup != "")
+                Where += " and  OperationGroup  LIKE  '%" + OperationGroup + "%'  ";
             if (Room != "")
                 Where += " and OperationRoomId IN (" + Room + ")  ";
             if (Anaes != "")
@@ -544,5 +552,47 @@ namespace AIMS.OperationAfter.UI
                 frmas.ShowDialog();
             }
         }
+        private void cboDept_TextUpdate(object sender, EventArgs e)
+        {
+            //清空combobox
+            this.cboDept.Items.Clear();
+            //清空listNew
+            listNew.Clear();
+            //遍历全部备查数据
+            listNew = BDepartment.GetDepartmentAllListBYSql(" and (HelpCode like '%" + cboDept.Text + "%' or Name like '%" + cboDept.Text + "%' )  ");
+            if (cboDept.Text.Trim() == "" || listNew == null || listNew.Count <= 0)
+            {
+                listNew = BDepartment.GetDepartmentAllListBYSql("");
+                listNew.Insert(0, new Department() { Id = -1, Name = "全部科室" });
+            }
+            //combobox添加已经查到的关键词
+            this.cboDept.Items.AddRange(listNew.ToArray());
+            //设置光标位置，否则光标位置始终保持在第一列，造成输入关键词的倒序排列
+            this.cboDept.SelectionStart = this.cboDept.Text.Length;
+            //保持鼠标指针原来状态，有时候鼠标指针会被下拉框覆盖，所以要进行一次设置。
+            Cursor = Cursors.Default;
+            //自动弹出下拉框
+            if (cboDept.Text.Trim() != "") this.cboDept.DroppedDown = true;
+        }
+
+        private void cboDept_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            int _deptId = -1;
+            if (cboDept.SelectedIndex >= 0 && cboDept.Text != "全部科室" && cboDept.SelectedItem != null)
+            {
+                try
+                {
+                    Department dt = cboDept.SelectedItem as Department;
+                    if (dt != null)
+                        _deptId = dt.Id.Value;
+                    else
+                        _deptId = BDepartment.GetModelName(cboDept.Text).Id.Value;
+                }
+                catch (Exception)
+                {
+                    _deptId = BDepartment.GetModelName(cboDept.Text).Id.Value;
+                }
+            }
+        }
     }
 }

AIMS/OperationAfter/frmOperationManage.resx

@@ -141,6 +141,9 @@
   <metadata name="ApplyDepNameColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="OperationGroup.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="SickBedColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

AIMSEntity/BLL/Extension/BDepartment.cs

@@ -59,5 +59,9 @@ namespace AIMSBLL
         {
             return DDepartment.GetDepartmentAllListBYSql(Kind);
         }
+        public static DataTable GetOperationGroups( )
+        {
+            return DDepartment.GetOperationGroups( );
+        }
     }
 }

AIMSEntity/DAL/Extension/DDepartment.cs

@@ -157,6 +157,12 @@ namespace AIMSDAL
             }
             return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString());
         }
+        public static DataTable GetOperationGroups( )
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("SELECT [OperationGroup] Names FROM [dbo].[OperationApply] GROUP BY [OperationGroup] "); 
+            return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString());
+        }
 
         public static List<Department> GetDepartmentAllList( )
         {

AIMSEntity/Extensions/SelectPatient.cs

@@ -115,7 +115,6 @@ namespace AIMSBLL
         {
             try
             { 
-                HelperDB.DbHelperSQL.BeginTrans();
                 BOperationApply.UpdateApplyState(ApplyId, 6); //修改状态为手术中
 
                 //手术诊断
@@ -268,12 +267,11 @@ namespace AIMSBLL
                     BFactEvents.Add(FactEventsObj);
                 }
                  
-                HelperDB.DbHelperSQL.CommitTrans();
 
             }
-            catch
+            catch(Exception ex)
             {
-                HelperDB.DbHelperSQL.RollbackTrans();
+                PublicMethod.WriteLog(ex); 
             }
         }
     }

AIMSExtension/PublicMethod.cs

@@ -283,8 +283,15 @@ namespace AIMSExtension
                 }
                 else if (array[0] >= 215) //二级汉字
                 {
+                    try
+                    {
+
                         return_py += ls_second_eng.Substring(ls_second_ch.IndexOf(hz[i].ToString(), 0), 1);
                     }
+                    catch (Exception)
+                    { 
+                    }
+                }
             }
             return return_py.ToUpper();
         }

DocumentManagement/DocumentEntity/DocumentExtension.cs

@@ -55,12 +55,26 @@ namespace DocumentManagement
                     if (AgeText.Text != "") Result += int.Parse(AgeText.Text);
                     var field9 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement
                         && (x as XTextInputFieldElement).ID == "field9").FirstOrDefault(); 
-                    if (field9.Text != "") Result += int.Parse(field9.Text);
                     var field10 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement
                         && (x as XTextInputFieldElement).ID == "field10").FirstOrDefault();
-                    if (field10.Text != "") Result += int.Parse(field10.Text);
                     var field11 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement
                         && (x as XTextInputFieldElement).ID == "field11").FirstOrDefault();
+
+                    var asa = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement
+                        && (x as XTextRadioBoxElement).GroupName == "皮肤" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault();
+                    if (asa != null)
+                      field9.Text =  asa.FormulaValue;  
+                    var asa2 = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement
+                        && (x as XTextRadioBoxElement).GroupName == "预计手术时间" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault();
+                    if (asa2 != null)
+                      field10.Text =  asa2.FormulaValue; 
+                    var asa3 = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement
+                        && (x as XTextRadioBoxElement).GroupName == "手术施压" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault();
+                    if (asa3 != null)
+                      field11.Text =  asa3.FormulaValue; 
+
+                    if (field9.Text != "") Result += int.Parse(field9.Text);
+                    if (field10.Text != "") Result += int.Parse(field10.Text);
                     if (field11.Text != "") Result += int.Parse(field11.Text);
                 }
                 catch (Exception)
@@ -218,7 +232,6 @@ namespace DocumentManagement
                         }
 
                     }
-
                 }
             }
         }
@@ -336,8 +349,7 @@ namespace DocumentManagement
                         && (x as XTextInputFieldElement).ID == "field12").FirstOrDefault();
                     patientId.Text = (num > 0 ? num.ToString() : "");
                 }
-
+                else if (XmlFileName == "手术患者压疮风险评估记录表")
-                if (XmlFileName == "手术患者压疮风险评估记录表")
                 {
                     int num = 0;
                     var asa = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement

DocumentManagement/DocumentManagement.csproj

@@ -223,6 +223,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="UI\frmTemplate.resx">
       <DependentUpon>frmTemplate.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="UI\frmTitle.resx">
       <DependentUpon>frmTitle.cs</DependentUpon>

DocumentManagement/UI/frmTemplate.resx

@@ -992,7 +992,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO
-        GAAAAk1TRnQBSQFMAgEBIQEAAaABCQGgAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        GAAAAk1TRnQBSQFMAgEBIQEAAagBCQGoAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAAZADAAEBAQABCAYAASQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -3367,7 +3367,7 @@
   <data name="toolStripMenuItem51.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vQAADr0BR/uQrQAAAVZJREFUOE+tkMFLAkEUxv2DBO952EMX8TLnPS2B4EKHOQpdtsvacZcgvAgSSpAY
+        vAAADrwBlbxySQAAAVZJREFUOE+tkMFLAkEUxv2DBO952EMX8TLnPS2B4EKHOQpdtsvacZcgvAgSSpAY
         22KIB0EYqCQqsUsgiMNCm0W0UHTq8LVvCqGDq4IfDMO8+b7fezOpjWs0GqPpd/F3VJJS4qTl/6st1Mtb
         BKdSw3v0MQ94Xh9icL8agORUPHTFrQrI5wgGt0BTqMtV1G4LOE4NYRiifz0EM/h6gJ54UM9onnfALQe6
         bq4eJgVBqII0OnXf27fXA5DMUlmFWdFCT6zxgXL2Dbf1CWZNYR9PwEpD6NYI7qmEGL4mgyhsHkXQyxL5
@@ -3385,7 +3385,7 @@
   <data name="toolStripMenuItem52.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vQAADr0BR/uQrQAAAT5JREFUOE+9kSFPxEAQhftT+hPuJ1RWViIrkSuRK5ErK1eeXFm5ssmZNYSSQNgL
+        vAAADrwBlbxySQAAAT5JREFUOE+9kSFPxEAQhftT+hPuJ1RWViIrkSuRK5ErK1eeXFm5ssmZNYSSQNgL
         CSFBsA7cY2b27not5CpIeMkzzc733kyLP8v5iOyQ3QdYF/D4/IrDk8vi4aWs82i1xfi0X4dw6lJm6+GH
         gFaZdQhXZvkRoOYIMcFYBzckWinb9vTNZd+/fM6BXPekLyAlIL7RIAGW0tuEzbXH7uFjgliqy7IDVack
         7SKUjbCUvJTqMnhz5bC7e88Q3peVJD1JOq9h+3xc47LDmNCaKMPssrEHAO3Lw8dkcRfokPO/w28Y7gPB
@@ -3402,7 +3402,7 @@
   <data name="toolStripMenuItem53.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vQAADr0BR/uQrQAAAZRJREFUOE+1kqFuHDEURecP9hP2ExYWGgYaLjQMNAw0CFgVGQ40XGi40HBQZThS
+        vAAADrwBlbxySQAAAZRJREFUOE+1kqFuHDEURecP9hP2ExYWGgYaLjQMNAw0CFgVGQ40XGi40HBQZThS
         qtRRChYals3tfXYm2aQbVapUS0eWZuae5/c8w39ZKToIMTj8fHrEy+Pr6/v8DfHoXwneoJ5Do8we9lbB
         HyxxbX9+engvlFCtEQupNSCMtu1f7y3y5OCshjM71ETxaQtr9J8CCQv+YBii8OxZ3aFMBnHUMHuF4LbI
         foDdfxSEVRDgnWFFQfPoL7CipcDbLjA36r0grALpu7B65tHD5o2RMLiivuw+CEbXh1a4z+w/a9S4gQ9s
@@ -3678,7 +3678,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACW
-        BQAAAk1TRnQBSQFMAwEBAAFgAQQBYAEEARABAAEQAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA
+        BQAAAk1TRnQBSQFMAwEBAAFoAQQBaAEEARABAAEQAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA
         ARADAAEBAQABGAYAAQwVAAGcAZABigF7AWwBYwFyAWEBWAFxAWABVwFxAWABVwFxAWABVwFxAWABVwFx
         AWABVwFxAWABVwFyAWEBWAF7AWwBYwGcAZABigHOAckBxpYAAa4BfAFvAdkBrQGdAdYBqAGaAdMBpgGY
         AdIBpAGXAcwBoQGZAckBngGXAcYBnAGWAcQBmQGVAcEBlgGTAbYBkQGLAbgBjgGLAXwBbQFkAb8BtwG0