From e33ef02608bc91ca1eb3a7d147f9cc9e6f50b2f3 Mon Sep 17 00:00:00 2001
From: Administrator <184677810@qq.com>
Date: Thu, 31 Oct 2019 20:00:33 +0800
Subject: [PATCH] update

---
 .../permission/dao/master/FolviteMapper.java       |  8 ++++-
 .../platform/permission/model/FolviteQuery.java    | 11 +++++++
 .../permission/model/FolviteRecordQuery.java       |  1 +
 .../resources/mainOrm/master/FolviteMapper.xml     | 34 +++++++++++++++++++++-
 .../operate/web/controller/FolviteController.java  | 27 ++++++++++++++++-
 .../operate/web/service/FolviteService.java        |  3 +-
 .../web/service/impl/FolviteServiceImpl.java       | 10 ++++++-
 7 files changed, 89 insertions(+), 5 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteMapper.java
index fb19fcd..8ea9c3a 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteMapper.java
@@ -4,6 +4,7 @@ import com.lyms.platform.permission.model.FolviteQuery;
 import com.lyms.platform.pojo.FolviteRecordModel;
 
 import java.util.List;
+import java.util.Map;
 
 
 public interface FolviteMapper {
@@ -12,7 +13,12 @@ public interface FolviteMapper {
      *
      * @return
      */
-    List<FolviteRecordModel> queryOne(FolviteQuery query);
+    List<FolviteRecordModel> queryList(FolviteQuery query);
+
+
+    List<Map<String, Object>> queryListMap(FolviteQuery query);
+
+    Integer queryListCount(FolviteQuery query);
 
     /**
      * 保存叶酸建档记录
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 2678c6f..e0e9f20 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
@@ -11,6 +11,9 @@ public class FolviteQuery extends BaseQuery {
 
     private String id;
 
+    //查询号
+    private String queryNo;
+
     //就诊卡号
     private String vcCard;
 
@@ -33,6 +36,14 @@ public class FolviteQuery extends BaseQuery {
         return womanId;
     }
 
+    public String getQueryNo() {
+        return queryNo;
+    }
+
+    public void setQueryNo(String queryNo) {
+        this.queryNo = queryNo;
+    }
+
     public void setWomanId(String womanId) {
         this.womanId = womanId;
     }
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 2d4cb8b..c6d4a9b 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
@@ -36,6 +36,7 @@ public class FolviteRecordQuery extends BaseQuery {
         return queryNo;
     }
 
+
     public void setQueryNo(String queryNo) {
         this.queryNo = queryNo;
     }
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 1ba9651..a6367d1 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
@@ -42,7 +42,7 @@
     </resultMap>
 
 
-    <select id="queryOne" parameterType="com.lyms.platform.permission.model.FolviteQuery" resultMap="folviteResultMap">
+    <select id="queryList" parameterType="com.lyms.platform.permission.model.FolviteQuery" resultMap="folviteResultMap">
         SELECT
         id AS id,
         NAME AS NAME,
@@ -84,6 +84,38 @@
         <include refid="whereSql"/>
     </select>
 
+
+    <select id="queryListMap" parameterType="com.lyms.platform.permission.model.FolviteQuery"
+            resultType="map">
+        SELECT
+        f.`name`,f.card_no,f.phone,p.receive_date,p.receive_number,p.receive_week,p.highrisk,p.provide_unit,f.habitation_address,f.habitation_area,f.habitation_city,f.habitation_country,f.habitation_province,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="queryNo !=null and queryNo != ''">
+                and f.name =#{queryNo}
+            </if>
+
+
+        </where>
+        <include refid="orderAndLimit"/>
+    </select>
+
+
+    <select id="queryListCount" parameterType="com.lyms.platform.permission.model.FolviteQuery"
+            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
+    </select>
+
+
     <select id="queryFolviteListCount" parameterType="com.lyms.platform.permission.model.FolviteQuery"
             resultType="java.lang.Integer">
         select count(id) from lyms_folvite_Info
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 ae62291..c70633d 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
@@ -97,7 +97,17 @@ public class FolviteController extends BaseController {
         return folviteService.queryOneProvide(id, getUserId(request));
     }
 
-
+    /***
+     * 孕次管理查询列表
+     *
+     * @param queryNo
+     * @param isconceive
+     * @param startReceiveDate
+     * @param endReceiveDate
+     * @param startDrawTime
+     * @param endDrawTime
+     * @return
+     */
     @RequestMapping(value = "queyrFolviteList", method = RequestMethod.GET)
     @ResponseBody
     @TokenRequired
@@ -127,4 +137,19 @@ public class FolviteController extends BaseController {
     }
 
 
+    @RequestMapping(value = "/queryFolviteRecord", method = RequestMethod.GET)
+    @ResponseBody
+    @TokenRequired
+    public BaseResponse queryFolviteRecord(@Param("queryNo") String queryNo) {
+        FolviteQuery query = new FolviteQuery();
+        query.setQueryNo(queryNo);
+
+        List<Map<String, Object>> maps = folviteService.recordList(query);
+        BaseListResponse response = new BaseListResponse();
+        response.setPageInfo(query.getPageInfo());
+        response.setData(maps);
+        return response;
+    }
+
+
 }
\ No newline at end of file
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 2049c1a..f014899 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
@@ -51,6 +51,7 @@ public interface FolviteService {
      * @return
      */
     BaseResponse queryOneProvide(String id, Integer userId);
+
     List<FolviteRecordModel> queryFolviteList(FolviteQuery folviteQuery);
 
     List<FolviteReceiveRecordModel> queryFolviteReceiveList(FolviteRecordQuery query);
@@ -58,7 +59,7 @@ public interface FolviteService {
     List<Map<String, Object>> list(FolviteRecordQuery folviteQuery);
 
 
-
+    List<Map<String, Object>> recordList(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 bb00528..18ac5b8 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.setIspregnancy(0);
         folviteQuery.setHospitalId(hospitalId);
-        List<FolviteRecordModel> recordModels = folviteMapper.queryOne(folviteQuery);
+        List<FolviteRecordModel> recordModels = folviteMapper.queryList(folviteQuery);
         Map<String, Object> data = new HashMap<>();
         String folviteId = null;
         if (CollectionUtils.isNotEmpty(recordModels)) {
@@ -252,6 +252,14 @@ public class FolviteServiceImpl implements FolviteService {
         return datas;
     }
 
+    @Override
+    public List<Map<String, Object>> recordList(FolviteQuery folviteQuery) {
+        if (folviteQuery.getNeed() != null) {
+            folviteQuery.mysqlBuild(folviteMapper.queryListCount(folviteQuery) == null ? 0 : folviteMapper.queryListCount(folviteQuery));
+        }
+        return folviteMapper.queryListMap(folviteQuery);
+    }
+
     FolviteResult result(ResidentsArchiveModel archiveModel) {
         FolviteResult folviteResult = new FolviteResult();
         folviteResult.setWomanId(archiveModel.getId());
-- 
1.8.3.1