Fix Bug #505 : 【业务逻辑缺陷】药品医嘱已由药房发药，护士仍能在"医嘱校对"模块执行"退回"操作

前后端双重校验防止已发药医嘱被退回： 1. 后端 InpatientAdviceDto 新增 dispenseStatus 字段，Mapper SQL LEFT JOIN med_medication_dispense 获取发药状态 2. 后端 adviceReject 方法增加前置校验，已发药(COMPLETED)的医嘱直接拒绝退回 3. 前端 prescriptionList.vue handleCancel 方法增加 dispenseStatus 校验，已发药医嘱点击退回时弹窗提示
Fix Bug #501 : 【住院护士站-医嘱执行】医嘱执行页面点击“取消执行”报错
2026-05-10 11:17:10 +08:00 · 2026-05-10 11:17:10 +08:00 · 2026-05-10 11:17:10 +08:00 · 2026-05-10 11:01:17 +08:00 · 2026-05-10 10:59:30 +08:00 · 2026-05-10 10:58:20 +08:00
10 changed files with 437 additions and 13 deletions
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
@@ -206,6 +206,8 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
            e.setTherapyEnum_enumText(EnumUtils.getInfoByValue(TherapyTimeType.class, e.getTherapyEnum()));
            // 请求状态
            e.setRequestStatus_enumText(EnumUtils.getInfoByValue(RequestStatus.class, e.getRequestStatus()));
+            // 发药状态
+            e.setDispenseStatus_enumText(EnumUtils.getInfoByValue(DispenseStatus.class, e.getDispenseStatus()));
            // 性别枚举
            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
            // 计算年龄
@@ -356,6 +358,17 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                medRequestList.add(item);
            }
        }
+        // 校验药品医嘱是否已发药，已发药的医嘱不允许退回
+        if (!medRequestList.isEmpty()) {
+            List<Long> medReqIds = medRequestList.stream().map(PerformInfoDto::getRequestId).toList();
+            List<MedicationDispense> dispenseList = medicationDispenseService.list(
+                    new LambdaQueryWrapper<MedicationDispense>()
+                            .in(MedicationDispense::getMedReqId, medReqIds)
+                            .eq(MedicationDispense::getStatusEnum, DispenseStatus.COMPLETED.getValue()));
+            if (!dispenseList.isEmpty()) {
+                return R.fail("该医嘱已发药，无法退回");
+            }
+        }
        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
        Date checkDate = new Date();
        if (!serviceRequestList.isEmpty()) {
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java
@@ -255,4 +255,8 @@ public class InpatientAdviceDto {

    /** 总价 */
    private BigDecimal totalPrice;
+
+    /** 发药状态 */
+    private Integer dispenseStatus;
+    private String dispenseStatus_enumText;
 }
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
@@ -153,7 +153,8 @@
           ii.balance_amount AS balance_amount,
           ii.account_id AS account_id,
           ii.performer_check_id,
-           ii.category_code
+           ii.category_code,
+           ii.dispense_status
    FROM (( SELECT T1.encounter_id,
                   T1.tenant_id,
                   #{medMedicationRequest} AS advice_table,
@@ -197,7 +198,8 @@
                   pra."name" AS admitting_doctor_name,
                   personal_account.balance_amount,
                   personal_account.id AS account_id,
-                   T2.category_code
+                   T2.category_code,
+                   mmd.status_enum AS dispense_status
            FROM med_medication_request AS T1
                     LEFT JOIN med_medication_definition AS T2
                               ON T2.id = T1.medication_id
@@ -278,6 +280,9 @@
                                         aa.balance_amount
                           ) AS personal_account
                              ON personal_account.encounter_id = ae.id
+                     LEFT JOIN med_medication_dispense mmd
+                               ON mmd.med_req_id = T1.id
+                                   AND mmd.delete_flag = '0'
                WHERE T1.delete_flag = '0'
                AND T1.refund_medicine_id IS NULL
                AND T1.generate_source_enum = #{doctorPrescription}
@@ -331,7 +336,8 @@
                   pra."name" AS admitting_doctor_name,
                   personal_account.balance_amount,
                   personal_account.id AS account_id,
-                   T2.category_code
+                   T2.category_code,
+                   NULL AS dispense_status
            FROM wor_service_request AS T1
                     LEFT JOIN wor_activity_definition AS T2
                               ON T2.id = T1.activity_id
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
@@ -105,6 +105,8 @@
                         <if test="statusEnum == 4">
                             T4.status_enum = #{completed}
                         </if>
+                         AND T4.summary_no IS NOT NULL
+                         AND T4.summary_no != ''
        ) AS ii
        ${ew.customSqlSegment}
        GROUP BY ii.encounter_id,
@@ -263,6 +265,8 @@
        AND T15.delete_flag = '0'
        WHERE T1.delete_flag = '0'
        -- 因发药配药合并，前台只能看到待发药，已发药状态，但是后台配药发药状态都查
+        AND T1.summary_no IS NOT NULL
+        AND T1.summary_no != ''
        AND
        <if test="dispenseStatus == null">
            T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared})
