From 12516a55fa332213f3eed1a9d9d3d5418449c99c Mon Sep 17 00:00:00 2001
From: wangjian963 <15215920+aprilry@user.noreply.gitee.com>
Date: Thu, 18 Jun 2026 11:25:11 +0800
Subject: [PATCH] =?UTF-8?q?774=20=E3=80=90=E9=97=A8=E8=AF=8A=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E5=B7=A5=E4=BD=9C=E7=AB=99=E3=80=91=E5=9C=A8=E9=97=A8?=
 =?UTF-8?q?=E8=AF=8A=E5=8C=BB=E7=94=9F=E7=AB=99=E7=9A=84=E5=8C=BB=E5=98=B1?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E3=80=90=E4=B8=AA=E4=BA=BA=E3=80=91=E3=80=90?=
 =?UTF-8?q?=E7=A7=91=E5=AE=A4=E3=80=91=E3=80=90=E5=85=A8=E9=99=A2=E3=80=91?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E5=8C=BB=E5=98=B1=E5=A5=97=E4=BB=B6=E9=83=BD?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE=E4=BD=86?=
 =?UTF-8?q?=E6=98=AF=E5=8F=AF=E4=BB=A5=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/MedicalOrderSetDialog.vue      | 60 ++++++++++++-------
 1 file changed, 40 insertions(+), 20 deletions(-)

diff --git a/healthlink-his-ui/src/views/basicmanage/medicalOrderSet/components/MedicalOrderSetDialog.vue b/healthlink-his-ui/src/views/basicmanage/medicalOrderSet/components/MedicalOrderSetDialog.vue
index 6083c8fa5..10fbd5d7d 100755
--- a/healthlink-his-ui/src/views/basicmanage/medicalOrderSet/components/MedicalOrderSetDialog.vue
+++ b/healthlink-his-ui/src/views/basicmanage/medicalOrderSet/components/MedicalOrderSetDialog.vue
@@ -131,7 +131,7 @@
       <vxe-column
         title="类型"
         align="center"
-        width="120"
+        width="160"
       >
         <template #default="scope">
           <template v-if="!scope.row.groupPackageId">
@@ -205,7 +205,6 @@
         title="单次剂量"
         align="center"
         width="250"
-        field="sortNumber"
       >
         <template #default="scope">
           <template v-if="!scope.row.groupPackageId">
@@ -214,11 +213,7 @@
               <el-input
                 v-model="scope.row.doseQuantity"
                 style="width: 70px; margin-right: 10px"
-                @input="
-                  (value) => {
-                    scope.row.dose = value * scope.row.unitConversionRatio;
-                  }
-                "
+                @input="(value) => handleDoseQuantityChange(value, scope.row)"
               />
               <span>
                 {{
@@ -232,11 +227,7 @@
               <el-input
                 v-model="scope.row.dose"
                 style="width: 70px; margin-right: 10px"
-                @input="
-                  (value) => {
-                    scope.row.doseQuantity = value / scope.row.unitConversionRatio;
-                  }
-                "
+                @input="(value) => handleDoseChange(value, scope.row)"
               />
               <span>
                 {{
@@ -260,7 +251,6 @@
         title="给药途径"
         align="center"
         width="150"
-        field="sortNumber"
       >
         <template #default="scope">
           <template v-if="!scope.row.groupPackageId">
@@ -292,7 +282,6 @@
         title="用药频次"
         align="center"
         width="150"
-        field="sortNumber"
       >
         <template #default="scope">
           <template v-if="!scope.row.groupPackageId">
@@ -324,7 +313,6 @@
         title="用药天数"
         align="center"
         width="100"
-        field="sortNumber"
       >
         <template #default="scope">
           <template v-if="!scope.row.groupPackageId">
@@ -547,8 +535,7 @@ function openAdd(tab) {
   } else if (tab === 'department') {
     formData.organizationId = userStore.orgId;
   }
-
-  addEmptyRow();
+  // 不再默认新增空行，用户点击"新增"按钮时才添加
 }
 
 function handleRangeChange(tab) {
@@ -680,7 +667,7 @@ function openEdit(tab, row) {
       };
     });
     nextId.value = prescriptionList.value.length + 1;
-    addEmptyRow();
+    // 不再默认新增空行，用户点击"新增"按钮时才添加
   });
 }
 
@@ -939,8 +926,9 @@ function selectAdviceBase(key, row) {
     JSON.stringify(row)
   ).chargeItemDefinitionId;
   prescriptionList.value[rowIndex.value].therapyEnum = preservedTherapyEnum;
-  addEmptyRow();
-  expandOrder.value = [key];
+  // 不再自动新增空行，用户点击"新增"按钮时才添加
+  // 强制触发 vxe-table v4 响应式更新（v4 不响应数组元素直接索引赋值）
+  prescriptionList.value = [...prescriptionList.value];
 }
 
 function handleFocus(row, index) {
@@ -972,6 +960,38 @@ function handleQuantityChange(row) {
   prescriptionList.value = [...prescriptionList.value];
 }
 
+// 单次剂量数量变化 → 自动计算剂量
+function handleDoseQuantityChange(value, row) {
+  if (value === '' || value === null || value === undefined) {
+    row.dose = undefined;
+  } else {
+    const ratio = row.unitConversionRatio;
+    const numValue = Number(value) || 0;
+    if (ratio && Number(ratio) > 0) {
+      row.dose = numValue * Number(ratio);
+    } else {
+      row.dose = numValue;
+    }
+  }
+  prescriptionList.value = [...prescriptionList.value];
+}
+
+// 剂量变化 → 反算单次剂量数量
+function handleDoseChange(value, row) {
+  if (value === '' || value === null || value === undefined) {
+    row.doseQuantity = undefined;
+  } else {
+    const ratio = row.unitConversionRatio;
+    const numValue = Number(value) || 0;
+    if (ratio && Number(ratio) > 0) {
+      row.doseQuantity = numValue / Number(ratio);
+    } else {
+      row.doseQuantity = numValue;
+    }
+  }
+  prescriptionList.value = [...prescriptionList.value];
+}
+
 function handleUnitChange(row) {
   prescriptionList.value = [...prescriptionList.value];
 }