diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteReceiveMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteReceiveMapper.java
index 578e7cd..bb68121 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteReceiveMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteReceiveMapper.java
@@ -25,5 +25,5 @@ public interface FolviteReceiveMapper {
 
     List<Map<String, Object>> list(FolviteRecordQuery query);
 
-    int listCount(FolviteRecordQuery query);
+    Integer listCount(FolviteRecordQuery query);
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteRecordQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteRecordQuery.java
index 1904c80..2d4cb8b 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteRecordQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteRecordQuery.java
@@ -15,7 +15,7 @@ public class FolviteRecordQuery extends BaseQuery {
     private String folviteId;
 
     //查询号（姓名、联系方式、证件号、就诊卡）
-    private String queyNo;
+    private String queryNo;
 
     // 孕前/孕后 0 孕前 1 孕后
     private Integer isconceive;
@@ -32,12 +32,12 @@ public class FolviteRecordQuery extends BaseQuery {
     //结束建档日期
     private Date endDrawTime;
 
-    public String getQueyNo() {
-        return queyNo;
+    public String getQueryNo() {
+        return queryNo;
     }
 
-    public void setQueyNo(String queyNo) {
-        this.queyNo = queyNo;
+    public void setQueryNo(String queryNo) {
+        this.queryNo = queryNo;
     }
 
     public Integer getIsconceive() {
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 bffc546..fda18b7 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -56,32 +56,68 @@ hospitalid
 
     <select id="list" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" resultType="map">
         SELECT
-        f.`name`,f.birthday,f.card_no,f.vc_card,p.isconceive,f.receivesum,
-        SUM(p.receive_number),f.drawTime,f.domicile_address,f.domicile_area,
-        f.domicile_city,f.domicile_country,f.domicile_province
+        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
         FROM
         lyms_folvite_provide AS p
         LEFT JOIN
         lyms_folvite_Info f ON p.folvite_id = f.id
         <where>
             1=1
-            <if test="queyNo != null and queyNo != ''">
+            <if test="queryNo != null and queryNo != ''">
                 and f.`name` =#{queryNo}
             </if>
+            <if test="isconceive !=null">
+                and p.isconceive=#{isconceive}
+            </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="startDrawTime != null">
+                AND  <![CDATA[ f.drawTime > date_format(#{startDrawTime},'%Y-%m-%d')  ]]>
+            </if>
+            <if test="endDrawTime != null">
+                AND  <![CDATA[ f.drawTime < date_format(#{endDrawTime},'%Y-%m-%d')  ]]>
+            </if>
 
         </where>
         GROUP BY p.folvite_id
         <include refid="orderAndLimit"/>
     </select>
 
-    <select id="listCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" resultType="int">
+    <select id="listCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" resultType="java.lang.Integer">
         SELECT
         count(1)
         FROM
         lyms_folvite_provide AS p
         LEFT JOIN
         lyms_folvite_Info f ON p.folvite_id = f.id
-        <include refid="whereSql"/>
+        <where>
+            1=1
+            <if test="queryNo != null and queryNo != ''">
+                and f.`name` =#{queryNo}
+            </if>
+            <if test="isconceive !=null">
+                and p.isconceive=#{isconceive}
+            </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="startDrawTime != null">
+                AND  <![CDATA[ f.drawTime > date_format(#{startDrawTime},'%Y-%m-%d')  ]]>
+            </if>
+            <if test="endDrawTime != null">
+                AND  <![CDATA[ f.drawTime < date_format(#{endDrawTime},'%Y-%m-%d')  ]]>
+            </if>
+
+        </where>
         GROUP BY p.folvite_id
     </select>
     <select id="queyFolviteReceiveCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"
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 9636a00..ae62291 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
@@ -114,10 +114,11 @@ public class FolviteController extends BaseController {
         query.setEndReceiveDate(DateUtil.getYmdhmDate(endReceiveDate));
         query.setStartReceiveDate(DateUtil.getYmdhmDate(startDrawTime));
         query.setEndDrawTime(DateUtil.getYmdhmDate(endDrawTime));
+        query.setQueryNo(queryNo);
         query.setSort("created asc");
-        query.setQueyNo(queryNo);
         query.setNeed("true");
 
+
         List<Map<String, Object>> list = folviteService.list(query);
         BaseListResponse baseResponse = new BaseListResponse();
         baseResponse.setData(list);
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 73dbfe0..bb00528 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
@@ -222,13 +222,36 @@ public class FolviteServiceImpl implements FolviteService {
 
     @Override
     public List<Map<String, Object>> list(FolviteRecordQuery folviteQuery) {
+        List<Map<String, Object>> datas = new ArrayList<>();
         if (folviteQuery.getNeed() != null) {
-            folviteQuery.mysqlBuild(receiveMapper.listCount(folviteQuery));
+            folviteQuery.mysqlBuild(receiveMapper.listCount(folviteQuery) == null ? 0 : receiveMapper.listCount(folviteQuery));
         }
-        return receiveMapper.list(folviteQuery);
+        List<Map<String, Object>> maps = receiveMapper.list(folviteQuery);
+        for (Map<String, Object> map : maps) {
+            Map<String, Object> m = new HashMap<>();
+            m.put("folviteId", map.get("folvite_id"));
+            m.put("name", map.get("name"));
+            m.put("cardNo", map.get("card_no"));
+            m.put("vcCard", map.get("vc_card"));
+            m.put("birthday", DateUtil.getyyyy_MM_dd((Date) map.get("birthday")));
+            m.put("isconceive", (int) map.get("isconceive") != 0 ? "孕后" : "孕前");
+            m.put("receivesum", map.get("receivesum"));
+            m.put("drawTime", DateUtil.getyyyy_MM_dd((Date) map.get("drawTime")));
+            m.put("sumNumber", map.get("sumNumber"));
+            m.put("domicileAddress", map.get("domicile_address"));
+            m.put("domicileArea", map.get("domicile_area"));
+            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(),
+                    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());
+            datas.add(m);
+        }
+        return datas;
     }
 
-
     FolviteResult result(ResidentsArchiveModel archiveModel) {
         FolviteResult folviteResult = new FolviteResult();
         folviteResult.setWomanId(archiveModel.getId());