epmetuser/epidemicPrevention/page

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -849,10 +849,10 @@
                 FROM ic_vaccine
                 WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId}
                 <if test="startDate != null and startDate != ''">
-                    AND DATE_FORMAT(INOCULATE_TIME,"%Y-%m-%d") &gt; #{startDate}
+                    AND DATE_FORMAT(INOCULATE_TIME,"%Y-%m-%d") &gt;= #{startDate}
                 </if>
                 <if test="endDate != null and endDate != ''">
-                    AND DATE_FORMAT(INOCULATE_TIME,"%Y-%m-%d") &lt; #{endDate}
+                    AND DATE_FORMAT(INOCULATE_TIME,"%Y-%m-%d") &lt;= #{endDate}
                 </if>
                 GROUP BY ID_CARD ) b ON a.ID_CARD = b.ID_CARD
             LEFT JOIN (
@@ -860,16 +860,16 @@
                 FROM ic_nat
                 WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId}
                 <if test="startDate != null and startDate != ''">
-                    AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") &gt; #{startDate}
+                    AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") &gt;= #{startDate}
                 </if>
                 <if test="endDate != null and endDate != ''">
-                    AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") &lt; #{endDate}
+                    AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") &lt;= #{endDate}
                 </if>
                 <if test='natStartDate != null and natStartDate != "" '>
-                    AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") &gt; #{natStartDate}
+                    AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") &gt;= #{natStartDate}
                 </if>
                 <if test='natEndDate != null and natEndDate != "" '>
-                    AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") &lt; #{natEndDate}
+                    AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") &lt;= #{natEndDate}
                 </if>
                 GROUP BY ID_CARD ) c ON a.ID_CARD = c.ID_CARD
         WHERE