UP

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java

@@ -12,7 +12,7 @@ import com.openhis.web.datadictionary.dto.MedicationManageUpDto;
 public interface IItemDefinitionService {
 
     /**
-     * 添加项目定价
+     * 添加药品的项目定价
      *
      * @param medicationManageUpDto 药品目录信息
      * @param medicationDetail 药品信息

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java

@@ -133,4 +133,20 @@ public class DeviceManageUpDto {
     /** 过敏标记 */
     // @NotNull(message = "过敏标记不能为空")
     private Integer allergenFlag;
+
+    /** 购入价 */
+    private BigDecimal purchasePrice;
+
+    /** 零售价 */
+    private BigDecimal retailPrice;
+
+    /** 最高零售价 */
+    private BigDecimal maximumRetailPrice;
+
+    /** 最小费用 */
+    private String minimalFee;
+
+    /** 医保类别 */
+    private String ybType;
+
 }

openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java

@@ -201,7 +201,7 @@ public class MedicationManageUpDto {
     private Integer statusEnum;
 
     /** 拆分属性 */
-    private String partAttribute;
+    private Integer partAttributeEnum;
 
     /** 贯标国家编码 */
     private String nationalDrugCode;

openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java

@@ -139,7 +139,7 @@ public class MedicationDefinition extends HisBaseEntity {
     private String nationalDrugCode;
 
     /** 拆分属性 */
-    private String partAttribute;
+    private Integer partAttributeEnum;
 
     /** 抗生素分类 */
     private String antibioticCode;