From 43bf9b14450210dbaffc438817fdfaa50fb7d07c Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 23 Mar 2018 16:27:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B2=E7=BA=BF=E5=9B=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 45 +++++++++++++++++----- .../operate/web/facade/BabyCheckFacade.java | 2 +- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 18bfae7..551cc49 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -5,10 +5,7 @@ import com.lyms.platform.biz.SequenceConstant; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.dao.operator.MongoQuery; -import com.lyms.platform.common.enums.OptActionEnums; -import com.lyms.platform.common.enums.QuickenEnums; -import com.lyms.platform.common.enums.RiskDefaultTypeEnum; -import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; @@ -2558,12 +2555,25 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(antExChuModels)) { AntExChuModel chumodel = antExChuModels.get(0); - if (chumodel != null && StringUtils.isNotEmpty(chumodel.getGonggao())) + if (StringUtils.isNotEmpty(chumodel.getGonggao()) || StringUtils.isNotEmpty(chumodel.getGonggaoSelect())) { Map item = new HashMap<>(); - item.put("value", chumodel.getGonggao()); + String value = ""; + if (StringUtils.isNotEmpty(chumodel.getGonggaoSelect()) ) + { + if (StringUtils.isNotEmpty(chumodel.getGonggaoType())) { + value = GongJingEnums.getGongGaoNameById(chumodel.getGonggaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(chumodel.getGonggaoType()); + } else { + value = GongJingEnums.getGongGaoNameById(chumodel.getGonggaoSelect()); + } + } + else if (StringUtils.isNotEmpty(chumodel.getGonggao())) + { + value = chumodel.getGonggao(); + } + item.put("value", value); item.put("time", DateUtil.getyyyy_MM_dd(chumodel.getCheckTime())); - if (StringUtils.isNumeric(chumodel.getGonggao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(chumodel.getGonggao()).matches()) + if (StringUtils.isNotEmpty(chumodel.getGonggao()) && (StringUtils.isNumeric(chumodel.getGonggao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(chumodel.getGonggao()).matches())) { titles.add(DateUtil.getyyyy_MM_dd(chumodel.getCheckTime())); values.add(chumodel.getGonggao()); @@ -2581,12 +2591,27 @@ public class AntenatalExaminationFacade { { for (AntenatalExaminationModel anmodel : examinationModelList) { - if (anmodel != null && StringUtils.isNotEmpty(anmodel.getGongGao())) + if (StringUtils.isNotEmpty(anmodel.getGongGao()) || StringUtils.isNotEmpty(anmodel.getGongGaoSelect())) { Map item = new HashMap<>(); - item.put("value", anmodel.getGongGao()); + + String value = ""; + if (StringUtils.isNotEmpty(anmodel.getGongGaoSelect()) ) + { + if (StringUtils.isNotEmpty(anmodel.getGongGaoType())) { + value = GongJingEnums.getGongGaoNameById(anmodel.getGongGaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(anmodel.getGongGaoType()); + } else { + value = GongJingEnums.getGongGaoNameById(anmodel.getGongGaoSelect()); + } + } + else if (StringUtils.isNotEmpty(anmodel.getGongGao())) + { + value = anmodel.getGongGao(); + } + + item.put("value", value); item.put("time", DateUtil.getyyyy_MM_dd(anmodel.getCheckDate())); - if (StringUtils.isNumeric(anmodel.getGongGao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(anmodel.getGongGao()).matches()) + if (StringUtils.isNotEmpty(anmodel.getGongGao()) && (StringUtils.isNumeric(anmodel.getGongGao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(anmodel.getGongGao()).matches())) { titles.add(DateUtil.getyyyy_MM_dd(anmodel.getCheckDate())); values.add(anmodel.getGongGao()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 334dceb..d8d6635 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -1657,7 +1657,7 @@ public class BabyCheckFacade { query.setYn(YnEnums.YES.getId()); query.setBuildId(babyId); //查询儿童的检查记录 - List checkModels = babyCheckService.queryBabyCheckRecord(query, "checkDate", Sort.Direction.ASC); + List checkModels = babyCheckService.queryBabyCheckRecord(query, "checkDate,created", Sort.Direction.ASC); if (CollectionUtils.isNotEmpty(checkModels)) { for (BabyCheckModel checkModel : checkModels) -- 1.8.3.1