Commit 06e71ed1b07e2ca43774abef2e039f3531f06328
1 parent
465c0573c8
Exists in
master
and in
6 other branches
临西体重报告定制
Showing 2 changed files with 30 additions and 4 deletions
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
View file @
06e71ed
| ... | ... | @@ -215,7 +215,7 @@ |
| 215 | 215 | } |
| 216 | 216 | } else { |
| 217 | 217 | AntenatalExaminationModel antenatalExaminationModel = AntenatalExaminationModels.get(AntenatalExaminationModels.size() - 1); |
| 218 | - if (antenatalExaminationModel.getCreated().getTime() > DateUtil.addDay(model.getPublishTime(),-7).getTime()) | |
| 218 | + if (antenatalExaminationModel.getCreated().getTime() > DateUtil.addDay(model.getPublishTime(),-3).getTime()) | |
| 219 | 219 | { |
| 220 | 220 | AntenatalExaminationModel antenatalExaminationModel1 = new AntenatalExaminationModel(); |
| 221 | 221 | //3 更新复诊记录 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
06e71ed
| ... | ... | @@ -1014,6 +1014,8 @@ |
| 1014 | 1014 | return null; |
| 1015 | 1015 | } |
| 1016 | 1016 | |
| 1017 | + kmap.put("hospitalId",hospitalId); | |
| 1018 | + | |
| 1017 | 1019 | setGuide(week, map, hospitalId); // 设置指南 |
| 1018 | 1020 | String nsArea = ReportConfig.getNSArea(basicConfig.getName()); |
| 1019 | 1021 | WeightConfigModel configModel = getWeightConfigBykcal(kmap, nsArea, rid); |
| ... | ... | @@ -1438,7 +1440,8 @@ |
| 1438 | 1440 | Map<String, Object> map5 = setData2("保证饮食的清淡", "每日食盐的摄入不得超过5g，烹调时减少酱油、味精、糖等调料的添加；减少油脂的摄入，保证饮食的清淡，少吃或不吃油炸食物、辛辣食物、糕点、饮料、冰淇淋等。"); |
| 1439 | 1441 | Map<String, Object> map6 = setData2("保证食物的清洁卫生", "保证食物的卫生，新鲜，不吃隔夜、变质的食物，不吃没有熟透的肉类和海鲜，尽量减少外出用餐。"); |
| 1440 | 1442 | Map<String, Object> map7 = setData2("远离烟、酒、咖啡因，保证水分的充足", "孕期绝对禁止抽烟、饮酒；减少咖啡因的摄入，每日不得超过300mg，少喝咖啡，不喝浓茶、碳酸饮料等，保证每日2300ml水的摄入。"); |
| 1441 | - Map<String, Object> map8 = setData2("规律的生活，适当的运动", "养成规律的睡眠习惯，早睡——11点以前入睡，避免熬夜，早起——7:30-8:00间起床吃早餐，以免晚上失眠；每天根据自己的情况保证20-40分钟的轻度运动，孕早期以散步为宜，中期以游泳、瑜伽为宜，孕晚期以散步、助产运动为宜。"); | |
| 1443 | +// Map<String, Object> map8 = setData2("规律的生活，适当的运动", "养成规律的睡眠习惯，早睡——11点以前入睡，避免熬夜，早起——7:30-8:00间起床吃早餐，以免晚上失眠；每天根据自己的情况保证20-40分钟的轻度运动，孕早期以散步为宜，中期以游泳、瑜伽为宜，孕晚期以散步、助产运动为宜。"); | |
| 1444 | + Map<String, Object> map8 = setData2("规律的生活，适当的运动", "养成规律的睡眠习惯，早睡——11点以前入睡，避免熬夜，早起——7:30-8:00间起床吃早餐，以免晚上失眠；每天根据自己的情况保证20-40分钟的轻度运动，孕早期以散步为宜，中期瑜伽为宜，孕晚期以散步、助产运动为宜。");//临西去掉游泳 | |
| 1442 | 1445 | |
| 1443 | 1446 | WeightConfigModel configModel = getWeightConfigByWeek(week); |
| 1444 | 1447 | Map<String, Object> map9 = setData2("本周需注意", configModel != null ? configModel.getWeekContent() : ""); |
| 1445 | 1448 | |
| ... | ... | @@ -1478,8 +1481,19 @@ |
| 1478 | 1481 | Map<String, Object> dinner2 = new LinkedHashMap<>(); // 晚加餐 |
| 1479 | 1482 | |
| 1480 | 1483 | String status = kmap.get("status"); |
| 1481 | - String kcal = Math.round(Double.parseDouble(kmap.get("kulStart"))) + "-" + Math.round(Double.parseDouble(kmap.get("kulEnd"))); | |
| 1482 | 1484 | |
| 1485 | + String hospitalId = kmap.get("hospitalId"); | |
| 1486 | + String kcal = ""; | |
| 1487 | + //临西热量计算 | |
| 1488 | + if (StringUtils.isNotEmpty(hospitalId) && "216".equals(hospitalId)) | |
| 1489 | + { | |
| 1490 | + kcal = Math.round(Double.parseDouble(kmap.get("kulStart")))+""; | |
| 1491 | + } | |
| 1492 | + else { | |
| 1493 | + kcal = Math.round(Double.parseDouble(kmap.get("kulStart"))) + "-" + Math.round(Double.parseDouble(kmap.get("kulEnd"))); | |
| 1494 | + } | |
| 1495 | + | |
| 1496 | + | |
| 1483 | 1497 | setData(breakfast, "早餐", configModel.getBreakfast()); |
| 1484 | 1498 | setData(breakfast2, "上午加餐", configModel.getBreakfastAdd()); |
| 1485 | 1499 | setData(lunch, "午餐", configModel.getLunch()); |
| ... | ... | @@ -1509,7 +1523,12 @@ |
| 1509 | 1523 | if (week < 12) { |
| 1510 | 1524 | suggests = configModel.getEarlySuggests(); |
| 1511 | 1525 | } else if (week <= 28) { |
| 1512 | - suggests = configModel.getMiddleSuggests(); | |
| 1526 | + suggests = new ArrayList<>(); | |
| 1527 | + //临西去掉游泳 | |
| 1528 | + for (String content : configModel.getMiddleSuggests()) | |
| 1529 | + { | |
| 1530 | + suggests.add(content.replace("游泳、","")); | |
| 1531 | + } | |
| 1513 | 1532 | } else { |
| 1514 | 1533 | suggests = configModel.getLaterSuggests(); |
| 1515 | 1534 | } |
| ... | ... | @@ -2039,6 +2058,13 @@ |
| 2039 | 2058 | } else if (k1 > 3300) { |
| 2040 | 2059 | k1 = 3300; |
| 2041 | 2060 | } |
| 2061 | + String hospitalId = map.get("hospitalId"); | |
| 2062 | + //临西热量计算 | |
| 2063 | + if (StringUtils.isNotEmpty(hospitalId) && "216".equals(hospitalId)) | |
| 2064 | + { | |
| 2065 | + k1 = k1 < 1500 ? 1500 : k1; | |
| 2066 | + } | |
| 2067 | + | |
| 2042 | 2068 | Criteria criteria = null; |
| 2043 | 2069 | if ("3".equals((String) map.get("type"))) { |
| 2044 | 2070 | criteria = Criteria.where("kcal").is(k1).and("dietaryType").is(0); |