jiangjiazhi / regional-platform

Authored by liquanyu almost 9 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 6 additions and 2 deletions

...	...	@@ -82,6 +82,9 @@
82	82	if (null != serviceType) {
83	83	condition = condition.and("serviceType", serviceType, MongoOper.IS);
84	84	}
	85	+ if (null != serviceStatus) {
	86	+ condition = condition.and("serviceStatus", serviceStatus, MongoOper.IS);
	87	+ }
85	88
86	89	if (null != serviceObj) {
87	90	condition = condition.and("serviceObj", serviceObj, MongoOper.IS);

...	...	@@ -154,7 +154,7 @@
154	154
155	155	SmsTemplateQuery query = new SmsTemplateQuery();
156	156	query.setYn(YnEnums.YES.getId());
157		- query.setNeed("1");
	157	+ query.setNeed("true");
158	158	query.setLimit(request.getLimit());
159	159	query.setPage(request.getPage());
160	160	query.setSmsType(request.getSmsType());
...	...	@@ -162,6 +162,7 @@
162	162	query.setServiceType(request.getServiceType());
163	163	query.setContent(request.getContent());
164	164	query.setServiceObj(request.getServiceObj());
	165	+ query.setHospitalId(request.getHospitalId());
165	166	if (request.getServiceObj() != null && request.getServiceObj() == 0)
166	167	{
167	168	//查询全部
...	...	@@ -179,7 +180,7 @@
179	180
180	181	if (request.getServiceStatus() != null && (request.getServiceStatus() == 101 \|\| request.getServiceStatus() == 102 \|\| request.getServiceStatus() == 103))
181	182	{
182		- query.setServiceType(null);
	183	+ query.setServiceStatus(null);
183	184	}
184	185
185	186	List<SmsTemplateModel> templates = smsTemplateService.querySmsTemplates(query);