diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteQuery.java
index e0e9f20..309cc76 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteQuery.java
@@ -2,6 +2,8 @@ package com.lyms.platform.permission.model;
 
 import com.lyms.platform.common.dao.BaseQuery;
 
+import java.util.Date;
+
 /**
  * @author: shuai-Bo
  * @Date: 2019/10/29 0029
@@ -32,6 +34,40 @@ public class FolviteQuery extends BaseQuery {
     //妇女建档id
     private String womanId;
 
+    //领取开始时间
+    private Date startReceiveDate;
+
+    //领取结束时间
+    private Date endReceiveDate;
+
+    //高危风险因素
+    private String highRisk;
+
+
+    public Date getStartReceiveDate() {
+        return startReceiveDate;
+    }
+
+    public void setStartReceiveDate(Date startReceiveDate) {
+        this.startReceiveDate = startReceiveDate;
+    }
+
+    public Date getEndReceiveDate() {
+        return endReceiveDate;
+    }
+
+    public void setEndReceiveDate(Date endReceiveDate) {
+        this.endReceiveDate = endReceiveDate;
+    }
+
+    public String getHighRisk() {
+        return highRisk;
+    }
+
+    public void setHighRisk(String highRisk) {
+        this.highRisk = highRisk;
+    }
+
     public String getWomanId() {
         return womanId;
     }
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
index a6367d1..40cb88e 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
@@ -96,10 +96,20 @@
         <where>
             1=1
             <if test="queryNo !=null and queryNo != ''">
-                and f.name =#{queryNo}
+                and f.name =#{queryNo} or f.card_no=#{queryNo} or f.phone=#{queryNo}
+            </if>
+            <if test="hospitalId !=null and hospitalId != ''">
+                and p.hospitalid =#{hospitalId}
+            </if>
+            <if test="startReceiveDate != null ">
+                AND  <![CDATA[ p.receive_date > date_format(#{startReceiveDate},'%Y-%m-%d')  ]]>
+            </if>
+            <if test="endReceiveDate != null">
+                AND  <![CDATA[ p.receive_date < date_format(#{endReceiveDate},'%Y-%m-%d')  ]]>
+            </if>
+            <if test="highRisk !=null and highRisk != ''">
+                AND p.highrisk=#{highRisk}
             </if>
-
-
         </where>
         <include refid="orderAndLimit"/>
     </select>
@@ -107,12 +117,30 @@
 
     <select id="queryListCount" parameterType="com.lyms.platform.permission.model.FolviteQuery"
             resultType="java.lang.Integer">
-           SELECT
-            count(1)
-             FROM
+        SELECT
+        count(1)
+        FROM
         lyms_folvite_provide AS p
         LEFT JOIN
         lyms_folvite_Info f ON p.folvite_id = f.id
+        <where>
+            1=1
+            <if test="queryNo !=null and queryNo != ''">
+                and f.name =#{queryNo} or f.card_no=#{queryNo} or f.phone=#{queryNo}
+            </if>
+            <if test="hospitalId !=null and hospitalId != ''">
+                and p.hospitalid =#{hospitalId}
+            </if>
+            <if test="startReceiveDate != null ">
+                AND  <![CDATA[ p.receive_date > date_format(#{startReceiveDate},'%Y-%m-%d')  ]]>
+            </if>
+            <if test="endReceiveDate != null">
+                AND  <![CDATA[ p.receive_date < date_format(#{endReceiveDate},'%Y-%m-%d')  ]]>
+            </if>
+            <if test="highRisk !=null and highRisk != ''">
+                AND p.highrisk=#{highRisk}
+            </if>
+        </where>
     </select>
 
 
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
index fda18b7..b2dda7c 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -58,7 +58,7 @@ hospitalid
         SELECT
         f.`name` as name,f.birthday,f.card_no,f.vc_card,p.isconceive,f.receivesum,
         SUM(p.receive_number) as sumNumber,f.drawTime,f.domicile_address,f.domicile_area,
-        f.domicile_city,f.domicile_country,f.domicile_province,p.folvite_id,p.issuer
+        f.domicile_city,f.domicile_country,f.domicile_province,p.folvite_id,p.issuer,f.phone
         FROM
         lyms_folvite_provide AS p
         LEFT JOIN
@@ -66,7 +66,7 @@ hospitalid
         <where>
             1=1
             <if test="queryNo != null and queryNo != ''">
-                and f.`name` =#{queryNo}
+                and f.`name` =#{queryNo} or f.phone=#{queryNo} or f.card_no =#{queryNo} or f.vc_card=#{queryNo}
             </if>
             <if test="isconceive !=null">
                 and p.isconceive=#{isconceive}
@@ -89,7 +89,8 @@ hospitalid
         <include refid="orderAndLimit"/>
     </select>
 
-    <select id="listCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" resultType="java.lang.Integer">
+    <select id="listCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"
+            resultType="java.lang.Integer">
         SELECT
         count(1)
         FROM
@@ -99,7 +100,7 @@ hospitalid
         <where>
             1=1
             <if test="queryNo != null and queryNo != ''">
-                and f.`name` =#{queryNo}
+                and f.`name` =#{queryNo} or f.phone=#{queryNo} or f.card_no =#{queryNo} or f.vc_card=#{queryNo}
             </if>
             <if test="isconceive !=null">
                 and p.isconceive=#{isconceive}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
index c70633d..883258f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
@@ -10,6 +10,7 @@ import com.lyms.platform.permission.model.FolviteQuery;
 import com.lyms.platform.permission.model.FolviteRecordQuery;
 import com.lyms.platform.pojo.FolviteReceiveRecordModel;
 import com.lyms.platform.pojo.FolviteRecordModel;
+import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -102,10 +103,6 @@ public class FolviteController extends BaseController {
      *
      * @param queryNo
      * @param isconceive
-     * @param startReceiveDate
-     * @param endReceiveDate
-     * @param startDrawTime
-     * @param endDrawTime
      * @return
      */
     @RequestMapping(value = "queyrFolviteList", method = RequestMethod.GET)
