diff --git a/AIMS/AIMS.csproj b/AIMS/AIMS.csproj index 76e97aa..5f8eb0f 100644 --- a/AIMS/AIMS.csproj +++ b/AIMS/AIMS.csproj @@ -1283,15 +1283,11 @@ - - PreserveNewest - + - - PreserveNewest - + diff --git a/AIMS/FormLogin.cs b/AIMS/FormLogin.cs index d58576e..9dc6701 100644 --- a/AIMS/FormLogin.cs +++ b/AIMS/FormLogin.cs @@ -50,11 +50,11 @@ namespace AIMS txtNo.Select(); txtNo.Focus(); } -//#if DEBUG -// txtNo.Text = "admin"; -// txtPassWord.Text = "1"; -// btnOk_Click(null, null); -//#endif +#if DEBUG + txtNo.Text = "admin"; + txtPassWord.Text = "1"; + btnOk_Click(null, null); +#endif } private void btnOk_Click(object sender, EventArgs e) { diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs b/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs index 2e895dd..ac6387e 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs @@ -1256,6 +1256,7 @@ namespace AIMS.OperationAanesthesia BOperationRecord.DeleteOperationRecordData(_record.Id.Value, PatientId, RecoverId); HelperDB.DbHelperSQL.CommitTrans(); + PublicMethod.WriteLog("取消转入", _record.PatientId.Value, 0, "镇静"); DisposeTimer(); //ClearData(); this.Close(); @@ -2283,7 +2284,7 @@ namespace AIMS.OperationAanesthesia _record.AnalgesiaRecord.RespiratorySystem = "无"; _record.AnalgesiaRecord.EndocrineSystem = "无"; _record.AnalgesiaRecord.OtherSpecialConditions = "无"; - _record.AnalgesiaRecord.PatientOutcome = "病房"; + _record.AnalgesiaRecord.PatientOutcome = "离院"; _record.AnalgesiaRecord.PainScore = "0"; _record.AnalgesiaRecord.StewardScoreDischarge = "6"; _record.AnalgesiaRecord.HighFallRisk = "无"; diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs index 3a7f421..5f6e3b6 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs @@ -72,18 +72,18 @@ this.panel1 = new System.Windows.Forms.Panel(); this.panel5 = new System.Windows.Forms.Panel(); this.superTabMain = new DevComponents.DotNetBar.SuperTabControl(); - this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); - this.panelExZKZB = new DevComponents.DotNetBar.PanelEx(); - this.panel8 = new AIMS.PublicUI.UI.DrawPanel(); - this.circularProgress1 = new DevComponents.DotNetBar.Controls.CircularProgress(); - this.zgcAnaesRecord = new DrawGraph.ZedGraphControl(); - this.spTabQXQDD = new DevComponents.DotNetBar.SuperTabItem(); this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.panelExBLSJ = new DevComponents.DotNetBar.PanelEx(); this.panel82 = new AIMS.PublicUI.UI.DrawPanel(); this.circularProgress2 = new DevComponents.DotNetBar.Controls.CircularProgress(); this.zgcAnaesRecord2 = new DrawGraph.ZedGraphControl(); this.spTabBM = new DevComponents.DotNetBar.SuperTabItem(); + this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); + this.panelExZKZB = new DevComponents.DotNetBar.PanelEx(); + this.panel8 = new AIMS.PublicUI.UI.DrawPanel(); + this.circularProgress1 = new DevComponents.DotNetBar.Controls.CircularProgress(); + this.zgcAnaesRecord = new DrawGraph.ZedGraphControl(); + this.spTabQXQDD = new DevComponents.DotNetBar.SuperTabItem(); this.panel7 = new System.Windows.Forms.Panel(); this.panel21 = new System.Windows.Forms.Panel(); this.PanelSave = new System.Windows.Forms.Panel(); @@ -140,12 +140,12 @@ this.panel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.superTabMain)).BeginInit(); this.superTabMain.SuspendLayout(); - this.superTabControlPanel1.SuspendLayout(); - this.panelExZKZB.SuspendLayout(); - this.panel8.SuspendLayout(); this.superTabControlPanel2.SuspendLayout(); this.panelExBLSJ.SuspendLayout(); this.panel82.SuspendLayout(); + this.superTabControlPanel1.SuspendLayout(); + this.panelExZKZB.SuspendLayout(); + this.panel8.SuspendLayout(); this.panel7.SuspendLayout(); this.panel21.SuspendLayout(); this.plTitleEventTime.SuspendLayout(); @@ -872,8 +872,8 @@ this.superTabMain.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabMain.ControlBox.MenuBox, this.superTabMain.ControlBox.CloseBox}); - this.superTabMain.Controls.Add(this.superTabControlPanel2); this.superTabMain.Controls.Add(this.superTabControlPanel1); + this.superTabMain.Controls.Add(this.superTabControlPanel2); this.superTabMain.Dock = System.Windows.Forms.DockStyle.Fill; this.superTabMain.Location = new System.Drawing.Point(0, 58); this.superTabMain.Name = "superTabMain"; @@ -888,96 +888,6 @@ this.spTabBM}); this.superTabMain.SelectedTabChanged += new System.EventHandler(this.superTabMain_SelectedTabChanged); // - // superTabControlPanel1 - // - this.superTabControlPanel1.Controls.Add(this.panelExZKZB); - this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28); - this.superTabControlPanel1.Name = "superTabControlPanel1"; - this.superTabControlPanel1.Size = new System.Drawing.Size(1389, 803); - this.superTabControlPanel1.TabIndex = 1; - this.superTabControlPanel1.TabItem = this.spTabQXQDD; - // - // panelExZKZB - // - this.panelExZKZB.CanvasColor = System.Drawing.SystemColors.Control; - this.panelExZKZB.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.panelExZKZB.Controls.Add(this.panel8); - this.panelExZKZB.DisabledBackColor = System.Drawing.Color.Empty; - this.panelExZKZB.Dock = System.Windows.Forms.DockStyle.Fill; - this.panelExZKZB.Location = new System.Drawing.Point(0, 0); - this.panelExZKZB.Name = "panelExZKZB"; - this.panelExZKZB.Size = new System.Drawing.Size(1389, 803); - this.panelExZKZB.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelExZKZB.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.panelExZKZB.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.panelExZKZB.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelExZKZB.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.panelExZKZB.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panelExZKZB.Style.GradientAngle = 90; - this.panelExZKZB.TabIndex = 0; - // - // panel8 - // - this.panel8.AutoScroll = true; - this.panel8.BackColor = System.Drawing.Color.White; - this.panel8.Controls.Add(this.circularProgress1); - this.panel8.Controls.Add(this.zgcAnaesRecord); - this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel8.Location = new System.Drawing.Point(0, 0); - this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(1389, 803); - this.panel8.TabIndex = 2; - this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll); - // - // circularProgress1 - // - this.circularProgress1.AnimationSpeed = 50; - // - // - // - this.circularProgress1.BackgroundStyle.BackgroundImageAlpha = ((byte)(0)); - this.circularProgress1.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom; - this.circularProgress1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.circularProgress1.FocusCuesEnabled = false; - this.circularProgress1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.circularProgress1.Location = new System.Drawing.Point(602, 274); - this.circularProgress1.Margin = new System.Windows.Forms.Padding(4); - this.circularProgress1.Name = "circularProgress1"; - this.circularProgress1.ProgressColor = System.Drawing.Color.DodgerBlue; - this.circularProgress1.Size = new System.Drawing.Size(389, 239); - this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; - this.circularProgress1.TabIndex = 6; - this.circularProgress1.Value = 100; - // - // zgcAnaesRecord - // - this.zgcAnaesRecord.Location = new System.Drawing.Point(416, 41); - this.zgcAnaesRecord.Name = "zgcAnaesRecord"; - this.zgcAnaesRecord.ScrollGrace = 0D; - this.zgcAnaesRecord.ScrollMaxX = 0D; - this.zgcAnaesRecord.ScrollMaxY = 0D; - this.zgcAnaesRecord.ScrollMaxY2 = 0D; - this.zgcAnaesRecord.ScrollMinX = 0D; - this.zgcAnaesRecord.ScrollMinY = 0D; - this.zgcAnaesRecord.ScrollMinY2 = 0D; - this.zgcAnaesRecord.Size = new System.Drawing.Size(800, 1000); - this.zgcAnaesRecord.TabIndex = 0; - this.zgcAnaesRecord.Visible = false; - this.zgcAnaesRecord.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord_ContextMenuBuilder); - this.zgcAnaesRecord.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseDownEvent); - this.zgcAnaesRecord.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseUpEvent); - this.zgcAnaesRecord.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseMoveEvent); - this.zgcAnaesRecord.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord_KeyUp); - this.zgcAnaesRecord.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord_MouseDoubleClick); - // - // spTabQXQDD - // - this.spTabQXQDD.AttachedControl = this.superTabControlPanel1; - this.spTabQXQDD.GlobalItem = false; - this.spTabQXQDD.Name = "spTabQXQDD"; - this.spTabQXQDD.Text = "麻醉记录单正面"; - // // superTabControlPanel2 // this.superTabControlPanel2.Controls.Add(this.panelExBLSJ); @@ -1068,6 +978,96 @@ this.spTabBM.Name = "spTabBM"; this.spTabBM.Text = "麻醉记录单背面"; // + // superTabControlPanel1 + // + this.superTabControlPanel1.Controls.Add(this.panelExZKZB); + this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28); + this.superTabControlPanel1.Name = "superTabControlPanel1"; + this.superTabControlPanel1.Size = new System.Drawing.Size(1389, 803); + this.superTabControlPanel1.TabIndex = 1; + this.superTabControlPanel1.TabItem = this.spTabQXQDD; + // + // panelExZKZB + // + this.panelExZKZB.CanvasColor = System.Drawing.SystemColors.Control; + this.panelExZKZB.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelExZKZB.Controls.Add(this.panel8); + this.panelExZKZB.DisabledBackColor = System.Drawing.Color.Empty; + this.panelExZKZB.Dock = System.Windows.Forms.DockStyle.Fill; + this.panelExZKZB.Location = new System.Drawing.Point(0, 0); + this.panelExZKZB.Name = "panelExZKZB"; + this.panelExZKZB.Size = new System.Drawing.Size(1389, 803); + this.panelExZKZB.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelExZKZB.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelExZKZB.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelExZKZB.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelExZKZB.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelExZKZB.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelExZKZB.Style.GradientAngle = 90; + this.panelExZKZB.TabIndex = 0; + // + // panel8 + // + this.panel8.AutoScroll = true; + this.panel8.BackColor = System.Drawing.Color.White; + this.panel8.Controls.Add(this.circularProgress1); + this.panel8.Controls.Add(this.zgcAnaesRecord); + this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel8.Location = new System.Drawing.Point(0, 0); + this.panel8.Name = "panel8"; + this.panel8.Size = new System.Drawing.Size(1389, 803); + this.panel8.TabIndex = 2; + this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll); + // + // circularProgress1 + // + this.circularProgress1.AnimationSpeed = 50; + // + // + // + this.circularProgress1.BackgroundStyle.BackgroundImageAlpha = ((byte)(0)); + this.circularProgress1.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom; + this.circularProgress1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.circularProgress1.FocusCuesEnabled = false; + this.circularProgress1.Font = new System.Drawing.Font("微软雅黑", 9F); + this.circularProgress1.Location = new System.Drawing.Point(602, 274); + this.circularProgress1.Margin = new System.Windows.Forms.Padding(4); + this.circularProgress1.Name = "circularProgress1"; + this.circularProgress1.ProgressColor = System.Drawing.Color.DodgerBlue; + this.circularProgress1.Size = new System.Drawing.Size(389, 239); + this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; + this.circularProgress1.TabIndex = 6; + this.circularProgress1.Value = 100; + // + // zgcAnaesRecord + // + this.zgcAnaesRecord.Location = new System.Drawing.Point(416, 41); + this.zgcAnaesRecord.Name = "zgcAnaesRecord"; + this.zgcAnaesRecord.ScrollGrace = 0D; + this.zgcAnaesRecord.ScrollMaxX = 0D; + this.zgcAnaesRecord.ScrollMaxY = 0D; + this.zgcAnaesRecord.ScrollMaxY2 = 0D; + this.zgcAnaesRecord.ScrollMinX = 0D; + this.zgcAnaesRecord.ScrollMinY = 0D; + this.zgcAnaesRecord.ScrollMinY2 = 0D; + this.zgcAnaesRecord.Size = new System.Drawing.Size(800, 1000); + this.zgcAnaesRecord.TabIndex = 0; + this.zgcAnaesRecord.Visible = false; + this.zgcAnaesRecord.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord_ContextMenuBuilder); + this.zgcAnaesRecord.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseDownEvent); + this.zgcAnaesRecord.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseUpEvent); + this.zgcAnaesRecord.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseMoveEvent); + this.zgcAnaesRecord.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord_KeyUp); + this.zgcAnaesRecord.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord_MouseDoubleClick); + // + // spTabQXQDD + // + this.spTabQXQDD.AttachedControl = this.superTabControlPanel1; + this.spTabQXQDD.GlobalItem = false; + this.spTabQXQDD.Name = "spTabQXQDD"; + this.spTabQXQDD.Text = "麻醉记录单正面"; + // // panel7 // this.panel7.BackColor = System.Drawing.SystemColors.Control; @@ -2020,12 +2020,12 @@ this.panel5.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.superTabMain)).EndInit(); this.superTabMain.ResumeLayout(false); - this.superTabControlPanel1.ResumeLayout(false); - this.panelExZKZB.ResumeLayout(false); - this.panel8.ResumeLayout(false); this.superTabControlPanel2.ResumeLayout(false); this.panelExBLSJ.ResumeLayout(false); this.panel82.ResumeLayout(false); + this.superTabControlPanel1.ResumeLayout(false); + this.panelExZKZB.ResumeLayout(false); + this.panel8.ResumeLayout(false); this.panel7.ResumeLayout(false); this.panel7.PerformLayout(); this.panel21.ResumeLayout(false); diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs index e03d939..1018bcc 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecord.cs @@ -1372,6 +1372,7 @@ namespace AIMS.OperationAanesthesia BOperationRecord.DeleteOperationRecordData(_record.Id.Value, PatientId, RecoverId); HelperDB.DbHelperSQL.CommitTrans(); + PublicMethod.WriteLog("取消转入", _record.PatientId.Value, 0, "麻醉"); DisposeTimer(); //ClearData(); this.Close(); diff --git a/AIMS/OperationAanesthesia/frmAanesthesiaRecover.cs b/AIMS/OperationAanesthesia/frmAanesthesiaRecover.cs index 187f4be..be31abf 100644 --- a/AIMS/OperationAanesthesia/frmAanesthesiaRecover.cs +++ b/AIMS/OperationAanesthesia/frmAanesthesiaRecover.cs @@ -905,6 +905,7 @@ namespace AIMS.OperationAanesthesia BOperationRecord.DeleteOperationRecorvreData(_record.Id.Value, PatientId, RecoverId); HelperDB.DbHelperSQL.CommitTrans(); + PublicMethod.WriteLog("取消转入", _record.PatientId.Value, 0, "恢复"); DisposeTimer(); //ClearData(); this.Close(); diff --git a/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs b/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs index 89f4916..67f4f19 100644 --- a/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs +++ b/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs @@ -675,6 +675,7 @@ namespace AIMS.OperationAanesthesia BOperationRecord.DeleteOperationRecordData(_record.Id.Value, PatientId, RecoverId); HelperDB.DbHelperSQL.CommitTrans(); + PublicMethod.WriteLog("取消转入", _record.PatientId.Value, 0, "护理"); DisposeTimer(); //ClearData(); this.Close(); diff --git a/AIMSEntity/Extensions/BOperationRecord.cs b/AIMSEntity/Extensions/BOperationRecord.cs index 2a8cf82..67b48ec 100644 --- a/AIMSEntity/Extensions/BOperationRecord.cs +++ b/AIMSEntity/Extensions/BOperationRecord.cs @@ -57,6 +57,7 @@ namespace AIMSBLL _record.Name = OperationFrontdt.Rows[0]["PatientName"].ToString(); _record.Sex = OperationFrontdt.Rows[0]["Sex"].ToString(); _record.Age = OperationFrontdt.Rows[0]["Age"].ToString(); + if (_record.Age == "0天" || _record.Age == "0日") _record.Age = "-"; _record.Identity = OperationFrontdt.Rows[0]["IdentityCard"].ToString(); _record.FareType = OperationFrontdt.Rows[0]["PatientKind"].ToString(); _record.BloodType = OperationFrontdt.Rows[0]["BloodType"].ToString(); @@ -94,7 +95,8 @@ namespace AIMSBLL _record.Applyoperation = OperationFrontdt.Rows[0]["ApplyOperationInfoId"].ToString(); _record.OperationType = OperationFrontdt.Rows[0]["OperationType"].ToString(); _record.MedicalRecord = OperationFrontdt.Rows[0]["MedicalRecord"].ToString(); - _record.PlanOperationTime = DateTime.Parse(OperationFrontdt.Rows[0]["PlanOperationTime"].ToString()); + if (OperationFrontdt.Rows[0]["PlanOperationTime"].ToString() != "") + _record.PlanOperationTime = DateTime.Parse(OperationFrontdt.Rows[0]["PlanOperationTime"].ToString()); } DataTable OperationDoingdt = BOperationRecord.GetOperationDoingDataTableByPatientId(PatientId, RecoverId); diff --git a/DrawGraph/AreaManage/BaseInfoTopManage.cs b/DrawGraph/AreaManage/BaseInfoTopManage.cs index 19025c4..dd0f66c 100644 --- a/DrawGraph/AreaManage/BaseInfoTopManage.cs +++ b/DrawGraph/AreaManage/BaseInfoTopManage.cs @@ -376,6 +376,12 @@ namespace DrawGraph ((TextBox)conl).Select(((TextBox)conl).Text.Length, 1); conl.Leave += new EventHandler(txt_Leave); break; + case "OperationRecord.Age": //体重 + ((TextBox)conl).BorderStyle = BorderStyle.Fixed3D; + ((TextBox)conl).Focus(); + ((TextBox)conl).Select(((TextBox)conl).Text.Length, 1); + conl.Leave += new EventHandler(txt_Leave); + break; //case "OperationRecord.AnaesthesiaMethodId": // Anaes_Click(aEdit1, e); // break; diff --git a/DrawGraph/AreaManage/DBManage.cs b/DrawGraph/AreaManage/DBManage.cs index bedb78b..7340ae8 100644 --- a/DrawGraph/AreaManage/DBManage.cs +++ b/DrawGraph/AreaManage/DBManage.cs @@ -178,7 +178,7 @@ namespace DrawGraph { i += AddOperationPosition(_operationRecord, _operationRecord.OperationPositionId); } - else if (items[1] == "Height" || items[1] == "Weight") + else if (items[1] == "Height" || items[1] == "Weight" || items[1] == "Age") { i += UpdatePatient(items[1] + "='" + value + "' where Id= " + _operationRecord.PatientId); } diff --git a/DrawGraph/AreaManage/SapManage.cs b/DrawGraph/AreaManage/SapManage.cs index dadff4c..bccadd1 100644 --- a/DrawGraph/AreaManage/SapManage.cs +++ b/DrawGraph/AreaManage/SapManage.cs @@ -259,7 +259,7 @@ namespace DrawGraph { foreach (FactDrug temp in myOpeRecord.FactDrugList) { - if (isSapDrugs(temp)) + if (isSapDrugs(temp) && temp.ParentId == 0) { temp.clearAddObj(ZedControl); } diff --git a/DrawGraphManagement/Program.cs b/DrawGraphManagement/Program.cs index bcd948d..3cf8281 100644 --- a/DrawGraphManagement/Program.cs +++ b/DrawGraphManagement/Program.cs @@ -15,7 +15,7 @@ namespace DrawGraphManagement Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); PreLoad(); - Application.Run(new MainUp()); + Application.Run(new Main()); } static void PreLoad() {