diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
index ef96535..189e589 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -711,7 +711,7 @@
 
 
     <select id="findUnUsed2" parameterType="map" resultType="map">
-        select a.user_id, c.type, d.city_id, d.area_id, d.name as hospitalName, d.province_id, a.create_hospital_id as hospitalId
+        select a.user_id, a.create_date, b.coupon_order, c.type, d.city_id, d.area_id, d.name as hospitalName, d.province_id, a.create_hospital_id as hospitalId
         from coupon_info a, coupon_template b, coupon_type c, organization d
         where a.coupon_template_id = b.id and b.type_id = c.id and a.status  = 1 and d.id = a.create_hospital_id
         and a.create_hospital_id = #{hid} and a.user_id in
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 ee4302a..f50ce7b 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
@@ -30,7 +30,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
-import scala.annotation.target.param;
 
 import javax.servlet.http.HttpServletResponse;
 import java.sql.PreparedStatement;
@@ -579,7 +578,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             for (Patients patient : patients) {
                 userIds.add(patient.getPid());
             }
-            List<Map<String, Object>> list = couponMapper.findUnUsedInfo(CollectionUtils.createMap("hospitalId", hospitalId, "userIds", userIds, "page", (page - 1) * limit, "limit", limit));
+            List<Map<String, Object>> list = couponMapper.findUnUsedInfo(CollectionUtils.createMap("hospitalId", hospitalId, "userIds", userIds));
             List<Map<String, Object>> restList = new ArrayList<>();
             for (Map<String, Object> map : list) {
                 map.put("couponName", (couponReportMap.get(map.get("type") + "_" + map.get("coupon_order"))).toString()
@@ -597,7 +596,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                         map.put("hospitalName", couponMapper.findHospitalNameById(patient.getHospitalId()));
                     }
                 }
-                map.put("checkTime", getCheckTime((Integer) map.get("type"), (String) map.get("user_id")));
+                map.put("checkTime", getCheckTime((Integer) map.get("type"), (String) map.get("user_id"), (Date) map.get("create_date")));
                 restList.add(map);
             }
             Integer count = couponMapper.findUnUsedInfoCount(CollectionUtils.createMap("userIds", userIds, "hospitalId", hospitalId));
@@ -619,55 +618,63 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
      * 9=新生儿访视	lyms_newborn_visit
      * 10=血红蛋白检查	lyms_babycheck
      */
