diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index 25b8883..8988e65 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit 25b88835bfb861f17fcec918f51e35d1922dbe2d
+Subproject commit 8988e6551401ce573c21834f842f0f68ddbd98b2
diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan
index ea8dce6..60b469f 160000
--- a/epdc-cloud-commons-yushan
+++ b/epdc-cloud-commons-yushan
@@ -1 +1 @@
-Subproject commit ea8dce697c0d53096b090c2f13c5a8c6ee0a24e0
+Subproject commit 60b469fb3d9fccb7220f65c3ddbaa412033ecc01
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
index 45e0f15..5299867 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml
@@ -96,10 +96,12 @@
             and uir.GRID_NAME like '%${gridName}%'
         </if>
         <if test="ageStart != null and ageStart != ''">
-            and ui.AGE >= #{ageStart}
+            AND STR_TO_DATE(ui.BIRTHDAY, '%Y-%m-%d') >= DATE_FORMAT( #{ageStart}, '%Y-%m-%d' )
+            AND ui.BIRTHDAY LIKE '%-%'
         </if>
         <if test="ageEnd != null and ageEnd != ''">
-            and ui.AGE &lt;= #{ageEnd}
+            and STR_TO_DATE(ui.BIRTHDAY, '%Y-%m-%d') &lt;= DATE_FORMAT( #{ageEnd}, '%Y-%m-%d' )
+            AND ui.BIRTHDAY LIKE '%-%'
         </if>
         <if test="isInoculate != null and isInoculate != '' and isInoculate == 0">
             and ui.VACCINATION_STATE = 0
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml
index fad93b8..ee3dd21 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml
@@ -50,6 +50,15 @@
         <if test="dose != null and dose != '' and dose > 0">
             AND v.DOSE = #{dose}
         </if>
+        <if test="street != null and street != ''">
+            and v.STREET like '%${street}%'
+        </if>
+        <if test="community != null and community != ''">
+            and v.COMMUNITY like '%${community}%'
+        </if>
+        <if test="gridName != null and gridName != ''">
+            and v.GRID like '%${gridName}%'
+        </if>
     </select>
 
     <select id="checkVaccination" resultType="com.elink.esua.epdc.vaccine.vim.entity.VaccinationInfoEntity">