jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 62 additions and 0 deletions

...	...	@@ -25,7 +25,16 @@
25	25
26	26	private String hospitalId;
27	27
	28	+
28	29	/**
	30	+ * 机构地址
	31	+ */
	32	+ private String orgProvince;
	33	+ private String orgCity;
	34	+ private String orgArea;
	35	+ private String orgName;
	36	+
	37	+ /**
29	38	* 省市区街道
30	39	*/
31	40	private String province;
...	...	@@ -77,6 +86,39 @@
77	86	* 表单自定义数据
78	87	*/
79	88	private Map<String, Object> formData;
	89	+
	90	+
	91	+ public String getOrgProvince() {
	92	+ return orgProvince;
	93	+ }
	94	+
	95	+ public void setOrgProvince(String orgProvince) {
	96	+ this.orgProvince = orgProvince;
	97	+ }
	98	+
	99	+ public String getOrgCity() {
	100	+ return orgCity;
	101	+ }
	102	+
	103	+ public void setOrgCity(String orgCity) {
	104	+ this.orgCity = orgCity;
	105	+ }
	106	+
	107	+ public String getOrgArea() {
	108	+ return orgArea;
	109	+ }
	110	+
	111	+ public void setOrgArea(String orgArea) {
	112	+ this.orgArea = orgArea;
	113	+ }
	114	+
	115	+ public String getOrgName() {
	116	+ return orgName;
	117	+ }
	118	+
	119	+ public void setOrgName(String orgName) {
	120	+ this.orgName = orgName;
	121	+ }
80	122
81	123	public String getId() {
82	124	return id;

...	...	@@ -24,10 +24,20 @@
24	24	*/
25	25	private String addressStr;
26	26
	27	+ private String orgAddressStr;
	28	+
27	29	/**
28	30	* 缺陷儿的生日
29	31	*/
30	32	private String babyBirthStr;
	33	+
	34	+ public String getOrgAddressStr() {
	35	+ return orgAddressStr;
	36	+ }
	37	+
	38	+ public void setOrgAddressStr(String orgAddressStr) {
	39	+ this.orgAddressStr = orgAddressStr;
	40	+ }
31	41
32	42	public String getCreateUserStr() {
33	43	return createUserStr;

...	...	@@ -246,6 +246,16 @@
246	246	null,
247	247	basicConfigService);
248	248	result.setAddressStr(addressStr);
	249	+
	250	+
	251	+ String orgAddressStr = CommonsHelper.getResidence(
	252	+ result.getOrgProvince(),
	253	+ result.getOrgCity(),
	254	+ result.getOrgArea(),
	255	+ null,
	256	+ null,
	257	+ basicConfigService);
	258	+ result.setOrgAddressStr(orgAddressStr);
249	259	Date babyBirth = result.getBabyBirth();
250	260	if (babyBirth != null) {
251	261	result.setBabyBirthStr(DateUtil.getyyyy_MM_dd(babyBirth));