jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files

...	...	@@ -121,6 +121,16 @@
121	121
122	122	private String bmi;
123	123
	124	+ private boolean isShow;
	125	+
	126	+ public boolean isShow() {
	127	+ return isShow;
	128	+ }
	129	+
	130	+ public void setIsShow(boolean isShow) {
	131	+ this.isShow = isShow;
	132	+ }
	133	+
124	134	public String getPid() {
125	135	return pid;
126	136	}

...	...	@@ -579,6 +579,15 @@
579	579	}
580	580	}
581	581
	582	+ if (dayWeights != null && dayWeights.size() > 0 && StringUtils.isNotEmpty(dayWeights.get(DateUtil.getyyyy_MM_dd(new Date()))))
	583	+ {
	584	+ map.put("isShow",true);
	585	+ }
	586	+ else
	587	+ {
	588	+ map.put("isShow",false);
	589	+ }
	590	+
582	591	setReport(map, weights, patientWeight.getBeforeWeight(), patientWeight.getBmi(), patientWeight.getDayWeights());
583	592
584	593	CollectionUtils.removeNullValue(map);
...	...	@@ -626,6 +635,16 @@
626	635	}
627	636	}
628	637	patientWeight.setWeightInfo(weightInfo);
	638	+
	639	+ Map<String, String> dayWeights = patientWeight.getDayWeights();
	640	+ if (dayWeights != null && dayWeights.size() > 0 && StringUtils.isNotEmpty(dayWeights.get(DateUtil.getyyyy_MM_dd(new Date()))))
	641	+ {
	642	+ patientWeight.setIsShow(true);
	643	+ }
	644	+ else
	645	+ {
	646	+ patientWeight.setIsShow(false);
	647	+ }
629	648
630	649	return RespBuilder.buildSuccess(patientWeight);
631	650	}