diff --git a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java index 90e919c1..0522ea48 100644 --- a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java +++ b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java @@ -62,4 +62,5 @@ public interface HisBaseMapper extends BaseMapper { } return tableNameAnnotation.value(); } + } diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java b/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java index 0a09c627..3caca9c0 100644 --- a/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java +++ b/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java @@ -37,16 +37,10 @@ public class HisBaseEntity implements Serializable { @TableField(fill = FieldFill.UPDATE) private Date updateTime; - /** 备注 */ - private String remark; - /** 租户ID */ private Integer tenantId; /** 删除标识 */ private Integer deleteFlag; - /** 测试标识 */ - private Integer testFlag; - } diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java index f5fbbb8c..a718daa5 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java @@ -76,91 +76,4 @@ public class Medication extends HisBaseEntity { /** 药品定义 */ private String definition; - - /** 药品编号 */ - private Long code; - - /** 药品名称 */ - private String name; - - /** 适用范围 */ - private Integer domainEnum; - - /** 药品版本 */ - private String version; - - /** 英文药名 */ - private String nameEn; - - /** 药品名称拼音码 */ - private String pyCode; - - /** 药品五笔码 */ - private String wbCode; - - /** 药品分类 */ - private Integer categoryCode; - - /** 商品名称 */ - private String merchandiseName; - - /** 商品名称拼音码 */ - private String merchandisePyCode; - - /** 商品五笔码 */ - private String merchandiseWbCode; - - /** 药品单位 */ - private String unitCode; - - /** 最小单位 */ - private String minUnitCode; - - /** 所含耗材 */ - private String comprisedText; - - /** 成分 */ - private String ingredient; - - /** 拆零比 */ - private BigDecimal partPercent; - - /** 剂量形式 */ - private Integer doseFrom; - - /** 批准文号 */ - private String approvalNumber; - - /** 医保是否对码 */ - private Integer ybMatchFlag; - - /** 医保编码 */ - private String ybCode; - - /** 药理作用分类 */ - private String pharmacologyCategoryCode; - - /** 是否皮试 */ - private Integer skinTestFlag; - - /** 是否为注射药物 */ - private Integer injectFlag; - - /** 生产厂家 */ - private Long manufacturerId; - - /** 供应商 */ - private Long supplyId; - - /** 是否限制使用 */ - private Integer restrictedFlag; - - /** 限制使用范围 */ - private String restrictedScope; - - /** 儿童用药标志 */ - private Integer childrenFlag; - - /** 产品特性 */ - private Integer characteristic; } \ No newline at end of file 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 57654969..23a7a05e 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 @@ -115,8 +115,4 @@ public class MedicationDefinition extends HisBaseEntity { /** 儿童用药标志 */ private Integer childrenFlag; - /** 产品特性 */ - private Integer characteristic; - - } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java index 51ff0fb5..5eb96a1e 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java @@ -77,4 +77,91 @@ public class MedicationDetail extends HisBaseEntity { /** 药品定义 */ private String definition; + /** 药品编号 */ + private Long code; + + /** 药品名称 */ + private String name; + + /** 适用范围 */ + private Integer domainEnum; + + /** 药品版本 */ + private String version; + + /** 英文药名 */ + private String nameEn; + + /** 药品名称拼音码 */ + private String pyCode; + + /** 药品五笔码 */ + private String wbCode; + + /** 药品分类 */ + private Integer categoryCode; + + /** 商品名称 */ + private String merchandiseName; + + /** 商品名称拼音码 */ + private String merchandisePyCode; + + /** 商品五笔码 */ + private String merchandiseWbCode; + + /** 药品单位 */ + private String unitCode; + + /** 最小单位 */ + private String minUnitCode; + + /** 所含耗材 */ + private String comprisedText; + + /** 成分 */ + private String ingredient; + + /** 拆零比 */ + private BigDecimal partPercent; + + /** 剂量形式 */ + private Integer doseFrom; + + /** 批准文号 */ + private String approvalNumber; + + /** 医保是否对码 */ + private Integer ybMatchFlag; + + /** 医保编码 */ + private String ybCode; + + /** 药理作用分类 */ + private String pharmacologyCategoryCode; + + /** 是否皮试 */ + private Integer skinTestFlag; + + /** 是否为注射药物 */ + private Integer injectFlag; + + /** 生产厂家 */ + private Long manufacturerId; + + /** 供应商 */ + private Long supplyId; + + /** 是否限制使用 */ + private Integer restrictedFlag; + + /** 限制使用范围 */ + private String restrictedScope; + + /** 儿童用药标志 */ + private Integer childrenFlag; + + /** 产品特性 */ + private Integer characteristic; + }