|
@@ -335,8 +335,10 @@ public class MedCheckWorkFacade {
|
|
|
}
|
|
|
if (ListUtil.isNotEmpty(codes)) {
|
|
|
List<BasDoctorInfo> basDoctorInfos = basDoctorInfoFacade.list(new QueryWrapper<BasDoctorInfo>()
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.in("group_id", codes)
|
|
|
- .eq("is_deleted", IsDeleteEnum.N.getKey()));
|
|
|
+ .or().isNull("group_id")
|
|
|
+ .in(ListUtil.isNotEmpty(checkWorkPageVO.getDepts()),"dept_id",checkWorkPageVO.getDepts()));
|
|
|
checkWorkPageVO.setDoctorIds(basDoctorInfos.stream().map(BasDoctorInfo::getDoctorId).collect(Collectors.toList()));
|
|
|
}
|
|
|
//通过主治医生去查,病区、科室、医疗组不作为筛选条件
|