403 住院医生工作站：应用医嘱组套后，药品明细字段内容丢失未正确引入表格 521 [住院医生站-临床医嘱-检查申请] 手工选择执行科室后，保存仍提示“未找到项目执行的科室” 528 [住院医生工作站-检查申请] 修改申请单成功后，弹窗未自动关闭且列表数据未自动刷新 531 [住院医生站-临床医嘱-检查] 检查申请单打开数据没有正常加载

2026-05-15 14:20:30 +08:00
parent 12d0733c0c
commit e65f12125b
12 changed files with 269 additions and 138 deletions
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
@@ -220,6 +220,7 @@
        :is-edit-mode="true"
        :edit-data="editingRow"
        :external-patient-info="patientInfo"
+        @submit-ok="handleEditSuccess"
      />
      <template #footer>
        <el-button @click="editDialogVisible = false">取消</el-button>
@@ -967,12 +968,17 @@ const handleEdit = (row) => {

 // 编辑弹窗确认提交
 const handleEditSubmit = () => {
-  // 调用MedicalExaminations组件的submit方法
  if (editFormRef.value?.submit) {
    editFormRef.value.submit();
  }
 };

+// 编辑保存成功回调：关闭弹窗并刷新列表
+const handleEditSuccess = () => {
+  editDialogVisible.value = false;
+  fetchData();
+};
+
 watch(
  () => patientInfo.value?.encounterId,
  (val) => {
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/api.js
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/api.js
@@ -10,6 +10,15 @@ export function getSurgeryPage(params) {
  });
 }

+// 检查项目专用分页查询（仅检查(23) + 定价，绕过 AOP 校验提升加载速度）
+export function getExaminationPage(params) {
+  return request({
+    url: '/doctor-station/advice/examination-page',
+    method: 'get',
+    params: params,
+  });
+}
+
 //医嘱大下拉
 export function getApplicationList(queryParams) {
  return request({
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue
@@ -206,7 +206,7 @@ import dayjs from 'dayjs';
 import {patientInfo} from '../../../store/patient.js';
 import {getDepartmentList} from '@/api/public.js';
 import {getEncounterDiagnosis} from '../../api.js';
-import {getApplicationList, saveCheckd} from './api';
+import {getExaminationPage, saveCheckd} from './api';
 import {ElMessage, ElMessageBox} from 'element-plus';
 import {WarningFilled, Warning, Refresh, Files, Document, EditPen, Aim, DocumentCopy} from '@element-plus/icons-vue';

@@ -266,27 +266,23 @@ const isSevereAllergy = computed(() => {
 });

 const getList = () => {
-  console.log('getList called, effectivePatientInfo:', effectivePatientInfo.value);
  if (!effectivePatientInfo.value?.inHospitalOrgId) {
-    console.log('inHospitalOrgId is missing, setting empty list');
    applicationList.value = [];
    return;
  }
  loading.value = true;
-  getApplicationList({
-    pageSize: 5000,
-    pageNum: 1,
-    categoryCode: '23',
+  getExaminationPage({
    organizationId: effectivePatientInfo.value.inHospitalOrgId,
-    adviceTypes: [3],
+    pageNo: 1,
+    pageSize: 5000,
+    searchKey: '',
  })
    .then((res) => {
-      if (res.code === 200) {
+      if (res.code === 200 && res.data?.records) {
        applicationListAll.value = res.data.records;
        applicationList.value = res.data.records.map((item) => {
-          const priceInfo = item.priceList?.[0] || {};
-          const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
-          const unit = item.unitCode_dictText || item.unitCode || '';
+          const price = item.price != null ? Number(item.price).toFixed(2) : '0.00';
+          const unit = item.unitCodeDictText || item.unitCode || '';
          return {
            adviceDefinitionId: item.adviceDefinitionId,
            orgId: item.orgId,
@@ -299,7 +295,6 @@ const getList = () => {
          nextTick(() => {
            // 使用 adviceName 匹配
            const selectedNames = props.editData.requestFormDetailList.map(item => item.adviceName);
-            console.log('getList completed, selectedNames:', selectedNames);
            const selectedIds = [];
            applicationList.value?.forEach(app => {
              // 匹配时去掉价格部分，只比较名称
@@ -308,7 +303,6 @@ const getList = () => {
                selectedIds.push(app.key);
              }
            });
-            console.log('getList completed, matched selectedIds:', selectedIds);
            transferValue.value = selectedIds;
          });
        }
@@ -404,13 +398,11 @@ const loadPatientAllergyHistory = () => {
  if (!effectivePatientInfo.value?.patientId) return;
 };

-// 加载编辑数据
+// 加载编辑数据 — 只负责解析 descJson 填充表单字段
+// 已选项目的匹配由 getList 数据加载完成后统一处理
 const loadEditData = () => {
  if (!props.isEditMode || !props.editData?.requestFormId) return;

-  console.log('loadEditData called, editData:', props.editData);
-
-  // 解析已有的descJson填充表单
  if (props.editData.descJson) {
    try {
      const obj = JSON.parse(props.editData.descJson);
@@ -431,91 +423,16 @@ const loadEditData = () => {
      console.error('解析descJson失败:', e);
    }
  }
-
-  // 设置已选项目（从requestFormDetailList获取）
-  // 注意：后端返回的字段是 adviceName，不是 adviceDefinitionId
-  console.log('requestFormDetailList:', props.editData.requestFormDetailList);
-  if (props.editData.requestFormDetailList && props.editData.requestFormDetailList.length) {
-    // 使用 adviceName 匹配
-    const selectedNames = props.editData.requestFormDetailList.map(item => item.adviceName);
-    console.log('setting transferValue by adviceName to:', selectedNames);
-    // 通过名称匹配找到对应的 key
-    const selectedIds = [];
-    applicationList.value?.forEach(app => {
-      if (selectedNames.includes(app.label?.split(' (')[0])) {
-        selectedIds.push(app.key);
-      }
-    });
-    console.log('matched selectedIds:', selectedIds);
-    transferValue.value = selectedIds;
-  } else {
-    console.log('requestFormDetailList is empty or undefined');
-  }
 };

-const projectWithDepartment = (selectProjectIds, type) => {
-  let isRelease = true;
-  const arr = [];
-  // 确保 applicationList 存在
-  if (!applicationList.value || !Array.isArray(applicationList.value)) {
-    return true;
-  }
-  selectProjectIds.forEach((element) => {
-    const searchData = applicationList.value.find((item) => {
-      return element == item.adviceDefinitionId;
-    });
-    arr.push(searchData);
-  });
-  // 只有当选择了项目（arr 非空）时才设置 targetDepartment
-  if (arr.length > 0) {
-    const obj = arr[0];
-    // 检查是否有未定义的项目（applicationList 中找不到）
-    if (!obj) {
-      console.warn('未找到项目定义，无法设置执行科室');
-      return false;
-    }
-    const isCompare = arr.every((item) => item && item.orgId == obj.orgId);
-    if (!isCompare) {
-      ElMessage({ type: 'error', message: '执行科室不同' });
-      isRelease = false;
-    }
-    const findItem = findTreeItem(orgOptions.value, obj.orgId);
-    if (!findItem) {
-      isRelease = false;
-      ElMessage({ type: 'error', message: '未找到项目执行的科室' });
-    }
-    if (type == 1 && isRelease) {
-      form.targetDepartment = findItem.id;
-      console.log('targetDepartment 设置为:', form.targetDepartment, '科室名称:', findItem.name);
-    }
-  } else {
-    // 清空选择时，也要清空 targetDepartment
+const projectWithDepartment = (selectProjectIds) => {
+  if (!selectProjectIds || selectProjectIds.length === 0) {
    form.targetDepartment = '';
  }
-  return isRelease;
 };

 watch(() => transferValue.value, (newValue) => {
-  console.log('transferValue changed:', newValue);
-  console.log('applicationList length:', applicationList.value?.length);
-  projectWithDepartment(newValue, 1);
-});
-
-// 监听 applicationList 加载完成，重新设置已选项目
-watch(() => applicationList.value, (newList) => {
-  if (newList && newList.length > 0 && props.isEditMode && props.editData?.requestFormDetailList?.length) {
-    console.log('applicationList loaded, re-setting transferValue');
-    // 使用 adviceName 匹配
-    const selectedNames = props.editData.requestFormDetailList.map(item => item.adviceName);
-    const selectedIds = [];
-    newList.forEach(app => {
-      const appName = app.label?.split(' (')[0];
-      if (selectedNames.includes(appName)) {
-        selectedIds.push(app.key);
-      }
-    });
-    transferValue.value = selectedIds;
-  }
+  projectWithDepartment(newValue);
 });

 const getPriorityCode = () => {
@@ -526,8 +443,8 @@ const submit = () => {
  if (transferValue.value.length == 0) {
    return proxy.$message.error('请选择检查项目');
  }
-  if (!projectWithDepartment(transferValue.value, 2)) {
-    return;
+  if (!form.targetDepartment) {
+    return proxy.$message.error('请选择发往科室');
  }
  if (!form.examinationPurpose) {
    return ElMessageBox.alert('请输入检查目的', '提示', { confirmButtonText: '确定', type: 'warning' });
@@ -545,20 +462,22 @@ const submit = () => {
  // 从原始记录中提取检查项目名称，用于申请单名称字段
  const selectedNames = applicationListAllFilter.map(item => item.adviceName).join('+');
  applicationListAllFilter = applicationListAllFilter.map((item) => {
+    // 新接口 getExaminationPage 返回扁平字段（price/unitCode），兼容旧接口 priceList[0]
+    const priceInfo = item.priceList?.[0] || {};
    return {
      adviceDefinitionId: item.adviceDefinitionId,
      adviceName: item.adviceName,
      quantity: 1,
-      unitCode: item.priceList[0].unitCode,
-      unitPrice: item.priceList[0].price,
-      totalPrice: item.priceList[0].price,
+      unitCode: item.unitCode || priceInfo.unitCode || '',
+      unitPrice: item.price ?? priceInfo.price ?? 0,
+      totalPrice: item.price ?? priceInfo.price ?? 0,
      positionId: item.positionId,
      ybClassEnum: item.ybClassEnum,
      conditionId: item.conditionId,
      encounterDiagnosisId: item.encounterDiagnosisId,
      adviceType: item.adviceType,
-      definitionId: item.priceList[0].definitionId,
-      definitionDetailId: item.priceList[0].definitionDetailId,
+      definitionId: item.chargeItemDefinitionId || priceInfo.definitionId || '',
+      definitionDetailId: item.definitionDetailId || priceInfo.definitionDetailId || '',
      accountId: effectivePatientInfo.value.accountId,
    };
  });
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
@@ -1668,18 +1668,27 @@ function handleSaveGroup(orderGroupList) {
    const baseRow = prescriptionList.value[rowIndex.value];
    const newRow = {
      ...baseRow,
+      isEdit: false,
      patientId: patientInfo.value.patientId,
      encounterId: patientInfo.value.encounterId,
      accountId: accountId.value,
      executeNum: 1,
      statusEnum: 1,
-      orgId: resolveOrgId(item.orderDetailInfos?.orgId || mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || '',
-      // 🔧 修复：同时保存 orgName，确保树匹配不到时仍有中文名称可显示
-      orgName: findOrgName(item.orderDetailInfos?.orgId || mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || item.orderDetailInfos?.orgName || mergedDetail.orgName || patientInfo.value?.inHospitalOrgName || '',
+      orgId: resolveOrgId(
+        (item.orderDetailInfos?.orgId || mergedDetail.orgId)
+          ? (item.orderDetailInfos?.orgId || mergedDetail.orgId)
+          : patientInfo.value?.inHospitalOrgId
+      ) || '',
+      orgName: findOrgName(
+        (item.orderDetailInfos?.orgId || mergedDetail.orgId)
+          ? (item.orderDetailInfos?.orgId || mergedDetail.orgId)
+          : patientInfo.value?.inHospitalOrgId
+      ) || item.orderDetailInfos?.orgName || mergedDetail.orgName || patientInfo.value?.inHospitalOrgName || '',
      dbOpType: prescriptionList.value[rowIndex.value].requestId ? '2' : '1',
      conditionId: conditionId.value,
      conditionDefinitionId: conditionDefinitionId.value,
      encounterDiagnosisId: encounterDiagnosisId.value,
+      diagnosisName: diagnosisName.value,
      therapyEnum: baseRow?.therapyEnum || '1',
    };
    // 覆盖关键字段：优先使用 item 的值，其次 mergedDetail（已由 setValue 填充），最后 baseRow
@@ -1691,6 +1700,16 @@ function handleSaveGroup(orderGroupList) {
    newRow.doseQuantity = item.doseQuantity ?? mergedDetail.doseQuantity ?? baseRow.doseQuantity;
    newRow.unitCode = item.unitCode ?? mergedDetail.unitCode ?? baseRow.unitCode;
    newRow.unitCode_dictText = item.unitCodeName || mergedDetail.unitCodeName || baseRow.unitCode_dictText || '';
+    // 确保价格字段有兜底值（setValue 可能因库存不足提前 return 导致未设置）
+    newRow.unitPrice = baseRow.unitPrice ?? mergedDetail.unitPrice ?? 0;
+    newRow.minUnitPrice = baseRow.minUnitPrice ?? mergedDetail.minUnitPrice ?? 0;
+    newRow.unitTempPrice = newRow.unitPrice;
+    newRow.methodCode_dictText = mergedDetail.methodCode_dictText || item.methodCode_dictText || '';
+    newRow.rateCode_dictText = mergedDetail.rateCode_dictText || item.rateCode_dictText || '';
+    newRow.doseUnitCode = mergedDetail.doseUnitCode || item.doseUnitCode || baseRow.doseUnitCode;
+    newRow.doseUnitCode_dictText = mergedDetail.doseUnitCode_dictText || item.doseUnitCode_dictText || '';
+    newRow.orgId = mergedDetail.orgId || mergedDetail.positionId || baseRow.orgId || '';
+    newRow.positionName = mergedDetail.orgName || mergedDetail.positionName || baseRow.positionName || '';

    // 计算价格和总量
    // 🔧 Bug #403 修复：使用 newRow.unitCode（已由 setValue 填充）而非 item.unitCode