jiangjiazhi / regional-platform | GitLab

Commit a5918624201a0d9ef85a227dd8bd0630623803d8

Authored by liquanyu over 6 years ago

1 parent cf68ee3134

Exists in master and in 6 other branches

儿童报告

Showing 2 changed files with 3 additions and 2 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java

...	...	@@ -2209,7 +2209,7 @@
2209	2209	// babyConfig("F:\\儿童营养报告\\儿童营养报告模板.xls");
2210	2210
2211	2211
2212		- babyNutritionConfig("F:\\儿童营养报告\\婴幼儿体重与营养管理报告内容及规则\\儿童膳食报告文章1.xls");
	2212	+ babyNutritionConfig("F:\\儿童营养报告\\婴幼儿体重与营养管理报告内容及规则\\儿童膳食报告文章2.xls");
2213	2213	}
2214	2214
2215	2215	}

...	...	@@ -523,10 +523,11 @@
523	523
524	524	if (elements.size() > 0)
525	525	{
	526	+ int tempMonth = month < 6 ? 0 : (month < 12 ? 6 : 12);
526	527	for (String key : elements.keySet())
527	528	{
528	529	BabyNutritionConfigModel babyNutritionConfig1 = mongoTemplate.findOne(
529		- Query.query(Criteria.where("type").is(5).and("monthAge").is(month).and("title").is(key)), BabyNutritionConfigModel.class);
	530	+ Query.query(Criteria.where("type").is(5).and("monthAge").is(tempMonth).and("title").is(key)), BabyNutritionConfigModel.class);
530	531	if (babyNutritionConfig1 == null)
531	532	{
532	533	continue;