From 9e7714dd0ea2e0835062187edc66458daca3a4ec Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Fri, 21 Mar 2025 16:23:31 +0800 Subject: [PATCH] =?UTF-8?q?med=5Fmedication=5Frequest=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20=E8=AF=8A=E6=96=ADid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/impl/DoctorStationAdviceAppServiceImpl.java | 1 + .../com/openhis/web/doctorstation/dto/AdviceSaveDto.java | 6 ++++++ .../com/openhis/medication/domain/MedicationRequest.java | 5 +++++ 3 files changed, 12 insertions(+) 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;