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 b02ef07..daa4d4c 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 @@ -51,6 +51,12 @@ public class SmsConfigModel{ //备注 private String remark; + //区域前缀 + private String areaPrefix; + + //对应医院中的孕妇,儿童,产妇是否收费 + private String isCharge; + public void covertObj(SmsConfigModel model) { this.id = model.getId(); @@ -66,6 +72,24 @@ public class SmsConfigModel{ this.hospitalId=model.getHospitalId(); this.highConfig = model.getHighConfig(); this.remark = model.getRemark(); + this.areaPrefix = model.getAreaPrefix(); + this.isCharge = model.getIsCharge(); + } + + public String getIsCharge() { + return isCharge; + } + + public void setIsCharge(String isCharge) { + this.isCharge = isCharge; + } + + public String getAreaPrefix() { + return areaPrefix; + } + + public void setAreaPrefix(String areaPrefix) { + this.areaPrefix = areaPrefix; } public String getRemark() { 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 e7aa60b..702d53d 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 @@ -79,6 +79,8 @@ public class SmsConfigFacade { //model.setDeptPrefix(JsonUtil.array2JsonString(request.getDeptPrefix())); model.setGuideTime(JsonUtil.array2JsonString(request.getGuideTime())); model.setSmsService(JsonUtil.array2JsonString(request.getSmsService())); + model.setAreaPrefix(request.getAreaPrefix()); + model.setIsCharge(JsonUtil.obj2Str(request.getIsCharge())); return model; } @@ -182,6 +184,8 @@ public class SmsConfigFacade { List weeks = JsonUtil.toList(model.getGuideTime(), String.class); sr.setGuideTime(WeekEnums.getWeekEnums(weeks)); sr.setSmsService(getSelectedNode(model.getSmsService())); + sr.setAreaPrefix(model.getAreaPrefix()); + sr.setIsCharge(JsonUtil.getMap(model.getIsCharge())); 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 190861f..7f3aec6 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,10 @@ public class SmsConfigRequest { @FormParam private Integer prefixType; + //区域前缀 + @FormParam + private String areaPrefix; + //医院前缀 @FormParam @NotEmpty(message = "医院前缀不能为空.") @@ -35,9 +39,27 @@ public class SmsConfigRequest { private String hospitalId; + //是否收费,孕妇,儿童,产妇 {"pregnant":"true","baby":"false","puerperant":"true"} + private Map isCharge; + //高危配置 private String highConfig; + public Map getIsCharge() { + return isCharge; + } + + public void setIsCharge(Map isCharge) { + this.isCharge = isCharge; + } + + public String getAreaPrefix() { + return areaPrefix; + } + + public void setAreaPrefix(String areaPrefix) { + this.areaPrefix = areaPrefix; + } public String getHospitalId() { return hospitalId; 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 58000f2..36ae9d3 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 @@ -27,6 +27,29 @@ public class SmsConfigResult { private String hospitalId; + + //是否收费,孕妇,儿童,产妇 {"pregnant":"true","baby":"false","puerperant":"true"} + private Map isCharge; + + //区域前缀 + private String areaPrefix; + + public Map getIsCharge() { + return isCharge; + } + + public void setIsCharge(Map isCharge) { + this.isCharge = isCharge; + } + + public String getAreaPrefix() { + return areaPrefix; + } + + public void setAreaPrefix(String areaPrefix) { + this.areaPrefix = areaPrefix; + } + public String getId() { return id; }