diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java index fa6a4a5..7d9403d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java @@ -31,6 +31,7 @@ import com.lyms.platform.query.ResidentsArchiveQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; import javax.jws.Oneway; @@ -252,8 +253,12 @@ public class FolicAcidFacade { } folicAcidQuery.setHospitalList(hospitalList); } - List folicAcidList = folicAcidService.queryFolicAcid(folicAcidQuery); + List folicAcidList = folicAcidService.queryFolicAcidWithSort(folicAcidQuery, "drawTime", Sort.Direction.DESC); if (CollectionUtils.isNotEmpty(folicAcidList)){ + + //返回第一条数据 + folicAcid = folicAcidList.get(0); + for (FolicAcid data: folicAcidList){ Map acidMap = new HashMap<>(); if (data.getPregnancyType()!=null){ @@ -276,7 +281,7 @@ public class FolicAcidFacade { } } } - resultMap.put("folicAcidResult",folicAcid); + resultMap.put("folicAcidResult",getFolic(folicAcid)); resultMap.put("archiveResult",archiveMap); resultMap.put("folicAcidHistory",list); BaseObjectResponse response = new BaseObjectResponse(); @@ -286,6 +291,27 @@ public class FolicAcidFacade { return response; } + public Map getFolic(FolicAcid folicAcid){ + if (folicAcid==null){ + return null; + } + Map map= new HashMap<>(); + map.put("id",folicAcid.getId()); + map.put("created",DateUtil.getyyyy_MM_dd(folicAcid.getCreated())); + map.put("drawTime",DateUtil.getyyyy_MM_dd(folicAcid.getDrawTime())); + map.put("drawCount",folicAcid.getDrawCount()); + map.put("highRisk",folicAcid.getHighRisk()); + map.put("hospitalId",folicAcid.getHospitalId()); + map.put("hospitalName",folicAcid.getHospitalName()); + map.put("operator",folicAcid.getOperator()); + map.put("operatorId",folicAcid.getOperatorId()); + map.put("parentId",folicAcid.getParentId()); + map.put("pregnancyType",folicAcid.getPregnancyType()); + map.put("pregnancyWeeks",folicAcid.getPregnancyWeeks()); + return map; + } + + public BaseListResponse queryFolicAcid(FolicAcidQueryRequest queryRequest,Integer userId){ List> list = new ArrayList<>();