删除无用字段

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 25b88835bfb861f17fcec918f51e35d1922dbe2d
+Subproject commit 8988e6551401ce573c21834f842f0f68ddbd98b2

epdc-cloud-commons-yushan

@@ -1 +1 @@
-Subproject commit ea8dce697c0d53096b090c2f13c5a8c6ee0a24e0
+Subproject commit 60b469fb3d9fccb7220f65c3ddbaa412033ecc01

epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml

@@ -37,7 +37,7 @@
         '榆山街道' as street,
         ui.USER_NAME,
         ui.ID_CARD,
-        YEAR (now()) - YEAR (substring(ui.ID_CARD, 7, 8)) as age,
+        ui.age,
         CASE WHEN ui.VACCINATION_NUM > 0 THEN 1 ELSE 0 END AS isInoculate,
         IFNULL(ui.VACCINATION_NUM, 0) AS VACCINATION_NUM,
         IFNULL(ui.VACCINATION_STATE, 0) AS VACCINATION_STATE,
@@ -51,8 +51,7 @@
         uir.PLOT,
         uir.BUILDING_NO,
         uir.UNIT,
-        uir.ROOM_NO,
-        DATE_FORMAT(uir.CREATED_TIME,'%Y-%m-%d %H:%i:%s') as CREATED_TIME
+        uir.ROOM_NO
         from epidemic_user_info ui
         left join epidemic_user_inout_record uir on ui.ID_CARD=uir.ID_CARD
         where ui.DEL_FLAG='0'
@@ -97,16 +96,13 @@
             and ui.AGE <= #{ageEnd}
         </if>
         <if test="isInoculate != null and isInoculate != '' and isInoculate == 0">
-            and ui.VACCINATION_NUM = 0
             and ui.VACCINATION_STATE = 0
         </if>
         <if test="isInoculate != null and isInoculate != '' and isInoculate == 1">
             and ui.VACCINATION_NUM = 1
-            and ui.VACCINATION_STATE = 1
         </if>
         <if test="isInoculate != null and isInoculate != '' and isInoculate == 2">
             and ui.VACCINATION_NUM = 2
-            and ui.VACCINATION_STATE = 1
         </if>
         <if test="isInoculate != null and isInoculate != '' and isInoculate == 3">
             and ui.VACCINATION_NUM = 3