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 6601d04..eb9846a 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 @@ -628,11 +628,11 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService * 9=新生儿访视 lyms_newborn_visit * 10=血红蛋白检查 lyms_babycheck */ - private String getCheckTime(Integer type, String userId, Date createDate) { - String parentId = null; - List patients = mongoTemplate.find(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), Patients.class); + private String getCheckTime(Integer type, String userId,String parentId) { +// String parentId = null; + /* List patients = mongoTemplate.find(Query.query(Criteria.where("pid").is(userId)).with(new Sort(Sort.Direction.DESC, "created")), Patients.class); for (Patients patient : patients) { -// System.out.println(patient.getId() + " " + DateUtil.getyyyy_MM_dd_hms(patient.getCreated())); + System.out.println(patient.getId() + " " + DateUtil.getyyyy_MM_dd_hms(patient.getCreated()) + " >> " + DateUtil.getyyyy_MM_dd_hms(createDate)); if(patient.getCreated().getTime() <= createDate.getTime()) { parentId = patient.getId(); if(type != 1 && type != 3) { @@ -645,7 +645,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } 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) { @@ -708,14 +708,14 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService System.out.println(patient); } - List userIds = new ArrayList<>(); - List> patientInfos = new ArrayList<>(); + List userIds = new ArrayList<>(); // 存储patientId +// List> patientInfos = new ArrayList<>(); for (Patients patient : patients) { - Map temp = new HashMap<>(); - temp.put("userId", patient.getPid()); - temp.put("date", DateUtil.getyyyy_MM_dd(patient.getCreated())); +// Map temp = new HashMap<>(); +// temp.put("userId", patient.getPid()); +// temp.put("date", DateUtil.getyyyy_MM_dd(patient.getCreated())); userIds.add(patient.getPid()); - patientInfos.add(temp); +// patientInfos.add(temp); } System.out.println(userIds); // Map param = CollectionUtils.createMap("hospitalIds", hospitalIds, "userIds", userIds, "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "page", (page - 1) * limit, "limit", limit); @@ -750,7 +750,10 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService for (Patients p : patients) { if(p.getId().equals(patientId)) { for (Map map : entry.getValue()) { - String checkTime = getCheckTime((Integer) map.get("type"), (String) map.get("user_id"), (Date) map.get("create_date")); + if(p.getCreated().getTime() > ((Date) map.get("create_date")).getTime()) { // 同一个产程中 patient的创建时间肯定小于优惠券的创建时间 + continue; + } + String checkTime = getCheckTime((Integer) map.get("type"), (String) map.get("user_id"), patientId); if(StringUtils.isNotEmpty(checkTime)) { /** 如果没有做检查 那么返回的时间就是空字符串 这里等于做了检查但是没用券 */ unUsedIds.add(p.getId()); unUsedCouponCount ++; @@ -895,7 +898,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService * 过滤掉全部优惠券所对应的项目都没做的userid * @param userIds */ - private void doFilter(List userIds, String hospitalId) { + /*private void doFilter(List userIds, String hospitalId) { if(CollectionUtils.isNotEmpty(userIds) && StringUtils.isNotEmpty(hospitalId)) { List> lists = couponMapper.findUserTypeInfo(CollectionUtils.createMap("userIds", userIds, "hospitalId", hospitalId)); if(CollectionUtils.isNotEmpty(lists)) { @@ -907,7 +910,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService for (Map map : lists) { Integer type = (Integer) map.get("type"); String userId = (String) map.get("user_id"); - String checkTime = getCheckTime(type, userId, (Date) map.get("create_date")); + String checkTime = getCheckTime(type, userId, (Date) map.get("create_date"), patientId); if(!"".equals(checkTime)) { // 找到对应信息 temp.put(userId, false); } @@ -919,7 +922,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } } } - } + }*/ @Override