jiangjiazhi / regional-platform

Authored by gengxiaokai over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 37 additions and 1 deletions

...	...	@@ -2432,7 +2432,13 @@
2432	2432	checkupResult.setZhiDaoYiJian(result.getZhiDaoYiJian());
2433	2433
2434	2434	//新增
2435		- checkupResult.setMaritalBingHistory(result.getMaritalBingHistory());
	2435	+ checkupResult.setMaritalBingHistory(result.getMaritalBingHistory());//既往病史
	2436	+ checkupResult.setSurgeryHistory(result.getSurgeryHistory());//手术史
	2437	+ checkupResult.setNowBingHistory(result.getNowBingHistory());//现病史
	2438	+ checkupResult.setFamilyHistory(result.getFamilyHistory());//家庭史
	2439	+ checkupResult.setZuyue(result.getZuyue());//足月
	2440	+ checkupResult.setLiuchan(result.getLiuchan());//流产
	2441	+ checkupResult.setZaochan(result.getZaochan());//早产
2436	2442
2437	2443	return checkupResult;
2438	2444	}

...	...	@@ -333,6 +333,12 @@
333	333	private Map<String,Object> nowBingHistory;
334	334	//家庭史
335	335	private Map<String,Object> familyHistory;
	336	+ //足月
	337	+ private Integer zuyue;
	338	+ //早产
	339	+ private Integer zaochan;
	340	+ //流产
	341	+ private Integer liuchan;
336	342
337	343	public Map<String, Object> getMaritalBingHistory() {
338	344	return maritalBingHistory;
...	...	@@ -364,6 +370,30 @@
364	370
365	371	public void setFamilyHistory(Map<String, Object> familyHistory) {
366	372	this.familyHistory = familyHistory;
	373	+ }
	374	+
	375	+ public Integer getZuyue() {
	376	+ return zuyue;
	377	+ }
	378	+
	379	+ public void setZuyue(Integer zuyue) {
	380	+ this.zuyue = zuyue;
	381	+ }
	382	+
	383	+ public Integer getZaochan() {
	384	+ return zaochan;
	385	+ }
	386	+
	387	+ public void setZaochan(Integer zaochan) {
	388	+ this.zaochan = zaochan;
	389	+ }
	390	+
	391	+ public Integer getLiuchan() {
	392	+ return liuchan;
	393	+ }
	394	+
	395	+ public void setLiuchan(Integer liuchan) {
	396	+ this.liuchan = liuchan;
367	397	}
368	398
369	399	public String getUsername() {