jiangjiazhi / regional-platform

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 6 additions and 2 deletions

...	...	@@ -275,7 +275,9 @@
275	275	@RequestParam(value = "cyNumType", required = false) Integer cyNumType,
276	276	@RequestParam(value = "qcNumType", required = false) Integer qcNumType,
277	277	@RequestParam(value = "settleType", required = false) Integer settleType,
278		- @RequestParam(value = "settleTime", required = false) String settleTime
	278	+ @RequestParam(value = "settleTime", required = false) String settleTime,
	279	+ @RequestParam(value = "positiveType", required = false) String positiveType,
	280	+ @RequestParam(value = "lhEyePositiveType", required = false) String lhEyePositiveType
279	281	) {
280	282
281	283	if (CollectionUtils.isNotEmpty(highRiskInfos)) {
...	...	@@ -389,6 +391,8 @@
389	391	request.setMildAnaemia(mildAnaemia);
390	392	request.setModerateAnaemia(moderateAnaemia);
391	393	request.setHeartMurmur(heartMurmur);
	394	+ request.setPositiveType(positiveType);
	395	+ request.setLhEyePositiveType(lhEyePositiveType);
392	396	//出牙数状态
393	397	request.setCyNumType(cyNumType);
394	398	//龋齿状态

...	...	@@ -3414,7 +3414,7 @@
3414	3414	//滦平、隆化-儿保管理-全部加健康/高危筛选
3415	3415	babyQuery.setHealthHigh(null!=request.getHealthHigh()?request.getHealthHigh():null);
3416	3416	System.out.println("========"+babyQuery.convertToQuery().convertToMongoQuery().toString());
3417		- //用隆华新口腔模块中数据筛选牙齿异常2项
	3417	+ //用隆华新口腔模块中数据筛选牙齿异常2项,口腔阳性
3418	3418	if(null!=request.getCyNumType()\|\|null!=request.getQcNumType()\|\|StringUtils.isNotEmpty(request.getPositiveType())){
3419	3419	babyQuery.setOralCheckYn(YnEnums.YES.getId());
3420	3420	babyQuery.setPositiveType(request.getPositiveType());