|
@@ -43,12 +43,7 @@ import thyyxxk.webserver.websocket.WebSocketServer;
|
|
|
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
import java.util.stream.Stream;
|
|
|
|
|
@@ -318,9 +313,31 @@ public class PublicServer {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 获取科室的子科室和本科
|
|
|
+ * 获取医生的子科室 和 兼职科室 以及兼职下面的子科室
|
|
|
+ *
|
|
|
+ * @return 返回科室
|
|
|
+ */
|
|
|
+ public Set<String> getChildDeptByUserCode() {
|
|
|
+ UserInfo userInfo = redisLikeService.getUserInfoByToken();
|
|
|
+ Set<String> list = new HashSet<>();
|
|
|
+
|
|
|
+ if (ListUtil.notBlank(userInfo.getPartTimeDept())) {
|
|
|
+ list.addAll(userInfo.getPartTimeDept());
|
|
|
+ }
|
|
|
+ list.add(userInfo.getDeptCode());
|
|
|
+ QueryWrapper<?> qw = new QueryWrapper<>();
|
|
|
+ qw.in("parent_code", list);
|
|
|
+ List<String> temp = dao.selectChildDeptByCodeList(qw);
|
|
|
+ if (ListUtil.notBlank(temp)) {
|
|
|
+ list.addAll(temp);
|
|
|
+ }
|
|
|
+ return list;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取科室 列表 下面的子科室
|
|
|
*
|
|
|
- * @param deptCodeList 科室代码
|
|
|
+ * @param deptCodeList 科室列表
|
|
|
* @return 返回科室
|
|
|
*/
|
|
|
public List<String> getKeShiLieBiaoList(List<String> deptCodeList) {
|