jiangjiazhi / regional-platform

Authored by gengxiaokai over 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 22 additions and 0 deletions

...	...	@@ -23,6 +23,8 @@
23	23
24	24
25	25	private String id;
	26	+ //血卡编号
	27	+ private String xkNo;
26	28	//实验号
27	29	private String testNumber;
28	30
29	31
...	...	@@ -304,9 +306,18 @@
304	306	this.modified = modified;
305	307	}
306	308
	309	+ public String getXkNo() {
	310	+ return xkNo;
	311	+ }
	312	+
	313	+ public void setXkNo(String xkNo) {
	314	+ this.xkNo = xkNo;
	315	+ }
	316	+
307	317	public Map<String,String> convertToDataModel(){
308	318	Map<String,String> map = new HashMap<String,String>();
309	319	map.put("id",id);
	320	+ map.put("xkNo",xkNo);
310	321	map.put("testNumber",testNumber);
311	322	map.put("collectHospitalId",collectHospitalId);
312	323	map.put("currentHospitalId",currentHospitalId);

...	...	@@ -55,6 +55,8 @@
55	55	}
56	56
57	57	private String id;
	58	+ //血卡编号
	59	+ private String xkNo;
58	60	//实验号
59	61	private String testNumber;
60	62	//采血单位
...	...	@@ -362,6 +364,14 @@
362	364	this.modified = modified;
363	365	}
364	366
	367	+ public String getXkNo() {
	368	+ return xkNo;
	369	+ }
	370	+
	371	+ public void setXkNo(String xkNo) {
	372	+ this.xkNo = xkNo;
	373	+ }
	374	+
365	375	@Override
366	376	public BabySieveModel convertToDataModel(){
367	377	BabySieveModel babySieveModel = new BabySieveModel();
...	...	@@ -390,6 +400,7 @@
390	400	babySieveModel.setPatientId(patientId);
391	401	babySieveModel.setCreated(DateUtil.parseYMD(created));
392	402	babySieveModel.setModified(DateUtil.parseYMD(modified));
	403	+ babySieveModel.setXkNo(xkNo);
393	404
394	405	return babySieveModel;
395	406	}