diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SmsTemplateQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SmsTemplateQuery.java index 1ca4020..3864052 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SmsTemplateQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SmsTemplateQuery.java @@ -82,6 +82,9 @@ public class SmsTemplateQuery extends BaseQuery implements IConvertToNativeQuery if (null != serviceType) { condition = condition.and("serviceType", serviceType, MongoOper.IS); } + if (null != serviceStatus) { + condition = condition.and("serviceStatus", serviceStatus, MongoOper.IS); + } if (null != serviceObj) { condition = condition.and("serviceObj", serviceObj, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java index c2f12a4..87cc642 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java @@ -154,7 +154,7 @@ public class SmsTemplateFacade { SmsTemplateQuery query = new SmsTemplateQuery(); query.setYn(YnEnums.YES.getId()); - query.setNeed("1"); + query.setNeed("true"); query.setLimit(request.getLimit()); query.setPage(request.getPage()); query.setSmsType(request.getSmsType()); @@ -162,6 +162,7 @@ public class SmsTemplateFacade { query.setServiceType(request.getServiceType()); query.setContent(request.getContent()); query.setServiceObj(request.getServiceObj()); + query.setHospitalId(request.getHospitalId()); if (request.getServiceObj() != null && request.getServiceObj() == 0) { //查询全部 @@ -179,7 +180,7 @@ public class SmsTemplateFacade { if (request.getServiceStatus() != null && (request.getServiceStatus() == 101 || request.getServiceStatus() == 102 || request.getServiceStatus() == 103)) { - query.setServiceType(null); + query.setServiceStatus(null); } List templates = smsTemplateService.querySmsTemplates(query);