From fa3d96cada9ea0fd3c29c2994dc93a8082dbd66f Mon Sep 17 00:00:00 2001
From: shiyang <shiyang@lymsh.com>
Date: Sat, 26 Mar 2022 15:56:46 +0800
Subject: [PATCH] update

---
 .../web/service/impl/ReportServiceImpl.java        | 40 ++++++++++++----------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index d6c53c8..edefe9f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -3135,6 +3135,26 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
 //            List<Map<String, Object>> couponInfos = couponMapper.couponInfo(param);
             List<Map<String, Object>> couponInfos = couponMapper.couponInfo2(param);
 
+            //秦皇岛年龄筛选 <35 岁(大于等于35需要移除，这里需要重新组装数据)
+            List<Map<String, Object>> couponInfo2=new ArrayList<>();
+            if(null!=param.get("age")) {
+                param.put("needPage", false);
+                couponInfo2=couponMapper.couponInfo2(param);
+                Iterator<Map<String, Object>> iterator = couponInfo2.iterator();
+                while (iterator .hasNext()) {
+                    Map<String, Object> map= iterator.next();
+                    if(MapUtils.isNotEmpty(map) && null!=map.get("used_id")) {
+                        Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("id").is(map.get("used_id").toString())), Patients.class);
+                        if (null != patients) {
+                            Integer age = DateUtil.getAge(patients.getBirth());
+                            if (age >= 35) {
+                                iterator.remove();
+                            }
+                        }
+                    }
+                }
+                couponInfos = CollectionUtils.getPageIds(couponInfo2, (Integer) param.get("currentPage"), (Integer) param.get("pageSize"));
+            }
             String subTitle = null;
             Set<String> subTitleTempSet = new HashSet<>();
 
@@ -3166,26 +3186,10 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             }
 //            int count = couponMapper.findCouponInfoCount(param);
             int count = couponMapper.findCouponInfoCount2(param);
-            //秦皇岛年龄筛选 <35 岁(大于等于35需要移除,count,需要减1)
+            //秦皇岛年龄筛选 <35 岁 （筛选后的总数）
             if(null!=param.get("age")) {
-                Iterator<Map<String, Object>> iterator = couponInfos.iterator();
-                while (iterator .hasNext()) {
-                    Map<String, Object> map= iterator.next();
-                    if(MapUtils.isNotEmpty(map) && null!=map.get("used_id")) {
-                        Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("id").is(map.get("used_id").toString())), Patients.class);
-                        if (null != patients) {
-                            Integer age = DateUtil.getAge(patients.getBirth());
-                            if (age >= 35) {
-                                iterator.remove();
-                                if(0!=count){
-                                    count--;
-                                }
-                            }
-                        }
-                    }
-                }
+                count=couponInfo2.size();
             }
-
             PageResult pageResult = new PageResult(count, currentPage, (Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", couponInfos, "subTitle", subTitle));
             return RespBuilder.buildSuccess(pageResult);
         }
-- 
1.8.3.1