From bd904aa9ff021abaf89e200c01b25cb08db9c99c Mon Sep 17 00:00:00 2001 From: leomon Date: Thu, 30 Mar 2023 23:24:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E5=A3=AB=E6=94=B6=E8=B4=B9=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AIMS/AIMS.csproj | 3 + .../frmAnaesthesiaChargeSelect.cs | 17 ++-- .../frmAnaesthesiaChargeSelect.designer.cs | 12 +-- AIMS/DataDictionary/frmChargSelect.cs | 24 ++--- AIMS/DataDictionary/frmChargsTemplateNew.cs | 1 + AIMS/OperationAanesthesia/frmFeesRecord.cs | 84 +++++++++++------- AIMS/Template/护士收费单.xlt | Bin 0 -> 28160 bytes .../DocumentEntity/DocumentDAL.cs | 2 +- 8 files changed, 86 insertions(+), 57 deletions(-) create mode 100644 AIMS/Template/护士收费单.xlt diff --git a/AIMS/AIMS.csproj b/AIMS/AIMS.csproj index b089b93..a07f454 100644 --- a/AIMS/AIMS.csproj +++ b/AIMS/AIMS.csproj @@ -1199,6 +1199,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.cs b/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.cs index fb80b88..d9d1cae 100644 --- a/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.cs +++ b/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.cs @@ -93,13 +93,13 @@ namespace AIMS.PublicUI.UI private void SetPageText(DataTable table) { total = table.Rows.Count; - if (total % 10 == 0) + if (total % 18 == 0) { - pages = total / 10; + pages = total / 18; } else { - pages = total / 10 + 1; + pages = total / 18 + 1; } lblPage.Text = currentPage + 1 + "/" + pages + "，共" + total + "条"; } @@ -112,8 +112,8 @@ namespace AIMS.PublicUI.UI private DataTable GetTableByCurrentPage(int currPage, DataTable dt) { DataTable pdt = dt.Clone(); - int index = currPage * 10; - for (int i = index; i < index + 10; i++) + int index = currPage * 18; + for (int i = index; i < index + 18; i++) { if (i == total) { @@ -217,15 +217,16 @@ namespace AIMS.PublicUI.UI } foreach (int id in list) { - foreach (DataGridViewRow row in dgvY.Rows) + foreach (DataRow row in ydt.Rows) { - if (Convert.ToInt32(row.Cells["yId"].Value) == id) + if (Convert.ToInt32(row["Id"]) == id) { - dgvY.Rows.Remove(row); + ydt.Rows.Remove(row); break; } } } + BindDgvY(ydt); } private void btnSave_Click(object sender, EventArgs e) diff --git a/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.designer.cs b/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.designer.cs index 97b7ebb..d75d5b4 100644 --- a/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.designer.cs +++ b/AIMS/DataDictionary/frmAnaesthesiaChargeSelect.designer.cs @@ -164,7 +164,7 @@ this.panel2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.panel2.Location = new System.Drawing.Point(0, 53); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(968, 469); + this.panel2.Size = new System.Drawing.Size(968, 509); this.panel2.TabIndex = 14; // // lblPage @@ -225,7 +225,7 @@ this.groupBox2.Controls.Add(this.dgvY); this.groupBox2.Location = new System.Drawing.Point(531, 24); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(424, 429); + this.groupBox2.Size = new System.Drawing.Size(424, 472); this.groupBox2.TabIndex = 0; this.groupBox2.TabStop = false; this.groupBox2.Text = "已选"; @@ -256,7 +256,7 @@ this.dgvY.RowHeadersVisible = false; this.dgvY.RowTemplate.Height = 23; this.dgvY.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvY.Size = new System.Drawing.Size(418, 404); + this.dgvY.Size = new System.Drawing.Size(418, 447); this.dgvY.TabIndex = 0; this.dgvY.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.dgvY_EditingControlShowing); // @@ -286,7 +286,7 @@ this.groupBox1.Controls.Add(this.dgvD); this.groupBox1.Location = new System.Drawing.Point(15, 24); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(471, 432); + this.groupBox1.Size = new System.Drawing.Size(471, 475); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "待选"; @@ -318,7 +318,7 @@ this.dgvD.RowHeadersVisible = false; this.dgvD.RowTemplate.Height = 23; this.dgvD.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvD.Size = new System.Drawing.Size(465, 407); + this.dgvD.Size = new System.Drawing.Size(465, 450); this.dgvD.TabIndex = 0; this.dgvD.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvD_CellDoubleClick); // @@ -354,7 +354,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(968, 522); + this.ClientSize = new System.Drawing.Size(968, 562); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; diff --git a/AIMS/DataDictionary/frmChargSelect.cs b/AIMS/DataDictionary/frmChargSelect.cs index 0048ab9..ac4e591 100644 --- a/AIMS/DataDictionary/frmChargSelect.cs +++ b/AIMS/DataDictionary/frmChargSelect.cs @@ -58,7 +58,7 @@ namespace AIMS.PublicUI.UI dgvD.AutoGenerateColumns = false; dgvY.AutoGenerateColumns = false; BindCharsDICT(); - ydt = BCharges.GetChargsByCodes(chargsTemplate.ConnectId,chargsTemplate.DefaultValue); + ydt = BCharges.GetChargsByCodes(chargsTemplate.ConnectId, chargsTemplate.DefaultValue); BindDgvY(ydt); } private void btnCancel_Click(object sender, EventArgs e) @@ -228,9 +228,9 @@ namespace AIMS.PublicUI.UI { ydr["Id"] = dr["Id"].ToString(); ydr["Name"] = dr["Name"].ToString(); - ydr["Code"] = dr["Code"].ToString(); + ydr["Code"] = dr["Code"].ToString(); ydr["Price"] = dr["Price"].ToString(); - ydr["Number"] = "0"; + ydr["Number"] = "1"; ydt.Rows.Add(ydr); break; } @@ -243,18 +243,18 @@ namespace AIMS.PublicUI.UI { List list = new List(); list.Add(dgvY.CurrentRow.Cells["yId"].Value.ToString()); - - for (int id = 0; id < list.Count; id++) + foreach (string id in list) { - for (int i = ydt.Rows.Count - 1; i >= 0; i--) + foreach (DataRow dr in ydt.Rows) { - if (ydt.Rows[i]["Code"].ToString() == list[id]) + if (dr["Id"].ToString() == id) { - ydt.Rows.Remove(ydt.Rows[i]); + ydt.Rows.Remove(dr); + break; } } } - dgvY.Rows.Remove(dgvY.CurrentRow); + BindDgvY(ydt); } private void btnSave_Click(object sender, EventArgs e) @@ -268,7 +268,7 @@ namespace AIMS.PublicUI.UI } string applianceId = string.Join("','", list.ToArray()); applianceId = "'" + applianceId + "'"; - string _Number = string.Join(",", number.ToArray()); + string _Number = string.Join(",", number.ToArray()); chargsTemplate.ConnectId = applianceId; chargsTemplate.DefaultValue = _Number; chargsTemplate.OperatorId = PublicMethod.OperatorId; @@ -301,9 +301,9 @@ namespace AIMS.PublicUI.UI { ydr["Id"] = row["Id"]; ydr["Name"] = row["Name"].ToString(); - ydr["Code"] = row["Code"].ToString(); + ydr["Code"] = row["Code"].ToString(); ydr["Price"] = row["Price"].ToString(); - ydr["Number"] = "0"; + ydr["Number"] = "1"; } ydt.Rows.Add(ydr); break; diff --git a/AIMS/DataDictionary/frmChargsTemplateNew.cs b/AIMS/DataDictionary/frmChargsTemplateNew.cs index 99c44e9..14d60f9 100644 --- a/AIMS/DataDictionary/frmChargsTemplateNew.cs +++ b/AIMS/DataDictionary/frmChargsTemplateNew.cs @@ -84,6 +84,7 @@ namespace AIMS.PublicUI.UI { this.Close(); } + /// /// 新增收费 /// diff --git a/AIMS/OperationAanesthesia/frmFeesRecord.cs b/AIMS/OperationAanesthesia/frmFeesRecord.cs index 26fecb5..4336e96 100644 --- a/AIMS/OperationAanesthesia/frmFeesRecord.cs +++ b/AIMS/OperationAanesthesia/frmFeesRecord.cs @@ -393,16 +393,25 @@ namespace AIMS.PublicUI.UI } if (chargCount > 0) { - lblDrugs.Text = string.Format(" 药品:{0}元 其他:{1}元 ", chargValue, chargValue2); - if (_record.InRoomTime != null && _record.OutRoomTime != null) - { - lblDrugs.Text += "在室时长：" + Math.Round(((TimeSpan)(_record.OutRoomTime - _record.InRoomTime)).TotalHours, 2) + " h "; - } if (FeeType != "护士") + { + lblDrugs.Text = string.Format(" 药品:{0}元 其他:{1}元 ", chargValue, chargValue2); + if (_record.InRoomTime != null && _record.OutRoomTime != null) + { + lblDrugs.Text += "在室时长：" + Math.Round(((TimeSpan)(_record.OutRoomTime - _record.InRoomTime)).TotalHours, 2) + " h "; + } if (_record.AnesthesiaBeginTime != null && _record.AnesthesiaEndTime != null) { lblDrugs.Text += "麻醉时长：" + Math.Round(((TimeSpan)(_record.AnesthesiaEndTime - _record.AnesthesiaBeginTime)).TotalHours, 2) + " h"; } + } + else + { + if (chargValue > 0) + lblDrugs.Text = string.Format(" 药品:{0}元 手术耗材:{1}元 ", chargValue, chargValue2); + else + lblDrugs.Text = string.Format(" 手术耗材:{0}元 ", chargValue2); + } } else { @@ -487,13 +496,17 @@ namespace AIMS.PublicUI.UI if (row + i >= drugdt.Rows.Count) break; int usedose = 0; ButtonX lb = new ButtonX(); - lb.Text = drugdt.Rows[row + i]["Name"].ToString().Trim() + " " + drugdt.Rows[row + i]["Stand"].ToString().Trim() + " " + drugdt.Rows[row + i]["Price"].ToString().Trim(); + string name = drugdt.Rows[row + i]["Name"].ToString().Trim() + " " + drugdt.Rows[row + i]["Stand"].ToString().Trim(); + //if (name.Length > 30) name = name.Substring(0, 30); + if (name.Contains("\r\n")) + name = name.Replace("\r\n", ""); + lb.Text = name + " " + drugdt.Rows[row + i]["Price"].ToString().Trim(); lb.Tag = drugdt.Rows[row + i]["Id"].ToString(); - lb.Font = new System.Drawing.Font("微软雅黑", 9.5f, FontStyle.Bold); - - lb.Size = new System.Drawing.Size(panelleftsel.Width - (usedose * 43) - 8, 30); + lb.Font = new System.Drawing.Font("微软雅黑", 9f, FontStyle.Bold); + lb.Tooltip = drugdt.Rows[row + i]["Name"].ToString().Trim() + " " + drugdt.Rows[row + i]["Stand"].ToString().Trim() + " " + drugdt.Rows[row + i]["Price"].ToString().Trim(); + lb.Size = new System.Drawing.Size(panelleftsel.Width - (usedose * 43) - 8, 31); lb.Cursor = Cursors.Hand; - lb.ColorTable = eButtonColor.Orange;// Flat; + lb.ColorTable = eButtonColor.Orange; ; lb.BackColor = Color.SkyBlue; lb.TextAlignment = eButtonTextAlignment.Left; lb.Parent = panelleftsel; @@ -574,6 +587,7 @@ namespace AIMS.PublicUI.UI btnSave.Focus(); Save(dgvDrugs, 1); Save(dgvChargsRecord, 2); + SetChargDrugPrice(); new frmMessageBox().Show(); } @@ -635,6 +649,7 @@ namespace AIMS.PublicUI.UI feesR.FeeSerial = dr.Cells[2].EditedFormattedValue.ToString(); feesR.ChargName = dr.Cells[3].EditedFormattedValue.ToString(); feesR.ChargSpec = dr.Cells[4].EditedFormattedValue.ToString(); + if (feesR.ChargSpec.Contains("\r\n")) feesR.ChargSpec = feesR.ChargSpec.Replace("\r\n", ""); feesR.Unit = dr.Cells[6].EditedFormattedValue.ToString(); feesR.FeeNum = dr.Cells[7].EditedFormattedValue.ToString(); feesR.FeeClass = dr.Cells[1].EditedFormattedValue.ToString(); @@ -981,14 +996,15 @@ namespace AIMS.PublicUI.UI private void btnTypeManager_Click(object sender, EventArgs e) { frmAnaesthesiaEvents fae = new frmAnaesthesiaEvents(); - fae.Type = 4; + fae.Type = (FeeType == "护士") ? 5 : 4; fae.ShowDialog(); BindAnaesthesiaEvents(); } private void btnTemp_Click(object sender, EventArgs e) { + _dataGridView.ClearSelection(); frmChargsTemplateNew frmChargSelect = new frmChargsTemplateNew(); - frmChargSelect.TemplateType = "麻醉"; + frmChargSelect.TemplateType = FeeType; frmChargSelect.FormClosed += (s, er) => { if (frmChargSelect.Tag == null) return; @@ -999,7 +1015,7 @@ namespace AIMS.PublicUI.UI } AddNewNullRows(); dgvChargsRecord.ClearSelection(); - SetChargDrugPrice(); + SetChargDrugPrice(); }; frmChargSelect.ShowDialog(); } @@ -1140,8 +1156,8 @@ namespace AIMS.PublicUI.UI AddNewNullRows(); SetChargDrugPrice(); - _dataGridView.CurrentCell = _dataGridView.Rows[_dataGridView.Rows.Count - 1].Cells[3]; - _dataGridView.BeginEdit(true); + //_dataGridView.CurrentCell = _dataGridView.Rows[_dataGridView.Rows.Count - 1].Cells[3]; + //_dataGridView.BeginEdit(true); if (dgvYP.Visible == true) { @@ -1420,7 +1436,7 @@ namespace AIMS.PublicUI.UI private void TxtOperatorName_DoubleClick(object sender, EventArgs e) { frmOperationDoctor = new PublicUI.UI.frmSelectPerson(); - frmOperationDoctor.PersonType = "麻醉医生"; + frmOperationDoctor.PersonType = (FeeType == "护士") ? "医生" : "麻醉医生"; frmOperationDoctor.SelectDepartmentName = _record.ApplyDepartmentName; frmOperationDoctor.SelectPersonData = SelectOperationDoctorData; frmOperationDoctor.FormClosed += new FormClosedEventHandler(frmOperationDoctor_FormClosed); @@ -1445,6 +1461,7 @@ namespace AIMS.PublicUI.UI GoldPrinter.ExcelAccess excel = new GoldPrinter.ExcelAccess(); string strFileName = "麻醉收费单.xlt"; //模板文件名 + if (FeeType == "护士") strFileName = "护士收费单.xlt"; string strExcelTemplateFile = Application.StartupPath; strExcelTemplateFile += @"\Template\" + strFileName; excel.Open(strExcelTemplateFile); //用模板文件 @@ -1455,22 +1472,28 @@ namespace AIMS.PublicUI.UI excel.SetCellText(4, "H", _record.InHospitalNo); excel.SetCellText(5, "B", _record.Name + " (" + _record.Sex + " " + _record.Age + ")"); excel.SetCellText(5, "H", _record.Identity); - excel.SetCellText(5, "E", DBManage.GetDictionaryValuesById(_record.Applydiagnose, "诊断")); - excel.SetCellText(38, "B", lblDrugs.Text); - excel.SetCellText(39, "B", _worker.Name); - if (_record.OperationDoctor != null && _record.OperationDoctor.Trim() != "") + + PatientRecord Patient = PatientRecord.GetPatientRecord(_record.PatientId.Value); + if (FeeType == "麻醉") { - string AnesthesiaDoctor = _record.OperationDoctor; - if (AnesthesiaDoctor.Contains(',')) AnesthesiaDoctor = AnesthesiaDoctor.Split(',')[0]; - Person son = BPerson.SelectSingle(" id in (" + AnesthesiaDoctor + ")", null, RecursiveType.Parent, 1); - if (son != null) - excel.SetCellText(39, "D", son.Name); + excel.SetCellText(5, "E", DBManage.GetDictionaryValuesById(_record.Applydiagnose, "诊断")); + excel.SetCellText(38, "B", lblDrugs.Text); + excel.SetCellText(39, "B", _worker.Name); + excel.SetCellText(39, "D", Patient.AnesthesiaDoctor); + excel.SetCellText(39, "G", DateTime.Now.ToString("yyyy-MM-dd HH:mm")); } - excel.SetCellText(39, "G", DateTime.Now.ToString("yyyy-MM-dd HH:mm")); - int rowNum = 6; + else + { + excel.SetCellText(5, "E", DBManage.GetDictionaryValuesById(_record.Operation, "手术")); + excel.SetCellText(27, "B", Patient.OperationDoctor); + excel.SetCellText(27, "F", Patient.InstrumentNurse + " " + Patient.TourNurse); + excel.SetCellText(27, "I", Patient.AnesthesiaDoctor); + excel.SetCellText(28, "B", lblDrugs.Text); + } + + int rowNum = 7; for (int i = 0; i < dgvDrugs.Rows.Count; i++) { - rowNum++; DataGridViewRow dr = dgvDrugs.Rows[i]; if (dr.Tag == null) continue; FeesRecord temp = dr.Tag as FeesRecord; @@ -1482,11 +1505,11 @@ namespace AIMS.PublicUI.UI dr.Cells[7].EditedFormattedValue.ToString(), ( dr.Cells[6].EditedFormattedValue.ToString() ) , (dr.Cells[8].EditedFormattedValue.ToString() ) }; + rowNum++; } } for (int i = 0; i < dgvChargsRecord.Rows.Count; i++) { - rowNum++; DataGridViewRow dr = dgvChargsRecord.Rows[i]; if (dr.Tag == null) continue; FeesRecord temp = dr.Tag as FeesRecord; @@ -1494,11 +1517,12 @@ namespace AIMS.PublicUI.UI { excel.GetRange(rowNum, "A", rowNum, "I").Value = new string[]{ ( dr.Cells[3].EditedFormattedValue.ToString()),"","","","", - ( dr.Cells[4].EditedFormattedValue.ToString()), + ( temp.ChargSpec ), dr.Cells[7].EditedFormattedValue.ToString(), ( dr.Cells[6].EditedFormattedValue.ToString() ) , (dr.Cells[8].EditedFormattedValue.ToString() ) }; + rowNum++; } } excel.Print(); diff --git a/AIMS/Template/护士收费单.xlt b/AIMS/Template/护士收费单.xlt new file mode 100644 index 0000000000000000000000000000000000000000..421820bc0b8408ba29941c1709de7028221415b8 GIT binary patch literal 28160 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 S^*}s*X8s@A-$22R{Qm{f2T_m! literal 0 HcmV?d00001 diff --git a/DocumentManagement/DocumentEntity/DocumentDAL.cs b/DocumentManagement/DocumentEntity/DocumentDAL.cs index 302a140..d4ed53a 100644 --- a/DocumentManagement/DocumentEntity/DocumentDAL.cs +++ b/DocumentManagement/DocumentEntity/DocumentDAL.cs @@ -956,7 +956,7 @@ namespace DocumentManagement StringBuilder strSql = new StringBuilder(); strSql.Append("insert into [PrintDocument]("); strSql.Append("[PatientId],TemplateId,[XmlFileName],[XmlFile],[XmlStatic],"); - strSql.Append(" [IsValid],[OperatorNo],[OperatorDate],[RecordId],[Remark]"); + strSql.Append(" [IsValid],[OperatorNo],[OperatorDate],[RecordId],[Remark],[OrderNo]"); strSql.Append(")"); strSql.Append(" values ("); strSql.Append("" + model.PatientId + ",");