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 18644c2..091ced0 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 @@ -43,6 +43,7 @@ import org.springframework.data.mongodb.core.query.Update; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; +import javax.validation.constraints.Max; import java.util.*; import java.util.concurrent.Callable; import java.util.concurrent.Future; @@ -1026,8 +1027,13 @@ public class BabyCheckFacade extends BaseServiceImpl { getBabyCheckList(buildIds, personModels.get(0), list); } - //其它高危 - base.setWcOtherHighRisk(StringUtils.isNotEmpty(model.getWcOtherHighRisk())?model.getWcOtherHighRisk():null); + //其它高危数据流转儿保检查 + if(CollectionUtils.isNotEmpty(list)){ + base.setWcOtherHighRisk(StringUtils.isNotEmpty(list.get(list.size()-1).get("wcOtherHighRisk"))?list.get(list.size()-1).get("wcOtherHighRisk"):null); + }else { + base.setWcOtherHighRisk(StringUtils.isNotEmpty(model.getWcOtherHighRisk())?model.getWcOtherHighRisk():null); + } + resMap.put("baseInfo", base); resMap.put("checkList", list); @@ -1339,7 +1345,6 @@ public class BabyCheckFacade extends BaseServiceImpl { //查询儿童的基本信息 List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); - Map checkRecord = new HashMap <>(); Date checkDate = cmodel.getCheckDate(); String monthAge = ""; @@ -1365,6 +1370,8 @@ public class BabyCheckFacade extends BaseServiceImpl { } else { checkRecord.put("hospitalName", ""); } + //获取每次检查的其它高危详情 + checkRecord.put("wcOtherHighRisk",StringUtils.isNotEmpty(cmodel.getWcOtherHighRisk())?cmodel.getWcOtherHighRisk():null); list.add(checkRecord); }