diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCheckTicketService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCheckTicketService.java index a818199..987b5f6 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCheckTicketService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCheckTicketService.java @@ -3,6 +3,7 @@ package com.lyms.platform.biz.service; import com.lyms.platform.biz.dal.IPatientDao; import com.lyms.platform.biz.dal.PatientCheckTicketDao; import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.enums.CouponEnums; import com.lyms.platform.pojo.PatientCheckTicket; import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.PatientCheckTicketQuery; @@ -105,6 +106,7 @@ public class PatientCheckTicketService { query.setHospitalId(hospitalId); query.setConsumeHospitalId(consumeHospitalId); query.setStatus(status); + query.setCoupon(CouponEnums.PRENATAL); return patientCheckTicketDao.queryTicket(query.convertToQuery().addOrder(Sort.Direction.DESC, "id")); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientCheckTicketQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientCheckTicketQuery.java index a9876a4..adabe2c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientCheckTicketQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientCheckTicketQuery.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.enums.CouponEnums; import com.lyms.platform.common.utils.StringUtils; import org.springframework.data.mongodb.core.query.Criteria; @@ -32,6 +33,7 @@ public class PatientCheckTicketQuery extends BaseQuery implements IConvertToNati private Integer status; // 1:创建未使用, 2:产检使用,3:分娩销毁 private Date createdStart; private Date createdEnd; + private CouponEnums coupon; // 产检券类型 public Date getCreatedStart() { return createdStart; @@ -70,6 +72,9 @@ public class PatientCheckTicketQuery extends BaseQuery implements IConvertToNati if (!StringUtils.isEmpty(consumeHospitalId)) { condition = condition.and("consumeHospitalId", consumeHospitalId, MongoOper.IS); } + if (coupon != null) { + condition = condition.and("coupon", coupon, MongoOper.IS); + } Criteria c1=null; if (null != createdStart) { if (null != c1) { @@ -131,4 +136,12 @@ public class PatientCheckTicketQuery extends BaseQuery implements IConvertToNati public void setStatus(Integer status) { this.status = status; } + + public CouponEnums getCoupon() { + return coupon; + } + + public void setCoupon(CouponEnums coupon) { + this.coupon = coupon; + } } diff --git a/platform-operate-api/pom.xml b/platform-operate-api/pom.xml index 09cc644..e3430d8 100644 --- a/platform-operate-api/pom.xml +++ b/platform-operate-api/pom.xml @@ -126,10 +126,12 @@ jetty-maven-plugin 9.3.8.v20160314 + + 9090 + / -