会诊查询兼职科室和自己科室

src/main/java/thyyxxk/webserver/service/casefrontsheet/JieShouHuiZhenService.java

@@ -15,6 +15,7 @@ import thyyxxk.webserver.service.redislike.RedisLikeService;
 import thyyxxk.webserver.utils.*;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -50,8 +51,7 @@ public class JieShouHuiZhenService {
      */
     public ResultVo<List<JieShouHuiZhenPojo>> getHuiZhenData(String startTime, String endTime, boolean history) {
 
-        UserInfo userInfo = redisLikeService.getUserInfoByToken();
-        List<String> deptList = publicServer.getKeShiLieBiaoList(userInfo.getDeptCode());
+        Set<String> deptList = publicServer.getChildDeptByUserCode();
         QueryWrapper<?> qw = new QueryWrapper<>();
 
         if (history) {
@@ -64,8 +64,8 @@ public class JieShouHuiZhenService {
             qw.gt("req_date", startTime)
                     .le("req_date", endTime);
         }
-        if (ListUtil.notBlank(deptList)) {
-            qw.and(q -> q.in("req_dept1", deptList).or().in("req_dept2", deptList));
+        if (publicServer.noNeedRule()) {
+            qw.in("req_dept1", deptList);
         }
 
         return ResultVoUtil.success(dao.getHuiZhenData(qw));