jiangjiazhi / regional-platform

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

Showing 7 changed files with 56 additions and 2 deletions

...	...	@@ -421,6 +421,17 @@
421	421	//分娩医生
422	422	private String deliverDoctor;
423	423
	424	+ //秦皇岛-有居住证填写字段
	425	+ private String liveCardNo;
	426	+
	427	+ public String getLiveCardNo() {
	428	+ return liveCardNo;
	429	+ }
	430	+
	431	+ public void setLiveCardNo(String liveCardNo) {
	432	+ this.liveCardNo = liveCardNo;
	433	+ }
	434	+
424	435	public String getDeliverDoctor() {
425	436	return deliverDoctor;
426	437	}

...	...	@@ -1994,9 +1994,9 @@
1994	1994	patient.setPatientVerifType(yunRequest.getPatientVerifType());
1995	1995	patient.setPatientVerifName(yunRequest.getPatientVerifName());
1996	1996	patient.setHusVerifType(yunRequest.getHusVerifType());
	1997	+ patient.setLiveCardNo(yunRequest.getLiveCardNo());
1997	1998
1998	1999
1999		-
2000	2000	return patient;
2001	2001	}
2002	2002
...	...	@@ -2187,7 +2187,7 @@
2187	2187	result.setPatientVerifName(p.getPatientVerifName());
2188	2188	result.setHusVerifType(p.getHusVerifType());
2189	2189	result.setHusbandName(p.getHusbandName());
2190		-
	2190	+ result.setLiveCardNo(p.getLiveCardNo());
2191	2191
2192	2192	return result;
2193	2193	}

...	...	@@ -225,6 +225,15 @@
225	225
226	226	// 居住类别
227	227	List<BasicConfigResult> liveType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID);
	228	+ //秦皇岛需求-增加有居住证，客服配置（其他地区不需要这个选项）
	229	+ if(StringUtils.isNotEmpty(hospitalId) && !"216".equals(hospitalId)){
	230	+ for (BasicConfigResult basicConfigResult : liveType) {
	231	+ if("有居住证".equals(basicConfigResult.getName())){
	232	+ liveType.remove(basicConfigResult);
	233	+ break;
	234	+ }
	235	+ }
	236	+ }
228	237	map.put("liveType", liveType);
229	238
230	239

...	...	@@ -559,6 +559,7 @@
559	559	map.put("patientVerifName", data.getPatientVerifName());
560	560	map.put("husVerifType", StringUtils.isNotEmpty(data.getHusVerifType()) ? ("1".equals(data.getHusVerifType()) ? "自动核验": "人工核验") : "未验证");
561	561	map.put("husVerifName", data.getHusVerifName());
	562	+ map.put("liveCardNo", data.getLiveCardNo());
562	563
563	564	return map;
564	565	}

...	...	@@ -72,6 +72,17 @@
72	72	//丈夫删除文件路径
73	73	private List<String> hdelFiles;
74	74
	75	+ //秦皇岛-有居住证填写字段
	76	+ private String liveCardNo;
	77	+
	78	+ public String getLiveCardNo() {
	79	+ return liveCardNo;
	80	+ }
	81	+
	82	+ public void setLiveCardNo(String liveCardNo) {
	83	+ this.liveCardNo = liveCardNo;
	84	+ }
	85	+
75	86	public String getPatientVerifType() {
76	87	return patientVerifType;
77	88	}

...	...	@@ -100,6 +100,17 @@
100	100	//预约下次检查时间
101	101	private String nextCheckTime;
102	102
	103	+ //秦皇岛-有居住证填写字段
	104	+ private String liveCardNo;
	105	+
	106	+ public String getLiveCardNo() {
	107	+ return liveCardNo;
	108	+ }
	109	+
	110	+ public void setLiveCardNo(String liveCardNo) {
	111	+ this.liveCardNo = liveCardNo;
	112	+ }
	113	+
103	114	public Integer getDueStatus() {
104	115	return dueStatus;
105	116	}

...	...	@@ -446,6 +446,17 @@
446	446	//丈夫证件人工核验人员名称
447	447	private String husVerifName;
448	448
	449	+ //秦皇岛-有居住证填写字段
	450	+ private String liveCardNo;
	451	+
	452	+ public String getLiveCardNo() {
	453	+ return liveCardNo;
	454	+ }
	455	+
	456	+ public void setLiveCardNo(String liveCardNo) {
	457	+ this.liveCardNo = liveCardNo;
	458	+ }
	459	+
449	460	public String getPatientVerifType() {
450	461	return patientVerifType;
451	462	}