jiangjiazhi / regional-platform

Commit 48b3b4afea715c0a3c49fa0b27171f6f6a01f9ed

Authored by Administrator over 5 years ago

Exists in master and in 6 other branches

update

Showing 2 changed files with 14 additions and 16 deletions

platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml

...	...	@@ -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') ]]>
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') ]]>
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') ]]>
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') ]]>
188	188	</if>
189	189	<if test="highRisk !=null and highRisk != ''">
190	190	AND p.highrisk=#{highRisk}

...	...	@@ -76,19 +76,19 @@
76	76	and f.`name` =#{queryNo} or f.phone=#{queryNo} or f.card_no =#{queryNo} or f.vc_card=#{queryNo}
77	77	</if>
78	78	<if test="isconceive !=null">
79		- and p.isconceive=#{isconceive}
	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') ]]>
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') ]]>
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') ]]>
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') ]]>
92	92	</if>
93	93
94	94	</where>
95	95
96	96
97	97
98	98
...	...	@@ -114,19 +114,19 @@
114	114	and f.`name` =#{queryNo} or f.phone=#{queryNo} or f.card_no =#{queryNo} or f.vc_card=#{queryNo}
115	115	</if>
116	116	<if test="isconceive !=null">
117		- and p.isconceive=#{isconceive}
	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') ]]>
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') ]]>
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') ]]>
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') ]]>
130	130	</if>
131	131	</where>
132	132	GROUP BY p.folvite_id
...	...	@@ -149,8 +149,6 @@
149	149	<if test="yn != null">
150	150	and yn=#{yn}
151	151	</if>
152		-
153		-
154	152	</where>
155	153
156	154