jiangjiazhi / regional-platform

Authored by qiaoyuewang about 1 year ago

Exists in dev

Showing 2 changed files with 13 additions and 3 deletions

...	...	@@ -1238,9 +1238,9 @@
1238	1238	temp.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); /** 预产期 */
1239	1239	temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
1240	1240	if("2100002419".equals(patients.getHospitalId())){
1241		- temp.put("phone", encryption == 0 ? StringUtils.encryPhone(patients.getPhone()) : patients.getPhone());
1242		- }else{
1243	1241	temp.put("phone", patients.getPhone());
	1242	+ }else{
	1243	+ temp.put("phone", encryption == 0 ? StringUtils.encryPhone(patients.getPhone()) : patients.getPhone());
1244	1244	}
1245	1245	temp.put("id", downRecord.getId());
1246	1246	temp.put("parentId", downRecord.getParentId());

...	...	@@ -48,6 +48,16 @@
48	48	//登记人
49	49	private String lName;
50	50	private String pid;
	51	+ private String highRiskFileCode;
	52	+
	53	+ public String getHighRiskFileCode() {
	54	+ return highRiskFileCode;
	55	+ }
	56	+
	57	+ public void setHighRiskFileCode(String highRiskFileCode) {
	58	+ this.highRiskFileCode = highRiskFileCode;
	59	+ }
	60	+
51	61	/**
52	62	* 身份证号码
53	63	*/
...	...	@@ -464,7 +474,7 @@
464	474	}
465	475
466	476	setPid(destModel.getPid());
467		-
	477	+ setHighRiskFileCode(destModel.getHighRiskFileCode());
468	478	if (null != destModel.getServiceType()) {
469	479	setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
470	480	}