Commit 15fe4e879968f7a1ecfc3455533e2afbf5a933d9
1 parent
e2276e6892
Exists in
master
and in
6 other branches
优惠劵报告
Showing 1 changed file with 0 additions and 36 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
15fe4e8
| ... | ... | @@ -2452,13 +2452,6 @@ |
| 2452 | 2452 | param.put("hospitalId", CollectionUtils.asList((String) param.get("hospitalId"))); |
| 2453 | 2453 | } |
| 2454 | 2454 | } |
| 2455 | - | |
| 2456 | -/* | |
| 2457 | - if(StringUtils.isBlank((String) param.get("hospitalId"))) { | |
| 2458 | - param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); *//** 模拟根据登陆人id 查询出来的医院 *//* | |
| 2459 | - } else { | |
| 2460 | - param.put("hospitalId", CollectionUtils.asList((String) param.get("hospitalId"))); | |
| 2461 | - }*/ | |
| 2462 | 2455 | doHospitalFilter(param); |
| 2463 | 2456 | |
| 2464 | 2457 | List<Map<String, Object>> couponReport = new ArrayList<>(); |
| 2465 | 2458 | |
| ... | ... | @@ -2523,33 +2516,10 @@ |
| 2523 | 2516 | } |
| 2524 | 2517 | } |
| 2525 | 2518 | } |
| 2526 | - | |
| 2527 | -// for (String hid : hospitalId) { | |
| 2528 | -// param.put("hid", hid); | |
| 2529 | -// Map<String, Object> usedInfo = couponMapper.findHospitalUsedInfo2(param); | |
| 2530 | -// Map<String, Object> sendInfo = couponMapper.findHospitalSendInfo2(param); | |
| 2531 | -// Map<String, Object> allusedInfo = couponMapper.findHospitalAllused(param); | |
| 2532 | -// | |
| 2533 | -// Map<String, Object> tempMap = packCouponMap(sendInfo, usedInfo, hNameMap, hid, xAxis, param); | |
| 2534 | -// | |
| 2535 | -// if(MapUtils.isNotEmpty(tempMap)) { | |
| 2536 | -// tempMap.put("allUserdCount",(allusedInfo == null || allusedInfo.get("allUserdCount") == null) ? 0 : allusedInfo.get("allUserdCount")); | |
| 2537 | -// | |
| 2538 | -// /** 方法/使用人数id */ | |
| 2539 | -// List<String> sendUserIds = couponMapper.findSendUserIds2(param); | |
| 2540 | -// List<String> usedUserIds = couponMapper.findUsedUserIds2(param); | |
| 2541 | -// tempMap.put("sendUserIds", sendUserIds); | |
| 2542 | -// tempMap.put("usedUserIds", usedUserIds); | |
| 2543 | -// couponReport.add(tempMap); | |
| 2544 | -// } | |
| 2545 | -// } | |
| 2546 | - | |
| 2547 | - | |
| 2548 | 2519 | } |
| 2549 | 2520 | |
| 2550 | 2521 | if(CollectionUtils.isNotEmpty(couponReport)) { |
| 2551 | 2522 | param.put("status", 2); |
| 2552 | -// List<Map<String, Object>> couponUsedTypeInfo = couponMapper.findUsedInfo(param); /** 优惠券使用详情 */ | |
| 2553 | 2523 | List<Map<String, Object>> couponUsedTypeInfo = couponMapper.findUsedInfo2(param); /** 优惠券使用详情 */ |
| 2554 | 2524 | for (Map<String, Object> m : couponReport) { |
| 2555 | 2525 | for (Map<String, Object> info : couponUsedTypeInfo) { |
| ... | ... | @@ -2560,7 +2530,6 @@ |
| 2560 | 2530 | |
| 2561 | 2531 | } |
| 2562 | 2532 | } |
| 2563 | - | |
| 2564 | 2533 | /** 查询医院所绑定的type和coupon_order */ |
| 2565 | 2534 | List<String> key = couponMapper.findCouponTitleByTemp(param); |
| 2566 | 2535 | setZeroDataByTemp(key, couponReport); |
| ... | ... | @@ -2586,7 +2555,6 @@ |
| 2586 | 2555 | m.put("value", entry.getKey()); |
| 2587 | 2556 | couponReportMap.add(m); |
| 2588 | 2557 | } |
| 2589 | -// return RespBuilder.buildSuccess("couponReport", couponReport, "couponReportMap", couponReportMap, "reportModel", reportModel); | |
| 2590 | 2558 | |
| 2591 | 2559 | /** 处理多产程问题 */ |
| 2592 | 2560 | for (Map<String, Object> map : couponReport) { |
| 2593 | 2561 | |
| ... | ... | @@ -2594,9 +2562,7 @@ |
| 2594 | 2562 | List<String> sendUserIds2 = new ArrayList<>(); |
| 2595 | 2563 | param.put("hid", map.get("hospitalId")); |
| 2596 | 2564 | if(CollectionUtils.isNotEmpty(sendUserIds)) { |
| 2597 | -// param.put("userIds", sendUserIds); | |
| 2598 | 2565 | param.put("hospitalFlag", "create_hospital_id"); /** 医院是用create_hospital_id 还是用 used_hospital_id限制*/ |
| 2599 | -// List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(param); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ | |
| 2600 | 2566 | List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfoWithSend(param); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ |
| 2601 | 2567 | for (Map<String, Object> m : mulitPatienInfo) { |
| 2602 | 2568 | Long count = (Long) m.get("count"); |
| ... | ... | @@ -2614,8 +2580,6 @@ |
| 2614 | 2580 | List<String> usedUserIds = (List<String>) map.get("usedUserIds"); |
| 2615 | 2581 | List<String> usedUserIds2 = new ArrayList<>(); |
| 2616 | 2582 | if(CollectionUtils.isNotEmpty(usedUserIds)) { |
| 2617 | -// List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(CollectionUtils.createMap("userIds", usedUserIds, "startDate", param.get("startDate"))); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ | |
| 2618 | -// param.put("userIds", usedUserIds); | |
| 2619 | 2583 | param.put("hospitalFlag", "used_hospital_id"); |
| 2620 | 2584 | List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(param); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ |
| 2621 | 2585 | for (Map<String, Object> m : mulitPatienInfo) { |