From 76f55cee02ca04a03eefb01becbccbdf30c38f80 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 4 Apr 2019 10:48:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msg/worker/CourseMsgGenerateWorker.java | 10 +++++-- .../msg/worker/YunAmsMsgGenerateWorker.java | 33 ++++++++++++++++++---- .../web/service/impl/PatientWeightServiceImpl.java | 2 ++ 3 files changed, 38 insertions(+), 7 deletions(-) diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/CourseMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/CourseMsgGenerateWorker.java index 9c96c74..c02fbdb 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/CourseMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/CourseMsgGenerateWorker.java @@ -156,12 +156,18 @@ public class CourseMsgGenerateWorker implements Runnable { String courseTime = DateUtils.getDateStr(course.getCourseTime(),DateUtils.Y_M_D_H_M)+" ("+DateUtils.getWeekOfDate(course.getCourseTime())+")"; String messageContent = "【"+messagePrefix+"】有新的孕妇学校课程发布啦，点击详情进一步了解和报名啦。"; +// MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), +// ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.YFXXKCTX.getId(), +// course.getHospitalId(), course.getId(), pat.getId(), course.getCourseName(), +// course.getCourseSpeaker(), courseTime, +// WxTempleteIdEnums.YUN_XUE_KE_CHEN_TX.getId(),service,SmsTimeTypeEnums.ONTIME.getId()); + + MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.YFXXKCTX.getId(), course.getHospitalId(), course.getId(), pat.getId(), course.getCourseName(), - course.getCourseSpeaker(), courseTime, + courseTime, course.getCourseSpeaker(), WxTempleteIdEnums.YUN_XUE_KE_CHEN_TX.getId(),service,SmsTimeTypeEnums.ONTIME.getId()); - messages.add(request); } } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java index 559cd2e..12e2e20 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java @@ -5,6 +5,7 @@ import com.lyms.platform.beans.MsgRequest; import com.lyms.platform.biz.service.HighRiskService; import com.lyms.platform.biz.service.YunBookbuildingService; import com.lyms.platform.common.enums.*; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.msg.model.MessageContent; @@ -216,6 +217,9 @@ public class YunAmsMsgGenerateWorker implements Runnable { } } if (highRiskContents.size() > 0) { + + String serDoct = getServiceDoctorId(pat.getId()); + for (String riskName : highRiskContents.keySet()) { MessageContent message = highRiskContents.get(riskName); String weekDay = HelperUtils.getYunWeekDay(pat.getLastMenses()); @@ -224,7 +228,7 @@ public class YunAmsMsgGenerateWorker implements Runnable { String messageContent = "【" + messagePrefix + "】" + message.getContent(); MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), ServiceObjEnums.YUNOBJ.getId(), SmsServiceEnums.GWZD.getId(), - pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title, "", + pat.getHospitalId(), message.getId(), pat.getId(), weekDay, title, serDoct, WxTempleteIdEnums.GAO_WEI_ZHI_DAO.getId(), serviceGwzd); messages.add(request); @@ -247,7 +251,7 @@ public class YunAmsMsgGenerateWorker implements Runnable { if (CollectionUtils.isNotEmpty(messageContents) && serviceYbzd > 0) { - String serDoct = getDoctorId(pat.getId()); + String serDoct = getServiceDoctorId(pat.getId()); for (MessageContent message : messageContents) { //判断当前短信是否已经发送 通过短信ID和孕妇ID @@ -277,15 +281,34 @@ public class YunAmsMsgGenerateWorker implements Runnable { } } - public String getDoctorId(String patientId) + /** + * 获取开通服务的医生id + * @param patientId + * @return + */ + public String getServiceDoctorId(String patientId) { PatientServiceQuery patientQuery = new PatientServiceQuery(); patientQuery.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId()); + patientQuery.setParentid(patientId); List patientServices = patientServiceService.queryPatientService(patientQuery); if (CollectionUtils.isNotEmpty(patientServices)) { - String serDoct = patientServices.get(0).getSerDoct(); - return serDoct == null ? "" : serDoct; + PatientService patientService = patientServices.get(0); + if (patientService != null) + { + if (patientService.getDocEndTime() != null) + { + if (patientService.getDocEndTime().getTime() > new Date().getTime()) + { + return patientService.getSerDoct() == null ? "" : patientService.getSerDoct(); + } + } + else + { + return patientService.getSerDoct() == null ? "" : patientService.getSerDoct(); + } + } } return ""; } 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 6e2a33a..46c15c0 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 @@ -2102,6 +2102,8 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient if (datas.containsKey("3") && datas.containsKey("8")) { datas.put("2", datas.get("8")); } + + healthChargeFacade.addHealthCharge(patientWeight.getHospitalId(),2,patientWeight.getPatientId(),1,1,userId); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(this.getFirstOrNull(datas)); } -- 1.8.3.1