jiangjiazhi / regional-platform

Commit 68e4acf340295e9f7b30437345ea2675b320f90a

Authored by shiyang almost 4 years ago

Exists in master and in 6 other branches

update

Showing 2 changed files with 42 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java

...	...	@@ -27,6 +27,7 @@
27	27	import com.lyms.platform.pojo.*;
28	28	import com.lyms.platform.query.*;
29	29	import com.mongodb.BasicDBObject;
	30	+import jdk.nashorn.internal.ir.LiteralNode;
30	31	import org.apache.commons.collections.CollectionUtils;
31	32	import org.springframework.beans.factory.annotation.Autowired;
32	33	import org.springframework.beans.factory.annotation.Qualifier;
33	34
...	...	@@ -1064,7 +1065,18 @@
1064	1065	resMap.put("baseInfo", base);
1065	1066	resMap.put("checkList", list);
1066	1067
	1068	+ //秦皇岛需求，查询最后一次检查的高危详情
	1069	+ if(CollectionUtils.isNotEmpty(list)){
	1070	+ String babyCheckId=list.get(list.size()-1).get("id");
	1071	+ Criteria criterBabyCheck=Criteria.where("id").is(babyCheckId);
	1072	+ Query queryBabyCheck=Query.query(criterBabyCheck);
	1073	+ BabyCheckModel babyCheckModel=mongoTemplate.findOne(queryBabyCheck,BabyCheckModel.class);
	1074	+ resMap.put("qhdHighRiskInfo",babyCheckModel.getHighRiskInfo());
	1075	+ }else {
	1076	+ resMap.put("qhdHighRiskInfo","");
	1077	+ }
1067	1078
	1079	+
1068	1080	br.setData(resMap);
1069	1081	br.setErrorcode(ErrorCodeConstants.SUCCESS);
1070	1082	br.setErrormsg("成功");
...	...	@@ -1251,6 +1263,9 @@
1251	1263	map.put("diagnoseList",diagnoseList);
1252	1264	map.put("height", babyCheckModel.getHeight());
1253	1265	map.put("weight", babyCheckModel.getWeight());
	1266	+ //秦皇岛需求，查询最后一次检查的高危详情
	1267	+ map.put("qhdHighRiskInfo",babyCheckModel.getHighRiskInfo());
	1268	+
1254	1269	list.add(map);
1255	1270	}
1256	1271	pageResult.setGrid(list);
...	...	@@ -1656,6 +1671,20 @@
1656	1671	base.setHealthCheckTypeWhole(null!=model.getHealthCheckTypeWhole()?model.getHealthCheckTypeWhole():null);
1657	1672	base.setKindergarten(null!=model.getKindergarten()?model.getKindergarten():null);
1658	1673	base.setBasicOrganization(null!=model.getBasicOrganization()?model.getBasicOrganization():null);
	1674	+
	1675	+ //秦皇岛需求，查询最后一次检查的高危详情
	1676	+ if(null!=id){
	1677	+ Criteria criterList=Criteria.where("buildId").is(id);
	1678	+ Query queryList=Query.query(criterList).with(new Sort(Sort.Direction.DESC, "checkDate"));
	1679	+ List<BabyCheckModel> babyCheckList=mongoTemplate.find(queryList, BabyCheckModel.class);
	1680	+ String babyCheckId=babyCheckList.get(0).getId();
	1681	+ Criteria criterBabyCheck=Criteria.where("id").is(babyCheckId);
	1682	+ Query queryBabyCheck=Query.query(criterBabyCheck);
	1683	+ BabyCheckModel babyCheckModel=mongoTemplate.findOne(queryBabyCheck,BabyCheckModel.class);
	1684	+ base.setQhdHighRiskInfo(babyCheckModel.getHighRiskInfo());
	1685	+ }else {
	1686	+ base.setQhdHighRiskInfo(null);
	1687	+ }
1659	1688
1660	1689	}
1661	1690	}

...	...	@@ -127,6 +127,19 @@
127	127	private Integer kindergarten;//2：幼儿园转诊--幼儿园机构
128	128	private Integer basicOrganization;//3:基层转诊--基层机构
129	129
	130	+ /***********************************************
	131	+ *秦皇岛儿保检查诊断位置用儿童高危详情替换
	132	+ */
	133	+ private List<String> qhdHighRiskInfo;
	134	+
	135	+ public List<String> getQhdHighRiskInfo() {
	136	+ return qhdHighRiskInfo;
	137	+ }
	138	+
	139	+ public void setQhdHighRiskInfo(List<String> qhdHighRiskInfo) {
	140	+ this.qhdHighRiskInfo = qhdHighRiskInfo;
	141	+ }
	142	+
130	143	public String getBabySource() {
131	144	return babySource;
132	145	}