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

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -7555,7 +7555,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        params.put("xmlStr", patNo);
        returnValue = com.yihu.jw.utils.WebserviceUtil.post(url,
                "http://business.htemr.haitaiinc.com",
                "manageDataAll",
                "manageEmrDataAll",
                params);
        logger.info("门诊病历列表信息，返回值xmlstr:" + returnValue);
@@ -7590,7 +7590,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        params.put("xmlStr", patNo);
        returnValue = com.yihu.jw.utils.WebserviceUtil.post(url,
                "http://business.htemr.haitaiinc.com",
                "manageDataAll",
                "manageEmrDataAll",
                params);
        logger.info("门诊病历列表信息，返回值xmlstr:" + returnValue);
@@ -7621,7 +7621,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        params.put("data", data);
        returnValue = com.yihu.jw.utils.WebserviceUtil.post(url,
                "http://business.htemr.haitaiinc.com",
                "manageDataAll",
                "manageEmrDataAll",
                params);
        logger.info("门诊病历列表信息，返回值xmlstr:" + returnValue);

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

@@ -3109,10 +3109,10 @@ public class ImService {
	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+"'";
			String sql ="SELECT * FROM topics t where " +
					"t.id='"+consult+"' and t.reply_user='"+doctor+"' and t.reply=1 and t.status=0 ";
			List<Map<String,Object>> mapList = jdbcTemplate.queryForList(sql);
			logger.info("sql======"+sql);
			if (mapList!=null&&mapList.size()!=0&&mapList.size()==1){
				//眼科接诊时更新眼科通状态
				if (!flag){