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 @@
+
+
+
+ {{ scope.row.remark || '-' }}
+
+
+
+
+
+