diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java index 961c15e..0859891 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java @@ -45,7 +45,8 @@ public class ReferralApplyOrderModel { private String transferredHospital; //转出医院id private String outHospitalId; - + //体验会员 0非会员 1会员 + private Integer expVip; //转入科室 private String transferredDepartment; //病情描述 @@ -67,6 +68,14 @@ public class ReferralApplyOrderModel { //转诊类型 1 儿童 2 孕妇 private Integer type; + public Integer getExpVip() { + return expVip; + } + + public void setExpVip(Integer expVip) { + this.expVip = expVip; + } + public String getDueWeek() { return dueWeek; } 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 30db190..428adbc 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 @@ -49,6 +49,17 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati private String outHospitalId; private String phone; private Integer type; + //体验会员 0非会员 1会员 + private Integer expVip; + + + public Integer getExpVip() { + return expVip; + } + + public void setExpVip(Integer expVip) { + this.expVip = expVip; + } public String getmCardNo() { return mCardNo; @@ -140,6 +151,9 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati if(null!=age){ condition=condition.and("age",age, MongoOper.IS); } + if(null!=expVip){ + condition=condition.and("expVip",expVip, MongoOper.IS); + } if(null!=transferredHospital){ condition=condition.and("transferredHospital",transferredHospital, 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 2e284e4..4808343 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 @@ -96,6 +96,7 @@ public class ApplyOrderFacade { referralApplyOrderModel.setPhone(patients.getPhone()); referralApplyOrderModel.setSex(SexEnum.WOMAN.getId()); referralApplyOrderModel.setBirth(patients.getBirth()); + referralApplyOrderModel.setExpVip(patients.getExpVip()); int days= DateUtil.daysBetween(new Date(),patients.getDueDate());; referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days)); } @@ -116,6 +117,7 @@ public class ApplyOrderFacade { referralApplyOrderModel.setPhone(patients.getPhone()); referralApplyOrderModel.setSex(babyModel.getSex()); referralApplyOrderModel.setCardNo(patients.getCardNo()); + referralApplyOrderModel.setExpVip(babyModel.getExpVip()); } } @@ -264,6 +266,7 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setOutHospitalId(data.get(0) + ""); } } + referralApplyOrderQuery.setExpVip(applyOrderQueryRequest.getTyVip()); 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 219a207..66330c3 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 @@ -33,7 +33,7 @@ public class BabyApplyOrderQueryRequest { //转出日期 private String transferred; //体验会员 - private String tyVip; + private Integer tyVip; // //1 转入 0转出 private String action; @@ -125,11 +125,11 @@ public class BabyApplyOrderQueryRequest { this.transferred = transferred; } - public String getTyVip() { + public Integer getTyVip() { return tyVip; } - public void setTyVip(String tyVip) { + public void setTyVip(Integer tyVip) { this.tyVip = tyVip; }