-    private String getCheckTime(Integer type, String userId) {
-        if(type != null && StringUtils.isNotEmpty(userId)) {
-            if(type == 1 || type == 3) {
-                Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), Patients.class);
-                if(patients != null) {
-                    return DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate());
-                }
-            } else if(type == 2) {
-                AntExChuModel exChuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class);
-                if(exChuModel != null) {
-                    return DateUtil.getyyyy_MM_dd(exChuModel.getCheckTime());
-                }
-                AntenatalExaminationModel antenatalExaminationModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), AntenatalExaminationModel.class);
-                if(antenatalExaminationModel != null) {
-                    return DateUtil.getyyyy_MM_dd(antenatalExaminationModel.getCheckDate());
-                }
-            } else if(type == 4) {
-                MaternalDeliverModel md = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class);
-                if(md != null) {
-                    return md.getDueDate();
-                }
-            } else if(type == 5) {
-                DischargeAbstractMotherModel dischargeAbstractMotherModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), DischargeAbstractMotherModel.class);
-                if(dischargeAbstractMotherModel != null) {
-                    return DateUtil.getyyyy_MM_dd(dischargeAbstractMotherModel.getLeaveHospitalDate());
-                }
-            } else if(type == 6) {
-                PostReviewModel p = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), PostReviewModel.class);
-                if(p != null) {
-                    return DateUtil.getyyyy_MM_dd(p.getCheckTime());
-                }
-            } else if(type == 7) {
-                BabyModel b = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class);
-                if(b != null) {
-                    return DateUtil.getyyyy_MM_dd(b.getBuildDate());
+    private String getCheckTime(Integer type, String userId, Date createDate) {
+        String parentId = null;
+        List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), Patients.class);
+        for (Patients patient : patients) {
+            if(patient.getCreated().getTime() < createDate.getTime()) {
+                parentId = patient.getId();
+                if(type == 1 || type == 3) {
+                    return DateUtil.getyyyy_MM_dd(patient.getBookbuildingDate());
                 }
-            } else if(type == 8 || type == 10) {
-                BabyCheckModel b = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), BabyCheckModel.class);
+            }
+        }
+        if(StringUtils.isEmpty(parentId) && type != 8 && type != 10) {
+            return "";
+        }
+        if(type == 2) {
+            AntExChuModel exChuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId).and("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class);
+            if(exChuModel != null) {
+                return DateUtil.getyyyy_MM_dd(exChuModel.getCheckTime());
+            }
+            AntenatalExaminationModel antenatalExaminationModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId).and("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), AntenatalExaminationModel.class);
+            if(antenatalExaminationModel != null) {
+                return DateUtil.getyyyy_MM_dd(antenatalExaminationModel.getCheckDate());
+            }
+        } else if(type == 4) {
+            MaternalDeliverModel md = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId).and("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class);
+            if(md != null) {
+                return md.getDueDate();
+            }
+        } else if(type == 5) {
+            DischargeAbstractMotherModel dischargeAbstractMotherModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId).and("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), DischargeAbstractMotherModel.class);
+            if(dischargeAbstractMotherModel != null) {
+                return DateUtil.getyyyy_MM_dd(dischargeAbstractMotherModel.getLeaveHospitalDate());
+            }
+        } else if(type == 6) {
+            PostReviewModel p = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId).and("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), PostReviewModel.class);
+            if(p != null) {
+                return DateUtil.getyyyy_MM_dd(p.getCheckTime());
+            }
+        } else if(type == 7) {
+            BabyModel b = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId).and("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class);
+            if(b != null) {
+                return DateUtil.getyyyy_MM_dd(b.getBuildDate());
+            }
+        } else if(type == 8 || type == 10) {
+            BabyModel babyModel = mongoTemplate.findById(userId, BabyModel.class);
+            if(babyModel != null) {
+                BabyCheckModel b = mongoTemplate.findOne(Query.query(Criteria.where("buildId").is(babyModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), BabyCheckModel.class);
                 if(b != null) {
                     return DateUtil.getyyyy_MM_dd(b.getCheckDate());
                 }
-            } else if(type == 9) {
-                NewbornVisit b = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), NewbornVisit.class);
-                if(b != null) {
-                    return DateUtil.getyyyy_MM_dd(b.getCheckTime());
-                }
+            }
+        } else if(type == 9) {
+            NewbornVisit b = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), NewbornVisit.class);
+            if(b != null) {
+                return DateUtil.getyyyy_MM_dd(b.getCheckTime());
             }
         }
-
         return "";
     }
 
@@ -682,12 +689,18 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         if(startDate != null && endDate != null) {
             c.and("bookbuildingDate").gte(startDate).lt(DateUtil.addDay(endDate, 1));
         }
-        List<Patients> patients = mongoTemplate.find(Query.query(c).with(new Sort(Sort.Direction.DESC, "bookbuildingDate")), Patients.class);
+        List<Patients> patients = mongoTemplate.find(Query.query(c).with(new Sort(Sort.Direction.DESC, "created")), Patients.class);
 
-        Set<String> userIds = new HashSet<>();
+        List<String> userIds = new ArrayList<>();
+        List<Map<String, String>> patientInfos = new ArrayList<>();
         for (Patients patient : patients) {
+            Map<String, String> temp = new HashMap<>();
+            temp.put("userId", patient.getPid());
+            temp.put("date", DateUtil.getyyyy_MM_dd(patient.getCreated()));
             userIds.add(patient.getPid());
+            patientInfos.add(temp);
         }
