diff --git a/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.cs b/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.cs index 8014102..38d1231 100644 --- a/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.cs +++ b/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.cs @@ -65,7 +65,7 @@ namespace AIMS.PublicUI.UI { int index = this.dgvY.Rows.Add(); this.dgvY.Rows[index].Cells["yId"].Value = dr["Id"].ToString(); - this.dgvY.Rows[index].Cells["yName"].Value = dr["Name"].ToString(); + this.dgvY.Rows[index].Cells["yName"].Value = dr["Name"].ToString() + " " + dr["Bill"].ToString() + " " + dr["price"].ToString(); } } private void BindDgv(DataTable dt) @@ -121,7 +121,7 @@ namespace AIMS.PublicUI.UI } DataRow dr = pdt.NewRow(); dr["Id"] = Convert.ToInt32(dt.Rows[i]["Id"]); - dr["Name"] = dt.Rows[i]["Name"].ToString(); + dr["Name"] = dt.Rows[i]["Name"].ToString() + " " + dr["Bill"].ToString() + " " + dr["price"].ToString(); pdt.Rows.Add(dr); } return pdt; diff --git a/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.designer.cs b/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.designer.cs index 191c3f2..83e4616 100644 --- a/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.designer.cs +++ b/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.designer.cs @@ -53,7 +53,7 @@ this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Selectcol = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.Select = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -113,7 +113,7 @@ this.txtQuery.Border.BorderBottomColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(227)))), ((int)(((byte)(231))))); this.txtQuery.Border.BorderBottomWidth = 1; this.txtQuery.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txtQuery.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.txtQuery.ForeColor = System.Drawing.Color.Black; this.txtQuery.Location = new System.Drawing.Point(82, 15); this.txtQuery.Name = "txtQuery"; this.txtQuery.Size = new System.Drawing.Size(295, 21); @@ -301,7 +301,7 @@ this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Id, this.Index, - this.Selectcol, + this.Select, this.oName}); dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; @@ -336,11 +336,11 @@ this.Index.Visible = false; this.Index.Width = 65; // - // Selectcol + // Select // - this.Selectcol.HeaderText = "选择"; - this.Selectcol.Name = "Select"; - this.Selectcol.Width = 65; + this.Select.HeaderText = "选择"; + this.Select.Name = "Select"; + this.Select.Width = 65; // // oName // @@ -401,5 +401,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn oName; private DevComponents.DotNetBar.ButtonX buttonX2; private DevComponents.DotNetBar.ButtonX buttonX1; + private System.Windows.Forms.DataGridViewCheckBoxColumn Select; } } \ No newline at end of file diff --git a/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.resx b/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.resx index d47ab00..7d525c7 100644 --- a/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.resx +++ b/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.resx @@ -132,9 +132,6 @@ True - - True - True diff --git a/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.designer.cs b/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.designer.cs index 9a547a2..9d788c3 100644 --- a/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.designer.cs +++ b/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.designer.cs @@ -57,7 +57,7 @@ this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Selectcol = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.Select = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ospec = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dDOSEPER = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -121,7 +121,7 @@ this.txtQuery.Border.BorderBottomColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(227)))), ((int)(((byte)(231))))); this.txtQuery.Border.BorderBottomWidth = 1; this.txtQuery.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txtQuery.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.txtQuery.ForeColor = System.Drawing.Color.Black; this.txtQuery.Location = new System.Drawing.Point(82, 15); this.txtQuery.Name = "txtQuery"; this.txtQuery.Size = new System.Drawing.Size(392, 21); @@ -269,7 +269,7 @@ this.dgvY.RowTemplate.Height = 23; this.dgvY.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvY.Size = new System.Drawing.Size(563, 268); - this.dgvY.TabIndex = 0; + this.dgvY.TabIndex = 0; this.dgvY.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvY_CellEndEdit); this.dgvY.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.dgvY_EditingControlShowing); // @@ -340,7 +340,7 @@ this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Id, this.Index, - this.Selectcol, + this.Select, this.oName, this.ospec, this.dDOSEPER, @@ -379,11 +379,11 @@ this.Index.Visible = false; this.Index.Width = 65; // - // Selectcol + // Select // - this.Selectcol.HeaderText = "选择"; - this.Selectcol.Name = "Select"; - this.Selectcol.Width = 65; + this.Select.HeaderText = "选择"; + this.Select.Name = "Select"; + this.Select.Width = 65; // // oName // @@ -476,5 +476,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dDOSEPER3; private DevComponents.DotNetBar.ButtonX buttonX3; private DevComponents.DotNetBar.ButtonX buttonX4; + private System.Windows.Forms.DataGridViewCheckBoxColumn Select; } } \ No newline at end of file diff --git a/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.resx b/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.resx index 633ee67..7d83a3b 100644 --- a/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.resx +++ b/AIMS/DataDictionary/frmAnaesthesiaDrugSelect.resx @@ -144,9 +144,6 @@ True - - True - True diff --git a/AIMS/DataDictionary/frmAnaesthesiaEventSelect.designer.cs b/AIMS/DataDictionary/frmAnaesthesiaEventSelect.designer.cs index 002c0cc..ec38749 100644 --- a/AIMS/DataDictionary/frmAnaesthesiaEventSelect.designer.cs +++ b/AIMS/DataDictionary/frmAnaesthesiaEventSelect.designer.cs @@ -53,7 +53,7 @@ this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Selectcol = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.Select = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -113,7 +113,7 @@ this.txtQuery.Border.BorderBottomColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(227)))), ((int)(((byte)(231))))); this.txtQuery.Border.BorderBottomWidth = 1; this.txtQuery.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txtQuery.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.txtQuery.ForeColor = System.Drawing.Color.Black; this.txtQuery.Location = new System.Drawing.Point(82, 15); this.txtQuery.Name = "txtQuery"; this.txtQuery.Size = new System.Drawing.Size(295, 21); @@ -301,7 +301,7 @@ this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Id, this.Index, - this.Selectcol, + this.Select, this.oName}); dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; @@ -336,11 +336,11 @@ this.Index.Visible = false; this.Index.Width = 65; // - // Selectcol + // Select // - this.Selectcol.HeaderText = "选择"; - this.Selectcol.Name = "Select"; - this.Selectcol.Width = 65; + this.Select.HeaderText = "选择"; + this.Select.Name = "Select"; + this.Select.Width = 65; // // oName // @@ -401,5 +401,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn oName; private DevComponents.DotNetBar.ButtonX buttonX2; private DevComponents.DotNetBar.ButtonX buttonX1; + private System.Windows.Forms.DataGridViewCheckBoxColumn Select; } } \ No newline at end of file diff --git a/AIMS/DataDictionary/frmAnaesthesiaEventSelect.resx b/AIMS/DataDictionary/frmAnaesthesiaEventSelect.resx index d47ab00..7d525c7 100644 --- a/AIMS/DataDictionary/frmAnaesthesiaEventSelect.resx +++ b/AIMS/DataDictionary/frmAnaesthesiaEventSelect.resx @@ -132,9 +132,6 @@ True - - True - True diff --git a/AIMS/DataDictionary/frmDrugs.Designer.cs b/AIMS/DataDictionary/frmDrugs.Designer.cs index 6789e98..e1ddfb4 100644 --- a/AIMS/DataDictionary/frmDrugs.Designer.cs +++ b/AIMS/DataDictionary/frmDrugs.Designer.cs @@ -28,11 +28,11 @@ /// private void InitializeComponent() { - System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("麻醉药"); - System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("精神I类"); - System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("精神II类"); - System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("普通药"); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("血液制品"); + System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("麻醉药"); + System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("精神I类"); + System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("精神II类"); + System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("普通药"); + System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("血液制品"); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.tsbAdd = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); @@ -59,9 +59,11 @@ this.cboDosageUnit = new System.Windows.Forms.ComboBox(); this.label7 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.txtComment = new System.Windows.Forms.TextBox(); this.txtStand = new System.Windows.Forms.TextBox(); this.label11 = new System.Windows.Forms.Label(); this.txtHelpCode = new System.Windows.Forms.TextBox(); + this.label10 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); this.cboDrugKind = new System.Windows.Forms.ComboBox(); this.chkIsValid = new System.Windows.Forms.CheckBox(); @@ -77,7 +79,8 @@ this.treeView1 = new System.Windows.Forms.TreeView(); this.panel2 = new System.Windows.Forms.Panel(); this.panel6 = new System.Windows.Forms.Panel(); - this.label10 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.cboZFBL = new System.Windows.Forms.ComboBox(); this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Code = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.NameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -93,8 +96,8 @@ this.Remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Channel = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Comment = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ZFBL = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.IsValidColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.txtComment = new System.Windows.Forms.TextBox(); this.toolStrip1.SuspendLayout(); this.panel4.SuspendLayout(); this.panel1.SuspendLayout(); @@ -210,7 +213,9 @@ this.panel4.Controls.Add(this.label4); this.panel4.Controls.Add(this.txtUnit); this.panel4.Controls.Add(this.label2); + this.panel4.Controls.Add(this.cboZFBL); this.panel4.Controls.Add(this.txtChannel); + this.panel4.Controls.Add(this.label15); this.panel4.Controls.Add(this.label9); this.panel4.Controls.Add(this.label5); this.panel4.Controls.Add(this.label8); @@ -260,7 +265,7 @@ // // txtUseRate // - this.txtUseRate.Location = new System.Drawing.Point(484, 129); + this.txtUseRate.Location = new System.Drawing.Point(492, 129); this.txtUseRate.Name = "txtUseRate"; this.txtUseRate.Size = new System.Drawing.Size(45, 23); this.txtUseRate.TabIndex = 563; @@ -268,7 +273,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(431, 132); + this.label6.Location = new System.Drawing.Point(451, 134); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(35, 14); this.label6.TabIndex = 562; @@ -277,7 +282,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(485, 129); + this.label4.Location = new System.Drawing.Point(543, 129); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(0, 14); this.label4.TabIndex = 561; @@ -359,6 +364,13 @@ this.label1.TabIndex = 557; this.label1.Text = "剂量单位"; // + // txtComment + // + this.txtComment.Location = new System.Drawing.Point(484, 46); + this.txtComment.Name = "txtComment"; + this.txtComment.Size = new System.Drawing.Size(123, 23); + this.txtComment.TabIndex = 554; + // // txtStand // this.txtStand.Location = new System.Drawing.Point(287, 43); @@ -382,6 +394,15 @@ this.txtHelpCode.Size = new System.Drawing.Size(123, 23); this.txtHelpCode.TabIndex = 552; // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(424, 49); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(49, 14); + this.label10.TabIndex = 551; + this.label10.Text = "表达式"; + // // label12 // this.label12.AutoSize = true; @@ -409,7 +430,7 @@ // chkIsValid // this.chkIsValid.AutoSize = true; - this.chkIsValid.Location = new System.Drawing.Point(549, 132); + this.chkIsValid.Location = new System.Drawing.Point(549, 134); this.chkIsValid.Name = "chkIsValid"; this.chkIsValid.Size = new System.Drawing.Size(68, 18); this.chkIsValid.TabIndex = 549; @@ -418,9 +439,9 @@ // // txtRemark // - this.txtRemark.Location = new System.Drawing.Point(102, 129); + this.txtRemark.Location = new System.Drawing.Point(100, 129); this.txtRemark.Name = "txtRemark"; - this.txtRemark.Size = new System.Drawing.Size(308, 23); + this.txtRemark.Size = new System.Drawing.Size(206, 23); this.txtRemark.TabIndex = 548; this.txtRemark.TextChanged += new System.EventHandler(this.txtName_TextChanged); // @@ -435,7 +456,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(31, 132); + this.label3.Location = new System.Drawing.Point(31, 134); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(63, 14); this.label3.TabIndex = 546; @@ -497,6 +518,7 @@ this.Remark, this.Channel, this.Comment, + this.ZFBL, this.IsValidColumn}); this.dgv.Dock = System.Windows.Forms.DockStyle.Fill; this.dgv.Location = new System.Drawing.Point(0, 0); @@ -523,27 +545,27 @@ this.treeView1.Font = new System.Drawing.Font("宋体", 11F); this.treeView1.Location = new System.Drawing.Point(0, 0); this.treeView1.Name = "treeView1"; - treeNode1.Name = "麻醉药"; - treeNode1.Text = "麻醉药"; - treeNode1.ToolTipText = "麻醉药"; - treeNode2.Name = "精神I类"; - treeNode2.Text = "精神I类"; - treeNode2.ToolTipText = "精神I类"; - treeNode3.Name = "精神II类"; - treeNode3.Text = "精神II类"; - treeNode3.ToolTipText = "精神II类"; - treeNode4.Name = "普通药"; - treeNode4.Text = "普通药"; - treeNode4.ToolTipText = "普通药"; - treeNode5.Name = "血液制品"; - treeNode5.Text = "血液制品"; - treeNode5.ToolTipText = "血液制品"; + treeNode6.Name = "麻醉药"; + treeNode6.Text = "麻醉药"; + treeNode6.ToolTipText = "麻醉药"; + treeNode7.Name = "精神I类"; + treeNode7.Text = "精神I类"; + treeNode7.ToolTipText = "精神I类"; + treeNode8.Name = "精神II类"; + treeNode8.Text = "精神II类"; + treeNode8.ToolTipText = "精神II类"; + treeNode9.Name = "普通药"; + treeNode9.Text = "普通药"; + treeNode9.ToolTipText = "普通药"; + treeNode10.Name = "血液制品"; + treeNode10.Text = "血液制品"; + treeNode10.ToolTipText = "血液制品"; this.treeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode1, - treeNode2, - treeNode3, - treeNode4, - treeNode5}); + treeNode6, + treeNode7, + treeNode8, + treeNode9, + treeNode10}); this.treeView1.Size = new System.Drawing.Size(181, 427); this.treeView1.TabIndex = 0; this.treeView1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.treeView1_MouseDoubleClick); @@ -566,14 +588,34 @@ this.panel6.Size = new System.Drawing.Size(872, 47); this.panel6.TabIndex = 9; // - // label10 + // label15 // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(424, 49); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(49, 14); - this.label10.TabIndex = 551; - this.label10.Text = "表达式"; + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(312, 134); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(63, 14); + this.label15.TabIndex = 557; + this.label15.Text = "自付比例"; + // + // cboZFBL + // + this.cboZFBL.FormattingEnabled = true; + this.cboZFBL.Items.AddRange(new object[] { + "", + "10%", + "20%", + "30%", + "40%", + "50%", + "60%", + "70%", + "80%", + "90%", + "100%"}); + this.cboZFBL.Location = new System.Drawing.Point(381, 132); + this.cboZFBL.Name = "cboZFBL"; + this.cboZFBL.Size = new System.Drawing.Size(64, 22); + this.cboZFBL.TabIndex = 558; // // Id // @@ -679,6 +721,12 @@ this.Comment.HeaderText = "表达式"; this.Comment.Name = "Comment"; // + // ZFBL + // + this.ZFBL.DataPropertyName = "ZFBL"; + this.ZFBL.HeaderText = "自付比例"; + this.ZFBL.Name = "ZFBL"; + // // IsValidColumn // this.IsValidColumn.DataPropertyName = "IsValid"; @@ -687,13 +735,6 @@ this.IsValidColumn.ReadOnly = true; this.IsValidColumn.Width = 75; // - // txtComment - // - this.txtComment.Location = new System.Drawing.Point(484, 46); - this.txtComment.Name = "txtComment"; - this.txtComment.Size = new System.Drawing.Size(123, 23); - this.txtComment.TabIndex = 554; - // // frmDrugs // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -769,6 +810,8 @@ private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label10; private System.Windows.Forms.TextBox txtComment; + private System.Windows.Forms.ComboBox cboZFBL; + private System.Windows.Forms.Label label15; private System.Windows.Forms.DataGridViewTextBoxColumn Id; private System.Windows.Forms.DataGridViewTextBoxColumn Code; private System.Windows.Forms.DataGridViewTextBoxColumn NameColumn; @@ -784,6 +827,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Remark; private System.Windows.Forms.DataGridViewTextBoxColumn Channel; private System.Windows.Forms.DataGridViewTextBoxColumn Comment; + private System.Windows.Forms.DataGridViewTextBoxColumn ZFBL; private System.Windows.Forms.DataGridViewTextBoxColumn IsValidColumn; } } \ No newline at end of file diff --git a/AIMS/DataDictionary/frmDrugs.cs b/AIMS/DataDictionary/frmDrugs.cs index 9368e51..be7623e 100644 --- a/AIMS/DataDictionary/frmDrugs.cs +++ b/AIMS/DataDictionary/frmDrugs.cs @@ -70,6 +70,7 @@ namespace DataDictionary.UI txtUseDose2.Text = dgv.CurrentRow.Cells["UseDose2"].Value.ToString(); txtUseDose3.Text = dgv.CurrentRow.Cells["UseDose3"].Value.ToString(); txtComment.Text = dgv.CurrentRow.Cells["Comment"].Value.ToString(); + cboZFBL.Text = dgv.CurrentRow.Cells["ZFBL"].Value.ToString(); if (dgv.CurrentRow.Cells["IsValidColumn"].Value.ToString() == "有效") { @@ -116,6 +117,7 @@ namespace DataDictionary.UI DrugsObj.UseDose1 = txtUseDose1.Text.Trim(); DrugsObj.UseDose2 = txtUseDose2.Text.Trim(); DrugsObj.UseDose3 = txtUseDose3.Text.Trim(); + DrugsObj.ZFBL = cboZFBL.Text.Trim(); DrugsObj.Comment = txtComment.Text.Trim(); if (chkIsValid.Checked) { @@ -189,6 +191,7 @@ namespace DataDictionary.UI dt.Rows[i]["Remark"].ToString(), dt.Rows[i]["Channel"].ToString(), dt.Rows[i]["Comment"].ToString(), + dt.Rows[i]["ZFBL"].ToString(), dt.Rows[i]["IsValid"].ToString()); dgv.Rows[i].Cells["Id"].Selected = false; } diff --git a/AIMS/DataDictionary/frmDrugs.resx b/AIMS/DataDictionary/frmDrugs.resx index 9eabf51..c8a8774 100644 --- a/AIMS/DataDictionary/frmDrugs.resx +++ b/AIMS/DataDictionary/frmDrugs.resx @@ -165,6 +165,9 @@ True + + True + True diff --git a/AIMS/FormLogin.cs b/AIMS/FormLogin.cs index 5e7fc94..4fc1e16 100644 --- a/AIMS/FormLogin.cs +++ b/AIMS/FormLogin.cs @@ -31,8 +31,8 @@ namespace AIMS txtNo.Select(); txtNo.Focus(); #if DEBUG - txtNo.Text = "0642"; - txtPassWord.Text = "123"; + txtNo.Text = "admin"; + txtPassWord.Text = "1"; btnOk_Click(null, null); #endif } diff --git a/AIMS/OperationFront/frmOperationApply.cs b/AIMS/OperationFront/frmOperationApply.cs index cff4cf9..0812479 100644 --- a/AIMS/OperationFront/frmOperationApply.cs +++ b/AIMS/OperationFront/frmOperationApply.cs @@ -110,11 +110,11 @@ namespace AIMS.OperationFront.UI DataTable Newdt = new DataTable(); if (CHK10.Checked) { - Newdt = AIMSExtension.PublicMethod.GetNewDataTable(dt, " StateId=10 " + dept + "AND MdrecNo LIKE '%" + txtMdrecNo.Text.Trim() + "%'", ""); + Newdt = AIMSExtension.PublicMethod.GetNewDataTable(dt, " StateId=10 " + dept + "AND MdrecNo LIKE '%" + txtMdrecNo.Text.Trim() + "%'", "OrderOperationTime"); } else { - Newdt = AIMSExtension.PublicMethod.GetNewDataTable(dt, " StateId>0 " + dept + "AND MdrecNo LIKE '%" + txtMdrecNo.Text.Trim() + "%'", ""); + Newdt = AIMSExtension.PublicMethod.GetNewDataTable(dt, " StateId>0 " + dept + "AND MdrecNo LIKE '%" + txtMdrecNo.Text.Trim() + "%'", "OrderOperationTime"); } dgv.DataSource = Newdt; for (int i = 0; i < dgv.Rows.Count; i++) diff --git a/AIMS/OremrUserControl/ucDocument.cs b/AIMS/OremrUserControl/ucDocument.cs index 6b82bd8..272841f 100644 --- a/AIMS/OremrUserControl/ucDocument.cs +++ b/AIMS/OremrUserControl/ucDocument.cs @@ -397,31 +397,58 @@ namespace AIMS.OremrUserControl if (DModel.XmlFileName == "自费项目治疗同意书") { - string Result = ""; - string Result1 = ""; - string Result2 = ""; frmDrugSel drugSel = new frmDrugSel(); drugSel.IsLoad = true; drugSel.ShowDialog(); - int i = 1; - foreach (var item in drugSel.FactDrugList) + int num = 1; + int a = 71; + int j = 42; + for (int i = 13; i < 42; i++) { - Result += i + "." + item.DrugName + " " + item.Dosage + "元\r\n"; - Result1 += " " + item.DrugKind + item.DosageUnit + "\r\n"; - Result2 += " " + item.DensityUnit + " " + " \r\n"; - i++; + if (num > drugSel.FactDrugList.Count) + return; + var item = drugSel.FactDrugList[num - 1]; + var field12 = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field" + i).FirstOrDefault(); + if (field12 != null) field12.Text = num + "." + item.DrugName + " " + item.Dosage + "元"; ; + var field13 = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field" + j).FirstOrDefault(); + if (field13 != null) field13.Text = " " + item.DrugKind + item.DosageUnit; + var field14 = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).ID == "field" + a).FirstOrDefault(); + if (field14 != null) field14.Text = " " + item.DensityUnit; + j++; + a++; + num++; } - var field12 = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement - && (x as XTextInputFieldElement).ID == "field15").FirstOrDefault(); - if (Result != "") field12.Text = Result.ToString(); - var field13 = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement - && (x as XTextInputFieldElement).ID == "field12").FirstOrDefault(); - if (Result1 != "") field13.Text = Result1.ToString(); - var field14 = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement - && (x as XTextInputFieldElement).ID == "field13").FirstOrDefault(); - if (Result2 != "") field14.Text = Result2.ToString(); - } + //if (DModel.XmlFileName == "自费项目治疗同意书") + //{ + // string Result = ""; + // string Result1 = ""; + // string Result2 = ""; + // frmDrugSel drugSel = new frmDrugSel(); + // drugSel.IsLoad = true; + // drugSel.ShowDialog(); + // int i = 1; + // foreach (var item in drugSel.FactDrugList) + // { + // Result += i + "." + item.DrugName + " " + item.Dosage + "元\r\n"; + // Result1 += " " + item.DrugKind + item.DosageUnit + "\r\n"; + // Result2 += " " + item.DensityUnit + " " + " \r\n"; + // i++; + // } + // var field12 = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + // && (x as XTextInputFieldElement).ID == "field15").FirstOrDefault(); + // if (Result != "") field12.Text = Result.ToString(); + // var field13 = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + // && (x as XTextInputFieldElement).ID == "field12").FirstOrDefault(); + // if (Result1 != "") field13.Text = Result1.ToString(); + // var field14 = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + // && (x as XTextInputFieldElement).ID == "field13").FirstOrDefault(); + // if (Result2 != "") field14.Text = Result2.ToString(); + + //} if (DModel.XmlFileName == "自费项目治疗同意书2") { string Result = ""; diff --git a/AIMS/PublicUI/frmDrugSel.Designer.cs b/AIMS/PublicUI/frmDrugSel.Designer.cs index 7664829..b77818e 100644 --- a/AIMS/PublicUI/frmDrugSel.Designer.cs +++ b/AIMS/PublicUI/frmDrugSel.Designer.cs @@ -66,6 +66,9 @@ this.superTabItem3 = new DevComponents.DotNetBar.SuperTabItem(); this.superTabItem4 = new DevComponents.DotNetBar.SuperTabItem(); this.dgvYP = new System.Windows.Forms.DataGridView(); + this.dgvDosage = new System.Windows.Forms.DataGridView(); + this.Dosage = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Code = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.TypeId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -75,13 +78,12 @@ this.Norm = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.DOSEPER = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.DoseUnit = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Unit = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Price = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Factroy = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Channel = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgvDosage = new System.Windows.Forms.DataGridView(); - this.Dosage = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.imageList1 = new System.Windows.Forms.ImageList(this.components); + this.ZFBL = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1.SuspendLayout(); this.panel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tabDrugs)).BeginInit(); @@ -450,10 +452,12 @@ this.Norm, this.DOSEPER, this.DoseUnit, + this.Unit, this.Price, this.Factroy, this.Channel, - this.Remark}); + this.Remark, + this.ZFBL}); dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -476,6 +480,53 @@ this.dgvYP.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.dgvYP_KeyPress); this.dgvYP.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.dgvYP_PreviewKeyDown); // + // dgvDosage + // + this.dgvDosage.AllowUserToAddRows = false; + this.dgvDosage.AllowUserToDeleteRows = false; + this.dgvDosage.BackgroundColor = System.Drawing.Color.White; + this.dgvDosage.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.White; + dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvDosage.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8; + this.dgvDosage.ColumnHeadersHeight = 30; + this.dgvDosage.ColumnHeadersVisible = false; + this.dgvDosage.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Dosage}); + this.dgvDosage.EnableHeadersVisualStyles = false; + this.dgvDosage.Location = new System.Drawing.Point(317, 148); + this.dgvDosage.Name = "dgvDosage"; + this.dgvDosage.ReadOnly = true; + this.dgvDosage.RowHeadersVisible = false; + this.dgvDosage.RowTemplate.Height = 30; + this.dgvDosage.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dgvDosage.Size = new System.Drawing.Size(60, 90); + this.dgvDosage.TabIndex = 18; + this.dgvDosage.Visible = false; + this.dgvDosage.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvDosage_CellClick); + this.dgvDosage.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dgvDosage_KeyDown); + this.dgvDosage.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.dgvDosage_KeyPress); + this.dgvDosage.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.dgvDosage_PreviewKeyDown); + // + // Dosage + // + this.Dosage.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.Dosage.HeaderText = "剂量"; + this.Dosage.Name = "Dosage"; + this.Dosage.ReadOnly = true; + // + // imageList1 + // + this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); + this.imageList1.TransparentColor = System.Drawing.Color.Transparent; + this.imageList1.Images.SetKeyName(0, "插入列.png"); + this.imageList1.Images.SetKeyName(1, "未插入列 .png"); + // // id // this.id.DataPropertyName = "Id"; @@ -549,6 +600,14 @@ this.DoseUnit.ReadOnly = true; this.DoseUnit.Width = 50; // + // Unit + // + this.Unit.DataPropertyName = "Unit"; + this.Unit.HeaderText = "单位2"; + this.Unit.Name = "Unit"; + this.Unit.ReadOnly = true; + this.Unit.Visible = false; + // // Price // this.Price.DataPropertyName = "Price"; @@ -580,52 +639,13 @@ this.Remark.ReadOnly = true; this.Remark.Visible = false; // - // dgvDosage + // ZFBL // - this.dgvDosage.AllowUserToAddRows = false; - this.dgvDosage.AllowUserToDeleteRows = false; - this.dgvDosage.BackgroundColor = System.Drawing.Color.White; - this.dgvDosage.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.BackColor = System.Drawing.Color.White; - dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvDosage.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8; - this.dgvDosage.ColumnHeadersHeight = 30; - this.dgvDosage.ColumnHeadersVisible = false; - this.dgvDosage.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Dosage}); - this.dgvDosage.EnableHeadersVisualStyles = false; - this.dgvDosage.Location = new System.Drawing.Point(317, 148); - this.dgvDosage.Name = "dgvDosage"; - this.dgvDosage.ReadOnly = true; - this.dgvDosage.RowHeadersVisible = false; - this.dgvDosage.RowTemplate.Height = 30; - this.dgvDosage.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvDosage.Size = new System.Drawing.Size(60, 90); - this.dgvDosage.TabIndex = 18; - this.dgvDosage.Visible = false; - this.dgvDosage.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvDosage_CellClick); - this.dgvDosage.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dgvDosage_KeyDown); - this.dgvDosage.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.dgvDosage_KeyPress); - this.dgvDosage.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.dgvDosage_PreviewKeyDown); - // - // Dosage - // - this.Dosage.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.Dosage.HeaderText = "剂量"; - this.Dosage.Name = "Dosage"; - this.Dosage.ReadOnly = true; - // - // imageList1 - // - this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); - this.imageList1.TransparentColor = System.Drawing.Color.Transparent; - this.imageList1.Images.SetKeyName(0, "插入列.png"); - this.imageList1.Images.SetKeyName(1, "未插入列 .png"); + this.ZFBL.DataPropertyName = "ZFBL"; + this.ZFBL.HeaderText = "自付比例"; + this.ZFBL.Name = "ZFBL"; + this.ZFBL.ReadOnly = true; + this.ZFBL.Visible = false; // // frmDrugSel // @@ -693,6 +713,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewComboBoxColumn4; private System.Windows.Forms.DataGridViewComboBoxColumn dataGridViewTextBoxColumn8; + private DevComponents.DotNetBar.ButtonX btnTypeManager; private System.Windows.Forms.DataGridViewTextBoxColumn id; private System.Windows.Forms.DataGridViewTextBoxColumn Code; private System.Windows.Forms.DataGridViewTextBoxColumn TypeId; @@ -702,10 +723,11 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Norm; private System.Windows.Forms.DataGridViewTextBoxColumn DOSEPER; private System.Windows.Forms.DataGridViewTextBoxColumn DoseUnit; + private System.Windows.Forms.DataGridViewTextBoxColumn Unit; private System.Windows.Forms.DataGridViewTextBoxColumn Price; private System.Windows.Forms.DataGridViewTextBoxColumn Factroy; private System.Windows.Forms.DataGridViewTextBoxColumn Channel; private System.Windows.Forms.DataGridViewTextBoxColumn Remark; - private DevComponents.DotNetBar.ButtonX btnTypeManager; + private System.Windows.Forms.DataGridViewTextBoxColumn ZFBL; } } \ No newline at end of file diff --git a/AIMS/PublicUI/frmDrugSel.cs b/AIMS/PublicUI/frmDrugSel.cs index 69c6f5a..85126ca 100644 --- a/AIMS/PublicUI/frmDrugSel.cs +++ b/AIMS/PublicUI/frmDrugSel.cs @@ -226,14 +226,17 @@ namespace AIMS.PublicUI.UI dr.Cells[3].Tag = drug.Id; dr.Cells[3].Value = drug.Name; dr.Cells[4].Value = drug.Price; - if (drug.Name == "吸入用七氟烷") - dr.Cells[6].Value = "ml"; - else - dr.Cells[6].Value = "支"; - if (drug.Name == "复方右旋糖酐40注射液" || drug.Name == "地佐辛注射液" || drug.Name == "注射用尼可地尔" || drug.Name == "盐酸甲氧明注射液" || drug.Name == "盐酸阿扎司琼氯化钠注射液") - dr.Cells[7].Value = "100%"; - else - dr.Cells[7].Value = "10%"; + dr.Cells[6].Value = drug.Unit; + dr.Cells[7].Value = drug.ZFBL; + + //if (drug.Name == "吸入用七氟烷") + // dr.Cells[6].Value = "ml"; + //else + // dr.Cells[6].Value = "支"; + //if (drug.Name == "复方右旋糖酐40注射液" || drug.Name == "地佐辛注射液" || drug.Name == "注射用尼可地尔" || drug.Name == "盐酸甲氧明注射液" || drug.Name == "盐酸阿扎司琼氯化钠注射液") + // dr.Cells[7].Value = "100%"; + //else + // dr.Cells[7].Value = "10%"; } else @@ -243,10 +246,12 @@ namespace AIMS.PublicUI.UI dr.Cells[3].Value = drug.Name; dr.Cells[4].Value = drug.Price; dr.Cells[6].Value = drug.Unit; - if (drug.Name == "电子注药泵ZZB-II-150") - dr.Cells[7].Value = "100%"; - else - dr.Cells[7].Value = "50%"; + dr.Cells[7].Value = drug.ZFBL; + + //if (drug.Name == "电子注药泵ZZB-II-150") + // dr.Cells[7].Value = "100%"; + //else + // dr.Cells[7].Value = "50%"; } @@ -1120,8 +1125,8 @@ namespace AIMS.PublicUI.UI _dataGridView.CurrentRow.Cells[4].Value = dgvYP.Rows[index].Cells["Price"].Value.ToString(); //_dataGridView.CurrentRow.Cells[5].Value = 1; - _dataGridView.CurrentRow.Cells[6].Value = "支"; - _dataGridView.CurrentRow.Cells[7].Value = "10%"; + _dataGridView.CurrentRow.Cells[6].Value = dgvYP.Rows[index].Cells["Unit"].Value.ToString(); + _dataGridView.CurrentRow.Cells[7].Value = dgvYP.Rows[index].Cells["ZFBL"].Value.ToString(); index = 0; dgvYP.Visible = false; AddNewNullRows(); diff --git a/AIMS/PublicUI/frmDrugSel.resx b/AIMS/PublicUI/frmDrugSel.resx index c891614..e6338c5 100644 --- a/AIMS/PublicUI/frmDrugSel.resx +++ b/AIMS/PublicUI/frmDrugSel.resx @@ -120,6 +120,9 @@ 132, 17 + + True + True @@ -132,6 +135,9 @@ True + + True + 957, 91 @@ -140,7 +146,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAa - CAAAAk1TRnQBSQFMAgEBAgEAAcgBBgHIAQYBFAEAARQBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFQ + CAAAAk1TRnQBSQFMAgEBAgEAAdABBgHQAQYBFAEAARQBAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFQ AwABFAMAAQEBAAEgBgABGS4AA1UBrwOAAf4DKwH8AysB/AGZAYsBQAH9AaEBkgEAAf8BkwGCAQAB/wGW AYcBQAH9AaMBlAEAAf8BowGUAQAB/wGjAZQBAAH/AysB/ANgAej/AA0AAZMBggEAAf8DYgH2A20B9wNt AfcDXAH4A4AB/gGXAYYBAAH/A20B9wHsAecB5AH/AewB5wHkAf8B7AHnAeQB/wNtAfcBkwGCAQAB//8A diff --git a/AIMSEntity/BLL/Extension/BCharges.cs b/AIMSEntity/BLL/Extension/BCharges.cs index 3a515c6..56639be 100644 --- a/AIMSEntity/BLL/Extension/BCharges.cs +++ b/AIMSEntity/BLL/Extension/BCharges.cs @@ -30,11 +30,11 @@ namespace AIMSBLL string sql = string.Empty; if (str == "") { - sql = string.Format("select Id,Name,Id code from Charges where IsValid = 1"); + sql = string.Format("select Id,Name,code,price,Bill from Charges where IsValid = 1"); } else { - sql = string.Format("SELECT Top 26 e.Id,e.Name,Id code FROM Charges e WHERE (Lower(Name) like '%{0}%' OR Lower(HelpCode) like '%{0}%') and IsValid = 1", str); + sql = string.Format("SELECT Top 26 e.Id,e.Name,code,price,Bill FROM Charges e WHERE (Lower(Name) like '%{0}%' OR Lower(HelpCode) like '%{0}%') and IsValid = 1", str); } return DBHelper.GetDataTable(sql); } diff --git a/AIMSEntity/BLL/Extension/BDrugs.cs b/AIMSEntity/BLL/Extension/BDrugs.cs index 00bf24d..92a32ea 100644 --- a/AIMSEntity/BLL/Extension/BDrugs.cs +++ b/AIMSEntity/BLL/Extension/BDrugs.cs @@ -14,7 +14,7 @@ namespace AIMSBLL { public static DataTable GetAllDrugsByCondition(string Condition) { - string strSql = "SELECT top 20 d.*, d.DrugKind as TypeName,Stand,DosageUnit,Dosage,Factory,Channel,Remark FROM Drugs d where d.IsValid=1 and (d.HelpCode like'%" + Condition.ToUpper() + "%' or d.Name like'%" + Condition + "%') Order By UseRate desc"; + string strSql = "SELECT top 20 d.*, d.DrugKind as TypeName,Stand,DosageUnit,Unit,Dosage,Factory,Channel,Remark,ZFBL FROM Drugs d where d.IsValid=1 and (d.HelpCode like'%" + Condition.ToUpper() + "%' or d.Name like'%" + Condition + "%') Order By UseRate desc"; return DBHelper.GetDataTable(strSql); } @@ -23,11 +23,11 @@ namespace AIMSBLL string sql = string.Empty; if (str == "") { - sql = string.Format("select Id,HelpCode,Name,Id code,Stand,UseDose1,UseDose2,UseDose3,Comment from Drugs where IsValid = 1"); + sql = string.Format("select Id,HelpCode,Name,Id code,Stand,UseDose1,UseDose2,UseDose3,Comment,ZFBL from Drugs where IsValid = 1"); } else { - sql = string.Format("SELECT Top 26 e.Id,e.Name,Id code, Stand,UseDose1,UseDose2,UseDose3,Comment FROM Drugs e WHERE (Lower(Name) like '%{0}%' OR Lower(HelpCode) like '%{0}%') and IsValid = 1", str); + sql = string.Format("SELECT Top 26 e.Id,e.Name,Id code, Stand,UseDose1,UseDose2,UseDose3,Comment,ZFBL FROM Drugs e WHERE (Lower(Name) like '%{0}%' OR Lower(HelpCode) like '%{0}%') and IsValid = 1", str); } return DBHelper.GetDataTable(sql); } diff --git a/AIMSEntity/DAL/AutoGenerate/DDrugs.cs b/AIMSEntity/DAL/AutoGenerate/DDrugs.cs index e1c321a..e314a4e 100644 --- a/AIMSEntity/DAL/AutoGenerate/DDrugs.cs +++ b/AIMSEntity/DAL/AutoGenerate/DDrugs.cs @@ -178,7 +178,7 @@ namespace AIMSDAL /// 影响的记录行数 internal static int ExcuteUpdateCommand(SqlCommand cmd, Drugs drugs) { - cmd.CommandText = "update Drugs set Name=@Name,HelpCode=@HelpCode,DrugKind=@DrugKind,Stand=@Stand,DosageUnit=@DosageUnit,Unit=@Unit,UseRate=@UseRate,IsValid=@IsValid,OperatorNo=@OperatorNo,OperatorName=@OperatorName,OperateDate=@OperateDate,Remark=@Remark,Channel=@Channel,UseDose1=@UseDose1,UseDose2=@UseDose2,UseDose3=@UseDose3,Comment=@Comment where Id=@Id"; + cmd.CommandText = "update Drugs set Name=@Name,HelpCode=@HelpCode,DrugKind=@DrugKind,Stand=@Stand,DosageUnit=@DosageUnit,Unit=@Unit,UseRate=@UseRate,IsValid=@IsValid,OperatorNo=@OperatorNo,OperatorName=@OperatorName,OperateDate=@OperateDate,Remark=@Remark,Channel=@Channel,UseDose1=@UseDose1,UseDose2=@UseDose2,UseDose3=@UseDose3,Comment=@Comment,ZFBL=@ZFBL where Id=@Id"; //从实体中取出值放入Command的参数列表 cmd.Parameters.Add(new SqlParameter("@Name", drugs.Name == null ? (object)DBNull.Value : (object)drugs.Name)); cmd.Parameters.Add(new SqlParameter("@HelpCode", drugs.HelpCode == null ? (object)DBNull.Value : (object)drugs.HelpCode)); @@ -197,6 +197,7 @@ namespace AIMSDAL cmd.Parameters.Add(new SqlParameter("@UseDose2", drugs.UseDose2 == null ? (object)DBNull.Value : (object)drugs.UseDose2)); cmd.Parameters.Add(new SqlParameter("@UseDose3", drugs.UseDose3 == null ? (object)DBNull.Value : (object)drugs.UseDose3)); cmd.Parameters.Add(new SqlParameter("@Comment", drugs.Comment == null ? (object)DBNull.Value : (object)drugs.Comment)); + cmd.Parameters.Add(new SqlParameter("@ZFBL", drugs.ZFBL == null ? (object)DBNull.Value : (object)drugs.ZFBL)); cmd.Parameters.Add(new SqlParameter("@Id", drugs.Id)); return cmd.ExecuteNonQuery(); } @@ -669,6 +670,10 @@ namespace AIMSDAL { entity.Comment = dr["Comment"].ToString(); } + if (dr["ZFBL"] != System.DBNull.Value) + { + entity.ZFBL = dr["ZFBL"].ToString(); + } if (dr["Price"] != System.DBNull.Value) { entity.Price = dr["Price"].ToString(); diff --git a/AIMSEntity/DAL/Extension/DDrugs.cs b/AIMSEntity/DAL/Extension/DDrugs.cs index bc9e96f..f2d8ba1 100644 --- a/AIMSEntity/DAL/Extension/DDrugs.cs +++ b/AIMSEntity/DAL/Extension/DDrugs.cs @@ -15,7 +15,7 @@ namespace AIMSDAL { StringBuilder strSql = new StringBuilder(); strSql.Append("insert into [Drugs]("); - strSql.Append("Name,HelpCode,DrugKind,Stand,DosageUnit,Unit,UseRate,IsValid,OperatorNo,OperatorName,OperateDate,Remark,Channel,UseDose1,UseDose2,UseDose3,Comment "); + strSql.Append("Name,HelpCode,DrugKind,Stand,DosageUnit,Unit,UseRate,IsValid,OperatorNo,OperatorName,OperateDate,Remark,Channel,UseDose1,UseDose2,UseDose3,Comment,ZFBL "); strSql.Append(")"); strSql.Append(" values ("); strSql.Append("'" + DrugsObj.Name + "',"); @@ -35,6 +35,7 @@ namespace AIMSDAL strSql.Append("'" + DrugsObj.UseDose2 + "',"); strSql.Append("'" + DrugsObj.UseDose3 + "',"); strSql.Append("'" + DrugsObj.Comment + "'"); + strSql.Append("'" + DrugsObj.ZFBL + "'"); strSql.Append(")"); HelperDB.DbHelperSQL.ExecNonQuery(strSql.ToString()); @@ -45,7 +46,7 @@ namespace AIMSDAL Drugs DrugsObj = new Drugs(); StringBuilder strSql = new StringBuilder(); strSql.Append("select "); - strSql.Append("Id,Name,HelpCode,DrugKind,Stand,DosageUnit,Unit,UseRate,IsValid,OperatorNo,OperatorName,OperateDate,Code,Remark,Channel,UseDose1,UseDose2,UseDose3,Comment "); + strSql.Append("Id,Name,HelpCode,DrugKind,Stand,DosageUnit,Unit,UseRate,IsValid,OperatorNo,OperatorName,OperateDate,Code,Remark,Channel,UseDose1,UseDose2,UseDose3,Comment,ZFBL "); strSql.Append(" from Drugs "); strSql.Append(" where Id=" + Id + ""); DataSet ds = HelperDB.DbHelperSQL.GetDataSet(strSql.ToString()); @@ -78,6 +79,7 @@ namespace AIMSDAL DrugsObj.UseDose2 = ds.Tables[0].Rows[0]["UseDose2"].ToString(); DrugsObj.UseDose3 = ds.Tables[0].Rows[0]["UseDose3"].ToString(); DrugsObj.Comment = ds.Tables[0].Rows[0]["Comment"].ToString(); + DrugsObj.ZFBL = ds.Tables[0].Rows[0]["ZFBL"].ToString(); if (ds.Tables[0].Rows[0]["OperateDate"].ToString() != "") { DrugsObj.OperateDate = DateTime.Parse(ds.Tables[0].Rows[0]["OperateDate"].ToString()); @@ -89,7 +91,7 @@ namespace AIMSDAL public static DataTable GetDataTable(string DrugKind) { StringBuilder strSql = new StringBuilder(); - strSql.Append("select [Id],[Name],[HelpCode],[DrugKind],[Stand],[DosageUnit],[Unit],CASE IsValid WHEN 1 THEN '有效' WHEN 0 THEN '无效' END AS IsValid,UseRate,Code,Remark,Channel,UseDose1,UseDose2,UseDose3,Comment"); + strSql.Append("select [Id],[Name],[HelpCode],[DrugKind],[Stand],[DosageUnit],[Unit],CASE IsValid WHEN 1 THEN '有效' WHEN 0 THEN '无效' END AS IsValid,UseRate,Code,Remark,Channel,UseDose1,UseDose2,UseDose3,Comment,ZFBL"); strSql.Append(" FROM Drugs where DrugKind like '%" + DrugKind + "%'"); return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); @@ -97,7 +99,7 @@ namespace AIMSDAL public static DataTable GetDataTable(string DrugKind, string Name) { StringBuilder strSql = new StringBuilder(); - strSql.Append("select [Id],[Name],[HelpCode],[DrugKind],[Stand],[DosageUnit],[Unit],CASE IsValid WHEN 1 THEN '有效' WHEN 0 THEN '无效' END AS IsValid,UseRate,Code,Remark,Channel,UseDose1,UseDose2,UseDose3,Comment"); + strSql.Append("select [Id],[Name],[HelpCode],[DrugKind],[Stand],[DosageUnit],[Unit],CASE IsValid WHEN 1 THEN '有效' WHEN 0 THEN '无效' END AS IsValid,UseRate,Code,Remark,Channel,UseDose1,UseDose2,UseDose3,Comment,ZFBL"); strSql.Append(" FROM Drugs where DrugKind like '%" + DrugKind + "%' " + (Name == "" ? "" : "and (NAME LIKE '%" + Name + "%' OR HelpCode LIKE '%" + Name + "%') ")); return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); @@ -105,20 +107,20 @@ namespace AIMSDAL public static DataTable GetDosageUnitDataTable(int UnitType) { StringBuilder strSql = new StringBuilder(); - strSql.Append("select [Id],[Name],[HelpCode],CASE UnitType WHEN 1 THEN '剂量单位' when 2 then '包装单位' end as UnitType,CASE IsValid WHEN 1 THEN '有效' WHEN 0 THEN '无效' END AS IsValid ,Code,Remark,Channel,UseDose1,UseDose2,UseDose3,Comment"); + strSql.Append("select [Id],[Name],[HelpCode],CASE UnitType WHEN 1 THEN '剂量单位' when 2 then '包装单位' end as UnitType,CASE IsValid WHEN 1 THEN '有效' WHEN 0 THEN '无效' END AS IsValid ,Code,Remark,Channel,UseDose1,UseDose2,UseDose3,Comment,ZFBL"); strSql.Append(" FROM DosageUnit WHERE UnitType=" + UnitType + " and IsValid=1"); return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); } public static DataTable GetDataTableByHelpCode(string HelpCode) { - string strSql = "SELECT Id,Name,Stand,DosageUnit,UseDose1,UseDose2,UseDose3,Comment FROM dbo.Drugs WHERE (NAME LIKE '%" + HelpCode + "%' OR HelpCode LIKE '%" + HelpCode + "%')"; + string strSql = "SELECT Id,Name,Stand,DosageUnit,UseDose1,UseDose2,UseDose3,Comment,ZFBL FROM dbo.Drugs WHERE (NAME LIKE '%" + HelpCode + "%' OR HelpCode LIKE '%" + HelpCode + "%')"; return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); } public static DataTable GetDrugsDataTable() { - string strSql = "SELECT TOP 21 e.Id, e.Name,e.Stand,e.UseDose1,e.UseDose2,e.UseDose3,Comment FROM Drugs e WHERE e.IsValid=1 ORDER BY e.UseRate DESC "; + string strSql = "SELECT TOP 21 e.Id, e.Name,e.Stand,e.UseDose1,e.UseDose2,e.UseDose3,Comment,ZFBL FROM Drugs e WHERE e.IsValid=1 ORDER BY e.UseRate DESC "; return HelperDB.DbHelperSQL.GetDataTable(strSql); } diff --git a/AIMSEntity/Model/AutoGenerate/Drugs.cs b/AIMSEntity/Model/AutoGenerate/Drugs.cs index 598cd15..5ba596c 100644 --- a/AIMSEntity/Model/AutoGenerate/Drugs.cs +++ b/AIMSEntity/Model/AutoGenerate/Drugs.cs @@ -29,6 +29,7 @@ namespace AIMSModel public string UseDose2 { get; set; } public string UseDose3 { get; set; } public string Price { get; set; } + public string ZFBL { get; set; } /// /// ///