111

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/consult/PatientConsultEndpoint.java

@@ -191,7 +191,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			}
			String url = "/chatroom/index?type="+type+"&peerId="+senderId+"&action=callVideo&peerName="+peerName+"&sessionId="+sessionId+"&content="+content;
			logger.info("url="+url);
			messageUtil.sendDoctorGetuiMessage(targetId,"4",url,"im消息",body);
			messageUtil.sendDoctorGetuiMessage(targetId,"4",url,"新消息",body);
			if(StringUtils.isNotBlank(zzdMessage)){
				messageUtil.sendDoctorDingdingMessage(null,targetId,"text","4",zzdMessage,null,null);
			}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -1632,7 +1632,8 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        //发起预警
        JSONObject start = new JSONObject();
        Map<String, Object> startMap = maps.get(0);
        start.put("createTime",startMap.get("createTime"));
        String createTime = startMap.get("createTime")+"";
        start.put("createTime",createTime);
        start.put("photo",startMap.get("photo"));
        start.put("serveDesc",startMap.get("serveDesc"));
        jsonObject.put("start",start);
@@ -1641,8 +1642,8 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        //预警推送
        JSONObject pushLog = new JSONObject();
        pushLog.put("family",patientFamilyPushLog(patient,orderId));
        pushLog.put("docotr",doctorPushLog(orderId,teamCode));
        pushLog.put("family",patientFamilyPushLog(patient,orderId,createTime));
        pushLog.put("docotr",doctorPushLog(orderId,teamCode,createTime));
        jsonObject.put("pushLog",pushLog);
        //其他日志
@@ -1740,7 +1741,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
     * @param orderId
     * @return
     */
    public List<Map<String, Object>> patientFamilyPushLog(String patient,String orderId){
    public List<Map<String, Object>> patientFamilyPushLog(String patient,String orderId,String createTime){
        List<Map<String, Object>> noticePersons = new ArrayList<>();
        JSONArray familyArr = familyMemberService.getPatientMembers(patient, null, null, null, "3");
        for (int i = 0; i < familyArr.size(); i++) {
@@ -1755,8 +1756,10 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            noticeObj.put("mobile", patientDO1.getMobile());
            noticeObj.put("status", 0);
            noticeObj.put("statusName", "未读");
            noticeObj.put("createTime",createTime);
            SystemMessageDO messageDO = systemMessageDao.findByRelationCodeAndReceiver(orderId, patientId);
            if (messageDO != null) {
                noticeObj.put("createTime",DateUtil.dateToStrLong(messageDO.getCreateTime()));
                if (StringUtils.isNotBlank(messageDO.getIsRead())) {
                    noticeObj.put("status", Integer.parseInt(messageDO.getIsRead()));
                    if (Integer.parseInt(messageDO.getIsRead()) == 1) {
@@ -1773,7 +1776,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
     * 医生推送日志
     * @return
     */
    public List<Map<String, Object>> doctorPushLog(String orderId,String teamCode){
    public List<Map<String, Object>> doctorPushLog(String orderId,String teamCode,String createTime){
        List<Map<String, Object>> noticePersons = new ArrayList<>();
        List<BaseDoctorDO> doctorDOS = baseTeamMemberDao.findAllMembersByLevel(teamCode,2);
        for (BaseDoctorDO doctorDO:doctorDOS) {
@@ -1786,9 +1789,12 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            noticeObj.put("mobile",doctorDO.getMobile());
            noticeObj.put("status",0);
            noticeObj.put("statusName","未响应");
            if (emergencyWarnDoctorResponseDao.findByDoctorAndOrderId(doctorDO.getId(),orderId)!=null){
            noticeObj.put("createTime",createTime);
            EmergencyWarnDoctorResponseDO logDO = emergencyWarnDoctorResponseDao.findByDoctorAndOrderId(doctorDO.getId(),orderId);
            if (logDO!=null){
                noticeObj.put("status",1);
                noticeObj.put("statusName","已响应");
                noticeObj.put("createTime",DateUtil.dateToStrLong(logDO.getResponseTime()));
            }
            noticePersons.add(noticeObj);
        }