From dbe16b752d2a2292ceb74ce9e71d4cac3305fac5 Mon Sep 17 00:00:00 2001 From: lsm Date: Wed, 18 Sep 2024 15:23:26 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=94=B6=E8=B4=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=8B=BC=E9=9F=B3=E7=A0=81=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Entity/EnrollmentOrg.cs | 1 + PEIS/View/Enrollment/EnrollmentOrgForm.cs | 4 ++-- PEIS/View/Enrollment/EnrollmentPersonForm.cs | 2 +- PEIS/View/Setting/FeeItemForm.cs | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/PEIS/Entity/EnrollmentOrg.cs b/PEIS/Entity/EnrollmentOrg.cs index 325f5dd..204af44 100644 --- a/PEIS/Entity/EnrollmentOrg.cs +++ b/PEIS/Entity/EnrollmentOrg.cs @@ -23,5 +23,6 @@ namespace PEIS.Entity public String CreatorCode { get; set; } public String Creator { get; set; } public Int64? OID { get; set; } + public String SpellCode { get; set; } } } \ No newline at end of file diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs index fe865b3..6ed0981 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs @@ -813,12 +813,12 @@ namespace PEIS.View.Enrollment private void FeeItemSearch_TextChanged(object sender, EventArgs e) // 收费项目检索 { - DgcFeeItem.DataSource = _lstFeeItem.Where(a => a?.FeeItemName.Contains(FeeItemSearch.Text) == true); + DgcFeeItem.DataSource = _lstFeeItem.Where(a => a?.FeeItemName.Contains(FeeItemSearch.Text) == true || a?.SpellCode?.Contains(FeeItemSearch.Text) == true); } private void FeeItemSearch2_TextChanged(object sender, EventArgs e) // 收费项目检索 { - DgcFeeItem2.DataSource = _lstFeeItem2.Where(a => a?.FeeItemName.Contains(FeeItemSearch2.Text) == true); + DgcFeeItem2.DataSource = _lstFeeItem2.Where(a => a?.FeeItemName.Contains(FeeItemSearch2.Text) == true || a?.SpellCode?.Contains(FeeItemSearch2.Text) == true); } private void PatientSearch_TextChanged(object sender, EventArgs e) // 团体成员检索 diff --git a/PEIS/View/Enrollment/EnrollmentPersonForm.cs b/PEIS/View/Enrollment/EnrollmentPersonForm.cs index d80e3f7..cd7700f 100644 --- a/PEIS/View/Enrollment/EnrollmentPersonForm.cs +++ b/PEIS/View/Enrollment/EnrollmentPersonForm.cs @@ -701,7 +701,7 @@ namespace PEIS.View.Enrollment private void FeeItemSearch_TextChanged(object sender, EventArgs e) { - DgcFeeItem.DataSource = _lstFeeItem.Where(a => a?.FeeItemName.Contains(FeeItemSearch.Text) == true); + DgcFeeItem.DataSource = _lstFeeItem.Where(a => a?.FeeItemName.Contains(FeeItemSearch.Text) == true || a?.SpellCode?.Contains(FeeItemSearch.Text) == true); } private void TsmiCopyFeeItem_Click(object sender, EventArgs e) diff --git a/PEIS/View/Setting/FeeItemForm.cs b/PEIS/View/Setting/FeeItemForm.cs index 7e659cf..aac115c 100644 --- a/PEIS/View/Setting/FeeItemForm.cs +++ b/PEIS/View/Setting/FeeItemForm.cs @@ -147,7 +147,7 @@ namespace PEIS.View.Setting { var search = MenuFee.TstbKey.Text.Trim(); if (search == "输入条件查询") return; - DgcFeeItem.SetDataSource(string.IsNullOrEmpty(search) ? _lstFeeItem : _lstFeeItem.Where(a => a.FeeItemCode.Contains(search) || a.FeeItemName.Contains(search)).ToList()); + DgcFeeItem.SetDataSource(string.IsNullOrEmpty(search) ? _lstFeeItem : _lstFeeItem.Where(a => a?.FeeItemName.Contains(search) == true || a.FeeItemName?.Contains(search) == true || a?.SpellCode?.Contains(search) == true).ToList()); } #endregion 收费项目