jiangjiazhi / regional-platform

Authored by litao almost 9 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 18 additions and 1 deletions

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.biz.dal.IPatientDao;
4	4	import com.lyms.platform.biz.dal.PatientCheckTicketDao;
5	5	import com.lyms.platform.common.dao.operator.MongoQuery;
	6	+import com.lyms.platform.common.enums.CouponEnums;
6	7	import com.lyms.platform.pojo.PatientCheckTicket;
7	8	import com.lyms.platform.pojo.Patients;
8	9	import com.lyms.platform.query.PatientCheckTicketQuery;
...	...	@@ -105,6 +106,7 @@
105	106	query.setHospitalId(hospitalId);
106	107	query.setConsumeHospitalId(consumeHospitalId);
107	108	query.setStatus(status);
	109	+ query.setCoupon(CouponEnums.PRENATAL);
108	110	return patientCheckTicketDao.queryTicket(query.convertToQuery().addOrder(Sort.Direction.DESC, "id"));
109	111	}
110	112

...	...	@@ -5,6 +5,7 @@
5	5	import com.lyms.platform.common.dao.operator.MongoCondition;
6	6	import com.lyms.platform.common.dao.operator.MongoOper;
7	7	import com.lyms.platform.common.dao.operator.MongoQuery;
	8	+import com.lyms.platform.common.enums.CouponEnums;
8	9	import com.lyms.platform.common.utils.StringUtils;
9	10	import org.springframework.data.mongodb.core.query.Criteria;
10	11
...	...	@@ -32,6 +33,7 @@
32	33	private Integer status; // 1：创建未使用， 2：产检使用，3：分娩销毁
33	34	private Date createdStart;
34	35	private Date createdEnd;
	36	+ private CouponEnums coupon; // 产检券类型
35	37
36	38	public Date getCreatedStart() {
37	39	return createdStart;
...	...	@@ -70,6 +72,9 @@
70	72	if (!StringUtils.isEmpty(consumeHospitalId)) {
71	73	condition = condition.and("consumeHospitalId", consumeHospitalId, MongoOper.IS);
72	74	}
	75	+ if (coupon != null) {
	76	+ condition = condition.and("coupon", coupon, MongoOper.IS);
	77	+ }
73	78	Criteria c1=null;
74	79	if (null != createdStart) {
75	80	if (null != c1) {
...	...	@@ -130,6 +135,14 @@
130	135
131	136	public void setStatus(Integer status) {
132	137	this.status = status;
	138	+ }
	139	+
	140	+ public CouponEnums getCoupon() {
	141	+ return coupon;
	142	+ }
	143	+
	144	+ public void setCoupon(CouponEnums coupon) {
	145	+ this.coupon = coupon;
133	146	}
134	147	}

...	...	@@ -126,10 +126,12 @@
126	126	<artifactId>jetty-maven-plugin</artifactId>
127	127	<version>9.3.8.v20160314</version>
128	128	<configuration>
	129	+ <httpConnector>
	130	+ <port>9090</port>
	131	+ </httpConnector>
129	132	<webAppConfig>
130	133	<contextPath>/</contextPath>
131	134	</webAppConfig>
132		-
133	135	</configuration>
134	136	</plugin>
135	137	</plugins>