兼诊科室查询

src/main/java/thyyxxk/webserver/dao/his/redislike/RedisLikeDao.java

@@ -59,10 +59,15 @@ public interface RedisLikeDao {
 
     @Select("select role_id from dj_user_role where user_code=#{code}")
     List<Integer> selectUserRoles(@Param("code") String code);
+
+    @Select("select dept_code from zy_part_time_dept where code=#{code}")
+    List<String> selectUserPartTimeDept(@Param("code") String code);
+
     @Select(" select rtrim(yb_code) " +
             "                          from zy_zd_relative_code  " +
             "                          where code = #{code}")
     String selectYbCodeContactRelation(String code);
+
     @Select("select rtrim(si_caty) " +
             "                          from zd_unit_code " +
             "                          where code = #{code}")

src/main/java/thyyxxk/webserver/service/redislike/RedisLikeService.java

@@ -135,7 +135,7 @@ public class RedisLikeService {
         return wjwCode;
     }
 
-    public String getYbDept(String code){
+    public String getYbDept(String code) {
         if (StringUtil.invalidValue(code)) {
             return null;
         }
@@ -158,6 +158,7 @@ public class RedisLikeService {
         }
         return wjwCode;
     }
+
     /**
      * @description:获取医保联系人关系
      * @author: lihong
@@ -165,7 +166,7 @@ public class RedisLikeService {
      * @param: code
      * @return: java.lang.String
      **/
-    public String getYbCodeContactRelation(String code){
+    public String getYbCodeContactRelation(String code) {
         if (StringUtil.invalidValue(code)) {
             return null;
         }
@@ -202,6 +203,7 @@ public class RedisLikeService {
             }
             userInfo.setDeptName(getDeptName(userInfo.getDeptCode()));
             userInfo.setRoles(dao.selectUserRoles(code));
+            userInfo.setPartTimeDept(dao.selectUserPartTimeDept(userInfo.getCode()));
             USER_MAP.put(code, userInfo);
         }
         try {

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/EmrServer.java

@@ -87,14 +87,19 @@ public class EmrServer {
 
     public List<JSONObject> getDeptTemplate() {
         UserInfo user = redisLikeService.getUserInfoByToken();
-        JSONArray data = emr.getDeptList(user.getDeptCode());
+        JSONArray data = new JSONArray();
+        if (ListUtil.notBlank(user.getPartTimeDept())) {
+            user.getPartTimeDept().forEach(item -> {
+                data.addAll(emr.getDeptList(item));
+            });
+        }
+        data.addAll(emr.getDeptList(user.getDeptCode()));
         return emrToTree(data);
     }
 
     /**
      * 获取 整个医院模板
      *
-     * @return
      */
     public List<JSONObject> wholeHospitalTemplate() {
         JSONArray data = emr.getEmrTree();

src/main/java/thyyxxk/webserver/utils/StringUtil.java

@@ -43,7 +43,7 @@ public class StringUtil {
     }
 
     public static boolean invalidValue(String str) {
-        return isBlank(str) || str.trim().equals("-");
+        return isBlank(str) || "-".equals(str.trim());
     }
 
     public static String[] triageDeptString2Array(String deptCodes) {