jiangjiazhi / regional-platform | GitLab

Commit 24c1349965d17acd957b4d020c52c83537d480fa

Authored by litao over 8 years ago

1 parent 23de990034

Exists in master and in 6 other branches

详情带上日期出院小结字段修复

Showing 2 changed files with 7 additions and 0 deletions

platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java

...	...	@@ -230,6 +230,12 @@
230	230	</foreach>
231	231	) b
232	232	where a.used_hospital_id = b.hospital_id and a.coupon_template_id = b.id and a.status = 2
	233	+ <if test="startDate != null">
	234	+ and a.use_date >= #{startDate}
	235	+ </if>
	236	+ <if test="endDate != null">
	237	+ and a.use_date <![CDATA[ < ]]> #{endDate}
	238	+ </if>
233	239	group by b.coupon_order, b.type, a.used_hospital_id
234	240	</select>
235	241

...	...	@@ -110,6 +110,7 @@
110	110	/** 产后 */
111	111	couponReportMap.put("3_1", "<div class='ag-double-line'>产后建档券<div>使用人次</div></div>");
112	112	couponReportMap.put("4_1", "<div class='ag-double-line'>分娩券<div>使用人次</div></div>");
	113	+ couponReportMap.put("5_1", "<div class='ag-double-line'>出院小结券<div>使用人次</div></div>");
113	114	couponReportMap.put("6_1", "<div class='ag-double-line'>42天访视券<div>使用人次</div></div>");
114	115	couponReportMap.put("6_2", "<div class='ag-double-line'>产后复查券(一)<div>使用人次</div></div>");
115	116	couponReportMap.put("6_3", "<div class='ag-double-line'>产后复查券(二)<div>使用人次</div></div>");