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 56b93d3..aa63796 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -262,10 +262,12 @@
) b
where a.used_hospital_id = b.hospital_id and a.coupon_template_id = b.id and a.status = 2
- and a.use_date >= #{startDate}
+-- and a.use_date >= #{startDate}
+ and a.create_date >= #{startDate}
- and a.use_date #{endDate}
+-- and a.use_date #{endDate}
+ and a.create_date #{endDate}
group by b.coupon_order, b.type, a.used_hospital_id
@@ -388,7 +390,7 @@
and a.create_date #{endDate}
- order by a.use_date desc, a.user_id desc
+ order by a.user_id, a.use_date desc
limit #{currentPage},#{pageSize}
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 9d71800..348dbac 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
@@ -705,6 +705,14 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
return "";
}
+ private List getNeedUsedIds(List patients, List antExChuModels, List antenatalExaminationModels, List maternalDeliverModels, List deliverModels, List postReviewModels) {
+ List needUsedIds = new ArrayList<>();
+ for (Patients patient : patients) {
+ needUsedIds.add(patient.getId());
+ }
+ return needUsedIds;
+ }
+
@Override
public BaseObjectResponse unUsed(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer page, Integer limit, Integer userId) {
List hospitalIds = getHospitalIds(userId, hospitalId);
@@ -716,19 +724,34 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
if(startDate != null && endDate != null) {
c.and("bookbuildingDate").gte(startDate).lt(DateUtil.addDay(endDate, 1));
}
+
List patients = mongoTemplate.find(Query.query(c).with(new Sort(Sort.Direction.DESC, "created")), Patients.class);
+ List parentIds = new ArrayList<>();
for (Patients patient : patients) {
- System.out.println(patient);
+ parentIds.add(patient.getId());
+ }
+ List babyModels = mongoTemplate.find(Query.query(Criteria.where("yn").ne(0).and("parentId").in(parentIds)), BabyModel.class);
+ List babyIds = new ArrayList<>();
+ for (BabyModel babyModel : babyModels) {
+ babyIds.add(babyModel.getId());
}
+ List babyCheckModels = mongoTemplate.find(Query.query(Criteria.where("yn").ne(0).and("buildId").in(babyModels)), BabyCheckModel.class);
+ List antExChuModels = mongoTemplate.find(Query.query(Criteria.where("yn").ne(0).and("parentId").in(parentIds)), AntExChuModel.class);
+ List antenatalExaminationModels = mongoTemplate.find(Query.query(Criteria.where("yn").ne(0).and("parentId").in(parentIds)), AntenatalExaminationModel.class);
+ List maternalDeliverModels = mongoTemplate.find(Query.query(Criteria.where("yn").ne(0).and("parentId").in(parentIds)), MaternalDeliverModel.class);
+ List deliverModels = mongoTemplate.find(Query.query(Criteria.where("yn").ne(0).and("patientId").in(parentIds)), DischargeAbstractMotherModel.class);
+ List postReviewModels = mongoTemplate.find(Query.query(Criteria.where("yn").ne(0).and("parentId").in(parentIds)), PostReviewModel.class);
+
+ List usedIds = getNeedUsedIds(patients, antExChuModels, antenatalExaminationModels, maternalDeliverModels, deliverModels, postReviewModels);
- List userIds = new ArrayList<>(); // 存储patientId
-// List