From 363119cd2db229f65e7ced26a3c114b8a0eb9270 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 11 Jan 2019 09:42:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E4=BD=93=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/PatientWeight.java | 22 +++++++++++++ .../web/service/impl/PatientWeightServiceImpl.java | 37 ++++++++++++++++------ 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java index 0f07fca..7c84b02 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java @@ -126,6 +126,28 @@ public class PatientWeight extends BaseModel { //异常次数 private Integer exceptionCount; + //0 未推送 1已经推送 + private Integer exceptionSend; + + //0 未推送 1已经推送 + private Integer sevenSend; + + public Integer getExceptionSend() { + return exceptionSend; + } + + public void setExceptionSend(Integer exceptionSend) { + this.exceptionSend = exceptionSend; + } + + public Integer getSevenSend() { + return sevenSend; + } + + public void setSevenSend(Integer sevenSend) { + this.sevenSend = sevenSend; + } + public Integer getExceptionCount() { return exceptionCount; } 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 0389f34..ba72785 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 @@ -1769,8 +1769,8 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient { Date currentDate = new Date(); DateUtil.formatYmd(currentDate); - if (!(patientWeight.getModified().getTime() < new Date().getTime() - && patientWeight.getModified().getTime() > currentDate.getTime())) + if (patientWeight.getModified().getTime() < new Date().getTime() + && patientWeight.getModified().getTime() > currentDate.getTime()) { continue; } @@ -1797,11 +1797,15 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } else if (type == 2) { + patientWeight.setSevenSend(1); content = "亲爱的准妈妈您好，我是您的私人体重管理医生，您目前已经很久没有记录您的体重值了，为了您和您孩子的健康，请您务必每天记录一下自己的体重，好让我们能随时关注到您和宝宝的健康状况，谢谢！"; + patientWeightService2.update(Query.query(Criteria.where("id").is(patientWeight.getId())), patientWeight); } else if (type == 3) { + patientWeight.setExceptionSend(1); content = "亲爱的准妈妈您好，我是您的私人体重管理医生，您目前的体重数据十分不理想，请您迅速与我联系或来院进行复查身体情况。"; + patientWeightService2.update(Query.query(Criteria.where("id").is(patientWeight.getId())), patientWeight); } mr.setFirst("【" + messagePrefix + "】" + content); mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); @@ -1845,11 +1849,6 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient smsConfigFacade.saveMsg(messages, patient.getHospitalId()); } - if (patientWeight != null) - { - patientWeightService2.update(Query.query(Criteria.where("id").is(patientWeight.getId())), patientWeight); - } - } } } @@ -1877,7 +1876,26 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient if (CollectionUtils.isNotEmpty(patientIds)) { - List weights = mongoTemplate.find(Query.query(Criteria.where("patientId").in(patientIds).and("modified").lte(DateUtil.addDay(new Date(),-7))), PatientWeight.class); + Criteria cr = Criteria.where("patientId").in(patientIds); + + if (type == 2) + { + cr.and("modified").lte(DateUtil.addDay(new Date(),-7)); + if (status != null && status == 1) + { + cr.and("sevenSend").is(status); + } + } + else if (type == 3) + { + cr.and("exceptionCount").gte(2); + if (status != null && status == 1) + { + cr.and("exceptionSend").is(status); + } + } + + List weights = mongoTemplate.find(Query.query(cr), PatientWeight.class); if (CollectionUtils.isNotEmpty(weights)) { for (PatientWeight weight : weights) @@ -1890,7 +1908,8 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient map.put("nowWeight",weight.getNowWeight()); map.put("days",DateUtil.getDays(weight.getModified(), new Date())); map.put("phone",patients.getPhone()); - map.put("cumulWeight",getDiff(weight.getBeforeWeight(),weight.getNowWeight())); + map.put("cumulWeight",getDiff(weight.getBeforeWeight(), weight.getNowWeight())); + datas.add(map); } } } -- 1.8.3.1