@@ -113,22 +110,41 @@ public class FolviteController extends BaseController {
     @TokenRequired
     public BaseResponse queryFolviteList(@Param("queryNo") String queryNo,
                                          @Param("isconceive") Integer isconceive,
-                                         @Param("startReceiveDate") String startReceiveDate,
-                                         @Param("endReceiveDate") String endReceiveDate,
-                                         @Param("startDrawTime") String startDrawTime,
-                                         @Param("endDrawTime") String endDrawTime) {
+                                         @Param("receiveDate") String receiveDate,
+                                         @Param("drawTime") String drawTime,
+                                         @Param("page") Integer page,
+                                         @Param("limit") Integer limit) {
 
         FolviteRecordQuery query = new FolviteRecordQuery();
-        query.setIsconceive(isconceive);
-        query.setStartReceiveDate(DateUtil.getYmdhmDate(startReceiveDate));
-        query.setEndReceiveDate(DateUtil.getYmdhmDate(endReceiveDate));
-        query.setStartReceiveDate(DateUtil.getYmdhmDate(startDrawTime));
-        query.setEndDrawTime(DateUtil.getYmdhmDate(endDrawTime));
-        query.setQueryNo(queryNo);
+        if (null != isconceive) {
+            query.setIsconceive(isconceive);
+        }
+        if (StringUtils.isNotEmpty(receiveDate)) {
+            try {
+                query.setStartReceiveDate(DateUtil.getSNDate(receiveDate)[0]);
+                query.setEndReceiveDate(DateUtil.getSNDate(receiveDate)[1]);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        if (StringUtils.isNotEmpty(drawTime)) {
+            try {
+                query.setStartDrawTime(DateUtil.getSNDate(drawTime)[0]);
+                query.setEndDrawTime(DateUtil.getSNDate(drawTime)[1]);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        if (StringUtils.isNotEmpty(queryNo)) {
+            query.setQueryNo(queryNo);
+        }
+
+        query.setPage(page);
+        query.setLimit(limit);
+
         query.setSort("created asc");
         query.setNeed("true");
-
-
         List<Map<String, Object>> list = folviteService.list(query);
         BaseListResponse baseResponse = new BaseListResponse();
         baseResponse.setData(list);
@@ -140,9 +156,34 @@ public class FolviteController extends BaseController {
     @RequestMapping(value = "/queryFolviteRecord", method = RequestMethod.GET)
     @ResponseBody
     @TokenRequired
-    public BaseResponse queryFolviteRecord(@Param("queryNo") String queryNo) {
+    public BaseResponse queryFolviteRecord(@Param("queryNo") String queryNo,
+                                           @Param("hospitalId") String hospitalId,
+                                           @Param("receiveDate") String receiveDate,
+                                           @Param("highRisk") String highRisk,
+                                           @Param("page") Integer page,
+                                           @Param("limit") Integer limit) {
         FolviteQuery query = new FolviteQuery();
-        query.setQueryNo(queryNo);
+        if (StringUtils.isNotEmpty(queryNo)) {
+            query.setQueryNo(queryNo);
+        }
+        if (StringUtils.isNotEmpty(hospitalId)) {
+            query.setHospitalId(hospitalId);
+        }
+        if (StringUtils.isNotEmpty(receiveDate)) {
+            try {
+                query.setStartReceiveDate(DateUtil.getSNDate(receiveDate)[0]);
+                query.setEndReceiveDate(DateUtil.getSNDate(receiveDate)[1]);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        if (StringUtils.isNotEmpty(highRisk)) {
+            query.setHighRisk(highRisk);
+        }
+        query.setPage(page);
+        query.setLimit(limit);
+        query.setSort("created asc");
+        query.setNeed("true");
 
         List<Map<String, Object>> maps = folviteService.recordList(query);
         BaseListResponse response = new BaseListResponse();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
index 18ac5b8..2944d02 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java
@@ -243,7 +243,7 @@ public class FolviteServiceImpl implements FolviteService {
             m.put("domicileCity", map.get("domicile_city"));
             m.put("domicileCountry", map.get("domicile_country"));
             m.put("domicileProvince", map.get("domicile_province"));
-            m.put("Address", CommonsHelper.getResidence(map.get("domicile_province").toString(), map.get("domicile_city").toString(),
+            m.put("address", CommonsHelper.getResidence(map.get("domicile_province").toString(), map.get("domicile_city").toString(),
                     map.get("domicile_area").toString(), map.get("domicile_country").toString(), map.get("domicile_address").toString(), basicConfigService));
             m.put("issuer", map.get("issuer"));
             m.put("issuerName", usersService.getUsers(Integer.valueOf(map.get("issuer").toString())).getName());
@@ -254,10 +254,36 @@ public class FolviteServiceImpl implements FolviteService {
 
     @Override
     public List<Map<String, Object>> recordList(FolviteQuery folviteQuery) {
+        List<Map<String, Object>> data = new ArrayList<>();
         if (folviteQuery.getNeed() != null) {
             folviteQuery.mysqlBuild(folviteMapper.queryListCount(folviteQuery) == null ? 0 : folviteMapper.queryListCount(folviteQuery));
         }
-        return folviteMapper.queryListMap(folviteQuery);
+        List<Map<String, Object>> list = folviteMapper.queryListMap(folviteQuery);
+        for (Map<String, Object> map : list) {
+            Map<String, Object> m = new HashMap<>();
+            m.put("receiveNumber", map.get("receive_number"));
+            m.put("provideUnit", map.get("provide_unit"));
+            String hospital = "";
+            if (org.apache.commons.lang.StringUtils.isNotEmpty(map.get("provide_unit").toString())) {
+                Organization organization = organizationService.getOrganization(Integer.parseInt(map.get("provide_unit").toString()));
+                if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
+                    hospital = organization.getName();
+                }
+            }
+            m.put("hospitalName", hospital);
+            m.put("highrisk", map.get("highrisk"));
+            m.put("issuerId", map.get("issuer"));
+            m.put("issuerName", usersService.getUsers(Integer.valueOf(map.get("issuer").toString())).getName());
+            m.put("receiveDate", DateUtil.getyyyy_MM_dd((Date) map.get("receive_date")));
+            m.put("receiveWeek", map.get("receive_week"));
+            m.put("cardNo", map.get("card_no"));
+            m.put("phone", map.get("phone"));
+            m.put("name", map.get("name"));
+            m.put("address", CommonsHelper.getResidence(map.get("habitation_province").toString(), map.get("habitation_city").toString(),
+                    map.get("habitation_area").toString(), map.get("habitation_country").toString(), map.get("habitation_address").toString(), basicConfigService));
+            data.add(m);
+        }
+        return data;
     }
 
     FolviteResult result(ResidentsArchiveModel archiveModel) {