From 4acc46772349adbe46667b46f0f8ec2f62b981fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E8=8F=B2?= <12704587+yvwen@user.noreply.gitee.com>
Date: Mon, 31 Mar 2025 10:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=8D=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../westernmedicine/index.vue                 | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
index dfcc3c92..bcbaa2a4 100644
--- a/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
+++ b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
@@ -411,7 +411,11 @@ function handleCurrentChange(row) {
   listWesternmedicine(currentRow.value).then((response) => {
     console.log("121212", response);
     personInfo.value = response.data.prescriptionPatientInfoDto;
-    medicineInfoList.value = response.data.prescriptionMedicineInfoDtoList;
+    medicineInfoList.value = Array.isArray(
+      response.data.prescriptionMedicineInfoDtoList
+    )
+      ? response.data.prescriptionMedicineInfoDtoList
+      : [response.data.prescriptionMedicineInfoDtoList];
     // 统计每个 prescriptionNo 的行数
     const groupCounts = countGroupRows(medicineInfoList.value);
     // 设置每行的标记
@@ -427,7 +431,11 @@ function submitMedicine(row) {
   updateMedicion(row.prescriptionNo).then((response) => {
     proxy.$modal.msgSuccess("发药成功");
     listWesternmedicine(currentRow.value).then((response) => {
-      medicineInfoList.value = response.data;
+      medicineInfoList.value = Array.isArray(
+        response.data.prescriptionMedicineInfoDtoList
+      )
+        ? response.data.prescriptionMedicineInfoDtoList
+        : [response.data.prescriptionMedicineInfoDtoList];
       // 统计每个 prescriptionNo 的行数
       const groupCounts = countGroupRows(medicineInfoList.value);
       // 设置每行的标记
@@ -453,7 +461,13 @@ function handleConfirm() {
     }
   );
   listWesternmedicine(currentRow.value).then((response) => {
-    medicineInfoList.value = response.data;
+    console.log("1212*******12", response);
+    medicineInfoList.value = Array.isArray(
+      response.data.prescriptionMedicineInfoDtoList
+    )
+      ? response.data.prescriptionMedicineInfoDtoList
+      : [response.data.prescriptionMedicineInfoDtoList];
+    // medicineInfoList.value = response.data;
     // 统计每个 prescriptionNo 的行数
     const groupCounts = countGroupRows(medicineInfoList.value);
     // 设置每行的标记