From 970f24e3fea10272f1d5162525d4a26059e8c467 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Sat, 26 Oct 2024 16:14:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=81=A5=E5=BA=B7=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/health/domain/dto/HealthMedicineBasicDto.java  | 4 ++++
 .../resources/mapper/health/HealthMedicineBasicMapper.xml    | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineBasicDto.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineBasicDto.java
index dc65f51..3f04109 100644
--- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineBasicDto.java
+++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineBasicDto.java
@@ -21,6 +21,10 @@ public class HealthMedicineBasicDto implements Serializable
     @ApiModelProperty(value="药品名称")
     private String name;
 
+    /** 关键字 */
+    @ApiModelProperty(value="关键字")
+    private String keys;
+
     /** 药品简称 */
     @ApiModelProperty(value="药品简称")
     private String shortName;
diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineBasicMapper.xml b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineBasicMapper.xml
index 310b243..5ff3cfd 100644
--- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineBasicMapper.xml
+++ b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineBasicMapper.xml
@@ -79,10 +79,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             a.del_flag='0'
             <if test="name != null  and name != ''"> and a.name like '%'|| #{name}||'%'</if>
+            <if test="keys != null  and keys != ''"> and a.name like '%'|| #{keys}||'%' or a.short_name like '%'|| #{keys}||'%' or a.brand like '%'|| #{keys}||'%' or a.manufacturers like '%'|| #{keys}||'%' or a.code like '%'|| #{keys}||'%'</if>
             <if test="shortName != null  and shortName != ''"> and a.short_name like '%'|| #{shortName}||'%'</if>
             <if test="classification != null  and classification != ''"> and a.classification = #{classification}</if>
             <if test="category != null  and category != ''"> and a.category = #{category}</if>
-            <if test="brand != null  and brand != ''"> and a.brand = #{brand}</if>
+            <if test="brand != null  and brand != ''"> and a.brand like '%'|| #{brand}||'%'</if>
             <if test="packaging != null  and packaging != ''"> and a.packaging = #{packaging}</if>
             <if test="manufacturers != null  and manufacturers != ''"> and a.manufacturers like '%'|| #{manufacturers}||'%'</if>
             <if test="treatmentType != null  and treatmentType != ''"> and a.treatment_type = #{treatmentType}</if>
@@ -90,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ingredients != null  and ingredients != ''"> and a.ingredients = #{ingredients}</if>
             <if test="usage != null  and usage != ''"> and a.usage = #{usage}</if>
             <if test="dosageForm != null  and dosageForm != ''"> and a.dosage_form = #{dosageForm}</if>
-            <if test="code != null  and code != ''"> and a.code = #{code}</if>
+            <if test="code != null  and code != ''"> and a.code like '%'|| #{code}||'%'</if>
         </where>
         order by a.create_time desc
     </select>