From 48b3b4afea715c0a3c49fa0b27171f6f6a01f9ed Mon Sep 17 00:00:00 2001
From: Administrator <184677810@qq.com>
Date: Fri, 1 Nov 2019 18:52:44 +0800
Subject: [PATCH] update

---
 .../resources/mainOrm/master/FolviteMapper.xml     |  8 ++++----
 .../mainOrm/master/FolviteReceiveMapper.xml        | 22 ++++++++++------------
 2 files changed, 14 insertions(+), 16 deletions(-)

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 45bf5f7..27f103a 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
@@ -148,10 +148,10 @@
                 and p.hospitalid =#{hospitalId}
             </if>
             <if test="startReceiveDate != null ">
-                AND  <![CDATA[ p.receive_date > date_format(#{startReceiveDate},'%Y-%m-%d')  ]]>
+                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')  ]]>
+                AND  <![CDATA[ p.receive_date <= date_format(#{endReceiveDate},'%Y-%m-%d')  ]]>
             </if>
             <if test="highRisk !=null and highRisk != ''">
                 AND p.highrisk=#{highRisk}
@@ -181,10 +181,10 @@
                 and p.hospitalid =#{hospitalId}
             </if>
             <if test="startReceiveDate != null ">
-                AND  <![CDATA[ p.receive_date > date_format(#{startReceiveDate},'%Y-%m-%d')  ]]>
+                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')  ]]>
+                AND  <![CDATA[ p.receive_date <= date_format(#{endReceiveDate},'%Y-%m-%d')  ]]>
             </if>
             <if test="highRisk !=null and highRisk != ''">
                 AND p.highrisk=#{highRisk}
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 ac67ff3..af6f1bd 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -76,19 +76,19 @@ yn
                 and f.`name` =#{queryNo} or f.phone=#{queryNo} or f.card_no =#{queryNo} or f.vc_card=#{queryNo}
             </if>
             <if test="isconceive !=null">
-                and p.isconceive=#{isconceive}
+                and f.isconceive=#{isconceive}
             </if>
             <if test="startReceiveDate != null ">
-                AND  <![CDATA[ p.receive_date > date_format(#{startReceiveDate},'%Y-%m-%d')  ]]>
+                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')  ]]>
+                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')  ]]>
+                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')  ]]>
+                AND  <![CDATA[ f.drawTime <= date_format(#{endDrawTime},'%Y-%m-%d')  ]]>
             </if>
 
         </where>
@@ -114,19 +114,19 @@ yn
                 and f.`name` =#{queryNo} or f.phone=#{queryNo} or f.card_no =#{queryNo} or f.vc_card=#{queryNo}
             </if>
             <if test="isconceive !=null">
-                and p.isconceive=#{isconceive}
+                and f.isconceive=#{isconceive}
             </if>
             <if test="startReceiveDate != null ">
-                AND  <![CDATA[ p.receive_date > date_format(#{startReceiveDate},'%Y-%m-%d')  ]]>
+                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')  ]]>
+                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')  ]]>
+                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')  ]]>
+                AND  <![CDATA[ f.drawTime <= date_format(#{endDrawTime},'%Y-%m-%d')  ]]>
             </if>
         </where>
         GROUP BY p.folvite_id
@@ -149,8 +149,6 @@ yn
             <if test="yn != null">
                 and yn=#{yn}
             </if>
-
-
         </where>
 
 
-- 
1.8.3.1