Commit 180c271f7b7e8d3844bd60bd4e2a519b492f4e0f
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
180c271
| ... | ... | @@ -474,29 +474,30 @@ |
| 474 | 474 | } |
| 475 | 475 | } |
| 476 | 476 | |
| 477 | - } | |
| 478 | - | |
| 479 | - if(CollectionUtils.isNotEmpty(couponReport)) { | |
| 480 | - param.put("status", 2); | |
| 481 | - List<Map<String, Object>> couponUsedTypeInfo = couponMapper.findUsedInfo(param); /** 优惠券使用详情 */ | |
| 482 | - for (Map<String, Object> m : couponReport) { | |
| 483 | - for (Map<String, Object> info : couponUsedTypeInfo) { | |
| 484 | - if(m.get("hospitalId").toString().equals(info.get("used_hospital_id"))) { | |
| 485 | - m.put(info.get("type") + "_" + info.get("coupon_order"), info.get("type_used_count")); | |
| 477 | + if(CollectionUtils.isNotEmpty(couponReport)) { | |
| 478 | + param.put("status", 2); | |
| 479 | + List<Map<String, Object>> couponUsedTypeInfo = couponMapper.findUsedInfo(param); /** 优惠券使用详情 */ | |
| 480 | + for (Map<String, Object> m : couponReport) { | |
| 481 | + for (Map<String, Object> info : couponUsedTypeInfo) { | |
| 482 | + if(m.get("hospitalId").toString().equals(info.get("used_hospital_id"))) { | |
| 483 | + m.put(info.get("type") + "_" + info.get("coupon_order"), info.get("type_used_count")); | |
| 484 | + } | |
| 486 | 485 | } |
| 487 | 486 | } |
| 488 | 487 | } |
| 488 | + | |
| 489 | + /** 查询医院所绑定的type和coupon_order */ | |
| 490 | + List<String> key = couponMapper.findCouponTitleByTemp(param); | |
| 491 | + setZeroDataByTemp(key, couponReport); | |
| 492 | + | |
| 489 | 493 | } |
| 490 | 494 | |
| 495 | + | |
| 491 | 496 | ReportModel reportModel = new ReportModel(); |
| 492 | 497 | reportModel.setxAxis(xAxis); |
| 493 | 498 | reportModel.setData(Arrays.asList("发放券数", "使用券数")); |
| 494 | 499 | reportModel.setSeries(createSeries(couponReport)); |
| 495 | 500 | reportModel.doMerge(); |
| 496 | - | |
| 497 | - /** 查询医院所绑定的type和coupon_order */ | |
| 498 | - List<String> key = couponMapper.findCouponTitleByTemp(param); | |
| 499 | - setZeroDataByTemp(key, couponReport); | |
| 500 | 501 | |
| 501 | 502 | Map<String, Object> titleMap = parseTitle(couponReport); |
| 502 | 503 | transNullToZero(couponReport, titleMap); |