diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java index 8ac5086a..5335cb29 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java @@ -131,7 +131,7 @@ public class MedicationManageDto { /** 药品分类 */ @Dict(dictCode = "med_category_code") - private Integer categoryCode; + private String categoryCode; private String categoryCode_dictText; /** 商品名称 */ diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java index da09e2b9..c444465c 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java @@ -109,7 +109,7 @@ public class MedicationManageUpDto { private String wbStr; /** 药品分类 */ - private Integer categoryCode; + private String categoryCode; /** 商品名称 */ private String merchandiseName; 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 088543d2..fbf97544 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 @@ -99,7 +99,7 @@ public class MedicationDetail extends HisBaseEntity { private String wbStr; /** 药品分类 */ - private Integer categoryCode; + private String categoryCode; /** 商品名称 */ private String merchandiseName; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java index f69bf849..0ecd9358 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationDefinitionService.java @@ -20,11 +20,4 @@ public interface IMedicationDefinitionService extends IService