shiyang / regional-platform

Download as
Browse Code »

Commit 9a343595d90a638272f029b3a683b834c5a4e81b

Authored by liquanyu
1 parent b41accfdc0
Exists in master

儿童统计

Showing 3 changed files with 19 additions and 10 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java View file @ 9a34359
... ... @@ -52,7 +52,7 @@
52 52 babyQuery.mysqlBuild(babyCheckDao.queryBabyCheckCount(babyQuery.convertToQuery()));
53 53 query.start(babyQuery.getOffset()).end(babyQuery.getLimit());
54 54 }
55   - return babyCheckDao.queryBabyCheckRecord(babyQuery.convertToQuery().addOrder(Sort.Direction.DESC,"created"));
  55 + return babyCheckDao.queryBabyCheckRecord(query.addOrder(Sort.Direction.DESC,"created"));
56 56 }
57 57  
58 58 public List<BabyCheckModel> queryBabyCheckRecord(BabyCheckModelQuery query,String sortkey,Sort.Direction sort) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 9a34359
... ... @@ -757,23 +757,27 @@
757 757 {
758 758 String height = checkModel.getHeight();
759 759 String birth = DateUtil.getyyyy_MM_dd(babyModel.getBirth());
  760 + if (!com.lyms.platform.common.utils.StringUtils.isNotEmpty(birth))
  761 + {
  762 + continue;
  763 + }
760 764 // type 0 体重标准差数值表 1 身长/身高标准差数值表 2 头围标准差数值表 3身高别体重
761 765 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(height))
762 766 {
763 767 String value = babyCheckFacade.getGrowthValue(birth,Double.parseDouble(height),babyModel.getSex(),1);
764   - checkModel.setHeadEvaluate(value);
  768 + checkModel.setHeightEvaluate(value);
765 769  
766 770 }
767 771 String head = checkModel.getHead();
768 772 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(head)) {
769   - String value = babyCheckFacade.getGrowthValue(birth,Double.parseDouble(head),babyModel.getSex(),1);
  773 + String value = babyCheckFacade.getGrowthValue(birth,Double.parseDouble(head),babyModel.getSex(),2);
770 774 checkModel.setHeadEvaluate(value);
771 775 }
772 776  
773 777 String weight = checkModel.getWeight();
774 778 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(weight)) {
775   - String value = babyCheckFacade.getGrowthValue(birth,Double.parseDouble(weight),babyModel.getSex(),1);
776   - checkModel.setHeadEvaluate(value);
  779 + String value = babyCheckFacade.getGrowthValue(birth,Double.parseDouble(weight),babyModel.getSex(),3);
  780 + checkModel.setWeightEvaluate(value);
777 781 }
778 782  
779 783 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(height) &&
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 9a34359
... ... @@ -2283,6 +2283,7 @@
2283 2283 }
2284 2284 }
2285 2285 map.put("checkDoctor",checkDoctor);
  2286 + list.add(map);
2286 2287 }
2287 2288  
2288 2289 }
2289 2290  
... ... @@ -2294,13 +2295,17 @@
2294 2295 Future f = pool.submit(c);
2295 2296 futures.add(f);
2296 2297 }
2297   - for (Future f : futures) {
2298   - try {
2299   - results.addAll((List) f.get(30, TimeUnit.SECONDS));
2300   - } catch (Exception e) {
2301   - ExceptionUtils.catchException(e, "baby check list");
  2298 + if (CollectionUtils.isNotEmpty(futures))
  2299 + {
  2300 + for (Future f : futures) {
  2301 + try {
  2302 + results.addAll((List) f.get(30, TimeUnit.SECONDS));
  2303 + } catch (Exception e) {
  2304 + ExceptionUtils.catchException(e, "baby check list");
  2305 + }
2302 2306 }
2303 2307 }
  2308 +
2304 2309 }
2305 2310  
2306 2311 BaseListResponse objectResponse = new BaseListResponse();