From 06e71ed1b07e2ca43774abef2e039f3531f06328 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 13 Oct 2020 16:50:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E8=A5=BF=E4=BD=93=E9=87=8D=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E5=AE=9A=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/service/impl/LisServiceImpl.java | 2 +- .../web/service/impl/PatientWeightServiceImpl.java | 32 ++++++++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java index 9c8a551..52f8988 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java @@ -215,7 +215,7 @@ public class LisServiceImpl implements LisService { } } else { AntenatalExaminationModel antenatalExaminationModel = AntenatalExaminationModels.get(AntenatalExaminationModels.size() - 1); - if (antenatalExaminationModel.getCreated().getTime() > DateUtil.addDay(model.getPublishTime(),-7).getTime()) + if (antenatalExaminationModel.getCreated().getTime() > DateUtil.addDay(model.getPublishTime(),-3).getTime()) { AntenatalExaminationModel antenatalExaminationModel1 = new AntenatalExaminationModel(); //3 更新复诊记录 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 422c21e..eba73fa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -1014,6 +1014,8 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient return null; } + kmap.put("hospitalId",hospitalId); + setGuide(week, map, hospitalId); // 设置指南 String nsArea = ReportConfig.getNSArea(basicConfig.getName()); WeightConfigModel configModel = getWeightConfigBykcal(kmap, nsArea, rid); @@ -1438,7 +1440,8 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient Map map5 = setData2("保证饮食的清淡", "每日食盐的摄入不得超过5g，烹调时减少酱油、味精、糖等调料的添加；减少油脂的摄入，保证饮食的清淡，少吃或不吃油炸食物、辛辣食物、糕点、饮料、冰淇淋等。"); Map map6 = setData2("保证食物的清洁卫生", "保证食物的卫生，新鲜，不吃隔夜、变质的食物，不吃没有熟透的肉类和海鲜，尽量减少外出用餐。"); Map map7 = setData2("远离烟、酒、咖啡因，保证水分的充足", "孕期绝对禁止抽烟、饮酒；减少咖啡因的摄入，每日不得超过300mg，少喝咖啡，不喝浓茶、碳酸饮料等，保证每日2300ml水的摄入。"); - Map map8 = setData2("规律的生活，适当的运动", "养成规律的睡眠习惯，早睡——11点以前入睡，避免熬夜，早起——7:30-8:00间起床吃早餐，以免晚上失眠；每天根据自己的情况保证20-40分钟的轻度运动，孕早期以散步为宜，中期以游泳、瑜伽为宜，孕晚期以散步、助产运动为宜。"); +// Map map8 = setData2("规律的生活，适当的运动", "养成规律的睡眠习惯，早睡——11点以前入睡，避免熬夜，早起——7:30-8:00间起床吃早餐，以免晚上失眠；每天根据自己的情况保证20-40分钟的轻度运动，孕早期以散步为宜，中期以游泳、瑜伽为宜，孕晚期以散步、助产运动为宜。"); + Map map8 = setData2("规律的生活，适当的运动", "养成规律的睡眠习惯，早睡——11点以前入睡，避免熬夜，早起——7:30-8:00间起床吃早餐，以免晚上失眠；每天根据自己的情况保证20-40分钟的轻度运动，孕早期以散步为宜，中期瑜伽为宜，孕晚期以散步、助产运动为宜。");//临西去掉游泳 WeightConfigModel configModel = getWeightConfigByWeek(week); Map map9 = setData2("本周需注意", configModel != null ? configModel.getWeekContent() : ""); @@ -1478,7 +1481,18 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient Map dinner2 = new LinkedHashMap<>(); // 晚加餐 String status = kmap.get("status"); - String kcal = Math.round(Double.parseDouble(kmap.get("kulStart"))) + "-" + Math.round(Double.parseDouble(kmap.get("kulEnd"))); + + String hospitalId = kmap.get("hospitalId"); + String kcal = ""; + //临西热量计算 + if (StringUtils.isNotEmpty(hospitalId) && "216".equals(hospitalId)) + { + kcal = Math.round(Double.parseDouble(kmap.get("kulStart")))+""; + } + else { + kcal = Math.round(Double.parseDouble(kmap.get("kulStart"))) + "-" + Math.round(Double.parseDouble(kmap.get("kulEnd"))); + } + setData(breakfast, "早餐", configModel.getBreakfast()); setData(breakfast2, "上午加餐", configModel.getBreakfastAdd()); @@ -1509,7 +1523,12 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient if (week < 12) { suggests = configModel.getEarlySuggests(); } else if (week <= 28) { - suggests = configModel.getMiddleSuggests(); + suggests = new ArrayList<>(); + //临西去掉游泳 + for (String content : configModel.getMiddleSuggests()) + { + suggests.add(content.replace("游泳、","")); + } } else { suggests = configModel.getLaterSuggests(); } @@ -2039,6 +2058,13 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } else if (k1 > 3300) { k1 = 3300; } + String hospitalId = map.get("hospitalId"); + //临西热量计算 + if (StringUtils.isNotEmpty(hospitalId) && "216".equals(hospitalId)) + { + k1 = k1 < 1500 ? 1500 : k1; + } + Criteria criteria = null; if ("3".equals((String) map.get("type"))) { criteria = Criteria.where("kcal").is(k1).and("dietaryType").is(0); -- 1.8.3.1