jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 31af91e8335028236c287c81840eccd72ee161cf

Authored by Administrator
1 parent 48b3b4afea
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 12 additions and 12 deletions

platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml View file @ 31af91e
... ... @@ -148,10 +148,10 @@
148 148 and p.hospitalid =#{hospitalId}
149 149 </if>
150 150 <if test="startReceiveDate != null ">
151   - AND <![CDATA[ p.receive_date >= date_format(#{startReceiveDate},'%Y-%m-%d') ]]>
  151 + AND <![CDATA[ p.receive_date >= date_format(#{startReceiveDate},'%Y-%m-%d %H:%i:%S') ]]>
152 152 </if>
153 153 <if test="endReceiveDate != null">
154   - AND <![CDATA[ p.receive_date <= date_format(#{endReceiveDate},'%Y-%m-%d') ]]>
  154 + AND <![CDATA[ p.receive_date <= date_format(#{endReceiveDate},'%Y-%m-%d %H:%i:%S') ]]>
155 155 </if>
156 156 <if test="highRisk !=null and highRisk != ''">
157 157 AND p.highrisk=#{highRisk}
158 158  
... ... @@ -181,10 +181,10 @@
181 181 and p.hospitalid =#{hospitalId}
182 182 </if>
183 183 <if test="startReceiveDate != null ">
184   - AND <![CDATA[ p.receive_date >= date_format(#{startReceiveDate},'%Y-%m-%d') ]]>
  184 + AND <![CDATA[ p.receive_date >= date_format(#{startReceiveDate},'%Y-%m-%d %H:%i:%S') ]]>
185 185 </if>
186 186 <if test="endReceiveDate != null">
187   - AND <![CDATA[ p.receive_date <= date_format(#{endReceiveDate},'%Y-%m-%d') ]]>
  187 + AND <![CDATA[ p.receive_date <= date_format(#{endReceiveDate},'%Y-%m-%d %H:%i:%S') ]]>
188 188 </if>
189 189 <if test="highRisk !=null and highRisk != ''">
190 190 AND p.highrisk=#{highRisk}
platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml View file @ 31af91e
... ... @@ -79,16 +79,16 @@
79 79 and f.isconceive=#{isconceive}
80 80 </if>
81 81 <if test="startReceiveDate != null ">
82   - AND <![CDATA[ p.receive_date >= date_format(#{startReceiveDate},'%Y-%m-%d') ]]>
  82 + AND <![CDATA[ p.receive_date >= date_format(#{startReceiveDate},'%Y-%m-%d %H:%i:%S') ]]>
83 83 </if>
84 84 <if test="endReceiveDate != null">
85   - AND <![CDATA[ p.receive_date <= date_format(#{endReceiveDate},'%Y-%m-%d') ]]>
  85 + AND <![CDATA[ p.receive_date <= date_format(#{endReceiveDate},'%Y-%m-%d %H:%i:%S') ]]>
86 86 </if>
87 87 <if test="startDrawTime != null">
88   - AND <![CDATA[ f.drawTime >= date_format(#{startDrawTime},'%Y-%m-%d') ]]>
  88 + AND <![CDATA[ f.drawTime >= date_format(#{startDrawTime},'%Y-%m-%d %H:%i:%S') ]]>
89 89 </if>
90 90 <if test="endDrawTime != null">
91   - AND <![CDATA[ f.drawTime <= date_format(#{endDrawTime},'%Y-%m-%d') ]]>
  91 + AND <![CDATA[ f.drawTime <= date_format(#{endDrawTime},'%Y-%m-%d %H:%i:%S') ]]>
92 92 </if>
93 93  
94 94 </where>
95 95  
96 96  
97 97  
... ... @@ -117,16 +117,16 @@
117 117 and f.isconceive=#{isconceive}
118 118 </if>
119 119 <if test="startReceiveDate != null ">
120   - AND <![CDATA[ p.receive_date >= date_format(#{startReceiveDate},'%Y-%m-%d') ]]>
  120 + AND <![CDATA[ p.receive_date >= date_format(#{startReceiveDate},'%Y-%m-%d %H:%i:%S') ]]>
121 121 </if>
122 122 <if test="endReceiveDate != null">
123   - AND <![CDATA[ p.receive_date <= date_format(#{endReceiveDate},'%Y-%m-%d') ]]>
  123 + AND <![CDATA[ p.receive_date <= date_format(#{endReceiveDate},'%Y-%m-%d %H:%i:%S') ]]>
124 124 </if>
125 125 <if test="startDrawTime != null">
126   - AND <![CDATA[ f.drawTime >= date_format(#{startDrawTime},'%Y-%m-%d') ]]>
  126 + AND <![CDATA[ f.drawTime >= date_format(#{startDrawTime},'%Y-%m-%d %H:%i:%S') ]]>
127 127 </if>
128 128 <if test="endDrawTime != null">
129   - AND <![CDATA[ f.drawTime <= date_format(#{endDrawTime},'%Y-%m-%d') ]]>
  129 + AND <![CDATA[ f.drawTime <= date_format(#{endDrawTime},'%Y-%m-%d %H:%i:%S') ]]>
130 130 </if>
131 131 </where>
132 132 GROUP BY p.folvite_id