体检报告页面过滤项目

src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs

@@ -158,16 +158,16 @@ namespace Shentun.Peis.RegisterChecks
             //                itemType
             //            }).ToList();
 
-            var entlist = (await _registerCheckRepository.GetDbSetAsync())
+            var entlist = (await _registerCheckRepository.GetQueryableAsync())
                  .Include(x => x.RegisterCheckAsbitems)
                  .ThenInclude(x => x.Asbitem).ThenInclude(x => x.ItemType)
-                 .Where(m => m.RegisterCheckAsbitems.Select(s => s.PatientRegisterId).Contains(input.PatientRegisterId)).ToList();
+                 .Where(m => m.PatientRegisterId == input.PatientRegisterId).ToList();
             //排序
             entlist = entlist.OrderBy(o => o.RegisterCheckAsbitems.Max(o => o.Asbitem.ItemType.DisplayOrder)).ToList()
                       .OrderBy(o => o.RegisterCheckAsbitems.Max(o => o.Asbitem.DisplayOrder)).ToList();
-            var userList = await _userRepository.GetListAsync();
 
-            var entdto = entlist.Select(s => new RegisterCheckOrAsbitemNameOrIsChargeDto
+
+            var entdto = entlist.Where(m => m.RegisterCheckAsbitems.Where(mm => mm.Asbitem.IsCheck == 'Y').Count() > 0).Select(s => new RegisterCheckOrAsbitemNameOrIsChargeDto
             {
                 CheckTypeFlag = s.RegisterCheckAsbitems.First().Asbitem.ItemType.CheckTypeFlag,
                 AsbitemName = string.Join(",", s.RegisterCheckAsbitems.Select(rs => rs.Asbitem.DisplayName).ToList()),