diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
index f500ad8c..7997ceb8 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
@@ -63,7 +63,10 @@ public class GainfoService : IGainfoService
             .WhereIF(request.DepartmentNos.IsPresent(), gainfo => request.DepartmentNos.Contains(gainfo.DepartmentNo))
             .WhereIF(request.Search.IsPresent(), gainfo =>
               gainfo.Name.Contains(request.Search)
-            || gainfo.Code.Contains(request.Search))
+            || gainfo.Code.Contains(request.Search)
+            || gainfo.IdNo.Contains(request.Search)
+            || gainfo.Werks.Contains(request.Search)
+            )
             .Select<GainfoPageResponse>()
             .ToPageListAsync(request);
 
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index 3dc1a432..df747aa0 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -36,11 +36,15 @@ public class BalanceService : IBalanceService
                 .LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
                 .LeftJoin<BusinessPlaceEntity>((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code)
                 .LeftJoin<BusinessShiftEntity>((record, ga, department, bplace, bshift) => record.BusinessShiftCode == bshift.Code)
-                .LeftJoin<BasicTypeEntity>((record, ga, department, bplace, bshift, type) => record.BusinessShiftCode.ToString() == type.Code)
+                .LeftJoin<BasicTypeEntity>((record, ga, department, bplace, bshift, type) => record.ShiftType == type.Code && type.Type == "mealshift")
                 .WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CostDate >= request.SearchDateTimePeriod.Start)
                 .WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, record => record.CostDate <= request.SearchDateTimePeriod.End)
                 .WhereIF(request.BusinessplaceCodes.IsPresent(), record => request.BusinessplaceCodes.Contains(record.BusinessPlaceCode))
                 .WhereIF(request.ShiftTypes.IsPresent(), record => request.ShiftTypes.Contains(record.ShiftType))
+                .WhereIF(request.Search.IsPresent(), (record, ga) =>
+                ga.Name.Contains(request.Search)
+                || ga.Code.Contains(request.Search)
+                )
                 .OrderBy(record => record.CreateTime, OrderByType.Desc)
                 .Select((record, ga, department, bplace, bshift, type) => new BalanceRecordResponse
                 {
@@ -66,7 +70,7 @@ public class BalanceService : IBalanceService
                     DepartmentName = department.Name,
                     BusinessPlaceName = bplace.Name,
                     BusinessShiftName = type.Display,
-                    CostDateTime = record.CreateTime // todo
+                    CostDateTime = record.CostDateTime
                 })
                 .ToPageListAsync(request);