Browse Source

生成核查任务添加非医疗组医生筛选

songxinlu 3 years ago
parent
commit
fb0a9c138b
1 changed files with 3 additions and 1 deletions
  1. 3 1
      src/main/java/com/diagbot/facade/MedCheckWorkFacade.java

+ 3 - 1
src/main/java/com/diagbot/facade/MedCheckWorkFacade.java

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