--- a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
@@ -314,6 +314,7 @@
                >
                  <template #title>
                    <span class="cat-title">{{ cat.categoryName }}</span>
+                    <span v-if="categoryLoadingSet.has(cat.typeId)" class="loading-dot"></span>
                  </template>
                  <div
                    v-for="item in cat.items"
@@ -329,6 +330,9 @@
                    </el-checkbox>
                    <span class="item-price">¥{{ item.price }}/{{ item.unit || "次" }}</span>
                  </div>
+                  <div v-if="categoryLoadingSet.has(cat.typeId)" class="category-loading-hint">
+                    加载中...
+                  </div>
                </el-collapse-item>
              </el-collapse>
            </div>
@@ -517,6 +521,7 @@ const rules = {
 const categoryList = ref([]);   // 原始分类+项目数据
 const dictSearchKey = ref('');
 const activeNames = ref('');    // 当前展开的折叠项
+const categoryLoadingSet = ref(new Set());  // Bug #500: 正在加载方法的分类集合

 const allMethods = ref([]);

@@ -632,9 +637,14 @@ const availableMethods = computed(() => {

 // 当可选方法列表改变时，如果当前选中的方法不在新列表中，则清空
 // #428: 分类展开时联动加载检查方法
+// Bug #500: 使用 categoryLoadingSet 替代 dictLoading，避免切换分类时整个区域闪烁
 async function handleCategoryExpand(cat) {
  if (!cat || !cat.typeName) return;

+  // 如果已加载过或正在加载中，跳过
+  if ((cat.methods && cat.methods.length > 0) || categoryLoadingSet.value.has(cat.typeId)) return;
+
+  categoryLoadingSet.value.add(cat.typeId);
  try {
    const res = await searchCheckMethod({ checkType: cat.typeName });
    let data = res?.data?.data || res?.data || res?.rows || res;
@@ -655,14 +665,16 @@ async function handleCategoryExpand(cat) {
    }
  } catch (err) {
    console.error('加载分类检查方法失败', err);
+  } finally {
+    categoryLoadingSet.value.delete(cat.typeId);
  }
 }
-async function handleCollapseChange(activeName) {
-  // 当折叠面板展开时，加载对应分类的检查方法
+// Bug #500: 改为非 async 函数，避免 el-collapse 的 @change 等待异步完成导致抖动
+function handleCollapseChange(activeName) {
  if (activeName) {
    const cat = filteredCategoryList.value.find(c => c.typeId == activeName);
    if (cat && (!cat.methods || cat.methods.length === 0)) {
-      await handleCategoryExpand(cat);
+      handleCategoryExpand(cat);  // 异步加载，不 await
    }
  }
 }
@@ -1309,6 +1321,20 @@ defineExpose({ getList });
  font-weight: 500;
  color: #303133;
 }
+/* Bug #500: 分类加载中的小圆点动画 */
+.loading-dot {
+  display: inline-block;
+  width: 6px;
+  height: 6px;
+  border-radius: 50%;
+  background: #409eff;
+  margin-left: 6px;
+  animation: dotPulse 1s ease-in-out infinite;
+}
+@keyframes dotPulse {
+  0%, 100% { opacity: 0.3; transform: scale(0.8); }
+  50% { opacity: 1; transform: scale(1.2); }
+}
 .item-row {
  display: flex;
  align-items: center;
@@ -1448,10 +1474,24 @@ defineExpose({ getList });
  height: auto;
  line-height: 1.5;
 }
+/* Bug #500: 折叠内容添加平滑过渡动画，避免切换时高度跳变 */
 :deep(.el-collapse-item__content) {
  padding-bottom: 4px;
+  transition: all 0.3s ease;
 }
+/* Bug #500: 折叠面板展开/收起动画使用 will-change 优化性能 */
 :deep(.el-collapse-item__wrap) {
  border: none;
+  will-change: height;
+}
+:deep(.el-collapse-item) {
+  transition: margin 0.2s ease;
+}
+/* Bug #500: 分类加载中提示样式 */
+.category-loading-hint {
+  color: #909399;
+  font-size: 12px;
+  text-align: center;
+  padding: 8px 0;
 }
 </style>
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js
@@ -121,3 +121,25 @@ export function getTestResultPage(queryParams) {
    data: queryParams,
  });
 }
+
+/**
+ * 删除申请单（仅待签发状态可删除）
+ */
+export function deleteRequestForm(data) {
+  return request({
+    url: '/reg-doctorstation/request-form/delete',
+    method: 'post',
+    data: data,
+  });
+}
+
+/**
+ * 撤回申请单（已签发状态撤回至待签发）
+ */
+export function withdrawRequestForm(data) {
+  return request({
+    url: '/reg-doctorstation/request-form/withdraw',
+    method: 'post',
+    data: data,
+  });
+}
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
@@ -95,9 +95,49 @@
              <span>{{ parseStatus(scope.row.status) }}</span>
            </template>
          </el-table-column>
-          <el-table-column label="操作" align="center" fixed="right">
+          <el-table-column label="操作" align="center" fixed="right" width="240">
            <template #default="scope">
              <el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
+              <!-- 待签发：修改、删除 -->
+              <template v-if="scope.row.status === '0' || scope.row.status === 0">
+                <el-button link type="primary" @click="handleEdit(scope.row)">修改</el-button>
+                <el-popconfirm
+                  title="确认删除该申请单？"
+                  @confirm="handleDelete(scope.row)"
+                  width="200"
+                >
+                  <template #reference>
+                    <el-button link type="danger">删除</el-button>
+                  </template>
+                </el-popconfirm>
+              </template>
+              <!-- 已签发（护士未校对）：撤回 -->
+              <template v-else-if="scope.row.status === '1' || scope.row.status === 1">
+                <el-popconfirm
+                  title="确认撤回该申请单？撤回后将回滚至待签发状态"
+                  @confirm="handleWithdraw(scope.row)"
+                  width="260"
+                >
+                  <template #reference>
+                    <el-button link type="warning">撤回</el-button>
+                  </template>
+                </el-popconfirm>
+              </template>
+              <!-- 已校对/待接收：打印 -->
+              <template v-else-if="scope.row.status === '2' || scope.row.status === 2 || scope.row.status === '3' || scope.row.status === 3">
+                <el-button link type="primary" @click="handlePrint(scope.row)">打印</el-button>
+              </template>
+              <!-- 已接收/已检查：打印、看报告 -->
+              <template v-else-if="scope.row.status === '4' || scope.row.status === 4 || scope.row.status === '5' || scope.row.status === 5">
+                <el-button link type="primary" @click="handlePrint(scope.row)">打印</el-button>
+                <el-button link type="primary" @click="handleViewReport(scope.row)">看报告</el-button>
+              </template>
+              <!-- 已出报告：打印、看报告 -->
+              <template v-else-if="scope.row.status === '6' || scope.row.status === 6">
+                <el-button link type="primary" @click="handlePrint(scope.row)">打印</el-button>
+                <el-button link type="success" @click="handleViewReport(scope.row)">看报告</el-button>
+              </template>
+              <!-- 已作废：仅详情 -->
            </template>
          </el-table-column>
        </el-table>
@@ -169,6 +209,60 @@
        <el-button @click="detailDialogVisible = false">关闭</el-button>
      </template>
    </el-dialog>
+    <!-- 修改申请单弹窗 -->
+    <el-dialog
+      v-model="editDialogVisible"
+      title="修改检查申请"
+      width="800px"
+      destroy-on-close
+      top="5vh"
+      :close-on-click-modal="false"
+    >
+      <div v-if="editDetail" class="applicationShow-container">
+        <el-form :model="editForm" label-width="120px">
+          <el-form-item label="申请单名称">
+            <el-input v-model="editForm.name" />
+          </el-form-item>
+          <el-form-item label="临床诊断">
+            <el-input v-model="editForm.clinicalDiagnosis" type="textarea" :rows="2" />
+          </el-form-item>
+          <el-form-item label="注意事项">
+            <el-input v-model="editForm.attention" type="textarea" :rows="2" />
+          </el-form-item>
+          <div v-if="editDetail.requestFormDetailList && editDetail.requestFormDetailList.length">
+            <el-divider>申请项目</el-divider>
+            <el-table :data="editDetail.requestFormDetailList" border size="small">
+              <el-table-column type="index" label="序号" width="60" align="center" />
+              <el-table-column prop="adviceName" label="医嘱名称" />
+              <el-table-column prop="quantity" label="数量" width="80" align="center" />
+              <el-table-column prop="unitCode_dictText" label="单位" width="100" />
+              <el-table-column prop="totalPrice" label="总价" width="100" align="right" />
+            </el-table>
+          </div>
+        </el-form>
+      </div>
+      <template #footer>
+        <el-button @click="editDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleSaveEdit" :loading="saveLoading">保存</el-button>
+      </template>
+    </el-dialog>
+    <!-- 报告查看弹窗 -->
+    <el-dialog
+      v-model="reportDialogVisible"
+      title="检查报告"
+      width="900px"
+      destroy-on-close
+      top="5vh"
+      :close-on-click-modal="false"
+    >
+      <div v-if="reportUrl" style="min-height: 500px;">
+        <iframe :src="reportUrl" style="width: 100%; height: 500px; border: none;" />
+      </div>
+      <el-empty v-else description="暂无报告数据" />
+      <template #footer>
+        <el-button @click="reportDialogVisible = false">关闭</el-button>
+      </template>
+    </el-dialog>
  </div>
 </template>

@@ -176,7 +270,7 @@
 import {computed, getCurrentInstance, ref, watch} from 'vue';
 import {Refresh, Search} from '@element-plus/icons-vue';
 import {patientInfo} from '../../store/patient.js';
-import {getCheck} from './api';
+import {getCheck, deleteRequestForm, withdrawRequestForm, getTestResult} from './api';
 import {getOrgList} from '@/views/doctorstation/components/api.js';

 const { proxy } = getCurrentInstance();
@@ -188,6 +282,16 @@ const currentDetail = ref(null);
 const descJsonData = ref(null);
 const orgOptions = ref([]);

+// 修改申请单相关
+const editDialogVisible = ref(false);
+const editDetail = ref(null);
+const editForm = ref({});
+const saveLoading = ref(false);
+
+// 报告查看相关
+const reportDialogVisible = ref(false);
+const reportUrl = ref('');
+
 // 筛选表单数据
 const getDefaultDateRange = () => {
  const now = new Date();
@@ -364,6 +468,217 @@ const handleViewDetail = (row) => {
  detailDialogVisible.value = true;
 };

+/**
+ * 修改申请单
+ */
+const handleEdit = (row) => {
+  editDetail.value = row;
+  // 解析 descJson 为表单数据
+  const form = { name: row.name || '' };
+  if (row.descJson) {
+    try {
+      const desc = JSON.parse(row.descJson);
+      form.clinicalDiagnosis = desc.clinicalDiagnosis || '';
+      form.attention = desc.attention || '';
+      form.symptom = desc.symptom || '';
+      form.sign = desc.sign || '';
+    } catch (e) {
+      console.error('解析 descJson 失败:', e);
+    }
+  }
+  editForm.value = form;
+  editDialogVisible.value = true;
+};
+
+/**
+ * 保存修改
+ */
+const handleSaveEdit = async () => {
+  if (!editDetail.value?.requestFormId) {
+    proxy.$modal?.msgWarning?.('申请单ID不存在');
+    return;
+  }
+  saveLoading.value = true;
+  try {
+    // 复用 save-check 接口进行更新（传入 requestFormId 即为编辑场景）
+    const res = await proxy.$http?.post?.('/reg-doctorstation/request-form/save-check', {
+      requestFormId: editDetail.value.requestFormId,
+      encounterId: editDetail.value.encounterId,
+      patientId: editDetail.value.patientId,
+      name: editForm.value.name,
+      organizationId: editDetail.value.inHospitalOrgId || patientInfo.value?.inHospitalOrgId,
+      descJson: JSON.stringify({
+        clinicalDiagnosis: editForm.value.clinicalDiagnosis,
+        attention: editForm.value.attention,
+        symptom: editForm.value.symptom,
+        sign: editForm.value.sign,
+      }),
+      activityList: [], // 修改场景仅更新描述信息，不修改项目
+    });
+    if (res?.code === 200) {
+      proxy.$modal?.msgSuccess?.('修改成功');
+      editDialogVisible.value = false;
+      await fetchData();
+    } else {
+      proxy.$modal?.msgError?.(res?.msg || '修改失败');
+    }
+  } catch (e) {
+    console.warn('修改申请单失败:', e.message);
+    proxy.$modal?.msgError?.('修改失败: ' + (e.message || '网络异常'));
+  } finally {
+    saveLoading.value = false;
+  }
+};
+
+/**
+ * 删除申请单（仅待签发状态可删除）
+ */
+const handleDelete = async (row) => {
+  if (!row.requestFormId) {
+    proxy.$modal?.msgWarning?.('申请单ID不存在');
+    return;
+  }
+  try {
+    const res = await deleteRequestForm({ requestFormId: row.requestFormId });
+    if (res?.code === 200) {
+      proxy.$modal?.msgSuccess?.('删除成功');
+      await fetchData();
+    } else {
+      proxy.$modal?.msgError?.(res?.msg || '删除失败');
+    }
+  } catch (e) {
+    console.warn('删除申请单失败:', e.message);
+    proxy.$modal?.msgError?.('删除失败: ' + (e.message || '网络异常'));
+  }
+};
+
+/**
+ * 撤回申请单（已签发状态撤回至待签发）
+ */
+const handleWithdraw = async (row) => {
+  if (!row.requestFormId) {
+    proxy.$modal?.msgWarning?.('申请单ID不存在');
+    return;
+  }
+  try {
+    const res = await withdrawRequestForm({ requestFormId: row.requestFormId });
+    if (res?.code === 200) {
+      proxy.$modal?.msgSuccess?.('撤回成功');
+      await fetchData();
+    } else {
+      proxy.$modal?.msgError?.(res?.msg || '撤回失败');
+    }
+  } catch (e) {
+    console.warn('撤回申请单失败:', e.message);
+    proxy.$modal?.msgError?.('撤回失败: ' + (e.message || '网络异常'));
+  }
+};
+
+/**
+ * 打印申请单
+ */
+const handlePrint = (row) => {
+  // 打开新窗口进行打印
+  const printWindow = window.open('', '_blank');
+  if (!printWindow) {
+    proxy.$modal?.msgWarning?.('请允许浏览器弹出窗口以进行打印');
+    return;
+  }
+  const content = buildPrintContent(row);
+  printWindow.document.write(`
+    <!DOCTYPE html>
+    <html>
+    <head>
+      <meta charset="utf-8">
+      <title>检查申请单打印</title>
+      <style>
+        body { font-family: "Microsoft YaHei", sans-serif; padding: 20px; font-size: 14px; }
+        h2 { text-align: center; margin-bottom: 20px; }
+        table { width: 100%; border-collapse: collapse; margin-top: 10px; }
+        th, td { border: 1px solid #ddd; padding: 8px; text-align: left; }
+        th { background: #f5f5f5; }
+        .info-row { margin: 8px 0; }
+        .label { font-weight: bold; display: inline-block; width: 100px; }
+        @media print { .no-print { display: none; } }
+      </style>
+    </head>
+    <body>
+      ${content}
+      <div class="no-print" style="text-align: center; margin-top: 20px;">
+        <button onclick="window.print()">打印</button>
+        <button onclick="window.close()">关闭</button>
+      </div>
+    </body>
+    </html>
+  `);
+  printWindow.document.close();
+};
+
+/**
+ * 构建打印内容
+ */
+const buildPrintContent = (row) => {
+  let descHtml = '';
+  if (row.descJson) {
+    try {
+      const desc = JSON.parse(row.descJson);
+      descHtml = Object.entries(labelMap)
+        .filter(([key]) => desc[key])
+        .map(([key, label]) => `<div class="info-row"><span class="label">${label}:</span>${desc[key]}</div>`)
+        .join('');
+    } catch (e) {
+      console.error('解析 descJson 失败:', e);
+    }
+  }
+  let itemsHtml = '';
+  if (row.requestFormDetailList && row.requestFormDetailList.length) {
+    itemsHtml = `
+      <h3>申请项目</h3>
+      <table>
+        <tr><th>序号</th><th>医嘱名称</th><th>数量</th><th>单位</th><th>总价</th></tr>
+        ${row.requestFormDetailList.map((item, i) => `
+          <tr>
+            <td>${i + 1}</td>
+            <td>${item.adviceName || '-'}</td>
+            <td>${item.quantity || '-'}</td>
+            <td>${item.unitCode_dictText || '-'}</td>
+            <td>${item.totalPrice || '-'}</td>
+          </tr>
+        `).join('')}
+      </table>
+    `;
+  }
+  return `
+    <h2>检查申请单</h2>
+    <div class="info-row"><span class="label">患者姓名:</span>${row.patientName || '-'}</div>
+    <div class="info-row"><span class="label">申请单名称:</span>${row.name || '-'}</div>
+    <div class="info-row"><span class="label">创建时间:</span>${row.createTime || '-'}</div>
+    <div class="info-row"><span class="label">处方号:</span>${row.prescriptionNo || '-'}</div>
+    <div class="info-row"><span class="label">申请者:</span>${row.requesterId_dictText || '-'}</div>
+    <div class="info-row"><span class="label">申请单状态:</span>${parseStatus(row.status)}</div>
+    ${descHtml ? `<h3>申请单描述</h3>${descHtml}` : ''}
+    ${itemsHtml}
+  `;
+};
+
+/**
+ * 查看报告
+ */
+const handleViewReport = async (row) => {
+  reportUrl.value = '';
+  reportDialogVisible.value = true;
+  try {
+    const res = await getTestResult({ encounterId: row.encounterId, requestFormId: row.requestFormId });
+    if (res?.code === 200 && res?.data) {
+      reportUrl.value = res.data;
+    } else {
+      console.warn('获取检查报告失败:', res?.msg || '无数据');
+    }
+  } catch (e) {
+    console.warn('获取检查报告异常:', e.message);
+  }
+};
+
 watch(
  () => patientInfo.value?.encounterId,
  (val) => {
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/surgeryApplication.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/surgeryApplication.vue
@@ -195,8 +195,9 @@ const recursionFun = (targetDepartment) => {
      name = obj.name;
    }
    const subObjArray = obj['children'];
-    for (let index = 0; index < subObjArray.length; index++) {
-      const item = subObjArray[index];
+    if (!subObjArray) continue;
+    for (let i = 0; i < subObjArray.length; i++) {
+      const item = subObjArray[i];
      if (item.id == targetDepartment) {
        name = item.name;
      }
--- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue
@@ -67,6 +67,9 @@
        </el-button>
      </div>
    </div>
+  </div>
+</template>
+    </div>
    <div
      style="padding: 10px; background-color: #eef9fd; height: 100%; overflow-y: auto"
      v-loading="loading"
@@ -497,8 +500,15 @@ function handleCancel() {
  let list = getSelectRows();
  let producerIds = [];
  list.forEach((item) => {
+    // 从 exePerformRecordList 直接提取 procedureId，确保取消执行时数据完整
+    const procedureIds = (item.exePerformRecordList || []).map((record) => record.procedureId);
+    if (procedureIds.length === 0 && (!item.procedureIds || item.procedureIds.length === 0)) {
+      proxy.$modal.msgError('请选择已执行的医嘱记录');
+      return;
+    }
+    const ids = procedureIds.length > 0 ? procedureIds : item.procedureIds;
    producerIds.push(
-      ...item.procedureIds.map((value) => {
+      ...ids.map((value) => {
        return {
          procedureId: value,
          therapyEnum: item.therapyEnum,
@@ -506,6 +516,9 @@ function handleCancel() {
      })
    );
  });
+  if (producerIds.length === 0) {
+    return;
+  }
  adviceCancel({ adviceExecuteDetailList: producerIds }).then((res) => {
    if (res.code == 200) {
      proxy.$modal.msgSuccess(res.msg || '取消执行成功');
--- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue
@@ -288,6 +288,12 @@ function handleCheck() {
 function handleCancel() {
  let list = getSelectRows();
  if (list.length > 0) {
+    // 校验已发药的医嘱不允许退回
+    let dispensedItems = list.filter(item => item.dispenseStatus === 4);
+    if (dispensedItems.length > 0) {
+      proxy.$message.error('该医嘱已发药，无法退回');
+      return;
+    }
    cancel(list).then((res) => {
      if (res.code == 200) {
        proxy.$modal.msgSuccess(res.msg);
Author	SHA1	Message	Date
华佗	42b7d06636	Fix Bug #505 : 【业务逻辑缺陷】药品医嘱已由药房发药，护士仍能在"医嘱校对"模块执行"退回"操作前后端双重校验防止已发药医嘱被退回： 1. 后端 InpatientAdviceDto 新增 dispenseStatus 字段，Mapper SQL LEFT JOIN med_medication_dispense 获取发药状态 2. 后端 adviceReject 方法增加前置校验，已发药(COMPLETED)的医嘱直接拒绝退回 3. 前端 prescriptionList.vue handleCancel 方法增加 dispenseStatus 校验，已发药医嘱点击退回时弹窗提示	2026-05-10 11:17:10 +08:00
赵云	5c453a51bb	Fix Bug #501 : 【住院护士站-医嘱执行】医嘱执行页面点击“取消执行”报错	2026-05-10 11:17:10 +08:00
关羽	d0dd9195ad	Fix Bug #503 : 【住院发退药】发药明细与发药汇总单数据触发时机不一致，存在业务脱节风险在 selectEncounterInfoListPage 和 selectMedicineDispenseOrderPage 两个查询中增加 summary_no IS NOT NULL 过滤条件，使发药明细单仅在护士执行"汇总发药申请"后才显示记录，与发药汇总单保持一致的触发时机。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 11:17:10 +08:00
赵云	764befbf28	Fix Bug #500 : 【门诊医生站】检查申请右侧"检查项目分类"切换时，界面出现明显抖动/闪烁 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 11:01:17 +08:00
赵云	e4315cc54a	Fix Bug #498 : 【住院医生工作站-检查申请】检查申请列表操作项过于单一，缺失修改/作废/打印/看报告等核心临床操作 - 根据申请单状态动态展示操作按钮（详情/修改/删除/撤回/打印/看报告） - 待签发状态：显示修改、删除按钮 - 已签发状态：显示撤回按钮 - 已校对/待接收状态：显示打印按钮 - 已接收/已检查/已出报告状态：显示打印、看报告按钮 - 新增修改申请单弹窗和报告查看弹窗 - 新增删除、撤回申请单 API 调用 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 10:59:30 +08:00
赵云	32580b1a34	Fix Bug #501 : 【住院护士站-医嘱执行】医嘱执行页面点击"取消执行"报错取消执行时 procedureIds 数组可能为空导致后端 SQL 异常，改为从 exePerformRecordList 直接提取 procedureId，并增加空数据校验 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 10:58:20 +08:00
华佗	07c92e63a2	Fix Bug #999 : 修复手术申请详情弹窗中 recursionFun 函数 children 为空时 TypeError 手术申请详情查看时，若科室组织数据中某节点无 children 字段（为 null/undefined），遍历访问 subObjArray.length 会抛出 TypeError 导致详情弹窗崩溃。添加 null 守卫 `if (!subObjArray) continue;` 优雅跳过无子节点的项。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 10:53:31 +08:00