实体字段 生产厂商文本追加

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;
 

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;