1

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/assistance/EmergencyAssistanceEndpoint.java

@@ -269,7 +269,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
                                       @ApiParam(name="content",value = "content")
                                       @RequestParam(value = "content") String content){
        try {
            JSONObject result =assistanceService.sendQuickMessage(orderId,patient,content);
            JSONObject result =assistanceService.sendQuickMessage(orderId,patient,content,getAgentUID());
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return ObjEnvelop.getError(result.getString(ResponseContant.resultMsg));
            }

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

@@ -176,7 +176,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                }
                assistanceDO.setType(4);
            }
            if(patient.equals(proxyPatient)) {//本人发起
            else if(patient.equals(proxyPatient)) {//本人发起
                assistanceDO.setProxyPatient(patient);
                assistanceDO.setProxyPatientName(patientDO.getName());
                assistanceDO.setProxyPatientPhone(patientDO.getMobile());
@@ -224,7 +224,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        }
        assistanceDO = emergencyAssistanceDao.save(assistanceDO);
        //创建im会话  紧急救助咨询的sessionid  为居民code+(wlyy_consult_team表consult)+20
        JSONObject IMObj = consultTeamService.addServiceConsult(assistanceDO.getId(),patient,proxyPatient,null);
        JSONObject IMObj = consultTeamService.addServiceConsult(assistanceDO.getId(),patient,agent,null);
        String sessionId=patient+"_"+ IMObj.getJSONObject("resultMsg").getString("consult") + "_20";
        assistanceDO.setSessionId(sessionId);
        //向会话中发送一条消息
@@ -961,7 +961,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        return result;
    }
    public JSONObject sendQuickMessage(String orderId,String patient,String content){
    public JSONObject sendQuickMessage(String orderId,String patient,String content,String agent){
        JSONObject result = new JSONObject();
        ConsultTeamDo consultTeam = consultTeamDao.queryByRelationCode(orderId);
        BasePatientDO patientDO = patientDao.findById(patient);
@@ -972,7 +972,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            return result;
        }
        if (consultTeam!=null){
            String response = imUtill.sendTopicIM(patient,patientDO.getName(),consultTeam.getConsult(),"1",content,null);
            String response = imUtill.sendTopicIM(patient,patientDO.getName(),consultTeam.getConsult(),"1",content,agent);
            JSONObject jsonObject = JSONObject.parseObject(response);
            if (jsonObject.getInteger("status")==200){
                result.put(ResponseContant.resultFlag, ResponseContant.success);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/consult/ConsultTeamService.java

@@ -146,7 +146,7 @@ public class ConsultTeamService {
     * @return
     * @throws Exception
     */
    public JSONObject addServiceConsult(String orderId,String patient,String proxyPatient,String symptoms) throws Exception {
    public JSONObject addServiceConsult(String orderId,String patient,String agent,String symptoms) throws Exception {
        JSONObject result = new JSONObject();
        // 判断居民是否已经签约
@@ -237,7 +237,7 @@ public class ConsultTeamService {
        }
        String content = patientDO.getName() + "发起紧急救助申请";
        JSONObject messages = imUtill.getCreateTopicMessage(patient, patientDO.getName(), consult.getTitle(), content, consult.getImages(), "");
        JSONObject messages = imUtill.getCreateTopicMessage(patient, patientDO.getName(), consult.getTitle(), content, consult.getImages(), agent);
        JSONObject imResponseJson = imUtill.createTopics(sessionId, consult.getId(), content, participants, messages, ImUtil.SESSION_TYPE_EMERGENCY_ASSISTANCE);
        if (imResponseJson == null || imResponseJson.getInteger("status") == -1) {
@@ -358,7 +358,7 @@ public class ConsultTeamService {
     * @return
     * @throws Exception
     */
    public JSONObject addSecurityMoConsult(String orderId,String patient,String proxyPatient,String symptoms) throws Exception {
    public JSONObject addSecurityMoConsult(String orderId,String patient,String agent,String symptoms) throws Exception {
        JSONObject result = new JSONObject();
        // 判断居民是否已经签约