Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -104,6 +104,9 @@ public class ConsultService {
            String key2 = "";
            if("1".equals(sender_type)){
                BasePatientDO tmp = basePatientDao.findById(sender_id);
                if(tmp==null){
                    return "";
                }
                key2 = tmp.getName();
            }else{
                BaseDoctorDO doctorDO = baseDoctorDao.findById(sender_id);