From 5231852e95b69bf519e14c853737d8c9542c5ddc Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Mon, 24 Mar 2025 19:50:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8E=82=E5=95=86=E6=96=87=E6=9C=AC=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/openhis/administration/domain/DeviceDefinition.java | 6 +++--- .../com/openhis/medication/domain/MedicationDefinition.java | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java index 30b4c780..610637b7 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java @@ -92,6 +92,9 @@ public class DeviceDefinition extends HisBaseEntity { /** 生产厂家 */ private Long manufacturerId; + /** 生产厂家 */ + private String manufacturerText; + /** 供应商 */ private Long supplyId; @@ -101,9 +104,6 @@ public class DeviceDefinition extends HisBaseEntity { /** 适用范围 */ private String jurisdiction; - /** 执行科室 */ - private Long ruleId; - /** 器材版本 */ private String version; 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 6db29b4c..1ce3be40 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 @@ -99,6 +99,9 @@ public class MedicationDefinition extends HisBaseEntity { /** 生产厂家 */ private Long manufacturerId; + /** 生产厂商文本 */ + private String manufacturerText; + /** 供应商 */ private Long supplyId;