From 72ab38f5d079b2ef3c7959cb491ff91f29607016 Mon Sep 17 00:00:00 2001
From: wangjian963 <15215920+aprilry@user.noreply.gitee.com>
Date: Mon, 8 Jun 2026 11:19:34 +0800
Subject: [PATCH] =?UTF-8?q?594=20=E3=80=90=E4=BD=8F=E9=99=A2=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E5=B7=A5=E4=BD=9C=E7=AB=99-=E4=B8=B4=E5=BA=8A?=
 =?UTF-8?q?=E5=8C=BB=E5=98=B1=E3=80=91=E5=BC=80=E7=AB=8B=E9=9C=80=E7=9A=AE?=
 =?UTF-8?q?=E8=AF=95=E8=8D=AF=E7=89=A9=E6=97=B6=E7=B3=BB=E7=BB=9F=E6=9C=AA?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E7=9A=AE=E8=AF=95=E7=A1=AE=E8=AE=A4=E6=A1=86?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=94=E5=8C=BB=E5=98=B1=E8=BE=93=E5=85=A5=E8=A1=8C?=
 =?UTF-8?q?=E2=80=9C=E7=9A=AE=E8=AF=95=E2=80=9D=E5=AD=97=E6=AE=B5=E7=BD=AE?=
 =?UTF-8?q?=E7=81=B0=E5=8F=AA=E8=AF=BB=E6=97=A0=E6=B3=95=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/components/order/OrderForm.vue       | 12 +++++++++-
 .../home/components/order/index.vue           | 22 ++++++++++++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/OrderForm.vue b/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/OrderForm.vue
index 87e0fbf57..13f60224f 100755
--- a/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/OrderForm.vue
+++ b/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/OrderForm.vue
@@ -71,7 +71,17 @@
             />
           </el-form-item>
           <span class="medicine-info"> 诊断：{{ config.diagnosisName }} </span>
-          <span class="medicine-info"> 皮试：{{ row.skinTestFlag_enumText }} </span>
+          <span class="medicine-info">
+            皮试：
+            <el-select
+              v-model="row.skinTestFlag"
+              style="width: 70px"
+              size="small"
+            >
+              <el-option :value="1" label="是" />
+              <el-option :value="0" label="否" />
+            </el-select>
+          </span>
           <span class="medicine-info"> 注射药品：{{ row.injectFlag_enumText }} </span>
           <span class="total-amount">
             总金额：{{ row.totalPrice ? Number(row.totalPrice).toFixed(2) + ' 元' : '0.00 元' }}
diff --git a/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue b/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue
index f061d665f..729805fc8 100755
--- a/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue
@@ -332,14 +332,16 @@
             <span v-if="!scope.row.isEdit">
               {{ scope.row.skinTestFlag_enumText || '-' }}
             </span>
-            <el-checkbox
+            <el-select
               v-else
               v-model="scope.row.skinTestFlag"
-              :true-value="true"
-              :false-value="0"
+              style="width: 80px"
+              size="small"
+              @click.stop
             >
-              是
-            </el-checkbox>
+              <el-option :value="1" label="是" />
+              <el-option :value="0" label="否" />
+            </el-select>
           </template>
         </vxe-column>
         <vxe-column title="停嘱医生" align="center" field="stopUserName" width="120">
@@ -1181,12 +1183,22 @@ function selectAdviceBase(key, row) {
         // 用户点击"是"，设置皮试标志为"是"
         prescriptionList.value[rowIndex.value].skinTestFlag = 1;
         prescriptionList.value[rowIndex.value].skinTestFlag_enumText = '是';
+        expandOrder.value = [currentUniqueKey];
+        const expandRow = filterPrescriptionList.value.find(item => item.uniqueKey === currentUniqueKey);
+        if (expandRow && prescriptionRef.value?.setRowExpand) {
+          prescriptionRef.value.setRowExpand([expandRow], true);
+        }
         expandOrderAndFocus(currentUniqueKey, row);
       })
       .catch((action) => {
         // 用户点击"否"，设置皮试标志为"否"
         prescriptionList.value[rowIndex.value].skinTestFlag = 0;
         prescriptionList.value[rowIndex.value].skinTestFlag_enumText = '否';
+        expandOrder.value = [currentUniqueKey];
+        const expandRow = filterPrescriptionList.value.find(item => item.uniqueKey === currentUniqueKey);
+        if (expandRow && prescriptionRef.value?.setRowExpand) {
+          prescriptionRef.value.setRowExpand([expandRow], true);
+        }
         expandOrderAndFocus(currentUniqueKey, row);
       });
   } else {