diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/WxStatisticsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/WxStatisticsServiceImpl.java index e1df972..8370c17 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/WxStatisticsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/WxStatisticsServiceImpl.java @@ -145,18 +145,25 @@ public class WxStatisticsServiceImpl implements WxStatisticsService { Query query = Query.query(Criteria.where("parentId").in(patientsIds) .andOperator(Criteria.where("trackType").in(list))); query.addCriteria(Criteria.where("overTimes").gte(1)); + Set set= new HashSet<>(); + List trackDownRecords = mongoTemplate.find(query, TrackDownRecord.class); + for(TrackDownRecord record:trackDownRecords){ + set.add(record.getParentId()); + } long fm = mongoTemplate.count(query, "lyms_trackdown_record"); - Query query1 = Query.query(Criteria.where("parentId").in(patientsIds) + Query query1 = Query.query(Criteria.where("parentId").in(set) .andOperator(Criteria.where("trackDownDateType").in(list))); List trackDowns = mongoTemplate.find(query1, TrackDown.class); - Set set= new HashSet<>(); + Set set2= new HashSet<>(); for(TrackDown td: trackDowns){ - set.add(td.getPid()); + set2.add(td.getParentId()); } - long fz = set.size(); + long fz = set2.size(); + //处理有逾期追访,但是overTime ==0问题 + fz = fz > fm ? fm :fz; returnMap.put("fz",String.valueOf(fz)); diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml index 3a12468..7f1c7ef 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml @@ -567,7 +567,7 @@ - +