为项目匹配添加模糊查询。

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>9.6.4</version>
+    <version>9.6.6</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

src/main/java/thyyxxk/webserver/dao/his/nationalmatch/NationalMatchDao.java

@@ -82,7 +82,7 @@ public interface NationalMatchDao {
     List<SiCentralHerbal> selectNationalHerbals(@Param("name") String name);
 
     @Select("select * from si_central_services where national_name=#{name} " +
-            "or local_medical_service_name=#{name}")
+            "or local_medical_service_name like #{name}")
     List<SiCentralServices> selectNationalServices(@Param("name") String name);
 
     @Select("select * from si_central_supplies_mini where national_name like #{name}")

src/main/java/thyyxxk/webserver/entity/nationalmatch/StandardLocalItem.java

@@ -20,11 +20,12 @@ public class StandardLocalItem {
     private String factory;
     private String standardCode;
     private String price;
-    private String searchNameForSupply;
     private String nationalCode;
     private String nationalName;
 
-    public String getSearchNameForSupply() {
-        return null == searchNameForSupply ? "" : (searchNameForSupply).trim();
+    private String fuzzyName;
+
+    public String getFuzzyName() {
+        return null == fuzzyName ? "" : (fuzzyName).trim();
     }
 }

src/main/java/thyyxxk/webserver/service/nationalmatch/NationalMatchService.java

@@ -68,13 +68,13 @@ public class NationalMatchService {
         if (type == NationalMatchType.MEDICINE) {
             String approve = param.getApprovalNumber();
             approve = StringUtil.isBlank(approve) ? "%%" : "%" + approve.replace("国药准字", "") + "%";
-            List<SiCentralMedicine> list = dao.selectNationalMedicines(param.getName(), approve);
+            List<SiCentralMedicine> list = dao.selectNationalMedicines(param.getFuzzyName(), approve);
             if (null == list || list.isEmpty()) {
                 return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有符合条件的国家目录。");
             }
             return ResultVoUtil.success(list);
         } else if (type == NationalMatchType.HERBAL){
-            String[] splits = param.getName().split("（");
+            String[] splits = param.getFuzzyName().split("（");
             splits = splits[0].split("\\(");
             String name = splits[0].replaceAll("颗粒", "");
             List<SiCentralHerbal> list = dao.selectNationalHerbals(name.trim());
@@ -83,20 +83,21 @@ public class NationalMatchService {
             }
             return ResultVoUtil.success(list);
         } else if (type == NationalMatchType.SERVICE) {
-            String[] splits = param.getName().split("外送");
+            String[] splits = param.getFuzzyName().split("外送");
             String name;
             if (splits.length == 1) {
                 name = splits[0];
             } else {
                 name = splits[0].substring(0, splits[0].length() - 1);
             }
+            name = "%" + name + "%";
             List<SiCentralServices> list = dao.selectNationalServices(name);
             if (null == list || list.isEmpty()) {
                 return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有符合条件的国家目录。");
             }
             return ResultVoUtil.success(list);
         } else {
-            String name = "%" + param.getSearchNameForSupply() + "%";
+            String name = "%" + param.getFuzzyName() + "%";
             List<SiCentralSuppliesMini> list = dao.selectNationalSupplies(name);
             if (null == list || list.isEmpty()) {
                 return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有符合条件的国家目录。");