From 2e267b4353e7ca8a821f8971bbc22456480745ab Mon Sep 17 00:00:00 2001
From: zhaoyun <zhaoyun@gentronhealth.com>
Date: Thu, 28 May 2026 11:24:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20Bug=20#597=20-=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8C=BB=E5=98=B1=E5=BC=B9=E7=AA=97=E6=B7=BB=E5=8A=A0=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E5=AD=97=E6=AE=B5=20+=20=E6=9F=A5=E8=AF=A2=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9Eremark?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/openhis/web/doctorstation/dto/AdviceBaseDto.java | 5 +++++
 .../web/regdoctorstation/dto/RegRequestBaseDto.java      | 5 +++++
 .../mapper/regdoctorstation/AdviceManageAppMapper.xml    | 9 ++++++---
 .../inpatientDoctor/home/components/order/OrderForm.vue  | 9 +++++++++
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java
index ea553b79f..49a4d7533 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java
@@ -250,4 +250,9 @@ public class AdviceBaseDto {
      * 是否缺少取药科室配置（仅药品类型使用）
      */
     private Boolean pharmacyConfigMissing;
+
+    /**
+     * 备注（最长50字）
+     */
+    private String remark;
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java
index afaf52c0c..402d603dc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java
@@ -50,4 +50,9 @@ public class RegRequestBaseDto extends RequestBaseDto {
     private String doseUnitCode;
     private String doseUnitCode_dictText;
 
+
+    /**
+     * 备注（最长50字）
+     */
+    private String remark;
 }
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
index 0c5f93fb7..60c7b054e 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
@@ -217,7 +217,8 @@
         T1.therapy_enum AS therapyEnum,
         T1.sort_number AS sort_number,
         T1.based_on_id AS based_on_id,
-        T1.medication_id AS advice_definition_id
+        T1.medication_id AS advice_definition_id,
+        NULL AS remark
         FROM med_medication_request AS T1
         LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id
         AND T2.delete_flag = '0'
@@ -270,7 +271,8 @@
         2 AS therapyEnum,
         99 AS sort_number,
         T1.based_on_id AS based_on_id,
-        T1.device_def_id AS advice_definition_id
+        T1.device_def_id AS advice_definition_id,
+        NULL AS remark
         FROM wor_device_request AS T1
         LEFT JOIN adm_device_definition AS T2 ON T2.ID = T1.device_def_id
         AND T2.delete_flag = '0'
@@ -320,7 +322,8 @@
         COALESCE(T1.therapy_enum, 2) AS therapyEnum,
         99 AS sort_number,
         T1.based_on_id AS based_on_id,
-        T1.activity_id AS advice_definition_id
+        T1.activity_id AS advice_definition_id,
+        T1.remark AS remark
         FROM wor_service_request AS T1
         LEFT JOIN wor_activity_definition AS T2
         ON T2.ID = T1.activity_id
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue
index 9a7d454c2..ea83fcc54 100755
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue
@@ -285,6 +285,9 @@
               </el-select>
             </template>
           </div>
+          <el-form-item label="备注：" prop="remark">
+            <el-input v-model="row.remark" maxlength="50" placeholder="最多50字" style="width: 200px" />
+          </el-form-item>
           <div class="form-actions">
             <el-button type="primary" @click="handleSave">确定</el-button>
             <el-button @click="handleCancel">取消</el-button>
@@ -365,6 +368,9 @@
               总金额：{{ row.totalPrice ? Number(row.totalPrice).toFixed(2) + ' 元' : '0.00 元' }}
             </span>
           </div>
+          <el-form-item label="备注：" prop="remark">
+            <el-input v-model="row.remark" maxlength="50" placeholder="最多50字" style="width: 200px" />
+          </el-form-item>
           <div class="form-actions">
             <el-button type="primary" @click="handleSave">确定</el-button>
             <el-button @click="handleCancel">取消</el-button>
@@ -418,6 +424,9 @@
               <!-- 金额: {{ row.priceList[0].price }} -->
             </span>
           </div>
+          <el-form-item label="备注：" prop="remark">
+            <el-input v-model="row.remark" maxlength="50" placeholder="最多50字" style="width: 200px" />
+          </el-form-item>
           <div class="form-actions">
             <el-button type="primary" @click="handleSave">确定</el-button>
             <el-button @click="handleCancel">取消</el-button>