diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
index 7a525566..359007b6 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
@@ -205,6 +205,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             medicationRequest.setOrgId(adviceSaveDto.getOrgId());
             medicationRequest.setLocationId(adviceSaveDto.getLocationId());
             medicationRequest.setEncounterId(adviceSaveDto.getEncounterId());
+            medicationRequest.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
             medicationRequest.setTherapyEnum(adviceSaveDto.getTherapyEnum());
             medicationRequest.setMethodCode(adviceSaveDto.getMethodCode());
             medicationRequest.setRateCode(adviceSaveDto.getRateCode());
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
index 6d1fa76d..5d6781dd 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
@@ -79,6 +79,12 @@ public class AdviceSaveDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long encounterId;
 
+    /**
+     * 诊断ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long conditionId;
+
     /** 治疗类型 */
     private Integer therapyEnum;
 
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
index cab561fb..58854087 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
@@ -91,6 +91,11 @@ public class MedicationRequest extends HisBaseEntity {
     /** 就诊id */
     private Long encounterId;
 
+    /**
+     * 诊断ID
+     */
+    private Long conditionId;
+
     /** 支持用药信息 */
     private String supportInfo;