From 8bb104088c6d2278d2a8ae067733218096fefb6f Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Tue, 4 Jun 2019 16:37:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E5=9B=A0=E7=B4=A0=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/BabyBookbuildingFacade.java | 10 ++++------ .../com/lyms/platform/operate/web/facade/BabyCheckFacade.java | 6 +++--- .../lyms/platform/operate/web/facade/BabyNutritionFacade.java | 1 - 3 files changed, 7 insertions(+), 10 deletions(-) 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 c2708c6..a6952c7 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 @@ -1311,12 +1311,10 @@ public class BabyBookbuildingFacade { List patientSerResults = (List) baseResponse.getObject(); result.setPatientSerResults(patientSerResults); - if (!isBuild && StringUtils.isNotEmpty(model.getParentId())) - { + if (!isBuild && StringUtils.isNotEmpty(model.getParentId())) { Patients patients = patientsService.findOnePatientById(model.getParentId()); - if (patients != null) - { - List> riskList = mongoUtil.findColor(patients.getRiskFactorId()); + if (patients != null) { + List> riskList = mongoUtil.findColor(patients.getRiskFactorId()); result.setmHighRiskReason(riskList); } } @@ -2750,7 +2748,7 @@ public class BabyBookbuildingFacade { if (CollectionUtils.isNotEmpty(models)) { for (BabyModel model : models) { Map data = new HashMap<>(); - if (model.getLastHighRisk() == null || model.getLastHighRisk() == 0) { + if (model.getHighRisk() == null || model.getHighRisk() == 0) { data.put("highRisk", ""); //jira WEB-1547 } else { data.put("highRisk", "高危"); 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 2783dff..e7d41f3 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 @@ -597,7 +597,7 @@ public class BabyCheckFacade { if (babyModel != null && org.apache.commons.lang.StringUtils.isNotEmpty(babyModel.getSource())) { BabyModel babyModel1 = new BabyModel(); babyModel1.setNextDate(babyModel.getNextDate()); - babyModel1.setLastHighRisk(babyModel.getLastHighRisk()); + babyModel1.setHighRisk(babyModel.getHighRisk()); babyModel1.setLastDiagnose(babyModel.getLastDiagnose()); babyModel1.setId(babyModel.getSource()); babyBookbuildingService.updateBabyBuild(babyModel1, babyModel.getSource()); @@ -610,7 +610,7 @@ public class BabyCheckFacade { for (BabyModel baby : babyModels) { BabyModel babyModel1 = new BabyModel(); babyModel1.setNextDate(babyModel.getNextDate()); - babyModel1.setLastHighRisk(babyModel.getLastHighRisk()); + babyModel1.setHighRisk(babyModel.getHighRisk()); babyModel1.setLastDiagnose(babyModel.getLastDiagnose()); babyModel1.setId(baby.getId()); babyBookbuildingService.updateBabyBuild(babyModel1, baby.getId()); @@ -2067,7 +2067,7 @@ public class BabyCheckFacade { for (BabyModel model : babyModels) { BabyManageListResult result = new BabyManageListResult(); result.setId(model.getId()); - if (model.getLastHighRisk() == null || model.getLastHighRisk() == 0) { + if (model.getHighRisk() == null || model.getHighRisk() == 0) { result.setHighRisk("健康"); } else { result.setHighRisk("高危"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index 6ef0175..6018518 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -1324,7 +1324,6 @@ public class BabyNutritionFacade { double kauls = getBasicKaul(month, model.getWeight(), model.getHeight(), baby.getSex()); if (month >= 0 && month <= 5) { - System.out.println("=========" + model.getFeedType()); List babyDietReport = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month).and("feedingPattern").is(Integer.valueOf(model.getFeedType()))), BabyDietReportModel.class); for (BabyDietReportModel babyDiet : babyDietReport) { -- 1.8.3.1