jiangjiazhi / regional-platform

Commit 916792778049810394101d47ccb4560668cbd14e

Authored by wangbo over 6 years ago

Exists in master and in 6 other branches

自测bug提交

Showing 3 changed files with 15 additions and 14 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java
platform-operate-api/src/main/resources/qhdnb.xls

...	...	@@ -9,6 +9,7 @@
9	9	import com.lyms.platform.permission.model.CheckItemManage;
10	10	import com.lyms.platform.permission.model.CheckItemManageQuery;
11	11	import com.lyms.platform.permission.service.CheckItemManageService;
	12	+import com.lyms.platform.pojo.AntExChuModel;
12	13	import com.lyms.platform.pojo.AntenatalExaminationModel;
13	14	import org.springframework.beans.factory.annotation.Autowired;
14	15	import org.springframework.data.mongodb.core.MongoTemplate;
...	...	@@ -111,18 +112,20 @@
111	112
112	113	} else {
113	114	//获取初诊
114		- AntExChuModelTemp antExChuModelTemps = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)), AntExChuModelTemp.class);
115		- if (antExChuModelTemps != null && antExChuModelTemps.getConfigItemId() != null) {
116		- String[] str = antExChuModelTemps.getConfigItemId().split(",");
117		- for (String s2 : str) {
118		- List<CheckItem> list1 = checkItemMapper.xcxGetCheckItemList(Integer.valueOf(s2).intValue());
119		- for (CheckItem checkItem : list1) {
120		- Map map = new HashMap();
121		- map.put("id", checkItem.getId());
122		- map.put("project", checkItem.getProject());
123		- map.put("projectInfo", checkItem.getProjectInfo());
124		- map.put("checkAttention", checkItem.getCheckAttention());
125		- list2.add(map);
	115	+ AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)), AntExChuModel.class);
	116	+ if (antExChuModel != null && StringUtils.isNotEmpty(antExChuModel.getConfigItemId())) {
	117	+ String[] str = antExChuModel.getConfigItemId().split(",");
	118	+ if (null != str && str.length > 0) {
	119	+ for (String s2 : str) {
	120	+ List<CheckItem> list1 = checkItemMapper.xcxGetCheckItemList(Integer.valueOf(s2).intValue());
	121	+ for (CheckItem checkItem : list1) {
	122	+ Map map = new HashMap();
	123	+ map.put("id", checkItem.getId());
	124	+ map.put("project", checkItem.getProject());
	125	+ map.put("projectInfo", checkItem.getProjectInfo());
	126	+ map.put("checkAttention", checkItem.getCheckAttention());
	127	+ list2.add(map);
	128	+ }
126	129	}
127	130	}
128	131	}

...	...	@@ -13,8 +13,6 @@
13	13
14	14	import javax.servlet.http.HttpServletRequest;
15	15	import javax.validation.Valid;
16		-import java.io.UnsupportedEncodingException;
17		-import java.util.Map;
18	16
19	17
20	18	/**

No preview for this file type