jiangjiazhi / regional-platform

Authored by jiangjiazhi almost 9 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 14 additions and 4 deletions

...	...	@@ -95,6 +95,7 @@
95	95	referralApplyOrderModel.setName(patients.getUsername());
96	96	referralApplyOrderModel.setPhone(patients.getPhone());
97	97	referralApplyOrderModel.setSex(SexEnum.WOMAN.getId());
	98	+ referralApplyOrderModel.setBirth(patients.getBirth());
98	99	int days= DateUtil.daysBetween(new Date(),patients.getDueDate());;
99	100	referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
100	101	}

...	...	@@ -20,7 +20,7 @@
20	20	private String id;
21	21	//名字
22	22	private String name;
23		- private Integer age;
	23	+ private String age;
24	24	//转入医院
25	25	private String transferredHospital;
26	26	//申请孕周
27	27
...	...	@@ -106,11 +106,15 @@
106	106	this.cardNo = cardNo;
107	107	}
108	108
109		- public Integer getAge() {
	109	+ public String getAge() {
	110	+ if(StringUtils.isEmpty(cardNo)){
	111	+ return SPIT;
	112	+ }
	113	+
110	114	return age;
111	115	}
112	116
113		- public void setAge(Integer age) {
	117	+ public void setAge(String age) {
114	118	this.age = age;
115	119	}
116	120
...	...	@@ -305,7 +309,12 @@
305	309	setPotentialRisk(destModel.getPotentialRisk());
306	310	setStatus(ApplyOrderStatusEnums.getTitle(destModel.getStatus()));
307	311	setTransferredHospital(destModel.getTransferredHospital());
308		- setAge(DateUtil.getAge(destModel.getBirth()));
	312	+ if(null!=destModel.getBirth()){
	313	+ Integer age = DateUtil.getAge(destModel.getBirth());
	314	+ if(null!=age){
	315	+ setAge(age+"");
	316	+ }
	317	+ }
309	318	setCardNo(destModel.getCardNo());
310	319	setPhone(destModel.getPhone());
311	320	return this;