diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java index 8528c8b..d5eb61a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java @@ -1,6 +1,7 @@ package com.lyms.platform.pojo; import com.lyms.platform.beans.SerialIdEnum; +import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; @@ -21,6 +22,16 @@ public class SmsConfigModel{ //前缀类型 0医院前缀 1科室前缀 private Integer prefixType; + //孕妇 一级提醒消息与二级漏检消息可以署名医生 0否 1是 + @FormParam + private Integer pregnantType; + + + //儿童 一级提醒消息与二级漏检消息可以署名医生 0否 1是 + @FormParam + private Integer babyType; + + //医院前缀 private String hospitalPrefix; @@ -78,6 +89,27 @@ public class SmsConfigModel{ this.areaPrefix = model.getAreaPrefix(); this.isCharge = model.getIsCharge(); this.serviceType = model.getServiceType(); + this.pregnantType = model.getPregnantType(); + this.babyType = model.getBabyType(); + } + + + + + public Integer getPregnantType() { + return pregnantType; + } + + public void setPregnantType(Integer pregnantType) { + this.pregnantType = pregnantType; + } + + public Integer getBabyType() { + return babyType; + } + + public void setBabyType(Integer babyType) { + this.babyType = babyType; } public String getServiceType() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java index bb9409a..0eff1d1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java @@ -97,15 +97,15 @@ public class SmsConfigFacade { SmsConfigModel model = new SmsConfigModel(); model.setHospitalId(request.getHospitalId()); model.setYn(YnEnums.YES.getId()); - model.setPrefixType(request.getPrefixType()); model.setHospitalPrefix(request.getHospitalPrefix()); - //model.setDeptPrefix(JsonUtil.array2JsonString(request.getDeptPrefix())); model.setGuideTime(JsonUtil.array2JsonString(request.getGuideTime())); model.setSmsService(JsonUtil.array2JsonString(request.getSmsService())); model.setAreaPrefix(request.getAreaPrefix()); model.setIsCharge(request.getIsCharge() == null ? "" : JsonUtil.obj2Str(request.getIsCharge())); model.setServiceType(request.getServiceType() == null ? "" : JsonUtil.obj2Str(request.getServiceType())); + model.setPregnantType(request.getPregnantType()); + model.setBabyType(request.getBabyType()); return model; } @@ -235,6 +235,8 @@ public class SmsConfigFacade { } sr.setServiceType(serviceType); + sr.setPregnantType(model.getPregnantType() == null ? 0 : model.getPregnantType()); + sr.setBabyType(model.getBabyType() == null ? 0 : model.getBabyType()); return sr; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java index c315285..44bdfad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmsConfigRequest.java @@ -17,6 +17,15 @@ public class SmsConfigRequest { @FormParam private Integer prefixType; + //孕妇 一级提醒消息与二级漏检消息可以署名医生 0否 1是 + @FormParam + private Integer pregnantType; + + + //儿童 一级提醒消息与二级漏检消息可以署名医生 0否 1是 + @FormParam + private Integer babyType; + //区域前缀 @FormParam private String areaPrefix; @@ -45,6 +54,22 @@ public class SmsConfigRequest { //高危配置 private String highConfig; + public Integer getPregnantType() { + return pregnantType; + } + + public void setPregnantType(Integer pregnantType) { + this.pregnantType = pregnantType; + } + + public Integer getBabyType() { + return babyType; + } + + public void setBabyType(Integer babyType) { + this.babyType = babyType; + } + private Map> serviceType; public Map> getServiceType() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsConfigResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsConfigResult.java index c9d6b50..f8b9a13 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsConfigResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsConfigResult.java @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web.result; +import com.lyms.platform.common.core.annotation.form.FormParam; + import java.util.List; import java.util.Map; @@ -16,6 +18,15 @@ public class SmsConfigResult { //医院前缀 private String hospitalPrefix; + //孕妇 一级提醒消息与二级漏检消息可以署名医生 0否 1是 + @FormParam + private Integer pregnantType; + + + //儿童 一级提醒消息与二级漏检消息可以署名医生 0否 1是 + @FormParam + private Integer babyType; + //科室前缀 private List deptPrefix; @@ -34,6 +45,22 @@ public class SmsConfigResult { //区域前缀 private String areaPrefix; + public Integer getPregnantType() { + return pregnantType; + } + + public void setPregnantType(Integer pregnantType) { + this.pregnantType = pregnantType; + } + + public Integer getBabyType() { + return babyType; + } + + public void setBabyType(Integer babyType) { + this.babyType = babyType; + } + private Map> serviceType; public Map> getServiceType() {