fix: 药品基础信息接口,新增VO字段。
This commit is contained in:
@@ -1,6 +1,8 @@
|
|||||||
package com.ruoyi.health.domain.vo;
|
package com.ruoyi.health.domain.vo;
|
||||||
|
|
||||||
|
import com.ruoyi.common.core.annotation.Excel;
|
||||||
import com.ruoyi.health.domain.HealthMedicineBasic;
|
import com.ruoyi.health.domain.HealthMedicineBasic;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
/**
|
/**
|
||||||
@@ -13,5 +15,21 @@ import io.swagger.annotations.ApiModel;
|
|||||||
@Data
|
@Data
|
||||||
public class HealthMedicineBasicVo extends HealthMedicineBasic
|
public class HealthMedicineBasicVo extends HealthMedicineBasic
|
||||||
{
|
{
|
||||||
|
/** 简称品牌 */
|
||||||
|
@ApiModelProperty(value="简称品牌)")
|
||||||
|
@Excel(name = "简称品牌")
|
||||||
|
private String shortNameBrand;
|
||||||
|
|
||||||
|
/** 简称品牌生产厂家 */
|
||||||
|
@ApiModelProperty(value="简称品牌生产厂家)")
|
||||||
|
@Excel(name = "简称品牌生产厂家")
|
||||||
|
private String shortNameBrandManufacturers;
|
||||||
|
|
||||||
|
/** 简称品牌包装 */
|
||||||
|
@ApiModelProperty(value="简称品牌包装)")
|
||||||
|
@Excel(name = "简称品牌包装")
|
||||||
|
private String shortNameBrandPackaging;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,7 +46,13 @@ public class HealthMedicineBasicServiceImpl implements IHealthMedicineBasicServi
|
|||||||
@Override
|
@Override
|
||||||
public List<HealthMedicineBasicVo> selectHealthMedicineBasicList(HealthMedicineBasicDto healthMedicineBasicDto)
|
public List<HealthMedicineBasicVo> selectHealthMedicineBasicList(HealthMedicineBasicDto healthMedicineBasicDto)
|
||||||
{
|
{
|
||||||
return healthMedicineBasicMapper.selectHealthMedicineBasicList(healthMedicineBasicDto);
|
List<HealthMedicineBasicVo> list=healthMedicineBasicMapper.selectHealthMedicineBasicList(healthMedicineBasicDto);
|
||||||
|
for (HealthMedicineBasicVo vo : list) {
|
||||||
|
vo.setShortNameBrand(vo.getShortName()+"-"+vo.getBrand());
|
||||||
|
vo.setShortNameBrandManufacturers(vo.getShortName()+"-"+vo.getBrand()+"-"+vo.getManufacturers());
|
||||||
|
vo.setShortNameBrandPackaging(vo.getShortName()+"-"+vo.getBrand()+"("+vo.getPackaging()+")");
|
||||||
|
}
|
||||||
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user