防疫信息查询

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java

@@ -64,4 +64,7 @@ public class EpidemicPreventionFormDTO extends PageFormDTO implements Serializab
      * 核酸检测次数
      */
     private Integer natCount;
+
+    private String startDate;
+    private String endDate;
 }

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

@@ -656,8 +656,28 @@
             IFNULL( c.count, 0 ) AS natCount
         FROM
             ic_resi_user a
-            LEFT JOIN ( SELECT ID_CARD, count( id ) AS count FROM ic_resi_vaccine WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} GROUP BY ID_CARD ) b ON a.ID_CARD = b.ID_CARD
-            LEFT JOIN ( SELECT ID_CARD, count( id ) AS count FROM ic_nat WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} GROUP BY ID_CARD ) c ON a.ID_CARD = c.ID_CARD
+            LEFT JOIN (
+                SELECT ID_CARD, count( id ) AS count
+                FROM ic_resi_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}
+                </if>
+                <if test="endDate != null and 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 (
+                SELECT ID_CARD, count( id ) AS count
+                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}
+                </if>
+                <if test="endDate != null and endDate != ''">
+                    AND DATE_FORMAT(NAT_TIME,"%Y-%m-%d") &lt; #{endDate}
+                </if>
+                GROUP BY ID_CARD ) c ON a.ID_CARD = c.ID_CARD
         WHERE
             a.DEL_FLAG = '0'
             <if test="customerId != null and customerId != ''">