- {{ props.pendingInfo.houseName + '-' + props.pendingInfo.bedName }}
+ {{ (props.pendingInfo.houseName || '-') + '-' + (props.pendingInfo.bedName || '-') }}
{{ props.pendingInfo.contractName }}
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferOut.vue b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferOut.vue
index ec839344..2b3c3985 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferOut.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferOut.vue
@@ -746,25 +746,42 @@ function handleGetDRMedication() {
});
}
-const initData = () => {
- getInit().then((res) => {
- initInfoOptions.value = res.data;
+const initData = async () => {
+ try {
+ // 并行获取初始化数据和科室数据
+ const [initRes, wardRes] = await Promise.all([
+ getInit(),
+ getPractitionerWard()
+ ]);
+
+ // 处理初始化数据
+ initInfoOptions.value = initRes.data;
+
+ // 处理科室数据
+ queryParams.value.wardId = wardRes[0]?.id || '';
+ initInfoOptions.value.wardListOptions = wardRes;
+
+ // 获取病房数据
+ if (wardRes[0]?.id) {
+ changeWardLocationId(wardRes[0].id);
+ }
+
+ // 最后获取患者列表
getPatientList();
- });
- getPractitionerWard().then((res) => {
- queryParams.value.wardId = res[0].id;
- initInfoOptions.value.wardListOptions = res;
- changeWardLocationId(res[0].id);
- });
+ } catch (error) {
+ console.error('初始化数据失败:', error);
+ // 即使初始化失败，也要尝试加载患者列表
+ getPatientList();
+ }
};
// 初始化加载患者列表
-onMounted(() => {
- initData();
+onMounted(async () => {
+ await initData();
});
-const refreshTap = () => {
- console.log('22222223');
- initData();
+const refreshTap = async () => {
+ console.log('刷新转科/出院页面数据');
+ await initData();
};
defineExpose({ refreshTap });
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/inOut/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/inOut/index.vue
index 214adfba..e750de3f 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/inOut/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/index.vue
@@ -44,16 +44,15 @@ const thirdRef = ref();
onBeforeMount(() => {});
onMounted(() => {});
defineExpose({ state });
-const test = () => {
- nextTick(() => {
- if (activeTabName.value == 'first') {
- firstRef?.value?.refreshTap();
- } else if (activeTabName.value == 'second') {
- secondRef?.value?.refreshTap();
- } else if (activeTabName.value == 'third') {
- thirdRef?.value?.refreshTap();
- }
- });
+const test = async () => {
+ await nextTick();
+ if (activeTabName.value == 'first') {
+ await firstRef?.value?.refreshTap();
+ } else if (activeTabName.value == 'second') {
+ await secondRef?.value?.refreshTap();
+ } else if (activeTabName.value == 'third') {
+ await thirdRef?.value?.refreshTap();
+ }
};
const activeTabName = ref('first');
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/nursingstatistics/operationrecord.vue b/openhis-ui-vue3/src/views/inpatientNurse/nursingstatistics/operationrecord.vue
index 85432de3..8b290748 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/nursingstatistics/operationrecord.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/nursingstatistics/operationrecord.vue
@@ -496,7 +496,7 @@ const dateChange = () => {
};
// 计算时间
rulesFrom.value.recordTime = computed(() => {
- console.log('11111111111111');
+ console.log('操作记录时间计算', rulesFrom.value.date + ' ' + rulesFrom.value.time);
return rulesFrom.value.date + ' ' + rulesFrom.value.time;
});
diff --git a/openhis-ui-vue3/src/views/inpatientNurse/tprChart/index.vue b/openhis-ui-vue3/src/views/inpatientNurse/tprChart/index.vue
index 782f7da2..ea03f1f9 100644
--- a/openhis-ui-vue3/src/views/inpatientNurse/tprChart/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/tprChart/index.vue
@@ -274,7 +274,7 @@ function init1(data) {
* 点击患者列表行 获取患者体温单数据
*/
function viewPatient(row) {
- console.log('1232312123221231');
+ console.log('查看患者体温单数据', row.patientName);
patientInfo.value = row;
console.log('点击患者列表行 获取患者体温单数据', row);
diff --git a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue
index 389c139c..be7df767 100644
--- a/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/medicationDetails.vue
@@ -557,7 +557,7 @@ watch(
queryParams.value.dispenseTimeETime = newQuery.occurrenceTimeETime + ' 23:59:59';
}
queryParams.value.flag = 1;
- console.log('11111111111111');
+ console.log('药品明细查询参数已设置完成');
// 执行查询
getList();
diff --git a/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue b/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
index f0c81478..6078292c 100644
--- a/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
+++ b/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
@@ -218,7 +218,7 @@ watch(
if (currentMonth < birthMonth || (currentMonth === birthMonth && currentDay < birthDay)) {
age--;
}
- console.log('22222222');
+ console.log('计算患者年龄完成:', age);
form.value.age = age;
}