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

This reverts commit 5946c1ea4b, reversing changes made to 8d905c9844.
2026-05-15 09:33:35 +08:00
parent 5946c1ea4b
commit 0aa7dd9b82
24 changed files with 172 additions and 335 deletions
--- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue
@@ -1,6 +1,5 @@
 <template>
-  <div class="fee-dialog-wrapper">
-    <el-dialog v-model="dialogVisible" title="补费" width="80%" :close-on-click-modal="false">
+  <el-dialog v-model="dialogVisible" title="补费" width="80%" :close-on-click-modal="false">
    <div style="font-size: 16px; font-weight: bold; margin-bottom: 10px">
      患者信息：{{
        props.patientInfo.patientName +
@@ -252,7 +251,7 @@
    </div>
  </el-dialog>
  <!-- 划价组套选择对话框 -->
-  <el-dialog v-model="groupSetDialogVisible" title="划价组套选择" width="600px" :close-on-click-modal="false" append-to-body :z-index="3000" destroy-on-close>
+  <el-dialog v-model="groupSetDialogVisible" title="划价组套选择" width="600px" :close-on-click-modal="false" append-to-body :z-index="3000">
    <div style="margin-bottom: 15px; display: flex; align-items: center; gap: 10px">
      <el-input
        v-model="groupSetSearchText"
@@ -303,7 +302,6 @@
      <el-button type="primary" @click="applyGroupSet" :disabled="!selectedGroupSet">应用</el-button>
    </div>
  </el-dialog>
-  </div>
 </template>

 <script setup>
@@ -521,28 +519,31 @@ watch(
  }
 );

-// 加载科室选项（递归扁平化树形结构）
+// 加载科室选项（支持树形/扁平两种数据结构）
 function loadDepartmentOptions() {
  getOrgList()
    .then((res) => {
-      if (!res?.data?.records?.length) {
-        departmentOptions.value = [];
-        return;
-      }
-      // 递归扁平化树形结构，提取所有科室节点
-      const flattenTree = (nodes) => {
-        const result = [];
-        for (const node of nodes) {
-          if (node?.id && node?.name) {
-            result.push(node);
+      if (res.data) {
+        // 尝试从树形结构中取：records[0].children
+        if (res.data.records && res.data.records.length > 0) {
+          if (res.data.records[0].children && res.data.records[0].children.length > 0) {
+            departmentOptions.value = res.data.records[0].children;
+            return;
          }
-          if (node?.children?.length) {
-            result.push(...flattenTree(node.children));
+          // 如果 records[0] 有 id 和 name（非树根节点），直接用所有 records
+          if (res.data.records[0].id) {
+            departmentOptions.value = res.data.records;
+            return;
          }
        }
-        return result;
-      };
-      departmentOptions.value = flattenTree(res.data.records);
+        // 兜底：如果 records 不存在或为空，尝试直接使用 data 本身
+        if (Array.isArray(res.data)) {
+          departmentOptions.value = res.data;
+          return;
+        }
+      }
+      // 所有方式都失败，置空
+      departmentOptions.value = [];
    })
    .catch(() => {
      console.warn('科室列表加载失败（可能无权限）');
@@ -608,13 +609,13 @@ function getUnitCodeOptions(row) {
  const unitCodes = [];
  // 大单位：优先用 code，code 缺失时用字典文本兜底
  if (row.unitCode != null && String(row.unitCode) !== '') {
-    unitCodes.push({ code: String(row.unitCode), codeText: row.unitCode_dictText || String(row.unitCode) });
+    unitCodes.push({ code: String(row.unitCode), codeText: row.unitCode_dictText });
  } else if (row.unitCode_dictText) {
    unitCodes.push({ code: row.unitCode_dictText, codeText: row.unitCode_dictText });
  }
  // 小单位：同上
  if (row.minUnitCode != null && String(row.minUnitCode) !== '') {
-    unitCodes.push({ code: String(row.minUnitCode), codeText: row.minUnitCode_dictText || String(row.minUnitCode) });
+    unitCodes.push({ code: String(row.minUnitCode), codeText: row.minUnitCode_dictText });
  } else if (row.minUnitCode_dictText) {
    unitCodes.push({ code: row.minUnitCode_dictText, codeText: row.minUnitCode_dictText });
  }
--- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue
@@ -241,8 +241,6 @@ const loading = ref(false);
 const chooseAll = ref(false);
 // 独立维护选中行ID集合，避免el-table内部selection状态异常导致联动全选
 const selectedRowIds = ref(new Set());
-// 跳过选中事件级联：程序化调用 toggleRowSelection 时阻止 handleRowSelect 触发 selectAllCheckboxesInRow
-const skipSelectCascade = ref(false);
 const props = defineProps({
  exeStatus: {
    type: Number,
@@ -486,13 +484,8 @@ function handleExecute() {
      if (hasServiceRequest) {
        // 仅传入选中医嘱对应的 encounterId，避免其他患者的耗材记录干扰
        const selectedEncounterIds = [...new Set(list.map((item) => item.encounterId).filter(Boolean))];
-        // 仅传入诊疗类医嘱的 requestId，让后端仅校验与本次执行相关的耗材，避免其他未执行医嘱的耗材记录干扰
-        const selectedRequestIds = list
-          .filter((item) => String(item.adviceTable || '') === 'wor_service_request')
-          .map((item) => item.requestId)
-          .filter(Boolean);
        if (selectedEncounterIds.length > 0) {
-          lotNumberMatch({ encounterIdList: selectedEncounterIds, requestIdList: selectedRequestIds }, { skipErrorMsg: true })
+          lotNumberMatch({ encounterIdList: selectedEncounterIds }, { skipErrorMsg: true })
            .then((matchRes) => {
              if (matchRes && matchRes.code !== 200) {
                console.warn('lotNumberMatch returned error:', matchRes.msg);
@@ -657,7 +650,6 @@ function handleRateChange(value, date, time, row, rateItem) {
 }

 function handelSwicthChange(value) {
-  skipSelectCascade.value = true;
  prescriptionList.value.forEach((item, index) => {
    const tableRef = proxy.$refs['tableRef' + index];
    if (tableRef && tableRef[0]) {
@@ -678,15 +670,12 @@ function handelSwicthChange(value) {
      }
    }
  });
-  skipSelectCascade.value = false;
 }

 // 默认选中全部行
 function defaultSelectAllRows() {
  // 清空并重建选中集合
  selectedRowIds.value.clear();
-  // 阻止 toggleRowSelection 触发 handleRowSelect 中的 selectAllCheckboxesInRow 级联
-  skipSelectCascade.value = true;
  prescriptionList.value.forEach((item, index) => {
    const tableRef = proxy.$refs['tableRef' + index];
    if (tableRef && tableRef[0]) {
@@ -699,7 +688,6 @@ function defaultSelectAllRows() {
      });
    }
  });
-  skipSelectCascade.value = false;
  // 更新全选开关状态
  chooseAll.value = true;
 }
@@ -776,7 +764,6 @@ function checkAndToggleRowSelection(row) {
        const isCurrentlySelected = selectedRowIds.value.has(row.requestId);

        // 根据checkbox状态更新表格行选中状态
-        skipSelectCascade.value = true;
        if (isAllSelected && !isCurrentlySelected) {
          selectedRowIds.value.add(row.requestId);
          tableRef[0].toggleRowSelection(row, true);
@@ -784,7 +771,6 @@ function checkAndToggleRowSelection(row) {
          selectedRowIds.value.delete(row.requestId);
          tableRef[0].toggleRowSelection(row, false);
        }
-        skipSelectCascade.value = false;
      }
    }
  });
@@ -796,10 +782,8 @@ function handleRowSelect(selection, row, tableIndex) {

  if (isSelected) {
    selectedRowIds.value.add(row.requestId);
-    // 仅在非程序化选中时，联动选中该行内部的所有checkbox
-    if (!skipSelectCascade.value) {
-      selectAllCheckboxesInRow(row);
-    }
+    // 选中行时，选中该行内部的所有checkbox
+    selectAllCheckboxesInRow(row);
  } else {
    selectedRowIds.value.delete(row.requestId);
    // 取消选中行时，取消选中该行内部的所有checkbox