jiangjiazhi / regional-platform

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 73 additions and 0 deletions

...	...	@@ -51,6 +51,12 @@
51	51	//备注
52	52	private String remark;
53	53
	54	+ //区域前缀
	55	+ private String areaPrefix;
	56	+
	57	+ //对应医院中的孕妇，儿童，产妇是否收费
	58	+ private String isCharge;
	59	+
54	60	public void covertObj(SmsConfigModel model)
55	61	{
56	62	this.id = model.getId();
...	...	@@ -66,6 +72,24 @@
66	72	this.hospitalId=model.getHospitalId();
67	73	this.highConfig = model.getHighConfig();
68	74	this.remark = model.getRemark();
	75	+ this.areaPrefix = model.getAreaPrefix();
	76	+ this.isCharge = model.getIsCharge();
	77	+ }
	78	+
	79	+ public String getIsCharge() {
	80	+ return isCharge;
	81	+ }
	82	+
	83	+ public void setIsCharge(String isCharge) {
	84	+ this.isCharge = isCharge;
	85	+ }
	86	+
	87	+ public String getAreaPrefix() {
	88	+ return areaPrefix;
	89	+ }
	90	+
	91	+ public void setAreaPrefix(String areaPrefix) {
	92	+ this.areaPrefix = areaPrefix;
69	93	}
70	94
71	95	public String getRemark() {

...	...	@@ -79,6 +79,8 @@
79	79	//model.setDeptPrefix(JsonUtil.array2JsonString(request.getDeptPrefix()));
80	80	model.setGuideTime(JsonUtil.array2JsonString(request.getGuideTime()));
81	81	model.setSmsService(JsonUtil.array2JsonString(request.getSmsService()));
	82	+ model.setAreaPrefix(request.getAreaPrefix());
	83	+ model.setIsCharge(JsonUtil.obj2Str(request.getIsCharge()));
82	84
83	85	return model;
84	86	}
...	...	@@ -182,6 +184,8 @@
182	184	List<String> weeks = JsonUtil.toList(model.getGuideTime(), String.class);
183	185	sr.setGuideTime(WeekEnums.getWeekEnums(weeks));
184	186	sr.setSmsService(getSelectedNode(model.getSmsService()));
	187	+ sr.setAreaPrefix(model.getAreaPrefix());
	188	+ sr.setIsCharge(JsonUtil.getMap(model.getIsCharge()));
185	189	return sr;
186	190	}
187	191

...	...	@@ -17,6 +17,10 @@
17	17	@FormParam
18	18	private Integer prefixType;
19	19
	20	+ //区域前缀
	21	+ @FormParam
	22	+ private String areaPrefix;
	23	+
20	24	//医院前缀
21	25	@FormParam
22	26	@NotEmpty(message = "医院前缀不能为空.")
23	27
...	...	@@ -35,9 +39,27 @@
35	39
36	40	private String hospitalId;
37	41
	42	+ //是否收费，孕妇，儿童，产妇 {"pregnant":"true","baby":"false","puerperant":"true"}
	43	+ private Map<String,String> isCharge;
	44	+
38	45	//高危配置
39	46	private String highConfig;
40	47
	48	+ public Map<String, String> getIsCharge() {
	49	+ return isCharge;
	50	+ }
	51	+
	52	+ public void setIsCharge(Map<String, String> isCharge) {
	53	+ this.isCharge = isCharge;
	54	+ }
	55	+
	56	+ public String getAreaPrefix() {
	57	+ return areaPrefix;
	58	+ }
	59	+
	60	+ public void setAreaPrefix(String areaPrefix) {
	61	+ this.areaPrefix = areaPrefix;
	62	+ }
41	63
42	64	public String getHospitalId() {
43	65	return hospitalId;

...	...	@@ -27,6 +27,29 @@
27	27
28	28	private String hospitalId;
29	29
	30	+
	31	+ //是否收费，孕妇，儿童，产妇 {"pregnant":"true","baby":"false","puerperant":"true"}
	32	+ private Map<String,String> isCharge;
	33	+
	34	+ //区域前缀
	35	+ private String areaPrefix;
	36	+
	37	+ public Map<String, String> getIsCharge() {
	38	+ return isCharge;
	39	+ }
	40	+
	41	+ public void setIsCharge(Map<String, String> isCharge) {
	42	+ this.isCharge = isCharge;
	43	+ }
	44	+
	45	+ public String getAreaPrefix() {
	46	+ return areaPrefix;
	47	+ }
	48	+
	49	+ public void setAreaPrefix(String areaPrefix) {
	50	+ this.areaPrefix = areaPrefix;
	51	+ }
	52	+
30	53	public String getId() {
31	54	return id;
32	55	}