From c611c0ce6f0a71631181a6ee85717b8486edf24b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=89=E7=8B=BB=E7=8C=8A?= <sarem_w@sina.com>
Date: Mon, 2 Mar 2026 15:37:33 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A148=20=E9=97=A8=E8=AF=8A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E3=80=8B=E9=97=A8=E8=AF=8A=E5=A4=84=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=9A=E9=80=89=E4=B8=8A=E5=A4=84=E7=BD=AE=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E3=80=90=E6=89=93=E5=8D=B0=E5=A4=84=E7=BD=AE?=
 =?UTF-8?q?=E5=8D=95=E3=80=91=E6=8C=89=E9=92=AE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/clinicmanagement/disposal/index.vue | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue
index de262b3f..e8b49108 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue
@@ -335,6 +335,7 @@ import useUserStore from '@/store/modules/user';
 import {getGroupMarkers} from '@/utils/his';
 
 import {PRINT_TEMPLATE, simplePrint} from '@/utils/printUtils.js';
+import {ElMessage} from "element-plus";
 // 患者搜索
 const queryParams = ref({
   pageNo: 1,
@@ -462,6 +463,7 @@ function getAllList(row) {
     });
     activityList.value = getGroupMarkers(activityList.value);
     deviceActivityList.value = res.data.records.filter((item) => {
+      console.info('item=====>', JSON.stringify(item));
       return item.deviceCategory == '7' || item.serviceCategory == '21';
     });
     loading.value = false;
@@ -690,22 +692,31 @@ function getEnPrescription() {
 
 // 打印处置单
 function printDisposal() {
-  let requestIds = deviceActivityList.value
+  let requestIds = deviceActivityList.value && deviceActivityList.value.length > 0
+      ? deviceActivityList.value
     .map((item) => {
       return item.requestId;
     })
-    .join(',');
-  advicePrint({ requestIds: requestIds }).then((res) => {
-    const result = res.data;
-    const printElements = JSON.parse(
-      JSON.stringify(disposalTemplate).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName)
-    );
-    var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
-    hiprintTemplate.print2(result, {
-      height: 210,
-      width: 148,
+    .join(',') : '';
+  if (requestIds !== '') {
+    advicePrint({ requestIds: requestIds }).then((res) => {
+      const result = res.data;
+      const printElements = JSON.parse(
+          JSON.stringify(disposalTemplate).replace(/{{HOSPITAL_NAME}}/g, userStore.hospitalName)
+      );
+      var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
+      hiprintTemplate.print2(result, {
+        height: 210,
+        width: 148,
+      });
     });
-  });
+  } else {
+    ElMessage({
+      type: 'error',
+      message: '暂无处置单',
+    });
+  }
+
 }
 
 // 判断是否为组内的第一行