diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 3c082be..19c939a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -1077,7 +1077,7 @@ public class BabyCheckFacade extends BaseServiceImpl { criteria.and("czOrfzProject").is("cz"); Query query=Query.query(criteria); BabyHighRiskBabyModel babyHighRiskBabyModel=mongoTemplate.findOne(query, BabyHighRiskBabyModel.class); - base.setCyzd(StringUtils.isNotEmpty(babyHighRiskBabyModel.getCyzd()) ? babyHighRiskBabyModel.getCyzd() : ""); + base.setCyzd(null!=babyHighRiskBabyModel ? babyHighRiskBabyModel.getCyzd() : ""); } resMap.put("baseInfo", base); resMap.put("checkList", list); @@ -1985,6 +1985,17 @@ public class BabyCheckFacade extends BaseServiceImpl { } } + //秦皇岛高危儿专科需求-出院诊断字段查询放到顶部详情栏目里 + if(StringUtils.isNotEmpty(hospitalId)&&"216".equals(hospitalId)&&CollectionUtils.isNotEmpty(models)){ + BabyHighRiskBabyModelQuery babyHighRiskquery=new BabyHighRiskBabyModelQuery(); + Criteria criteria=Criteria.where("buildId").is(models.get(0).getId()); + criteria.and("czOrfzProject").is("cz"); + Query query=Query.query(criteria); + BabyHighRiskBabyModel babyHighRiskBabyModel=mongoTemplate.findOne(query, BabyHighRiskBabyModel.class); + if(CollectionUtils.isNotEmpty(results)) { + results.get(0).setCyzd(null!=babyHighRiskBabyModel.getCyzd() ? babyHighRiskBabyModel.getCyzd() : ""); + } + } } }