diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MedicineArticleController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MedicineArticleController.java index 4f5463a..1ada36b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MedicineArticleController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MedicineArticleController.java @@ -96,6 +96,16 @@ public class MedicineArticleController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return medicineArticleFacade.queryListPage(modelQuery,loginState.getId()); } + /** + * 儿童小程序接口-文章查询 + * @param id + * @return + */ + @ResponseBody + @RequestMapping(value = "/queryArticleBabyApp",method = RequestMethod.GET) + public BaseResponse queryArticleBabyApp(@RequestParam(value = "id") String id) { + return medicineArticleFacade.queryArticleBabyApp(id); + } } \ No newline at end of file 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 d539d87..2207ff3 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 @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.BabyBookbuildingService; +import com.lyms.platform.biz.service.BabyCheckService; import com.lyms.platform.biz.service.MedicineArticleService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.OptActionEnums; @@ -11,9 +12,11 @@ import com.lyms.platform.common.utils.DateUtil; 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.permission.service.OrganizationService; +import com.lyms.platform.pojo.BabyCheckModel; import com.lyms.platform.pojo.MedicineArticleModel; +import com.lyms.platform.query.BabyCheckModelQuery; import com.lyms.platform.query.MedicineArticleQuery; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; @@ -36,13 +39,15 @@ public class MedicineArticleFacade { @Autowired private MongoTemplate mongoTemplate; @Autowired - private OrganizationService organizationService; - @Autowired private CouponMapper couponMapper; @Autowired private OperateLogFacade operateLogFacade; @Autowired private MedicineArticleService medicineArticleService; + @Autowired + private BabyBookbuildingService babyBookbuildingService; + @Autowired + private BabyCheckService babyCheckService; @@ -126,4 +131,31 @@ public class MedicineArticleFacade { br.setErrormsg("成功"); return br; } + + public BaseResponse queryArticleBabyApp(String id) { + if(StringUtils.isEmpty(id)){ + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("参数错误"); + } + BabyCheckModelQuery query = new BabyCheckModelQuery(); + query.setYn(YnEnums.YES.getId()); + query.setBuildId(id); + List checkModels = babyCheckService.queryBabyCheckRecord(query, "checkDate,created", Sort.Direction.DESC); + List resultList=new ArrayList<>(); + if(CollectionUtils.isNotEmpty(checkModels) && + CollectionUtils.isNotEmpty(checkModels.get(0).getArticleTypes()) && + StringUtils.isNotEmpty(checkModels.get(0).getHospitalId())){ + + MedicineArticleQuery articleQuery=new MedicineArticleQuery(); + articleQuery.setYn(YnEnums.YES.getId()); + articleQuery.setHospitalId(checkModels.get(0).getHospitalId()); + articleQuery.setArticleTypes(checkModels.get(0).getArticleTypes()); + articleQuery.setNeed(null); + resultList=medicineArticleService.queryList(articleQuery, Sort.Direction.DESC,new String[]{"created"}); + } + BaseObjectResponse br = new BaseObjectResponse(); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setData(resultList); + br.setErrormsg("成功"); + return br; + } }