Merge branch 'master' of https://172.16.32.165/lighter/web-server

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

@@ -136,7 +136,7 @@ public interface NationalMatchDao {
     @Select("select aaz231 as injuryUniqueId,ake001 as nationalCode,projectConnotation='',exclusions='',ake002 as nationalName, " +
             "aka052 as valuationUnit,ake003 as catalogueType,bke215 as fundType,aae030 as start_time, aae031 as end_time, " +
             "matchedCount=(select count(1) from yp_zd_dict t where t.aaz231=a.aaz231) " +
-            "from t_industrial_injury_catalogue a where a.ake003='21' and a.ake002 like #{name} ")
+            "from t_industrial_injury_catalogue a where a.ake003 in ('21','23') and a.ake002 like #{name} ")
     List<SiCentralServices> selectInjuryServices(String name);
 
     @Select("select code as nationalCode,supplies_name as nationalName,si_universal_name as siName, " +
@@ -153,7 +153,7 @@ public interface NationalMatchDao {
             "bke608 as approvalNumber,ake002 as nationalName,aka074 as specifications, " +
             "ake003 as catalogueType,bke215 as fundType,aae030 as start_time, aae031 as end_time, " +
             "matchedCount=(select count(1) from yp_zd_dict t where t.aaz231=a.aaz231) " +
-            "from t_industrial_injury_catalogue a where a.ake003 in ('23','24') and a.ake002 like #{name} ")
+            "from t_industrial_injury_catalogue a where a.ake003 in ('23','24','21') and a.ake002 like #{name} ")
     List<SiCentralSuppliesMini> selectInjurySupplies(String name);
 
     @Update("update yp_zd_dict set national_status=1,national_code=#{nationalCode}," +