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 ddd40b9..377afaf 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -72,15 +72,11 @@ VALUES
     </select>
 
     <sql id="whereSql">
-        1=1
         <where>
-            <if test="folviteId != null">
-                and folviteId=#{folviteId}
-            </if>
-            <if test="">
-                and id=#{id}
+            1=1
+            <if test="folviteId != null and folviteId != ''">
+                and folvite_id=#{folviteId}
             </if>
-
         </where>
 
 
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteRecordModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteRecordModel.java
index aaaf330..2902805 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteRecordModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/FolviteRecordModel.java
@@ -2,7 +2,6 @@ package com.lyms.platform.pojo;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang.time.DateUtils;
 
 import java.util.Date;
 
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 71ca524..e560ed1 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
@@ -7,12 +7,14 @@ import com.lyms.platform.operate.web.service.FolviteService;
 import com.lyms.platform.permission.model.FolviteQuery;
 import com.lyms.platform.pojo.FolviteReceiveRecordModel;
 import com.lyms.platform.pojo.FolviteRecordModel;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 叶酸接口
@@ -94,10 +96,17 @@ public class FolviteController extends BaseController {
     @RequestMapping(value = "queyrFolviteList", method = RequestMethod.GET)
     @ResponseBody
     @TokenRequired
-    public BaseResponse queryFolviteList(@Valid @RequestBody FolviteQuery query) {
-
-
-        return null;
+    public BaseResponse queryFolviteList(@Param("cardNo") String cardNo,
+                                         @Param("womanId") String womanId) {
+
+        FolviteQuery query = new FolviteQuery();
+        query.setCardNo(cardNo);
+        query.setWomanId(womanId);
+        query.setSort("created asc");
+        List<FolviteRecordModel> recordModels = folviteService.queryFolviteList(query);
+        BaseResponse baseResponse = new BaseResponse();
+        baseResponse.setObject(recordModels);
+        return baseResponse;
     }
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/FolviteService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/FolviteService.java
index 4a46778..769eeb2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/FolviteService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/FolviteService.java
@@ -57,4 +57,6 @@ public interface FolviteService {
     List<FolviteReceiveRecordModel> queryFolviteReceiveList(FolviteRecordQuery query);
 
     List<FolviteRecordModel> list(FolviteQuery folviteQuery);
+
+
 }
\ No newline at end of file
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 6d5b472..5b3efda 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
@@ -76,7 +76,7 @@ public class FolviteServiceImpl implements FolviteService {
         folviteQuery.setHospitalId(hospitalId);
         List<FolviteRecordModel> recordModels = folviteMapper.queryOne(folviteQuery);
         Map<String, Object> data = new HashMap<>();
-        String womanId = null;
+        String folviteId = null;
         if (CollectionUtils.isNotEmpty(recordModels)) {
             FolviteRecordModel queryOne = recordModels.get(0);
             if (null != queryOne) {
@@ -89,38 +89,29 @@ public class FolviteServiceImpl implements FolviteService {
                 data.put("address", CommonsHelper.getResidence(queryOne.getDomicileProvince(), queryOne.getDomicileCity(),
                         queryOne.getDomicileArea(), queryOne.getDomicileCountry(), queryOne.getDomicileAddress(), basicConfigService));
                 flag = false;
-                womanId = queryOne.getWomanId();
+                folviteId = queryOne.getId();
             }
         }
-       /* FolviteQuery queryFolvite = new FolviteQuery();
-        queryFolvite.setWomanId(womanId);
-        queryFolvite.setCardNo(cardNo);
-        List<FolviteRecordModel> recordModel = queryFolviteList(queryFolvite);
-        List<List<Map<String, Object>>> list = new ArrayList();
-        if (CollectionUtils.isNotEmpty(recordModel)) {
-            FolviteRecordQuery recordQuery = new FolviteRecordQuery();
-            for (FolviteRecordModel folviteModel : recordModel) {
-                List<Map<String, Object>> listMap = new ArrayList<>();
-                recordQuery.setFolviteId(folviteModel.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);
-                    }
+        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() + "周");
                 }
-                list.add(listMap);
+                listMap.add(recordMap);
             }
-        }*/
+        }
+
 
         FolviteResult result = null;
         if (flag) {
@@ -139,7 +130,7 @@ public class FolviteServiceImpl implements FolviteService {
 
         BaseResponse responses = new BaseResponse();
         response.put("baseInfo", data);
-        response.put("history", "历史记录");
+        response.put("history", listMap);
         response.put("womanRecord", result);
         responses.setObject(response);
         return responses;