diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java index c0a6daf..086d110 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsTemplateModel.java @@ -65,6 +65,18 @@ public class SmsTemplateModel extends BaseModel { private Integer templateType; private Integer yn; + + //健康类型 0健康 1高危 + private Integer healthType; + + public Integer getHealthType() { + return healthType; + } + + public void setHealthType(Integer healthType) { + this.healthType = healthType; + } + public Integer getTemplateType() { return templateType; } 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 21ee587..43195e9 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 @@ -79,7 +79,7 @@ public class SmsTemplateFacade { model.setCreated(new Date()); model.setModified(new Date()); SmsTemplateModel result = smsTemplateService.addSmsTemplate(model); - operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospitalId),result,OptActionEnums.ADD.getId(),"添加短信模板"); + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), result, OptActionEnums.ADD.getId(), "添加短信模板"); BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(result.getId()); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -123,6 +123,7 @@ public class SmsTemplateFacade { model.setSpecialDateType(request.getSpecialDateType()); model.setStatus(request.getStatus()); model.setTemplateType(request.getTemplateType()); + model.setHealthType(request.getHealthType()); return model; } @@ -260,6 +261,7 @@ public class SmsTemplateFacade { && temp.getSmsType() != SmsServiceEnums.TSYYTX.getId() && temp.getSmsType() != SmsServiceEnums.TYZDYYTX.getId() && temp.getSmsType() != SmsServiceEnums.TLZDYYTX.getId() + && temp.getSmsType() != SmsServiceEnums.CJGQTX.getId() ) { //发送频次 @@ -291,6 +293,11 @@ public class SmsTemplateFacade { String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType()); str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate +" "+ date+" "+splDate+ " " +dateRange; } + else if (temp.getSmsType() != SmsServiceEnums.EBGQTX.getId()) + { + str ="一次" +((temp.getHealthType() == null || temp.getHealthType() == 0 ) ? "健康" : "高危") + + ((temp.getTemplateType() == null || temp.getTemplateType() == 0 ) ? "推送" : "短信"); + } result.put("sendDate",str); result.put("sendTimes", SendTimeEnums.getNameById(temp.getSendTimeType())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java index 1137de8..23590e9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsTemplateRequest.java @@ -67,6 +67,17 @@ public class SmsTemplateRequest extends BaseQuery { //模板类型 0推送 1短信 private Integer templateType; + //健康类型 0健康 1高危 + private Integer healthType; + + public Integer getHealthType() { + return healthType; + } + + public void setHealthType(Integer healthType) { + this.healthType = healthType; + } + public Integer getTemplateType() { return templateType; }