From b7d556aab4e38dff704bfa9a6bcbc2f4481cc685 Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Thu, 13 Mar 2025 17:11:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openhis/administration/domain/OrganizationLocation.java | 5 ++++- .../com/openhis/medication/domain/MedicationDefinition.java | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java index 964f1088..623a8a45 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java @@ -34,9 +34,12 @@ public class OrganizationLocation extends HisBaseEntity { /** 位置编码 */ private Long locationId; - /** 默认药房 */ + /** 默认发药药房 */ private Long defLocationId; + /** 默认执行科室 */ + private Long defOrganizationId; + /** 药品类别 */ private String medCategoryCode; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java index 94540128..29a284c1 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java @@ -117,4 +117,10 @@ public class MedicationDefinition extends HisBaseEntity { /** 最大库存警戒数量(常规单位) */ private BigDecimal itemMaxQuantity; + /** 默认门诊单位 */ + private String defEncounterUnitCode; + + /** 默认住院单位 */ + private String defInhospitalUnitCode; + } \ No newline at end of file