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

# Conflicts:
#	openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue

@@ -875,7 +875,7 @@ import { ArrowDown, Search, Memo, Minus, Plus, Edit, Delete } from '@element-plu
 import printUtils, { getPrinterList, PRINT_TEMPLATE, savePrinterToCache, } from '@/utils/printUtils';
 import Template from "@/views/inpatientDoctor/home/emr/components/template.vue";
 
-const emit = defineEmits(['selectDiagnosis']);
+const emit = defineEmits(['selectDiagnosis', 'inspectionListRefresh']);
 const total = ref(0);
 const queryParams = ref({});
 const prescriptionList = ref([]);
@@ -2084,6 +2084,21 @@ function getOrgList() {
   });
 }
 
+/** 诊疗医嘱关联检验申请时 contentJson 含 applyNo */
+function getInspectionApplyNoFromAdviceRow(row) {
+  if (!row || row.adviceType !== 3) {
+    return null;
+  }
+  try {
+    const raw = row.contentJson;
+    const j = raw ? (typeof raw === 'string' ? JSON.parse(raw) : raw) : {};
+    const no = j && j.applyNo != null ? String(j.applyNo).trim() : '';
+    return no || null;
+  } catch (e) {
+    return null;
+  }
+}
+
 function handleDelete() {
   let selectRows = prescriptionRef.value.getSelectionRows();
   console.log('BugFix#219: handleDelete called, selectRows=', selectRows);
@@ -2263,12 +2278,31 @@ function handleDelete() {
   }
   
   if (deleteList.length > 0) {
-    savePrescription({ adviceSaveList: deleteList }).then((res) => {
-      if (res.code == 200) {
-        proxy.$modal.msgSuccess('删除成功');
-        getListInfo(false);
-      }
+    const hasLabLinked = deleteList.some((d) => {
+      const row = normalRows.find((r) => r.requestId === d.requestId);
+      return row && getInspectionApplyNoFromAdviceRow(row);
     });
+    const runApiDelete = () => {
+      savePrescription({ adviceSaveList: deleteList }).then((res) => {
+        if (res.code == 200) {
+          proxy.$modal.msgSuccess('删除成功');
+          getListInfo(false);
+          emit('inspectionListRefresh');
+        }
+      });
+    };
+    if (hasLabLinked) {
+      proxy.$modal
+        .confirm(
+          '删除此医嘱将同时作废关联的检验申请单（检验页签中的同单申请及同单下相关医嘱）。是否继续？',
+          '删除确认',
+          { type: 'warning' }
+        )
+        .then(runApiDelete)
+        .catch(() => {});
+    } else {
+      runApiDelete();
+    }
   } else if (consultationRows.length == 0) {
     proxy.$modal.msgWarning('所选医嘱不可删除，请先撤回后再删除');
     return;