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 2774af1..8f26a23 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
@@ -33,6 +33,7 @@
         ID_CARD = #{idCard}
     </update>
     <select id="getEpidemicUserRecordList" resultType="com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordListDTO">
+
         select
         ui.ID,
         ui.USER_NAME,
@@ -125,6 +126,104 @@
                 #{id}
             </foreach>
         </if>
+        <if test="nativePlace != null and nativePlace != ''">
+            and ui.NATIVE_PLACE like '%${nativePlace}%'
+        </if>
+        <if test="houseAddress != null and houseAddress != ''">
+            and ui.HOUSE_ADDRESS like '%${houseAddress}%'
+        </if>
+        <if test="plot != null and plot != ''">
+            and ui.PLOT like '%${plot}%'
+        </if>
+        <if test="buildingNo != null and buildingNo != ''">
+            and ui.BUILDING_NO like '%${buildingNo}%'
+        </if>
+        <if test="unit != null and unit != ''">
+            and ui.UNIT like '%${unit}%'
+        </if>
+        <if test="roomNo != null and roomNo != ''">
+            and ui.ROOM_NO like '%${roomNo}%'
+        </if>
+        <if test="outLiveAddressDetail != null and outLiveAddressDetail != ''">
+            and ui.OUT_LIVE_ADDRESS_DETAIL like '%${outLiveAddressDetail}%'
+        </if>
+        <if test="gender != null and gender != ''">
+            and ui.GENDER = #{gender}
+        </if>
+        <if test="nation != null and nation != ''">
+            and ui.NATION = #{nation}
+        </if>
+        <if test="formerName != null and formerName != ''">
+            and ui.FORMER_NAME like '%${formerName}%'
+        </if>
+        <if test="startBirthdayTime != null and startBirthdayTime != '' and endBirthdayTime != null and endBirthdayTime != ''">
+            AND DATE_FORMAT( ui.BIRTHDAY, '%Y-%m-%d' ) BETWEEN #{startBirthdayTime} AND #{endBirthdayTime}
+        </if>
+        <if test="standardOfCulture != null and standardOfCulture != ''">
+            and ui.STANDARD_OF_CULTURE = #{standardOfCulture}
+        </if>
+        <if test="health != null and health != ''">
+            and ui.HEALTH = #{health}
+        </if>
+        <if test="maritalStatus != null and maritalStatus != ''">
+            and ui.MARITAL_STATUS = #{maritalStatus}
+        </if>
+        <if test="relation != null and relation != ''">
+            and ui.RELATION = #{relation}
+        </if>
+        <if test="politicsStatus != null and politicsStatus != ''">
+            and ui.POLITICS_STATUS = #{politicsStatus}
+        </if>
+        <if test="faith != null and faith != ''">
+            and ui.FAITH like '%${faith}%'
+        </if>
+        <if test="graduateSchool != null and graduateSchool != ''">
+            and ui.GRADUATE_SCHOOL like '%${graduateSchool}%'
+        </if>
+        <if test="professional != null and professional != ''">
+            and ui.PROFESSIONAL like '%${professional}%'
+        </if>
+        <if test="workStatus != null and workStatus != ''">
+            and ui.WORK_STATUS = #{workStatus}
+        </if>
+        <if test="industryCategory != null and industryCategory != ''">
+            and ui.INDUSTRY_CATEGORY = #{industryCategory}
+        </if>
+        <if test="workUnits != null and workUnits != ''">
+            and ui.WORK_UNITS like '%${workUnits}%'
+        </if>
+        <if test="military != null and military != ''">
+            and ui.MILITARY = #{military}
+        </if>
+        <if test="peopleCategories != null and peopleCategories != ''">
+            and ui.PEOPLE_CATEGORIES = #{peopleCategories}
+        </if>
+        <if test="car != null and car != ''">
+            and ui.CAR like '%${car}%'
+        </if>
+
+        <if test="carNo != null and carNo != ''">
+            and ui.CAR_NO like '%${carNo}%'
+        </if>
+        <if test="hushaiStatus != null and hushaiStatus != ''">
+            and ui.HUSHAI_STATUS = #{hushaiStatus}
+        </if>
+        <if test="bloodType != null and bloodType != ''">
+            and ui.BLOOD_TYPE = #{bloodType}
+        </if>
+
+        <if test="accountType != null and accountType != ''">
+            and ui.ACCOUNT_TYPE like '%${accountType}%'
+        </if>
+        <if test="familyCategory != null and familyCategory != ''">
+            and ui.FAMILY_CATEGORY like '%${familyCategory}%'
+        </if>
+        <if test="helpStatus != null and helpStatus != ''">
+            and ui.HELP_STATUS like '%${helpStatus}%'
+        </if>
+        <if test="startCheckTime != null and startCheckTime != '' and endCheckTime != null and endCheckTime != ''">
+            AND DATE_FORMAT( ui.CHECK_DATE, '%Y-%m-%d' ) BETWEEN #{startCheckTime} AND #{endCheckTime}
+        </if>
         ORDER BY ui.UPDATED_TIME DESC
         <if test="excelBigDataPageSize != null and excelBigDataPageIndex != null">
             limit #{excelBigDataPageIndex},#{excelBigDataPageSize}