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

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -1627,7 +1627,12 @@ public class ImService {
		if (wxId.equalsIgnoreCase("xm_ykyy_wx")){
			if (!flag){
				BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(consult);
				BusinessOrderDO businessOrderDO = new BusinessOrderDO();
				if(cons.getRelationCode() != null){
					businessOrderDO  = businessOrderDao.selectByRelationCode(cons.getRelationCode());
				}else {
					businessOrderDO  = businessOrderDao.selectByRelationCode(consult);
				}
				if (businessOrderDO!=null){
					ykyyService.updateYktOrderStatus(businessOrderDO.getOrderNo(),"4");
				}
@@ -3090,4 +3095,23 @@ public class ImService {
		return flag;
	}
	public void doctorReplyUpdateYktState(String consult,String doctor,String wxId){
		if (wxId.equalsIgnoreCase("xm_ykyy_wx")){
			String sql ="select * from muc_messages m  where m.session_id IN " +
				"(SELECT t.session_id FROM topics t where t.id = '"+consult+"') " +
				"and m.sender_id = '"+doctor+"'";
			List<Map<String,Object>> mapList = jdbcTemplate.queryForList(sql);
			if (mapList!=null&&mapList.size()!=0&&mapList.size()==1){
				//眼科接诊时更新眼科通状态
				if (!flag){
					BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(consult);
					if (businessOrderDO!=null){
						ykyyService.updateYktOrderStatus(businessOrderDO.getOrderNo(),"5");
					}
				}
			}
		}
	}
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1020,6 +1020,8 @@ public class BaseHospitalRequestMapping {
        //导诊助手结束咨询
        public static final String guidanceFinishConsult = "guidanceFinishConsult";
        public static final String doctorReplyUpdateYktState = "doctorReplyUpdateYktState";
    }
    /**

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

@@ -908,4 +908,22 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
		}
		return success(flag);
	}
	@PostMapping(value = BaseHospitalRequestMapping.DodtorIM.doctorReplyUpdateYktState)
	@ApiOperation(value = "医生回复修改眼科通状态", notes = "医生回复修改眼科通状态")
	public ObjEnvelop doctorReplyUpdateYktState(@ApiParam(name = "consult", value = "consult")
											@RequestParam(value = "consult", required = true)String consult,
											@ApiParam(name = "doctor", value = "doctor")
											@RequestParam(value = "doctor", required = true)String doctor) {
		Boolean flag =false;
		try {
			imService.doctorReplyUpdateYktState(consult,doctor,wxId);
			flag=true;
		}catch (Exception e){
			System.out.println("医生回复修改眼科通状态："+e.getMessage());
		}
		return success(flag);
	}
}