From aa62fbfd716ab294d5a0fe5970e539a33841c4fd Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Wed, 16 Oct 2024 12:49:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8D=AF=E5=93=81=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?VO=E5=AD=97=E6=AE=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/vo/HealthMedicineBasicVo.java       | 18 ++++++++++++++++++
 .../impl/HealthMedicineBasicServiceImpl.java   |  8 +++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineBasicVo.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineBasicVo.java
index a1de0a1..19492a1 100644
--- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineBasicVo.java
+++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineBasicVo.java
@@ -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;
+
+
 
 }
diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineBasicServiceImpl.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineBasicServiceImpl.java
index 9bf9ca0..658ab1e 100644
--- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineBasicServiceImpl.java
+++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineBasicServiceImpl.java
@@ -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;
     }
 
     /**