|
|
@@ -87,11 +87,12 @@ public class EnteralNutritionTemplateServiceImpl implements IEnteralNutritionTem
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getTemplateDescription()), EnteralNutritionTemplate::getTemplateDescription, bo.getTemplateDescription());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getPrescriptionType()), EnteralNutritionTemplate::getPrescriptionType, bo.getPrescriptionType());
|
|
|
|
|
|
- List<SysDept> sysDepts = deptMapper.selectList(new LambdaQueryWrapper<SysDept>().like(SysDept::getDeptName, bo.getPrescriptionDepartmentName()));
|
|
|
List<Long> deptIds = new ArrayList<>();
|
|
|
- sysDepts.forEach(element -> deptIds.add(element.getDeptId()));
|
|
|
- lqw.in(EnteralNutritionTemplate::getPrescriptionId, deptIds);
|
|
|
+ deptMapper.selectList(new LambdaQueryWrapper<SysDept>().like(SysDept::getDeptName, bo.getPrescriptionDepartmentName()))
|
|
|
+ .forEach(element -> deptIds.add(element.getDeptId()));
|
|
|
+ lqw.in(!deptIds.isEmpty(), EnteralNutritionTemplate::getPrescriptionId, deptIds);
|
|
|
|
|
|
+ lqw.eq(bo.getType() != null, EnteralNutritionTemplate::getType, bo.getType());
|
|
|
lqw.eq(bo.getPrescriptionId() != null, EnteralNutritionTemplate::getPrescriptionId, bo.getPrescriptionId());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getContent()), EnteralNutritionTemplate::getContent, bo.getContent());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), EnteralNutritionTemplate::getStatus, bo.getStatus());
|
