jiangjiazhi / regional-platform

Authored by liquanyu over 3 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 146 additions and 1 deletions

...	...	@@ -455,6 +455,50 @@
455	455	//预约建档舒张压（低压）
456	456	private String qhdjdszy;
457	457
	458	+ /**
	459	+ * 秦皇岛妇幼定制需求
	460	+ */
	461	+ //联系人姓名
	462	+ private String contactName;
	463	+ //联系人电话
	464	+ private String contactPhone;
	465	+ //联系人证件类型
	466	+ private String contactCertTypeId;
	467	+ //联系人证件号码
	468	+ private String contactCertNo;
	469	+
	470	+ public String getContactName() {
	471	+ return contactName;
	472	+ }
	473	+
	474	+ public void setContactName(String contactName) {
	475	+ this.contactName = contactName;
	476	+ }
	477	+
	478	+ public String getContactPhone() {
	479	+ return contactPhone;
	480	+ }
	481	+
	482	+ public void setContactPhone(String contactPhone) {
	483	+ this.contactPhone = contactPhone;
	484	+ }
	485	+
	486	+ public String getContactCertTypeId() {
	487	+ return contactCertTypeId;
	488	+ }
	489	+
	490	+ public void setContactCertTypeId(String contactCertTypeId) {
	491	+ this.contactCertTypeId = contactCertTypeId;
	492	+ }
	493	+
	494	+ public String getContactCertNo() {
	495	+ return contactCertNo;
	496	+ }
	497	+
	498	+ public void setContactCertNo(String contactCertNo) {
	499	+ this.contactCertNo = contactCertNo;
	500	+ }
	501	+
458	502	public String getQhdjdheight() {
459	503	return qhdjdheight;
460	504	}

...	...	@@ -2061,6 +2061,11 @@
2061	2061	patient.setQhdjdssy(yunRequest.getQhdjdssy());
2062	2062	patient.setQhdjdszy(yunRequest.getQhdjdszy());
2063	2063
	2064	+
	2065	+ patient.setContactCertNo(yunRequest.getContactCertNo());
	2066	+ patient.setContactCertTypeId(yunRequest.getContactCertTypeId());
	2067	+ patient.setContactName(yunRequest.getContactName());
	2068	+ patient.setContactPhone(yunRequest.getContactPhone());
2064	2069	return patient;
2065	2070	}
2066	2071
...	...	@@ -2298,7 +2303,10 @@
2298	2303	result.setQhdyqweight(p.getQhdyqweight());
2299	2304	result.setQhdjdssy(p.getQhdjdssy());
2300	2305	result.setQhdjdszy(p.getQhdjdszy());
2301		-
	2306	+ result.setContactCertNo(p.getContactCertNo());
	2307	+ result.setContactCertTypeId(p.getContactCertTypeId());
	2308	+ result.setContactName(p.getContactName());
	2309	+ result.setContactPhone(p.getContactPhone());
2302	2310	return result;
2303	2311	}
2304	2312

...	...	@@ -566,6 +566,12 @@
566	566	map.put("liveCardNo", data.getLiveCardNo());
567	567	map.put("villageRegister", data.getVillageRegister());
568	568
	569	+
	570	+ map.put("contactName", data.getContactName());
	571	+ map.put("contactCertType", getBasicConfig(data.getContactCertTypeId()));
	572	+ map.put("contactCertNo", data.getContactCertNo());
	573	+ map.put("contactPhone", data.getContactPhone());
	574	+
569	575	return map;
570	576	}
571	577

...	...	@@ -540,6 +540,51 @@
540	540	//预约建档舒张压（低压）
541	541	private String qhdjdszy;
542	542
	543	+
	544	+ /**
	545	+ * 秦皇岛妇幼定制需求
	546	+ */
	547	+ //联系人姓名
	548	+ private String contactName;
	549	+ //联系人电话
	550	+ private String contactPhone;
	551	+ //联系人证件类型
	552	+ private String contactCertTypeId;
	553	+ //联系人证件号码
	554	+ private String contactCertNo;
	555	+
	556	+ public String getContactName() {
	557	+ return contactName;
	558	+ }
	559	+
	560	+ public void setContactName(String contactName) {
	561	+ this.contactName = contactName;
	562	+ }
	563	+
	564	+ public String getContactPhone() {
	565	+ return contactPhone;
	566	+ }
	567	+
	568	+ public void setContactPhone(String contactPhone) {
	569	+ this.contactPhone = contactPhone;
	570	+ }
	571	+
	572	+ public String getContactCertTypeId() {
	573	+ return contactCertTypeId;
	574	+ }
	575	+
	576	+ public void setContactCertTypeId(String contactCertTypeId) {
	577	+ this.contactCertTypeId = contactCertTypeId;
	578	+ }
	579	+
	580	+ public String getContactCertNo() {
	581	+ return contactCertNo;
	582	+ }
	583	+
	584	+ public void setContactCertNo(String contactCertNo) {
	585	+ this.contactCertNo = contactCertNo;
	586	+ }
	587	+
543	588	public String getQhdjdheight() {
544	589	return qhdjdheight;
545	590	}

...	...	@@ -480,6 +480,48 @@
480	480	//预约建档舒张压（低压）
481	481	private String qhdjdszy;
482	482
	483	+
	484	+ //联系人姓名
	485	+ private String contactName;
	486	+ //联系人电话
	487	+ private String contactPhone;
	488	+ //联系人证件类型
	489	+ private String contactCertTypeId;
	490	+ //联系人证件号码
	491	+ private String contactCertNo;
	492	+
	493	+ public String getContactName() {
	494	+ return contactName;
	495	+ }
	496	+
	497	+ public void setContactName(String contactName) {
	498	+ this.contactName = contactName;
	499	+ }
	500	+
	501	+ public String getContactPhone() {
	502	+ return contactPhone;
	503	+ }
	504	+
	505	+ public void setContactPhone(String contactPhone) {
	506	+ this.contactPhone = contactPhone;
	507	+ }
	508	+
	509	+ public String getContactCertTypeId() {
	510	+ return contactCertTypeId;
	511	+ }
	512	+
	513	+ public void setContactCertTypeId(String contactCertTypeId) {
	514	+ this.contactCertTypeId = contactCertTypeId;
	515	+ }
	516	+
	517	+ public String getContactCertNo() {
	518	+ return contactCertNo;
	519	+ }
	520	+
	521	+ public void setContactCertNo(String contactCertNo) {
	522	+ this.contactCertNo = contactCertNo;
	523	+ }
	524	+
483	525	public String getQhdjdheight() {
484	526	return qhdjdheight;
485	527	}