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 收费项目