From 275e7f59788e0613fc32b3e353be7d054cf06a84 Mon Sep 17 00:00:00 2001
From: wangjian963 <15215920+aprilry@user.noreply.gitee.com>
Date: Mon, 1 Jun 2026 14:41:12 +0800
Subject: [PATCH] =?UTF-8?q?597=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=E4=B8=B4=E5=BA=8A=E5=8C=BB=E5=98=B1?=
 =?UTF-8?q?=E9=9C=80=E5=A2=9E=E5=8A=A0=E2=80=9C=E5=A4=87=E6=B3=A8=E2=80=9D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/regdoctorstation/AdviceManageAppMapper.xml      | 3 +++
 .../inpatientDoctor/home/components/order/OrderForm.vue    | 6 +++---
 .../views/inpatientDoctor/home/components/order/index.vue  | 7 +++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

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 723d64929..77879a155 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
@@ -219,6 +219,7 @@
         T1.effective_dose_start AS start_time,
         T1.based_on_id AS based_on_id,
         T1.medication_id AS advice_definition_id,
+        T1.content_json::jsonb ->> 'remark' AS remark,
         T1.effective_dose_end AS stop_time,
         T1.update_by AS stop_user_name
         FROM med_medication_request AS T1
@@ -275,6 +276,7 @@
         T1.req_authored_time AS start_time,
         T1.based_on_id AS based_on_id,
         T1.device_def_id AS advice_definition_id,
+        T1.content_json::jsonb ->> 'remark' AS remark,
         NULL::timestamp AS stop_time,
         '' AS stop_user_name
         FROM wor_device_request AS T1
@@ -328,6 +330,7 @@
         T1.occurrence_start_time AS start_time,
         T1.based_on_id AS based_on_id,
         T1.activity_id AS advice_definition_id,
+        T1.remark AS remark,
         T1.occurrence_end_time AS stop_time,
         T1.update_by AS stop_user_name
         FROM wor_service_request AS T1
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 fc751e3ca..e41a0f471 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
@@ -200,6 +200,9 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="备注：" prop="remark">
+              <el-input v-model="row.remark" maxlength="50" placeholder="最多50字" style="width: 200px" />
+            </el-form-item>
           </div>
         </div>
         <div
@@ -294,9 +297,6 @@
               </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>
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
index 153ab0cf2..b7fac23cc 100755
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
@@ -342,6 +342,13 @@
             </span>
           </template>
         </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" width="150" show-overflow-tooltip>
+          <template #default="scope">
+            <span v-if="!scope.row.isEdit">
+              {{ scope.row.remark || '-' }}
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column label="诊断" align="center" prop="diagnosisName" width="150">
           <template #default="scope">
             <span v-if="!scope.row.isEdit">