jiangjiazhi / regional-platform

Authored by liquanyu over 9 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 19 additions and 5 deletions

...	...	@@ -658,7 +658,7 @@
658	658	bm.setBabyWeight(b.getBabyWeight());
659	659	bm.setHospitalId(b.getHospitalId());
660	660
661		- bm.setHighRisk(b.getHighRisk());
	661	+
662	662	//bm.setHighRiskReason(b.getHighRiskReason());
663	663	bm.setExpVip(b.getExpVip());
664	664	bm.setMremark(b.getMremark());
665	665
...	...	@@ -689,8 +689,16 @@
689	689	bm.setHospitalId(b.getHospitalId());
690	690	bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgar()));
691	691
	692	+ if (b.getHighRisk() == null) {
	693	+ bm.setLastHighRisk(0);
	694	+ bm.setHighRisk(0);
	695	+ }
	696	+ else
	697	+ {
	698	+ bm.setLastHighRisk(b.getHighRisk());
	699	+ bm.setHighRisk(b.getHighRisk());
	700	+ }
692	701
693		- bm.setLastHighRisk(b.getHighRisk());
694	702
695	703
696	704	return bm;

...	...	@@ -160,12 +160,18 @@
160	160	model.setGuideSuggest(request.getGuideSuggest());
161	161	model.setCheckDoctor(request.getCheckDoctor());
162	162	model.setNextDate(DateUtil.parseYMD(request.getNextDate()));
163		- model.setHighRisk(request.getHighRisk());
164	163
165		- model.setDrugGllergic(JsonUtil.obj2JsonString(request.getDrugGllergic()));
166		- model.setChestw(request.getChestw());
167	164
	165	+ if (request.getHighRisk() == null){
	166	+ model.setHighRisk(0);
	167	+ }
	168	+ else
	169	+ {
	170	+ model.setHighRisk(request.getHighRisk());
	171	+ }
168	172
	173	+ model.setDrugGllergic(JsonUtil.obj2JsonString(request.getDrugGllergic()));
	174	+ model.setChestw(request.getChestw());
169	175
170	176
171	177	model.setCheckDate(DateUtil.parseYMD(request.getCheckDate()));