diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java
index 345d7496b0..c1663d71d5 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java
@@ -1,10 +1,13 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.dto.form.PageFormDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.Date;
/**
* @Description
@@ -80,4 +83,18 @@ public class EpidemicPreventionFormDTO extends PageFormDTO implements Serializab
* 关注类型,核酸检测:2,疫苗接种:1
*/
private Integer attentionType;
+
+ /**
+ * 年龄段查询,起始生日
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date startBirthDay;
+
+ /**
+ * 年龄段查询,截止生日
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date endBirthDay;
}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java
index 0639371186..0632fd9025 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java
@@ -1,9 +1,11 @@
package com.epmet.dto.result;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
+import java.util.Date;
/**
* @Description
@@ -37,6 +39,10 @@ public class EpidemicPreventionResultDTO implements Serializable {
* 身份证
*/
private String idCard;
+
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthDay;
+
/**
* 疫苗接种次数
*/
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 9105d1d48b..688745f515 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
@@ -815,6 +815,7 @@
HOME_ID,
MOBILE,
a.ID_CARD,
+ a.BIRTHDAY,
IFNULL( b.count, 0 ) AS vaccineCount,
IFNULL( c.count, 0 ) AS natCount
FROM
@@ -877,6 +878,12 @@
AND a.ID_CARD LIKE concat( '%', #{idCard}, '%' )
+
+ AND DATE_FORMAT(a.BIRTHDAY,'%Y-%m-%d') = ]]> #{startBirthDay}
+
+
+ AND DATE_FORMAT(a.BIRTHDAY,'%Y-%m-%d') #{endBirthDay}
+
ORDER BY GRID_ID,VILLAGE_ID,BUILD_ID,UNIT_ID,HOME_ID, convert(NAME using gbk)
) t
WHERE