Commit f2dc34d73c38640ea51bbbca11aec7b9a981e505
1 parent
cc86a2fd52
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 12 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
f2dc34d
| ... | ... | @@ -1077,7 +1077,7 @@ |
| 1077 | 1077 | criteria.and("czOrfzProject").is("cz"); |
| 1078 | 1078 | Query query=Query.query(criteria); |
| 1079 | 1079 | BabyHighRiskBabyModel babyHighRiskBabyModel=mongoTemplate.findOne(query, BabyHighRiskBabyModel.class); |
| 1080 | - base.setCyzd(StringUtils.isNotEmpty(babyHighRiskBabyModel.getCyzd()) ? babyHighRiskBabyModel.getCyzd() : ""); | |
| 1080 | + base.setCyzd(null!=babyHighRiskBabyModel ? babyHighRiskBabyModel.getCyzd() : ""); | |
| 1081 | 1081 | } |
| 1082 | 1082 | resMap.put("baseInfo", base); |
| 1083 | 1083 | resMap.put("checkList", list); |
| ... | ... | @@ -1985,6 +1985,17 @@ |
| 1985 | 1985 | } |
| 1986 | 1986 | } |
| 1987 | 1987 | |
| 1988 | + //秦皇岛高危儿专科需求-出院诊断字段查询放到顶部详情栏目里 | |
| 1989 | + if(StringUtils.isNotEmpty(hospitalId)&&"216".equals(hospitalId)&&CollectionUtils.isNotEmpty(models)){ | |
| 1990 | + BabyHighRiskBabyModelQuery babyHighRiskquery=new BabyHighRiskBabyModelQuery(); | |
| 1991 | + Criteria criteria=Criteria.where("buildId").is(models.get(0).getId()); | |
| 1992 | + criteria.and("czOrfzProject").is("cz"); | |
| 1993 | + Query query=Query.query(criteria); | |
| 1994 | + BabyHighRiskBabyModel babyHighRiskBabyModel=mongoTemplate.findOne(query, BabyHighRiskBabyModel.class); | |
| 1995 | + if(CollectionUtils.isNotEmpty(results)) { | |
| 1996 | + results.get(0).setCyzd(null!=babyHighRiskBabyModel.getCyzd() ? babyHighRiskBabyModel.getCyzd() : ""); | |
| 1997 | + } | |
| 1998 | + } | |
| 1988 | 1999 | } |
| 1989 | 2000 | } |
| 1990 | 2001 |