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 12bfa13..525751b 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
@@ -26,7 +26,7 @@ public class FolviteQuery extends BaseQuery {
     private String certificateType;
 
     //是否结束孕辰 0、未结束 1、已结束
-    private int ispregnancy;
+    private Integer ispregnancy;
 
     //建档医院
     private String hospitalId;
@@ -115,11 +115,11 @@ public class FolviteQuery extends BaseQuery {
         return certificateType;
     }
 
-    public int getIspregnancy() {
+    public Integer getIspregnancy() {
         return ispregnancy;
     }
 
-    public void setIspregnancy(int ispregnancy) {
+    public void setIspregnancy(Integer ispregnancy) {
         this.ispregnancy = ispregnancy;
     }
 
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 8e68716..3c61cbb 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
@@ -294,11 +294,12 @@ drawTime ) VALUES (
                 and vc_card=#{vcCard,jdbcType=VARCHAR}
             </if>
             <if test="hospitalId != null and hospitalId !=''">
-                and hospitalId=#{hospitalId,jdbcType=VARCHAR}
+                and hospitalid=#{hospitalId,jdbcType=VARCHAR}
             </if>
-            <if test="ispregnancy != null and ispregnancy !=''">
-                and ispregnancy=#{ispregnancy,jdbcType=VARCHAR}
+            <if test="ispregnancy != null">
+                and ispregnancy=#{ispregnancy}
             </if>
+
         </where>
     </sql>
 
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 fc4cccd..77a1d36 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -59,7 +59,7 @@ yn
 
     <select id="list" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" resultType="map">
         SELECT
-        f.`name` as name,f.birthday,f.card_no,f.vc_card,p.isconceive,f.receivesum,
+        f.`name` as name,f.birthday,f.card_no,f.vc_card,f.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.phone
         FROM
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 6d83577..29f5fe4 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
@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
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 196fffa..294e407 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
@@ -79,7 +79,7 @@ public class FolviteServiceImpl implements FolviteService {
         folviteQuery.setHospitalId(hospitalId);
         List<FolviteRecordModel> recordModels = folviteMapper.queryList(folviteQuery);
         Map<String, Object> data = new HashMap<>();
-        String folviteId = null;
+        List<Map<String, Object>> listMap = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(recordModels)) {
             FolviteRecordModel queryOne = recordModels.get(0);
             if (null != queryOne) {
@@ -92,27 +92,26 @@ public class FolviteServiceImpl implements FolviteService {
                 data.put("sumNumber", queryOne.getReceiveSum());
                 data.put("address", CommonsHelper.getResidence(queryOne.getDomicileProvince(), queryOne.getDomicileCity(),
                         queryOne.getDomicileArea(), queryOne.getDomicileCountry(), queryOne.getDomicileAddress(), basicConfigService));
+                data.put("drawTime", DateUtil.getyyyy_MM_dd(queryOne.getDrawTime()));
                 flag = false;
-                folviteId = queryOne.getId();
             }
-        }
-        FolviteRecordQuery recordQuery = new FolviteRecordQuery();
-        recordQuery.setFolviteId(folviteId);
-        List<Map<String, Object>> listMap = new ArrayList<>();
-        List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
-        if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
-            for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) {
-                Map<String, Object> recordMap = new HashMap<>();
-                recordMap.put("drawCount", folviteRecordModel.getReceiveNumber());
-                recordMap.put("drawTime", DateUtil.getyyyy_MM_dd(folviteRecordModel.getReceiveDate()));
-                recordMap.put("id", folviteRecordModel.getId());
-                recordMap.put("other", folviteRecordModel.getIsconceive());
-                if (folviteRecordModel.getIsconceive() == 0) {
-                    recordMap.put("pregnancyType", "孕前");
-                } else {
-                    recordMap.put("pregnancyType", "孕" + folviteRecordModel.getReceiveWeek() + "周");
+            FolviteRecordQuery recordQuery = new FolviteRecordQuery();
+            recordQuery.setFolviteId(queryOne.getId());
+            List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
+            if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
+                for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) {
+                    Map<String, Object> recordMap = new HashMap<>();
+                    recordMap.put("drawCount", folviteRecordModel.getReceiveNumber());
+                    recordMap.put("drawTime", DateUtil.getyyyy_MM_dd(folviteRecordModel.getReceiveDate()));
+                    recordMap.put("id", folviteRecordModel.getId());
+                    recordMap.put("other", folviteRecordModel.getIsconceive());
+                    if (folviteRecordModel.getIsconceive() == 0) {
+                        recordMap.put("pregnancyType", "孕前");
+                    } else {
+                        recordMap.put("pregnancyType", "孕" + folviteRecordModel.getReceiveWeek() + "周");
+                    }
+                    listMap.add(recordMap);
                 }
-                listMap.add(recordMap);
             }
         }
         FolviteResult result = null;
@@ -264,7 +263,7 @@ public class FolviteServiceImpl implements FolviteService {
             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("isconceive", map.get("isconceive").toString().equals("0") ? "孕前" : "孕后");
             m.put("receivesum", map.get("receivesum"));
             m.put("drawTime", DateUtil.getyyyy_MM_dd((Date) map.get("drawTime")));
             m.put("sumNumber", map.get("sumNumber"));
@@ -277,6 +276,7 @@ public class FolviteServiceImpl implements FolviteService {
                     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());
+            m.put("phone", map.get("phone"));
             datas.add(m);
         }
         return datas;