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 4808343..58c0795 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 @@ -254,6 +254,8 @@ public class ApplyOrderFacade { List babyApplyOrderResults = new ArrayList<>(); referralApplyOrderQuery.setName(applyOrderQueryRequest.getName()); referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo()); + referralApplyOrderQuery.setPhone(applyOrderQueryRequest.getPhone()); + //1 转入 0转出 if ("1".equals(applyOrderQueryRequest.getAction())) { List data = autoMatchFacade.matchOrgId(userId); @@ -266,7 +268,9 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setOutHospitalId(data.get(0) + ""); } } - referralApplyOrderQuery.setExpVip(applyOrderQueryRequest.getTyVip()); + if(null!=applyOrderQueryRequest.getTyVip() &&Boolean.TRUE.equals(applyOrderQueryRequest.getTyVip())){ + referralApplyOrderQuery.setExpVip(1); + } List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); if (CollectionUtils.isNotEmpty(orderModels)) { 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 66330c3..ed0b311 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 @@ -14,10 +14,10 @@ public class BabyApplyOrderQueryRequest { private String cardNo; //儿童姓名 private String name; - //联系方式 - private String phone; //月龄开始 private String ylStart; + //联系方式 + private String phone; //月龄结束 private String ylEnd; //高危id @@ -33,7 +33,7 @@ public class BabyApplyOrderQueryRequest { //转出日期 private String transferred; //体验会员 - private Integer tyVip; + private Boolean tyVip; // //1 转入 0转出 private String action; @@ -125,11 +125,11 @@ public class BabyApplyOrderQueryRequest { this.transferred = transferred; } - public Integer getTyVip() { + public Boolean getTyVip() { return tyVip; } - public void setTyVip(Integer tyVip) { + public void setTyVip(Boolean tyVip) { this.tyVip = tyVip; }