shiyang / regional-platform

Authored by liquanyu over 9 years ago

Showing 2 changed files with 17 additions and 3 deletions

...	...	@@ -94,7 +94,7 @@
94	94
95	95
96	96	model.setTemperature(request.getTemperature());
97		- model.setWeight(request.getHeight());
	97	+ model.setHeight(request.getHeight());
98	98	model.setWeight(request.getWeight());
99	99	model.setHead(request.getHead());
100	100	model.setHeightWeight(request.getHeightWeight());
...	...	@@ -146,6 +146,8 @@
146	146	model.setChestw(request.getChestw());
147	147
148	148
	149	+
	150	+
149	151	model.setCheckDate(DateUtil.parseYMD(request.getCheckDate()));
150	152
151	153	return model;
...	...	@@ -435,7 +437,7 @@
435	437
436	438
437	439	model.setTemperature(checkModel.getTemperature());
438		- model.setWeight(checkModel.getHeight());
	440	+ model.setHeight(checkModel.getHeight());
439	441	model.setWeight(checkModel.getWeight());
440	442	model.setHead(checkModel.getHead());
441	443	model.setHeightWeight(checkModel.getHeightWeight());
442	444
...	...	@@ -482,8 +484,9 @@
482	484	model.setCheckDoctor(checkModel.getCheckDoctor());
483	485	model.setNextDate(DateUtil.getyyyy_MM_dd(checkModel.getNextDate()));
484	486	model.setHighRisk(checkModel.getHighRisk());
	487	+ model.setCheckDate(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate()));
485	488
486		- model.setDrugGllergic(JsonUtil.str2Obj(checkModel.getBregma(), Map.class));
	489	+ model.setDrugGllergic(JsonUtil.str2Obj(checkModel.getDrugGllergic(), Map.class));
487	490	model.setChestw(checkModel.getChestw());
488	491
489	492	return model;

...	...	@@ -196,6 +196,17 @@
196	196	//是否高危儿童 0 非高危 1高危
197	197	private Integer highRisk;
198	198
	199	+ //检查时间
	200	+ private String checkDate;
	201	+
	202	+ public String getCheckDate() {
	203	+ return checkDate;
	204	+ }
	205	+
	206	+ public void setCheckDate(String checkDate) {
	207	+ this.checkDate = checkDate;
	208	+ }
	209	+
199	210	public Map getDrugGllergic() {
200	211	return drugGllergic;
201	212	}