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 6188010..5f492f8 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -775,20 +775,6 @@
#{key}
-
-
- and d.province_id = #{provinceId}
-
-
- and d.city_id = #{cityId}
-
-
- and d.area_id = #{areaId}
-
-
- and d.street_id = #{streetId}
-
-
and b.coupon_order = #{coupon_order}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java
index 0eb68b7..6513be2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/OrgCouponServiceImpl.java
@@ -165,6 +165,41 @@ public class OrgCouponServiceImpl extends BaseServiceImpl implements OrgCouponSe
}
}
+ //隆化省市县筛选
+ String provinceId=(null!=param.get("provinceId")) ? param.get("provinceId").toString() : "";
+ String cityId=(null!=param.get("cityId")) ? param.get("cityId").toString() : "";
+ String areaId=(null!=param.get("areaId")) ? param.get("areaId").toString() : "";
+ String streetId=(null!=param.get("streetId")) ? param.get("streetId").toString() : "";
+ if (StringUtils.isNotEmpty(provinceId)) {
+ Criteria criteria = new Criteria();
+ criteria = criteria.and("provinceRegisterId").is(provinceId);
+ if(StringUtils.isNotEmpty(cityId)){
+ criteria.and("cityRegisterId").is(cityId);
+ }
+ if (StringUtils.isNotEmpty(areaId)){
+ criteria.and("areaRegisterId").is(areaId);
+ }
+ if(StringUtils.isNotEmpty(streetId)){
+ criteria.and("streetRegisterId").is(streetId);
+ }
+ if(StringUtils.isNotEmpty(key)){
+ keys.clear();
+ criteria.orOperator(Criteria.where("name").is(key), Criteria.where("cardNo").is(key), Criteria.where("phone").is(key));
+ }
+ List patients = mongoTemplate.find(Query.query(criteria), Patients.class);
+ if (CollectionUtils.isNotEmpty(patients)) {
+ for (Patients patients1 : patients) {
+ keys.add(patients1.getPid());
+ }
+ } else {
+ List