Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

# Conflicts:
#	patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/specialty/index.jsp

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/message/MessageService.java

@@ -254,11 +254,13 @@ public class MessageService extends BaseService {
        //专科消息
        List<Message> specialistList = null;
        if (flag == 1){
            specialistList = messageDao.getSpecialistUnRead(doctor);
        }else if (flag == 2){
            specialistList = messageDao.getSpecialistUnRead2(doctor);
        List<Message> specialistList = new ArrayList<>();
        if (flag!=null){
            if (flag == 1){
                specialistList = messageDao.getSpecialistUnRead(doctor);
            }else if (flag == 2){
                specialistList = messageDao.getSpecialistUnRead2(doctor);
            }
        }
        JSONObject specialistMesJson = new JSONObject();
        JSONArray jsonArray = new JSONArray();