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

patient-co-statistics/src/main/resources/application.yml

@@ -199,4 +199,4 @@ fv:
    password: 123456
systemConfig:
  msg_push_server: http://127.0.0.1:3000/api/v1/chats/sm
  msg_push_server: http://192.168.131.102:3000/api/v1/chats/sm

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultController.java

@@ -202,7 +202,7 @@ public class DoctorConsultController extends WeixinBaseController {
                if(wlyyTalkGroups!=null&&wlyyTalkGroups.size()>0)
                for(WlyyTalkGroup wlyyTalkGroup:wlyyTalkGroups){
                    json.put("group"+wlyyTalkGroup.getType(),wlyyTalkGroup.getCode());
                    json.put("group"+wlyyTalkGroup.getType()+"Name",wlyyTalkGroup.getName());
                    json.put("groupName"+wlyyTalkGroup.getType(),wlyyTalkGroup.getName());
                }
                jsonArray.put(json);
            }

patient-co-wlyy/src/main/resources/system.properties

@@ -84,7 +84,7 @@ im_list_get=http://192.168.131.101:3000/
#sign_check_upload=http://59.61.92.90:8072/wlyy_service
im_group_server=http://120.41.252.108:3031/api/v1/chats/gm
msg_push_server=http://120.41.252.108:3031/api/v1/chats/sm
msg_push_server=http://192.168.131.102:3000/api/v1/chats/sm
weixin_websocket_server = http://172.19.103.76:8000/user/senddata.do
#file upload temp path