diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 1203976d6c..497d96a25b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/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} - AND DATE_FORMAT(INOCULATE_TIME,"%Y-%m-%d") > #{startDate} + AND DATE_FORMAT(INOCULATE_TIME,"%Y-%m-%d") >= #{startDate} - AND DATE_FORMAT(INOCULATE_TIME,"%Y-%m-%d") < #{endDate} + AND DATE_FORMAT(INOCULATE_TIME,"%Y-%m-%d") <= #{endDate} 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} - AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") > #{startDate} + AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") >= #{startDate} - AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") < #{endDate} + AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") <= #{endDate} - AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") > #{natStartDate} + AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") >= #{natStartDate} - AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") < #{natEndDate} + AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") <= #{natEndDate} GROUP BY ID_CARD ) c ON a.ID_CARD = c.ID_CARD WHERE