liquanyu / regional-platform

Commit 88c88a939973b6dd39c318be7da2f6153eb84ca3

Authored by wtt over 5 years ago

update

Showing 3 changed files with 13 additions and 13 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveQhdModel.java
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java

...	...	@@ -435,9 +435,9 @@
435	435	}else if("2".equals(clzffs)){
436	436	map.put("clzffs","免费");
437	437	}
438		-// map.put("collectDocterId",collectDocterId);
	438	+ map.put("collectDocterId",collectDocterId);
439	439	map.put("caiXueTime", DateUtil.getYMDH(caiXueTime));
440		-// map.put("ssHospital",ssHospital);
	440	+ map.put("ssHospital",ssHospital);
441	441	map.put("momName",momName);
442	442	map.put("zhuYuanNum",zhuYuanNum);
443	443	map.put("idcard",idcard);

...	...	@@ -1561,19 +1561,19 @@
1561	1561	condition = condition.and("sieveStatus", sieveStatusList2, MongoOper.IN);
1562	1562	}
1563	1563
1564		- if (null != testItem ) {
	1564	+ if (StringUtils.isNotEmpty(testItem)) {
1565	1565	condition = condition.and("testItem", testItem, MongoOper.IS);
1566	1566	}
1567		- if (null != msms ) {
	1567	+ if (StringUtils.isNotEmpty(msms)) {
1568	1568	condition = condition.and("msms", msms, MongoOper.IS);
1569	1569	}
1570		- if (null != xsTiaoXingMa ) {
	1570	+ if (StringUtils.isNotEmpty(xsTiaoXingMa)) {
1571	1571	condition = condition.and("xsTiaoXingMa", xsTiaoXingMa, MongoOper.IS);
1572	1572	}
1573		- if (null != msTiaoXingMa ) {
	1573	+ if (StringUtils.isNotEmpty(msTiaoXingMa)) {
1574	1574	condition = condition.and("msTiaoXingMa", msTiaoXingMa, MongoOper.IS);
1575	1575	}
1576		- if (null != sieveStatuseNw && !"0".equals(sieveStatuseNw)) {
	1576	+ if (StringUtils.isNotEmpty(sieveStatuseNw) && !"0".equals(sieveStatuseNw)) {
1577	1577	condition = condition.and("sieveStatuseNw", sieveStatuseNw, MongoOper.IS);
1578	1578	}
1579	1579	if (null != sieveStatuseNwListNin) {
1580	1580
1581	1581
...	...	@@ -1582,13 +1582,13 @@
1582	1582	if (null != sieveStatuseNwListIn) {
1583	1583	condition = condition.and("sieveStatuseNw", sieveStatuseNwListIn, MongoOper.IN);
1584	1584	}
1585		- if (null != csjg ) {
	1585	+ if (StringUtils.isNotEmpty(csjg)) {
1586	1586	condition = condition.and("csjg", csjg, MongoOper.IS);
1587	1587	}
1588		- if (null != pay_type ) {
	1588	+ if (StringUtils.isNotEmpty(pay_type)) {
1589	1589	condition = condition.and("pay_type", pay_type, MongoOper.IS);
1590	1590	}
1591		- if (null != clzffs ) {
	1591	+ if (StringUtils.isNotEmpty(clzffs)) {
1592	1592	condition = condition.and("clzffs", clzffs, MongoOper.IS);
1593	1593	}
1594	1594

...	...	@@ -699,7 +699,7 @@
699	699	sieveStatusNwListNin.add("3");
700	700	babyModelQuery.setSieveStatuseNwListNin(sieveStatusNwListNin);
701	701	} else {
702		- babyModelQuery.setSieveStatus(babySieveAddQhdRequest.getSieveStatuseNw());
	702	+ babyModelQuery.setSieveStatuseNw(babySieveAddQhdRequest.getSieveStatuseNw());
703	703	}
704	704	//筛查结果（1阳性、2阴性）
705	705	babyModelQuery.setCsjg(babySieveAddQhdRequest.getCsjg());
706	706
...	...	@@ -782,11 +782,11 @@
782	782	BabySieveQhdModel bm = babySieveQhdService.findOneBabySieveById(id);
783	783	if (bm != null) {
784	784	Map <String, String> map = bm.convertToDataModel();
785		- map.put("ssHospital",XsescEnums.getYchospitalId(bm.getSsHospital()).getYchospitalName());
	785	+ /*map.put("ssHospital",XsescEnums.getYchospitalId(bm.getSsHospital()).getYchospitalName());
786	786	Users user = usersService.getUsers(Integer.valueOf(bm.getCollectDocterId()));
787	787	if (user != null) {
788	788	map.put("collectDocterId",user.getName());
789		- }
	789	+ }*/
790	790	br.setData(map);
791	791	br.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
792	792	return br;