-

common/common-entity/src/main/java/com/yihu/jw/entity/care/assistance/EmergencyAssistanceDO.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.care.assistance;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import netscape.javascript.JSObject;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -38,6 +39,7 @@ public class EmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
    private String patientPhoto;
    private Integer patientSex;
    private double distance;//医生与患者距离 单位km
    private JSObject otherDoctorDistance;
    public String getPatient() {
        return patient;
@@ -234,4 +236,13 @@ public class EmergencyAssistanceDO extends UuidIdentityEntityWithOperator {
    public void setDistance(double distance) {
        this.distance = distance;
    }
    @Transient
    public JSObject getOtherDoctorDistance() {
        return otherDoctorDistance;
    }
    public void setOtherDoctorDistance(JSObject otherDoctorDistance) {
        this.otherDoctorDistance = otherDoctorDistance;
    }
}

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

@@ -126,7 +126,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        ConsultTeamDo consultTeam = consultTeamDao.queryByRelationCode(assistanceDO.getId());
        if (consultTeam!=null){
            if (StringUtils.isNotBlank(assistanceDO.getSendMessage())){
                imUtill.sendTopicIM(patient,patientDO.getName(),consultTeam.getId(),"1",assistanceDO.getSendMessage(),null);
                imUtill.sendTopicIM(patient,patientDO.getName(),consultTeam.getConsult(),"1",assistanceDO.getSendMessage(),null);
            }
        }
        emergencyAssistanceDao.save(assistanceDO);
@@ -356,9 +356,16 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            return result;
        }
        if (consultTeam!=null){
            imUtill.sendTopicIM(patient,patientDO.getName(),consultTeam.getId(),"1",content,null);
            result.put(ResponseContant.resultFlag, ResponseContant.success);
            result.put(ResponseContant.resultMsg,"发送成功");
            String response = imUtill.sendTopicIM(patient,patientDO.getName(),consultTeam.getConsult(),"1",content,null);
            JSONObject jsonObject = JSONObject.parseObject(response);
            if (jsonObject.getInteger("status")==200){
                result.put(ResponseContant.resultFlag, ResponseContant.success);
                result.put(ResponseContant.resultMsg,"发送成功");
            }
            else {
                result.put(ResponseContant.resultFlag, ResponseContant.fail);
                result.put(ResponseContant.resultMsg,jsonObject.getString("message"));
            }
        }
        return result;
    }