+        System.out.println(userIds);
 //                Map<String, Object> param = CollectionUtils.createMap("hospitalIds", hospitalIds, "userIds", userIds, "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "page", (page - 1) * limit, "limit", limit);
         if(CollectionUtils.isNotEmpty(userIds)) {
             Map<String, Object> param = CollectionUtils.createMap("hospitalIds", hospitalIds, "userIds", userIds, "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "page", (page - 1) * limit, "limit", limit);
@@ -697,20 +710,56 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 List<Map<String, Object>> list = couponMapper.findUnUsed2(param);
                 if(CollectionUtils.isNotEmpty(list)) {
                     Map<String, Object> temp = new HashMap<>();
-                    Set<String> unUsedUids = new HashSet<>();
+                    Set<String> unUsedIds = new HashSet<>(); // 存储patientId或者是babyId
+                    List<Map<String, Object>> unUsedCoupons = new ArrayList<>();
                     Integer unUsedCouponCount = 0;
                     temp.putAll(list.get(0));
                     temp.put("cityName", findName(list.get(0).get("city_id")));
                     temp.put("areaName", findName(list.get(0).get("area_id")));
                     temp.remove("user_id");
-                    for (Map<String, Object> map : list) {
-                        /** 如果没有做检查 那么返回的时间就是空字符串 */
-                        if (StringUtils.isNotEmpty(getCheckTime((Integer) map.get("type"), (String) map.get("user_id")))) {
-                            unUsedUids.add((String) map.get("user_id"));
-                            unUsedCouponCount++;
+
+                    Map<String, List<Map<String, Object>>> infos = new HashMap<>(); // key = patientId, value = 该patient所对应的所有优惠券
+                    for (Patients p : patients) {
+                        for (Map<String,Object> coupon : list) {
+                            if(p.getPid().equals(coupon.get("user_id").toString())) {
+                                List<Map<String, Object>> coupons = infos.containsKey(p.getId()) ? infos.get(p.getId()) : new ArrayList<Map<String, Object>>();
+                                coupons.add(coupon);
+                                infos.put(p.getId(), coupons);
+                            }
                         }
                     }
-                    temp.put("un_used_people", unUsedUids.size());
+                    for (Map.Entry<String, List<Map<String, Object>>> entry : infos.entrySet()) {
+                        String patientId = entry.getKey();
+                        for (Patients p : patients) {
+                            if(p.getId().equals(patientId)) {
+                                for (Map<String, Object> map : entry.getValue()) {
+                                    String checkTime = getCheckTime((Integer) map.get("type"), (String) map.get("user_id"), (Date) map.get("create_date"));
+                                    if(StringUtils.isNotEmpty(checkTime)) {  /** 如果没有做检查 那么返回的时间就是空字符串  这里等于做了检查但是没用券 */
+                                        unUsedIds.add(p.getId());
+                                        unUsedCouponCount ++;
+                                        map.put("couponName", (couponReportMap.get(map.get("type") + "_" + map.get("coupon_order"))).toString()
+                                                .replaceAll("使用人次", "")
+                                                .replaceAll("<div class='ag-double-line'>", "")
+                                                .replaceAll("<div>", "")
+                                                .replaceAll("</div>", ""));
+                                        map.put("username", p.getUsername());
+                                        map.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(p.getPhone()));
+                                        map.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(p.getCardNo()));
+                                        map.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date()));
+                                        map.put("doctorName", couponMapper.getUserName(p.getBookbuildingDoctor()));
+                                        map.put("hospitalName", couponMapper.findHospitalNameById(p.getHospitalId()));
+                                        map.put("checkTime", checkTime);
+                                        unUsedCoupons.add(map);
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+
+                    temp.put("un_used_people", unUsedIds.size());
+                    temp.put("unUsedIds", unUsedIds);
+                    temp.put("un_used_coupons", unUsedCoupons);
                     temp.put("un_used_coupon_count", unUsedCouponCount);
                     restList.add(temp);
                 }
@@ -811,7 +860,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 for (Map<String, Object> map : lists) {
                     Integer type = (Integer) map.get("type");
                     String userId = (String) map.get("user_id");
-                    String checkTime = getCheckTime(type, userId);
+                    String checkTime = getCheckTime(type, userId, (Date) map.get("create_date"));
                     if(!"".equals(checkTime)) { // 找到对应信息
                         temp.put(userId, false);
                     }