jiangjiazhi / regional-platform

Authored by liquanyu over 2 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 9 additions and 0 deletions

...	...	@@ -348,6 +348,7 @@
348	348	re.setSendHospital(organizationService.getOrganizationName(model.getSendHospitalId()));
349	349	re.setApplyWeek(DateUtil.getWeekDesc(model.getLastMenses(),model.getSendDate()));
350	350	re.setCurrentWeek(DateUtil.getWeekDesc(model.getLastMenses(),new Date()));
	351	+ re.setCurrentWeekInt(DateUtil.getWeek(model.getLastMenses(),new Date()));
351	352	re.setAddressRegisterStr(CommonsHelper.getResidence(model.getProvinceRegisterId(),
352	353	model.getCityRegisterId(),
353	354	model.getAreaRegisterId(),

...	...	@@ -10,11 +10,19 @@
10	10	private String addressRegisterStr; //居住地址
11	11	private String applyWeek; //申请孕周
12	12	private String currentWeek; //当前孕周
	13	+ private Integer currentWeekInt; //当前孕周数字
13	14	private String pnationStr; //民族
14	15	private String sendHospital;//送检医院
15	16	private String reviceDateStr;//接收时间
16	17	private String ysfDateStr;//应随访日期
17	18
	19	+ public Integer getCurrentWeekInt() {
	20	+ return currentWeekInt;
	21	+ }
	22	+
	23	+ public void setCurrentWeekInt(Integer currentWeekInt) {
	24	+ this.currentWeekInt = currentWeekInt;
	25	+ }
18	26
19	27	public String getYsfDateStr() {
20	28	return ysfDateStr;