From ba5ac84d96d4a1ee3ff5245c4d4d1ae4784e3bc8 Mon Sep 17 00:00:00 2001
From: wangjian963 <15215920+aprilry@user.noreply.gitee.com>
Date: Fri, 29 May 2026 15:47:05 +0800
Subject: [PATCH] =?UTF-8?q?621=20[=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E8=AF=8A=E7=96=97=E7=9B=AE=E5=BD=95]=20=E8=AF=8A=E7=96=97?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=EF=BC=88=E5=A6=82=E7=A9=BA=E8=B0=83=E8=B4=B9?=
 =?UTF-8?q?=EF=BC=89=E7=BC=96=E8=BE=91/=E6=96=B0=E5=A2=9E=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=88=90=E5=8A=9F=E5=90=8E=EF=BC=8C=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=E2=80=9C=E9=9B=B6=E5=94=AE=E4=BB=B7?=
 =?UTF-8?q?=E2=80=9D=E5=AD=97=E6=AE=B5=E5=9B=9E=E6=98=BE=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=20622=20[=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-=E8=AF=8A?=
 =?UTF-8?q?=E7=96=97=E7=9B=AE=E5=BD=95]=20=E8=AF=8A=E7=96=97=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=BC=96=E8=BE=91=E5=BC=B9=E7=AA=97=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E9=99=A4=E7=BC=96=E5=8F=B7=E5=A4=96=E7=9A=84=E5=A4=A7=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=A0=B8=E5=BF=83=E5=AD=97=E6=AE=B5=EF=BC=88=E9=9B=B6?=
 =?UTF-8?q?=E5=94=AE=E4=BB=B7=E3=80=81=E7=9B=AE=E5=BD=95=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=AD=89=EF=BC=89=E6=97=A0=E6=B3=95=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/openhis/medication/domain/MedicationRequest.java   | 2 +-
 .../components/diagnosisTreatmentDialog.vue                | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
index 108c14986..333244653 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
@@ -112,7 +112,7 @@ public class MedicationRequest extends HisBaseEntity {
     private String supportInfo;
 
     /** 退回原因 */
-    private String backReason;
+    private String backReason = "";
 
     /** 请求开始时间 */
     private Date reqAuthoredTime;
diff --git a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
index 433274ec8..d6bcd4e3a 100755
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
@@ -115,7 +115,6 @@
                 v-model="form.categoryCode"
                 clearable
                 filterable
-                :disabled="form.isEditInfoDisable === 1"
                 no-data-text=""
               >
                 <el-option
@@ -192,7 +191,6 @@
                 clearable
                 filterable
                 style="width: 240px"
-                :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
                 no-data-text=""
               >
                 <el-option
@@ -258,7 +256,6 @@
                 placeholder=""
                 clearable
                 filterable
-                :disabled="form.isEditInfoDisable === 1"
                 no-data-text=""
               >
                 <el-option
@@ -323,7 +320,6 @@
               <el-input
                 v-model="form.retailPrice"
                 placeholder=""
-                :disabled="form.isEditInfoDisable === 1"
                 @input="updatePrices"
               />
             </el-form-item>
@@ -404,7 +400,6 @@
                     controls-position="right"
                     :min="1"
                     :max="999"
-                    :disabled="form.isEditInfoDisable === 1"
                     @change="calculateTotalPrice"
                   />
                 </el-form-item>
@@ -605,8 +600,6 @@ function calculateTotalPrice() {
     );
     if (hasValidItem) {
       form.value.retailPrice = parseFloat(totalPrice.value) || 0;
-    } else {
-      form.value.retailPrice = undefined;
     }
   } catch (error) {
     totalPrice.value = '0.00';