From fcccfc19598c7b6241acbee9ab0fd16acb63bd72 Mon Sep 17 00:00:00 2001
From: wzk <2438381872@qq.com>
Date: Fri, 21 Nov 2025 09:23:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8C=BB=E5=98=B1=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A=E5=90=8E=E4=B8=AD=E6=88=90=E8=8D=AF=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=90=8D=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/prescription/prescriptionlist.vue    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
index 78fd7913..b628b0b1 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -908,7 +908,7 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="诊断" align="center" prop="diagnosisName" width="150">
+<el-table-column label="诊断" align="center" prop="diagnosisName" width="150">
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
             {{ scope.row.diagnosisName || scope.row.conditionDefinitionName }}
@@ -1468,7 +1468,7 @@ function selectAdviceBase(key, row) {
     } else {
       // 没有 deviceId 或 deviceName，可能是中成药（药品）
       // 根据 categoryCode 判断
-      if (row.categoryCode == '1') {
+if (row.categoryCode == '1') {
         finalAdviceType = 2; // 中成药
       } else {
         // 默认认为是中成药
@@ -1766,14 +1766,11 @@ function handleSave() {
     // 保存时，将前端的耗材类型（4）转换为后端需要的类型（2）
     // 后端接口中：1=药品, 2=耗材, 3=诊疗
     // 前端显示中：1=西药, 2=中成药, 3=诊疗, 4=耗材
-    const saveAdviceType = parsedContent.adviceType == 4 ? 2 : parsedContent.adviceType;
+    const saveAdviceType = item.adviceType == 4 ? 2 : item.adviceType;
     return {
-      ...parsedContent,
+      ...item,
       adviceType: saveAdviceType,
-      requestId: item.requestId,
-      dbOpType: '1',
-      groupId: item.groupId,
-      uniqueKey: undefined,
+      dbOpType: item.requestId ? '2' : '1',
     };
   });
   savePrescriptionSign({