jiangjiazhi / regional-platform

Authored by liquanyu about 8 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 23 additions and 1 deletions

...	...	@@ -57,6 +57,9 @@
57	57	//对应医院中的孕妇，儿童，产妇是否收费
58	58	private String isCharge;
59	59
	60	+ //医院各项服务类型采用短信或者推送
	61	+ private String serviceType;
	62	+
60	63	public void covertObj(SmsConfigModel model)
61	64	{
62	65	this.id = model.getId();
...	...	@@ -74,6 +77,15 @@
74	77	this.remark = model.getRemark();
75	78	this.areaPrefix = model.getAreaPrefix();
76	79	this.isCharge = model.getIsCharge();
	80	+ this.serviceType = model.getServiceType();
	81	+ }
	82	+
	83	+ public String getServiceType() {
	84	+ return serviceType;
	85	+ }
	86	+
	87	+ public void setServiceType(String serviceType) {
	88	+ this.serviceType = serviceType;
77	89	}
78	90
79	91	public String getIsCharge() {

...	...	@@ -98,7 +98,7 @@
98	98	model.setSmsService(JsonUtil.array2JsonString(request.getSmsService()));
99	99	model.setAreaPrefix(request.getAreaPrefix());
100	100	model.setIsCharge(request.getIsCharge() == null ? "" : JsonUtil.obj2Str(request.getIsCharge()));
101		-
	101	+ model.setServiceType(request.getServiceType() == null ? "" : JsonUtil.obj2Str(request.getServiceType()));
102	102	return model;
103	103	}
104	104

...	...	@@ -45,6 +45,16 @@
45	45	//高危配置
46	46	private String highConfig;
47	47
	48	+ private List<Map<String,List<Map<String,String>>>> serviceType;
	49	+
	50	+ public List<Map<String, List<Map<String, String>>>> getServiceType() {
	51	+ return serviceType;
	52	+ }
	53	+
	54	+ public void setServiceType(List<Map<String, List<Map<String, String>>>> serviceType) {
	55	+ this.serviceType = serviceType;
	56	+ }
	57	+
48	58	public Map<String, String> getIsCharge() {
49	59	return isCharge;
50	60	}