jiangjiazhi / regional-platform

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 0 additions and 20 deletions

...	...	@@ -153,6 +153,5 @@
153	153
154	154	Map<String,Object> findHospitalAllused(Map<String, Object> param);
155	155
156		- Map<String,Object> findHospitalCsAllused(Map<String, Object> queryParam);
157	156	}

...	...	@@ -984,22 +984,5 @@
984	984	</select>
985	985
986	986
987		-
988		- <select id="findHospitalCsAllused" parameterType="map" resultType="map">
989		- select count(t.id) as allUserdCsCount
990		- from coupon_info c, hospital_coupon_template_group h,coupon_template t ,coupon_type p
991		- where h.coupon_template_group_id=t.group_id and t.type_id=p.id and c.coupon_template_id = t.id
992		- and h.hospital_id = #{hid}
993		- and p.type=11
994		- <if test="startDate != null">
995		- and c.use_date >= #{startDate}
996		- </if>
997		- <if test="endDate != null">
998		- and c.use_date <![CDATA[ <= ]]> #{endDate}
999		- </if>
1000		- and c.status =2 and c.used_id is not null
1001		- </select>
1002		-
1003		-
1004	987	</mapper>

...	...	@@ -2490,13 +2490,11 @@
2490	2490	Map<String, Object> usedInfo = couponMapper.findHospitalUsedInfo2(queryParam);
2491	2491	Map<String, Object> sendInfo = couponMapper.findHospitalSendInfo2(queryParam);
2492	2492	Map<String, Object> allusedInfo = couponMapper.findHospitalAllused(queryParam);
2493		- Map<String, Object> allusedCsInfo = couponMapper.findHospitalCsAllused(queryParam);
2494	2493
2495	2494	Map<String, Object> tempMap = packCouponMap(sendInfo, usedInfo, hNameMap, hid, xAxis, queryParam);
2496	2495
2497	2496	if(MapUtils.isNotEmpty(tempMap)) {
2498	2497	tempMap.put("allUserdCount",(allusedInfo == null \|\| allusedInfo.get("allUserdCount") == null) ? 0 : allusedInfo.get("allUserdCount"));
2499		- tempMap.put("allUserdCsCount",(allusedCsInfo == null \|\| allusedCsInfo.get("allUserdCsCount") == null) ? 0 : allusedCsInfo.get("allUserdCsCount"));
2500	2498
2501	2499	/** 方法/使用人数id */
2502	2500	List<String> sendUserIds = couponMapper.findSendUserIds2(queryParam);