Commit 2f242f0b913b98fd92da9f94506bc3fc2609f283
Exists in
master
and in
7 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
View file @
2f242f0
| ... | ... | @@ -256,9 +256,10 @@ |
| 256 | 256 | List<FolicAcid> folicAcidList = folicAcidService.queryFolicAcidWithSort(folicAcidQuery, "drawTime", Sort.Direction.DESC); |
| 257 | 257 | if (CollectionUtils.isNotEmpty(folicAcidList)){ |
| 258 | 258 | |
| 259 | - //返回第一条数据 | |
| 260 | - folicAcid = folicAcidList.get(0); | |
| 261 | - | |
| 259 | + if (folicAcid==null){ | |
| 260 | + //返回第一条数据 | |
| 261 | + folicAcid = folicAcidList.get(0); | |
| 262 | + } | |
| 262 | 263 | for (FolicAcid data: folicAcidList){ |
| 263 | 264 | Map<String,Object> acidMap = new HashMap<>(); |
| 264 | 265 | if (data.getPregnancyType()!=null){ |