diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicineArticleFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicineArticleFacade.java index d102c13..ffc8c72 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicineArticleFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MedicineArticleFacade.java @@ -13,8 +13,10 @@ import com.lyms.platform.common.utils.ReflectionUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.pojo.BabyCheckModel; +import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.MedicineArticleModel; import com.lyms.platform.query.BabyCheckModelQuery; +import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.MedicineArticleQuery; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -132,9 +134,16 @@ public class MedicineArticleFacade { if(StringUtils.isEmpty(id)){ return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("参数错误"); } + BabyModelQuery babyModelQuery=new BabyModelQuery(); + babyModelQuery.setYn(YnEnums.YES.getId()); + babyModelQuery.setPid(id); + List babyModelList = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery, "created", Sort.Direction.DESC); + if(CollectionUtils.isEmpty(babyModelList)){ + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("儿童档案不存在"); + } BabyCheckModelQuery query = new BabyCheckModelQuery(); query.setYn(YnEnums.YES.getId()); - query.setBuildId(id); + query.setBuildId(babyModelList.get(0).getId()); List checkModels = babyCheckService.queryBabyCheckRecord(query, "checkDate,created", Sort.Direction.DESC); List resultList=new ArrayList<>(); if(CollectionUtils.isNotEmpty(checkModels) &&