jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 6 additions and 5 deletions

...	...	@@ -5,6 +5,7 @@
5	5	import org.springframework.data.mongodb.core.mapping.Document;
6	6
7	7	import java.util.Date;
	8	+import java.util.Map;
8	9
9	10	/**
10	11	* 产筛申请单
...	...	@@ -64,7 +65,7 @@
64	65	private Date bcCheckDate;
65	66
66	67	//生育史
67		- private String historyBirth;
	68	+ private Map<String,String> historyBirth;
68	69
69	70	//既往史
70	71	private String pastHistory;
71	72
...	...	@@ -166,11 +167,11 @@
166	167	this.bcCheckDate = bcCheckDate;
167	168	}
168	169
169		- public String getHistoryBirth() {
	170	+ public Map<String, String> getHistoryBirth() {
170	171	return historyBirth;
171	172	}
172	173
173		- public void setHistoryBirth(String historyBirth) {
	174	+ public void setHistoryBirth(Map<String, String> historyBirth) {
174	175	this.historyBirth = historyBirth;
175	176	}
176	177

...	...	@@ -716,7 +716,7 @@
716	716	result.put("collectionDate",DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate()));
717	717	result.put("crl",sieveApply.getCrl());
718	718	result.put("bcCheckDate",DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate()));
719		- result.put("historyBirth",StringUtils.isNotEmpty(sieveApply.getHistoryBirth()) ? JsonUtil.getMap(sieveApply.getHistoryBirth()) : new HashMap<>());
	719	+ result.put("historyBirth",sieveApply.getHistoryBirth());
720	720	result.put("pastHistory",sieveApply.getPastHistory());
721	721	result.put("applyHospitalId",sieveApply.getApplyHospitalId());
722	722	result.put("sendDoctor",sieveApply.getSendDoctor());

...	...	@@ -100,7 +100,7 @@
100	100	sieveApplyOrderModel.setCrl(crl);
101	101	sieveApplyOrderModel.setBpd(bpd);
102	102	sieveApplyOrderModel.setBcCheckDate(StringUtils.isNotEmpty(bcCheckDate) ? DateUtil.parseYMD(bcCheckDate) : null);
103		- sieveApplyOrderModel.setHistoryBirth(historyBirth != null ? JsonUtil.obj2Str(historyBirth) : null);
	103	+ sieveApplyOrderModel.setHistoryBirth(historyBirth);
104	104	sieveApplyOrderModel.setPastHistory(pastHistory);
105	105	sieveApplyOrderModel.setApplyHospitalId(applyHospitalId);
106	106