From 6ccc953c212cd59bd8becbb58c344ee2c1e89892 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 23 Dec 2016 14:24:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/biz/dal/IBabyCheckDao.java | 2 ++ .../platform/biz/dal/impl/BabyCheckDaoImpl.java | 5 +++ .../platform/biz/service/BabyCheckService.java | 13 ++++++-- .../web/controller/BabyBuildController.java | 6 ++-- .../operate/web/facade/BabyBookbuildingFacade.java | 36 ++++++++++++++++++---- .../operate/web/request/BabyManageRequest.java | 22 +++++++++++++ 6 files changed, 74 insertions(+), 10 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyCheckDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyCheckDao.java index 8a2ac6a..e7e9ad2 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyCheckDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyCheckDao.java @@ -22,4 +22,6 @@ public interface IBabyCheckDao { List queryLastDiagnoseCheck(List ids); int queryBabyCheckCount(MongoQuery mongoQuery); + + void updateBabyCheckByBuildId(BabyCheckModel checkModel, String buildId); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java index 0c9d08a..21a4c7e 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java @@ -69,5 +69,10 @@ public class BabyCheckDaoImpl extends BaseMongoDAOImpl implement return (int) count(mongoQuery.convertToMongoQuery()); } + @Override + public void updateBabyCheckByBuildId(BabyCheckModel checkModel, String buildId) { + this.mongoTemplate.updateMulti(new Query(Criteria.where("buildId").is(buildId)), Update.update("birth", checkModel.getBirth()), BabyCheckModel.class); + } + } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java index e5793d3..69a65db 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java @@ -46,8 +46,13 @@ public class BabyCheckService { babyCheckDao.updateBabyCheck(obj, id); } - public List queryBabyCheckRecord(BabyCheckModelQuery query) { - return babyCheckDao.queryBabyCheckRecord(query.convertToQuery().addOrder(Sort.Direction.DESC,"modified")); + public List queryBabyCheckRecord(BabyCheckModelQuery babyQuery) { + MongoQuery query = babyQuery.convertToQuery(); + if (StringUtils.isNotEmpty(babyQuery.getNeed())) { + babyQuery.mysqlBuild(babyCheckDao.queryBabyCheckCount(babyQuery.convertToQuery())); + query.start(babyQuery.getOffset()).end(babyQuery.getLimit()); + } + return babyCheckDao.queryBabyCheckRecord(babyQuery.convertToQuery().addOrder(Sort.Direction.DESC,"created")); } public List queryBabyCheckRecord(BabyCheckModelQuery query,String sortkey,Sort.Direction sort) { @@ -91,4 +96,8 @@ public class BabyCheckService { return babyCheckDao.queryBabyCheckCount(babyQuery.convertToQuery()); } + + public void updateBabyCheckByBuildId(BabyCheckModel checkModel, String buildId) { + babyCheckDao.updateBabyCheckByBuildId(checkModel,buildId); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index e6cc8f8..15b3d39 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -393,9 +393,11 @@ public class BabyBuildController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/getBabyGroupRightCount") @ResponseBody @TokenRequired - public BaseResponse getBabyGroupRightCount(@Valid @RequestBody BabyManageRequest babyManageRequest,HttpServletRequest request){ + public BaseResponse getBabyGroupRightCount(@Valid @RequestBody BabyManageRequest babyManageRequest,HttpServletRequest request, + @RequestParam("page") Integer page, + @RequestParam("limit") Integer limit){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return babyBookbuildingFacade.getBabyGroupRightCount(babyManageRequest,loginState.getId()); + return babyBookbuildingFacade.getBabyGroupRightCount(babyManageRequest,loginState.getId(),page,limit); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 3690adc..8d511a7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -108,6 +108,8 @@ public class BabyBookbuildingFacade { private AutoMatchFacade autoMatchFacade; + + private static ExecutorService pool = Executors.newFixedThreadPool(10); @@ -198,7 +200,7 @@ public class BabyBookbuildingFacade { * @param request * @return */ - public BaseResponse updateBabyBookbuilding(BabyBookbuildingAddRequest request,Integer userId) { + public BaseResponse updateBabyBookbuilding(BabyBookbuildingAddRequest request, Integer userId) { BabyModel model = getBabyModel(request); model.setModified(new Date()); model.setOperator(userId); @@ -280,6 +282,14 @@ public class BabyBookbuildingFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + + private void updateCheckBirth(BabyModel babyModel) + { + BabyCheckModel checkModel = new BabyCheckModel(); + checkModel.setBirth(babyModel.getBirth()); + babyCheckService.updateBabyCheckByBuildId(checkModel, babyModel.getId()); + } + /** * 添加儿童建档 * @@ -2179,7 +2189,7 @@ public class BabyBookbuildingFacade { * @param userId * @return */ - public BaseResponse getBabyGroupRightCount(BabyManageRequest request, Integer userId) { + public BaseResponse getBabyGroupRightCount(BabyManageRequest request, Integer userId,Integer page,Integer limit) { String hospitalId = ""; //得到当前登录的医院id if (userId != null) { @@ -2213,6 +2223,19 @@ public class BabyBookbuildingFacade { babyQuery.setCheckDateStart(end); } + babyQuery.setPage(page); + babyQuery.setLimit(limit); + babyQuery.setNeed("true"); + + if (StringUtils.isNotEmpty(request.getItemType()) && "1".equals(request.getItemType())) + { + babyQuery.setHeightEvaluate(request.getEvaluate()); + } + else if (StringUtils.isNotEmpty(request.getItemType()) && "2".equals(request.getItemType())) + { + babyQuery.setWeightEvaluate(request.getEvaluate()); + } + List> results = new ArrayList<>(); List babyCheckModels = babyCheckService.queryBabyCheckRecord(babyQuery); @@ -2239,12 +2262,12 @@ public class BabyBookbuildingFacade { { BabyModel model = getBabyModelById(checkModel.getBuildId()); Map map = new HashMap<>(); - map.put("babyId",model.getId()); - map.put("checkId",checkModel.getId()); + map.put("babyId",model.getId()); //儿童主键 + map.put("checkId",checkModel.getId()); //检查主键 map.put("sex", StringUtils.emptyDeal(SexEnum.getTextById(model.getSex()))); //性别 map.put("babyName", StringUtils.emptyDeal(model.getName())); //儿童名称 map.put("birthday", StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth()))); //生日 - map.put("age",""); //当前月龄 + map.put("age",StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), checkModel.getCheckDate()))); //检查月龄 map.put("height",checkModel.getHeight()); //身长 map.put("weight", checkModel.getWeight()); //体重 map.put("growthEvaluate",checkModel.getGrowthEvaluate()); //体格发育评价 @@ -2280,7 +2303,8 @@ public class BabyBookbuildingFacade { } } - BaseObjectResponse objectResponse = new BaseObjectResponse(); + BaseListResponse objectResponse = new BaseListResponse(); + objectResponse.setPageInfo(babyQuery.getPageInfo()); objectResponse.setData(results); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index 1015d9b..4423625 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -74,6 +74,28 @@ public class BabyManageRequest extends BaseQuery { private String isArea; + //检查项类型 1身长 2 体重 + private String itemType; + + //评价 + private String evaluate; + + public String getItemType() { + return itemType; + } + + public void setItemType(String itemType) { + this.itemType = itemType; + } + + public String getEvaluate() { + return evaluate; + } + + public void setEvaluate(String evaluate) { + this.evaluate = evaluate; + } + public String getHospitalProvinceId() { return hospitalProvinceId; } -- 1.8.3.1