diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java index 6348bb9..285634a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java @@ -58,7 +58,7 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati private Integer type; //体验会员 0非会员 1会员 private Integer expVip; - + private Integer serviceType; /** * 生日 */ @@ -156,6 +156,14 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati return mCardNo; } + public Integer getServiceType() { + return serviceType; + } + + public void setServiceType(Integer serviceType) { + this.serviceType = serviceType; + } + public void setmCardNo(String mCardNo) { this.mCardNo = mCardNo; } @@ -245,6 +253,9 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati if(null!=expVip){ condition=condition.and("expVip",expVip, MongoOper.IS); } + if(null!=serviceType){ + condition=condition.and("serviceType",serviceType, MongoOper.IS); + } if(StringUtils.isNotEmpty(mCardNo)){ condition=condition.and("mCardNo",mCardNo, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 01a31ef..8334feb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -341,6 +341,7 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo()); referralApplyOrderQuery.setPhone(applyOrderQueryRequest.getPhone()); referralApplyOrderQuery.setmCardNo(applyOrderQueryRequest.getmCardNo()); + referralApplyOrderQuery.setServiceType(applyOrderQueryRequest.getServiceType()); String hospital = autoMatchFacade.getHospitalId(userId); referralApplyOrderQuery.setHospitalId(hospital); referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java index ed0b311..8c05c79 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java @@ -110,6 +110,9 @@ public class BabyApplyOrderQueryRequest { } public Integer getServiceType() { + if(null!=serviceType&&100==serviceType){ + return null; + } return serviceType; }