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 69a65db..252abc1 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 @@ -52,7 +52,7 @@ public class BabyCheckService { babyQuery.mysqlBuild(babyCheckDao.queryBabyCheckCount(babyQuery.convertToQuery())); query.start(babyQuery.getOffset()).end(babyQuery.getLimit()); } - return babyCheckDao.queryBabyCheckRecord(babyQuery.convertToQuery().addOrder(Sort.Direction.DESC,"created")); + return babyCheckDao.queryBabyCheckRecord(query.addOrder(Sort.Direction.DESC,"created")); } public List queryBabyCheckRecord(BabyCheckModelQuery query,String sortkey,Sort.Direction sort) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 22c2ca1..c520ff2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -757,23 +757,27 @@ public class TestController { { String height = checkModel.getHeight(); String birth = DateUtil.getyyyy_MM_dd(babyModel.getBirth()); + if (!com.lyms.platform.common.utils.StringUtils.isNotEmpty(birth)) + { + continue; + } // type 0 体重标准差数值表 1 身长/身高标准差数值表 2 头围标准差数值表 3身高别体重 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(height)) { String value = babyCheckFacade.getGrowthValue(birth,Double.parseDouble(height),babyModel.getSex(),1); - checkModel.setHeadEvaluate(value); + checkModel.setHeightEvaluate(value); } String head = checkModel.getHead(); if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(head)) { - String value = babyCheckFacade.getGrowthValue(birth,Double.parseDouble(head),babyModel.getSex(),1); + String value = babyCheckFacade.getGrowthValue(birth,Double.parseDouble(head),babyModel.getSex(),2); checkModel.setHeadEvaluate(value); } String weight = checkModel.getWeight(); if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(weight)) { - String value = babyCheckFacade.getGrowthValue(birth,Double.parseDouble(weight),babyModel.getSex(),1); - checkModel.setHeadEvaluate(value); + String value = babyCheckFacade.getGrowthValue(birth,Double.parseDouble(weight),babyModel.getSex(),3); + checkModel.setWeightEvaluate(value); } if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(height) && 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 8d511a7..7a85eab 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 @@ -2283,6 +2283,7 @@ public class BabyBookbuildingFacade { } } map.put("checkDoctor",checkDoctor); + list.add(map); } } @@ -2294,13 +2295,17 @@ public class BabyBookbuildingFacade { Future f = pool.submit(c); futures.add(f); } - for (Future f : futures) { - try { - results.addAll((List) f.get(30, TimeUnit.SECONDS)); - } catch (Exception e) { - ExceptionUtils.catchException(e, "baby check list"); + if (CollectionUtils.isNotEmpty(futures)) + { + for (Future f : futures) { + try { + results.addAll((List) f.get(30, TimeUnit.SECONDS)); + } catch (Exception e) { + ExceptionUtils.catchException(e, "baby check list"); + } } } + } BaseListResponse objectResponse = new BaseListResponse();