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

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

@@ -283,8 +283,7 @@ async function handleOrgSwitch(val) {
   }).then(async () => {
     try {
       await switchOrg(val);
-      permissionStore.setRoutes([]);
-      router.replace({path: '/redirect' + route.path});
+      location.reload();
     } 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) {
-  emit("selsectPatient", row);
+function clickRow(params) {
+  emit("selsectPatient", params.row);
 }
 </script>
       

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

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