jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 88 additions and 2 deletions

1	1	package com.lyms.platform.pojo;
2	2
3	3	import com.lyms.platform.beans.SerialIdEnum;
	4	+import com.lyms.platform.common.core.annotation.form.FormParam;
4	5	import com.lyms.platform.common.result.BaseModel;
5	6	import org.springframework.data.mongodb.core.mapping.Document;
6	7
...	...	@@ -21,6 +22,16 @@
21	22	//前缀类型 0医院前缀 1科室前缀
22	23	private Integer prefixType;
23	24
	25	+ //孕妇一级提醒消息与二级漏检消息可以署名医生 0否 1是
	26	+ @FormParam
	27	+ private Integer pregnantType;
	28	+
	29	+
	30	+ //儿童一级提醒消息与二级漏检消息可以署名医生 0否 1是
	31	+ @FormParam
	32	+ private Integer babyType;
	33	+
	34	+
24	35	//医院前缀
25	36	private String hospitalPrefix;
26	37
...	...	@@ -78,6 +89,27 @@
78	89	this.areaPrefix = model.getAreaPrefix();
79	90	this.isCharge = model.getIsCharge();
80	91	this.serviceType = model.getServiceType();
	92	+ this.pregnantType = model.getPregnantType();
	93	+ this.babyType = model.getBabyType();
	94	+ }
	95	+
	96	+
	97	+
	98	+
	99	+ public Integer getPregnantType() {
	100	+ return pregnantType;
	101	+ }
	102	+
	103	+ public void setPregnantType(Integer pregnantType) {
	104	+ this.pregnantType = pregnantType;
	105	+ }
	106	+
	107	+ public Integer getBabyType() {
	108	+ return babyType;
	109	+ }
	110	+
	111	+ public void setBabyType(Integer babyType) {
	112	+ this.babyType = babyType;
81	113	}
82	114
83	115	public String getServiceType() {

...	...	@@ -97,15 +97,15 @@
97	97	SmsConfigModel model = new SmsConfigModel();
98	98	model.setHospitalId(request.getHospitalId());
99	99	model.setYn(YnEnums.YES.getId());
100		-
101	100	model.setPrefixType(request.getPrefixType());
102	101	model.setHospitalPrefix(request.getHospitalPrefix());
103		- //model.setDeptPrefix(JsonUtil.array2JsonString(request.getDeptPrefix()));
104	102	model.setGuideTime(JsonUtil.array2JsonString(request.getGuideTime()));
105	103	model.setSmsService(JsonUtil.array2JsonString(request.getSmsService()));
106	104	model.setAreaPrefix(request.getAreaPrefix());
107	105	model.setIsCharge(request.getIsCharge() == null ? "" : JsonUtil.obj2Str(request.getIsCharge()));
108	106	model.setServiceType(request.getServiceType() == null ? "" : JsonUtil.obj2Str(request.getServiceType()));
	107	+ model.setPregnantType(request.getPregnantType());
	108	+ model.setBabyType(request.getBabyType());
109	109	return model;
110	110	}
111	111
...	...	@@ -235,6 +235,8 @@
235	235	}
236	236
237	237	sr.setServiceType(serviceType);
	238	+ sr.setPregnantType(model.getPregnantType() == null ? 0 : model.getPregnantType());
	239	+ sr.setBabyType(model.getBabyType() == null ? 0 : model.getBabyType());
238	240	return sr;
239	241	}
240	242

...	...	@@ -17,6 +17,15 @@
17	17	@FormParam
18	18	private Integer prefixType;
19	19
	20	+ //孕妇一级提醒消息与二级漏检消息可以署名医生 0否 1是
	21	+ @FormParam
	22	+ private Integer pregnantType;
	23	+
	24	+
	25	+ //儿童一级提醒消息与二级漏检消息可以署名医生 0否 1是
	26	+ @FormParam
	27	+ private Integer babyType;
	28	+
20	29	//区域前缀
21	30	@FormParam
22	31	private String areaPrefix;
...	...	@@ -44,6 +53,22 @@
44	53
45	54	//高危配置
46	55	private String highConfig;
	56	+
	57	+ public Integer getPregnantType() {
	58	+ return pregnantType;
	59	+ }
	60	+
	61	+ public void setPregnantType(Integer pregnantType) {
	62	+ this.pregnantType = pregnantType;
	63	+ }
	64	+
	65	+ public Integer getBabyType() {
	66	+ return babyType;
	67	+ }
	68	+
	69	+ public void setBabyType(Integer babyType) {
	70	+ this.babyType = babyType;
	71	+ }
47	72
48	73	private Map<String,Map<String,String>> serviceType;
49	74

1	1	package com.lyms.platform.operate.web.result;
2	2
	3	+import com.lyms.platform.common.core.annotation.form.FormParam;
	4	+
3	5	import java.util.List;
4	6	import java.util.Map;
5	7
...	...	@@ -16,6 +18,15 @@
16	18	//医院前缀
17	19	private String hospitalPrefix;
18	20
	21	+ //孕妇一级提醒消息与二级漏检消息可以署名医生 0否 1是
	22	+ @FormParam
	23	+ private Integer pregnantType;
	24	+
	25	+
	26	+ //儿童一级提醒消息与二级漏检消息可以署名医生 0否 1是
	27	+ @FormParam
	28	+ private Integer babyType;
	29	+
19	30	//科室前缀
20	31	private List<Map> deptPrefix;
21	32
...	...	@@ -33,6 +44,22 @@
33	44
34	45	//区域前缀
35	46	private String areaPrefix;
	47	+
	48	+ public Integer getPregnantType() {
	49	+ return pregnantType;
	50	+ }
	51	+
	52	+ public void setPregnantType(Integer pregnantType) {
	53	+ this.pregnantType = pregnantType;
	54	+ }
	55	+
	56	+ public Integer getBabyType() {
	57	+ return babyType;
	58	+ }
	59	+
	60	+ public void setBabyType(Integer babyType) {
	61	+ this.babyType = babyType;
	62	+ }
36	63
37	64	private Map<String,Map<String,String>> serviceType;
38	65