jiangjiazhi / regional-platform

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 11 additions and 1 deletions

...	...	@@ -6874,7 +6874,7 @@
6874	6874	//saveMicroelements("E:\\dev\\微量元素指导报告模板.xls");
6875	6875	//saveBabyMicroelements("F:\\技术文档\\儿童微量元素\\儿童微量元素指导报告模板.xls");
6876	6876	//saveBabyBone("F:\\技术文档\\骨密度\\儿童骨密度报告模板内容表.xls");
6877		- saveQhdDist("F:\\儿童营养报告\\秦皇岛市妇幼新版选择儿童膳食报告\\秦皇岛市妇幼儿童膳食报告one.xls");
	6877	+ saveQhdDist("F:\\儿童营养报告\\秦皇岛市妇幼新版选择儿童膳食报告\\（泉渝）秦皇岛市妇幼儿童膳食报告one(1).xls");
6878	6878	// saveQhdDist1("F:\\儿童营养报告\\秦皇岛市妇幼新版选择儿童膳食报告\\秦皇岛市妇幼儿童膳食报告0-11.xls");
6879	6879	}
6880	6880

...	...	@@ -1851,6 +1851,11 @@
1851	1851	double kaul = getKcal(month, model.getWeight(), model.getHeight(), baby.getSex(), kaupEvaluate);
1852	1852
1853	1853
	1854	+ if (month == 5)
	1855	+ {
	1856	+ month = 6;
	1857	+ }
	1858	+
1854	1859	List<BabySSReportModel> ss = mongoTemplate.find(Query.query(Criteria.where("startMonthAge").lte(month).and("endMonthAge").gte(month)),
1855	1860	BabySSReportModel.class);
1856	1861	if (CollectionUtils.isNotEmpty(ss))
...	...	@@ -2153,6 +2158,11 @@
2153	2158	//获取热量值体重在正常范围内的不计算热量值
2154	2159	int kaul = (int)getKcal(month, model.getWeight(), model.getHeight(), baby.getSex(), kaupEvaluate);
2155	2160
	2161	+
	2162	+ if (month == 5)
	2163	+ {
	2164	+ month = 6;
	2165	+ }
2156	2166
2157	2167	if (month >= 6 && month <= 11) {
2158	2168