Merge remote-tracking branch 'origin/develop' into develop

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/PractitionerAppServiceImpl.java

@@ -8,8 +8,12 @@ import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.ChineseConvertUtils;
 import com.core.common.utils.MessageUtils;
+import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.SecurityUtils;
+import com.core.framework.web.service.TokenService;
+import com.core.common.core.domain.model.LoginUserExtend;
 import com.core.system.service.ISysTenantService;
+import com.core.system.service.ISysUserService;
 import com.openhis.administration.domain.BizUser;
 import com.openhis.administration.domain.BizUserRole;
 import com.openhis.administration.domain.Practitioner;
@@ -62,6 +66,12 @@ public class PractitionerAppServiceImpl implements IPractitionerAppService {
     @Resource
     private AssignSeqUtil assignSeqUtil;
 
+    @Resource
+    private TokenService tokenService;
+
+    @Resource
+    private ISysUserService userService;
+
     /**
      * 新增用户及参与者
      *
@@ -508,6 +518,17 @@ public class PractitionerAppServiceImpl implements IPractitionerAppService {
         }
 
         iPractitionerService.updateById(practitioner);
+
+        // 刷新 Redis 缓存中的 LoginUser，确保后续 getInfo 接口返回新科室信息
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        LoginUserExtend loginUserExtend = userService.getLoginUserExtend(loginUser.getUserId());
+        if (loginUserExtend != null) {
+            loginUser.setOrgId(loginUserExtend.getOrgId());
+            loginUser.getUser().setOrgId(loginUserExtend.getOrgId());
+            loginUser.getUser().setOrgName(loginUserExtend.getOrgName());
+            tokenService.refreshToken(loginUser);
+        }
+
         return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"切换科室"}));
     }
 

openhis-ui-vue3/src/layout/components/Navbar.vue

@@ -283,8 +283,7 @@ async function handleOrgSwitch(val) {
   }).then(async () => {
     try {
       await switchOrg(val);
-      permissionStore.setRoutes([]);
+      location.reload();
-      router.replace({path: '/redirect' + route.path});
     } catch (e) {
       // ignore
     }

openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientList.vue

@@ -66,7 +66,7 @@ watch(
     queryParams.value.searchKey = newValue;
     getList();
   },
-  { immdiate: true }
+  { immediate: true }
 );
 
 getList();
@@ -77,8 +77,8 @@ function getList() {
   });
 }
 
-function clickRow(row) {
+function clickRow(params) {
-  emit("selsectPatient", row);
+  emit("selsectPatient", params.row);
 }
 </script>
       

openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue

@@ -2065,8 +2065,8 @@ function loadCheckInPatientList() {
 }
 
 /** 弹窗行点击处理 */
-function selectRow(row) {
+function selectRow(params) {
-  selectedCheckInPatient.value = row;
+  selectedCheckInPatient.value = params.row;
 }
 
 /** 确认签到（一键签到：直接构建挂号参数 → 预结算 → 弹收费窗口） */