From fbdcd815bdc0ed52384713dae9cf28ed83f7d2b2 Mon Sep 17 00:00:00 2001
From: zhaoyun <zhaoyun@gentronhealth.com>
Date: Thu, 28 May 2026 11:00:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20Bug=20#597=20-=20=E4=BD=8F=E9=99=A2?=
 =?UTF-8?q?=E5=8C=BB=E5=98=B1=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DoctorStationAdviceAppServiceImpl.java        |  3 +++
 .../openhis/web/doctorstation/dto/AdviceSaveDto.java   |  5 +++++
 .../openhis/web/doctorstation/dto/RequestBaseDto.java  |  5 +++++
 .../com/openhis/workflow/domain/ServiceRequest.java    |  5 +++++
 .../inpatientDoctor/home/components/order/index.vue    | 10 ++++++++++
 5 files changed, 28 insertions(+)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
index ca722b74c..e09f2c29b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
@@ -2033,6 +2033,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 serviceRequest.setBasedOnTable(CommonConstants.TableName.MED_MEDICATION_REQUEST);
             }
 
+            // 备注
+            serviceRequest.setRemark(adviceSaveDto.getRemark());
+
             iServiceRequestService.saveOrUpdate(serviceRequest);
 
             // 保存时保存诊疗费用项
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
index 743e86842..45d0bf37b 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
@@ -270,6 +270,11 @@ public class AdviceSaveDto {
      */
     private String sourceBillNo;
 
+    /**
+     * 备注（最长50字）
+     */
+    private String remark;
+
     /**
      * 设置默认值
      */
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
index d15d39c26..aca5aee11 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
@@ -238,4 +238,9 @@ public class RequestBaseDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long patientId;
 
+    /**
+     * 备注（最长50字）
+     */
+    private String remark;
+
 }
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
index e1283867e..e268539dd 100755
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
@@ -173,4 +173,9 @@ public class ServiceRequest extends HisBaseEntity {
      */
     private Integer generateSourceEnum;
 
+    /**
+     * 备注（最长50字）
+     */
+    private String remark;
+
 }
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 8e13d9518..bb2bb6671 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
@@ -298,6 +298,16 @@
             </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>
+            <span v-else>
+              <el-input v-model="scope.row.remark" maxlength="50" placeholder="最多50字" />
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column label="诊断" align="center" prop="diagnosisName" width="150">
           <template #default="scope">
             <span v-if="!scope.row.isEdit">