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

2026-01-28 14:29:29 +08:00
parent 0cecf3bcad b8d7e3cdf1
commit 81cc8b08a0
42 changed files with 1389 additions and 563 deletions
--- a/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/history.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/components/history.vue
@@ -42,7 +42,6 @@ import {defineEmits, ref, unref} from 'vue';
 import {deleteRecord, getRecordByEncounterIdList} from '../api';
 import {ElMessage} from 'element-plus';
 import {patientInfo} from '../../store/patient.js';
-import apiRequestManager from '@/utils/apiRequestManager.js';

 const emits = defineEmits(['historyClick']);
 const props = defineProps({
@@ -68,30 +67,15 @@ const queryParams = ref({
  isPage: 0,
 });
 const historyData = ref([]);
-// 防止重复加载的标志
-let isLoadingHistory = false;
-
 const queryList = async () => {
-  // 防止重复加载
-  if (isLoadingHistory) {
-    console.log('History data is already loading, skipping duplicate call');
-    return;
-  }
-
-  isLoadingHistory = true;
-
  try {
    if (patientInfo.value.encounterId && unref(definitionId) && unref(definitionId) !== '') {
-      const res = await apiRequestManager.execute(
-        getRecordByEncounterIdList,
-        '/document/record/getRecordByEncounterIdList',
-        {
-          isPage: 0, // 确保参数一致，便于去重
-          encounterId: patientInfo.value.encounterId,
-          patientId: patientInfo.value.patientId,
-          definitionId: unref(definitionId),
-        }
-      );
+      const res = await getRecordByEncounterIdList({
+        ...queryParams.value,
+        encounterId: patientInfo.value.encounterId,
+        patientId: patientInfo.value.patientId,
+        definitionId: unref(definitionId),
+      });
      historyData.value = res.data || [];
    } else {
      historyData.value = [];
@@ -99,8 +83,6 @@ const queryList = async () => {
  } catch (error) {
    // ElMessage.error(' 获取模板树失败 ');
    historyData.value = [];
-  } finally {
-    isLoadingHistory = false; // 重置加载标志
  }
 };
 const handleNodeClick = (data) => {
--- a/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/index.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/hospitalizationEmr/index.vue
@@ -103,7 +103,6 @@ import dayjs from 'dayjs';
 // 打印工具
 import {PRINT_TEMPLATE, simplePrint} from '@/utils/printUtils.js';
 import {getEncounterDiagnosis} from '../api';
-import apiRequestManager from '@/utils/apiRequestManager.js';
 import History from './components/history';
 import Template from './components/template';
 import TemplateEdit from './components/templateEdit.vue';
@@ -206,7 +205,7 @@ const handleNodeClick = (data, node) => {

      // 选择任何病历模板后，都加载该病历类型的最新历史记录
      if (node.isLeaf && props.patientInfo && props.patientInfo.patientId) {
-        debouncedLoadLatestMedicalRecord();
+        loadLatestMedicalRecord();
      }
    }, 100);
  });
@@ -280,7 +279,7 @@ const handleSubmitOk = async (data) => {

      // 等待历史记录列表更新后，重新加载最新病历并更新选中状态
      setTimeout(() => {
-        debouncedLoadLatestMedicalRecord();
+        loadLatestMedicalRecord();
      }, 100);
    } catch (error) {
      ElMessage.error('提交失败');
@@ -411,7 +410,7 @@ const selectOutpatientMedicalRecordTemplate = async () => {
      // 等待模板加载完成，然后获取并回显最新病历数据
      setTimeout(() => {
        historyRef.value?.queryList();
-        debouncedLoadLatestMedicalRecord();
+        loadLatestMedicalRecord();
      }, 500);
    });
  } else {
@@ -422,36 +421,19 @@ const selectOutpatientMedicalRecordTemplate = async () => {
 // 当前选中的历史病历ID，用于在History组件中高亮显示
 const selectedHistoryRecordId = ref('');

-import { debounce } from 'lodash-es';
-
-// 防止重复加载的标志
-let isLoadingLatestRecord = false;
-
 // 加载最新的病历数据并回显
 const loadLatestMedicalRecord = async () => {
  if (!patientInfo.value.encounterId || !currentSelectTemplate.value.id) return;

-  // 防止重复加载
-  if (isLoadingLatestRecord) {
-    console.log('Latest medical record is already loading, skipping duplicate call');
-    return;
-  }
-
-  isLoadingLatestRecord = true;
  loading.value = true;
-
  try {
    // 获取患者的历史病历记录
-    const res = await apiRequestManager.execute(
-      getRecordByEncounterIdList,
-      '/document/record/getRecordByEncounterIdList',
-      {
-        isPage: 0,
-        encounterId: patientInfo.value.encounterId,
-        patientId: patientInfo.value.patientId,
-        definitionId: currentSelectTemplate.value.id,
-      }
-    );
+    const res = await getRecordByEncounterIdList({
+      isPage: 0,
+      encounterId: patientInfo.value.encounterId,
+      patientId: patientInfo.value.patientId,
+      definitionId: currentSelectTemplate.value.id,
+    });

    const historyRecords = res.data || [];
    if (historyRecords.length > 0) {
@@ -537,12 +519,8 @@ const loadLatestMedicalRecord = async () => {
    });
  } finally {
    loading.value = false;
-    isLoadingLatestRecord = false; // 重置加载标志
  }
 };
-
-// 防抖版本的加载最新病历数据函数
-const debouncedLoadLatestMedicalRecord = debounce(loadLatestMedicalRecord, 300);
 const templateRef = ref(null);

 const handleTemplateClick = (data) => {
@@ -772,7 +750,7 @@ const selectDefaultTemplate = () => {

        // 直接加载最新病历数据，不再使用额外的setTimeout延迟
        // 因为handleNodeClick中已经有nextTick和setTimeout处理组件渲染
-        debouncedLoadLatestMedicalRecord();
+        loadLatestMedicalRecord();
      });
    } else {
      console.log('未找到门诊病历模板');
--- a/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
@@ -59,8 +59,8 @@
        </el-table-column>
        <el-table-column label="操作" width="120" align="center">
          <template #default="scope">
-            <el-button type="text" size="small" @click="handlePrint(scope.row)">打印</el-button>
-            <el-button type="text" size="small" style="color: #f56c6c" @click="handleDelete(scope.row)">删除</el-button>
+            <el-button link size="small" @click="handlePrint(scope.row)">打印</el-button>
+            <el-button link size="small" style="color: #f56c6c" @click="handleDelete(scope.row)">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -379,7 +379,7 @@
          <!-- 标题栏 -->
          <div class="selected-header" style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 15px; padding-bottom: 10px; border-bottom: 1px solid #eee;">
            <span style="font-weight: bold; color: #1a2b6d">已选择</span>
-            <el-button type="text" @click="clearAllSelected" style="color: #f56c6c">清空</el-button>
+            <el-button link @click="clearAllSelected" style="color: #f56c6c">清空</el-button>
          </div>

          <!-- 已选项目列表 -->
@@ -393,7 +393,7 @@
                <span class="item-itemName">{{ item.itemName }}</span>
                <span class="item-price">¥{{ item.itemPrice }}</span>
                <el-button
-                  type="text"
+                  link
                  size="small"
                  style="color: #f56c6c; margin-left: auto"
                  @click="removeInspectionItem(item)"