jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c52ee6b77cc3c21eeb6656accf8a22e3699ba7c5

Authored by yangfei
2 parents 2293236276 43bf9b1445
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ c52ee6b
... ... @@ -5,10 +5,7 @@
5 5 import com.lyms.platform.biz.service.*;
6 6 import com.lyms.platform.common.constants.ErrorCodeConstants;
7 7 import com.lyms.platform.common.dao.operator.MongoQuery;
8   -import com.lyms.platform.common.enums.OptActionEnums;
9   -import com.lyms.platform.common.enums.QuickenEnums;
10   -import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
11   -import com.lyms.platform.common.enums.YnEnums;
  8 +import com.lyms.platform.common.enums.*;
12 9 import com.lyms.platform.common.result.BaseObjectResponse;
13 10 import com.lyms.platform.common.result.BaseResponse;
14 11 import com.lyms.platform.common.utils.*;
15 12  
16 13  
... ... @@ -2558,12 +2555,25 @@
2558 2555 if (CollectionUtils.isNotEmpty(antExChuModels))
2559 2556 {
2560 2557 AntExChuModel chumodel = antExChuModels.get(0);
2561   - if (chumodel != null && StringUtils.isNotEmpty(chumodel.getGonggao()))
  2558 + if (StringUtils.isNotEmpty(chumodel.getGonggao()) || StringUtils.isNotEmpty(chumodel.getGonggaoSelect()))
2562 2559 {
2563 2560 Map<String,String> item = new HashMap<>();
2564   - item.put("value", chumodel.getGonggao());
  2561 + String value = "";
  2562 + if (StringUtils.isNotEmpty(chumodel.getGonggaoSelect()) )
  2563 + {
  2564 + if (StringUtils.isNotEmpty(chumodel.getGonggaoType())) {
  2565 + value = GongJingEnums.getGongGaoNameById(chumodel.getGonggaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(chumodel.getGonggaoType());
  2566 + } else {
  2567 + value = GongJingEnums.getGongGaoNameById(chumodel.getGonggaoSelect());
  2568 + }
  2569 + }
  2570 + else if (StringUtils.isNotEmpty(chumodel.getGonggao()))
  2571 + {
  2572 + value = chumodel.getGonggao();
  2573 + }
  2574 + item.put("value", value);
2565 2575 item.put("time", DateUtil.getyyyy_MM_dd(chumodel.getCheckTime()));
2566   - if (StringUtils.isNumeric(chumodel.getGonggao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(chumodel.getGonggao()).matches())
  2576 + if (StringUtils.isNotEmpty(chumodel.getGonggao()) && (StringUtils.isNumeric(chumodel.getGonggao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(chumodel.getGonggao()).matches()))
2567 2577 {
2568 2578 titles.add(DateUtil.getyyyy_MM_dd(chumodel.getCheckTime()));
2569 2579 values.add(chumodel.getGonggao());
2570 2580  
2571 2581  
... ... @@ -2581,12 +2591,27 @@
2581 2591 {
2582 2592 for (AntenatalExaminationModel anmodel : examinationModelList)
2583 2593 {
2584   - if (anmodel != null && StringUtils.isNotEmpty(anmodel.getGongGao()))
  2594 + if (StringUtils.isNotEmpty(anmodel.getGongGao()) || StringUtils.isNotEmpty(anmodel.getGongGaoSelect()))
2585 2595 {
2586 2596 Map<String,String> item = new HashMap<>();
2587   - item.put("value", anmodel.getGongGao());
  2597 +
  2598 + String value = "";
  2599 + if (StringUtils.isNotEmpty(anmodel.getGongGaoSelect()) )
  2600 + {
  2601 + if (StringUtils.isNotEmpty(anmodel.getGongGaoType())) {
  2602 + value = GongJingEnums.getGongGaoNameById(anmodel.getGongGaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(anmodel.getGongGaoType());
  2603 + } else {
  2604 + value = GongJingEnums.getGongGaoNameById(anmodel.getGongGaoSelect());
  2605 + }
  2606 + }
  2607 + else if (StringUtils.isNotEmpty(anmodel.getGongGao()))
  2608 + {
  2609 + value = anmodel.getGongGao();
  2610 + }
  2611 +
  2612 + item.put("value", value);
2588 2613 item.put("time", DateUtil.getyyyy_MM_dd(anmodel.getCheckDate()));
2589   - if (StringUtils.isNumeric(anmodel.getGongGao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(anmodel.getGongGao()).matches())
  2614 + if (StringUtils.isNotEmpty(anmodel.getGongGao()) && (StringUtils.isNumeric(anmodel.getGongGao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(anmodel.getGongGao()).matches()))
2590 2615 {
2591 2616 titles.add(DateUtil.getyyyy_MM_dd(anmodel.getCheckDate()));
2592 2617 values.add(anmodel.getGongGao());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ c52ee6b
... ... @@ -1657,7 +1657,7 @@
1657 1657 query.setYn(YnEnums.YES.getId());
1658 1658 query.setBuildId(babyId);
1659 1659 //查询儿童的检查记录
1660   - List<BabyCheckModel> checkModels = babyCheckService.queryBabyCheckRecord(query, "checkDate", Sort.Direction.ASC);
  1660 + List<BabyCheckModel> checkModels = babyCheckService.queryBabyCheckRecord(query, "checkDate,created", Sort.Direction.ASC);
1661 1661 if (CollectionUtils.isNotEmpty(checkModels))
1662 1662 {
1663 1663 for (BabyCheckModel checkModel : checkModels)