From 8c9b78088aeaadad13aa34381b4f430b06bbe0eb Mon Sep 17 00:00:00 2001
From: Administrator <184677810@qq.com>
Date: Fri, 1 Nov 2019 16:13:37 +0800
Subject: [PATCH] update

---
 .../mainOrm/master/FolviteReceiveMapper.xml        | 11 ++++++++--
 .../operate/web/controller/FolviteController.java  | 24 +++++++++++++++++++++-
 .../web/service/impl/FolviteServiceImpl.java       |  1 +
 3 files changed, 33 insertions(+), 3 deletions(-)

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 01e19d9..875e582 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -95,7 +95,9 @@ yn
         <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 (
         SELECT
         count(1)
         FROM
@@ -126,6 +128,10 @@ yn
                 AND  <![CDATA[ f.drawTime < date_format(#{endDrawTime},'%Y-%m-%d')  ]]>
             </if>
         </where>
+
+        ) t
+
+
     </select>
 
     <select id="queyFolviteReceiveCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"
@@ -187,12 +193,13 @@ yn
             <if test="isconceive != null">
                 isconceive=#{isconceive,jdbcType=INTEGER},
             </if>
-            <if test="endPregnancy != null and endPregnancy !=''">
+            <if test="endPregnancy != null ">
                 end_pregnancy=#{endPregnancy,jdbcType=INTEGER},
             </if>
             <if test="yn ! = null">
                 yn=#{yn}
             </if>
+
         </set>
     </sql>
 
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 56d4205..33b5214 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
@@ -169,7 +169,17 @@ public class FolviteController extends BaseController {
         return baseResponse;
     }
 
-
+    /**
+     * 查询发放列表
+     *
+     * @param queryNo
+     * @param hospitalId
+     * @param receiveDate
+     * @param highRisk
+     * @param page
+     * @param limit
+     * @return
+     */
     @RequestMapping(value = "/queryFolviteRecord", method = RequestMethod.GET)
     @ResponseBody
     @TokenRequired
@@ -210,6 +220,12 @@ public class FolviteController extends BaseController {
         return response;
     }
 
+    /**
+     * 删除
+     *
+     * @param id
+     * @return
+     */
     @RequestMapping(value = "deleteReceive/{id}", method = RequestMethod.DELETE)
     @ResponseBody
     @TokenRequired
@@ -218,6 +234,12 @@ public class FolviteController extends BaseController {
         return folviteService.deleteProvide(id);
     }
 
+    /**
+     * 获取详情
+     *
+     * @param id
+     * @return
+     */
     @RequestMapping(value = "querFolviteRecordInfo/{id}", method = RequestMethod.GET)
     @ResponseBody
     @TokenRequired
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 b91b819..f128202 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
@@ -192,6 +192,7 @@ public class FolviteServiceImpl implements FolviteService {
                 folviteResult.setHospitalIdStr(hospital);
 
             } catch (Exception e) {
+
             }
         }
         BaseResponse response = new BaseResponse();
-- 
1.8.3.1