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

# Conflicts:
#	svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/DoctorConsultEndpoint.java

@@ -238,14 +238,14 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
										  @ApiParam(name = "reason", value = "复诊说明", defaultValue = "复诊说明")
										  @RequestParam(value = "reason", required = false) String reason)throws Exception{
		ConsultTeamDo consult = new ConsultTeamDo();
		/*if(2 == type){
		if(2 == type){
			consult.setType(16);//视频复诊
			if ("xm_ykyy_wx".equalsIgnoreCase(wxId)){
			/*if ("xm_ykyy_wx".equalsIgnoreCase(wxId)){
				prescriptionService.sendWxTemplateMsg(wxId,outpatientCode,null,"16","outpatientMsgRemind","");
			}
			}*/
		}else{
			consult.setType(9);//图文复诊
		}*/
		}
		//咨询类型（1、图文；2、视频,3、图文+视频）