Merge branch 'dev' of humingfen/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/synergy/SynergyManageService.java

@@ -428,14 +428,27 @@ public class SynergyManageService extends BaseJpaService {
        workOrderDao.save(workorderDO);
    }
    /**
     * 发送消息
     * @param workorderDO
     * @param user
     * @param type
     */
    public void sendMessage(ManageSynergyWorkorderDO workorderDO, User user, Integer type){
        String url = wlyyUrl + "doctor/message/sendMessage";
        //组装message内容
        JSONObject message = new JSONObject();
        message.put("sender", workorderDO.getReceiverCode());
        message.put("receiver", workorderDO.getCreateUser());
        message.put("type", type);
        message.put("relationCode", workorderDO.getCode());
        if(type == 24){
            message.put("receiver", workorderDO.getReceiverCode());
            message.put("sender", workorderDO.getCreateUser());
            message.put("type", type);
            message.put("relationCode", workorderDO.getCode());
        }else {
            message.put("sender", workorderDO.getReceiverCode());
            message.put("receiver", workorderDO.getCreateUser());
            message.put("type", type);
            message.put("relationCode", workorderDO.getCode());
        }
        //组装jsonObject内容
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("type", workorderDO.getType());