From 31af91e8335028236c287c81840eccd72ee161cf Mon Sep 17 00:00:00 2001
From: Administrator <184677810@qq.com>
Date: Fri, 1 Nov 2019 19:15:07 +0800
Subject: [PATCH] update

---
 .../src/main/resources/mainOrm/master/FolviteMapper.xml  |  8 ++++----
 .../resources/mainOrm/master/FolviteReceiveMapper.xml    | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 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 27f103a..4ddc495 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 %H:%i:%S')  ]]>
             </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 %H:%i:%S')  ]]>
             </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 %H:%i:%S')  ]]>
             </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 %H:%i:%S')  ]]>
             </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 af6f1bd..b10bb34 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -79,16 +79,16 @@ yn
                 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 %H:%i:%S')  ]]>
             </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 %H:%i:%S')  ]]>
             </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 %H:%i:%S')  ]]>
             </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 %H:%i:%S')  ]]>
             </if>
 
         </where>
@@ -117,16 +117,16 @@ yn
                 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 %H:%i:%S')  ]]>
             </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 %H:%i:%S')  ]]>
             </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 %H:%i:%S')  ]]>
             </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 %H:%i:%S')  ]]>
             </if>
         </where>
         GROUP BY p.folvite_id
-- 
1.8.3.1