qdintc/intc-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 药品基础信息接口，新增VO字段。

Browse Source
This commit is contained in:
tianyongbao
2024-10-16 12:49:53 +08:00
parent 963278822d
commit aa62fbfd71
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineBasicVo.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.health.domain.vo;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.health.domain.HealthMedicineBasic;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import io.swagger.annotations.ApiModel;
/**
@@ -13,5 +15,21 @@ import io.swagger.annotations.ApiModel;
@Data
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;
}

8
ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineBasicServiceImpl.java
View File

@@ -46,7 +46,13 @@ public class HealthMedicineBasicServiceImpl implements IHealthMedicineBasicServi
@Override
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;
}
/**