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/doctor/dao/service/BaseDoctorBGService.java

@@ -87,13 +87,13 @@ public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO,
    public List<Map<String,Object>> selectByDoctor(String doctor, Integer contentType, String content, Integer page, Integer size){
        String sql = "select id as \"id\", doctor as \"doctor\",doctor_name as \"doctorName\",content_type as \"contentType\"," +
                "content as \"content\" , content_desc as \"contentDesc\",is_sort as \"isSort\",del as \"del\" " +
                " from base_doctor_message whre del=1 and doctor='"+doctor+"' ";
                " from base_doctor_message where del=1 and doctor='"+doctor+"' ";
        if (contentType!=null){
            sql +=" and content_type= "+contentType;
        }
        if (StringUtils.isNotBlank(content)){
            sql +=" and content like '%"+content+"%'v";
            sql +=" and content like '%"+content+"%' ";
        }
        sql +=" order by is_sort desc ";
@@ -114,7 +114,7 @@ public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO,
            List<Map<String,Object>> maps = jdbcTemplate.queryForList(sql);
            Integer isSort=0;
            if (maps!=null&&maps.size()!=0){
                isSort = Integer.parseInt(maps.get(0).get("total").toString());
                isSort = Integer.parseInt(maps.get(0).get("total").toString())+1;
            }else {
                isSort=isSort+1;
            }
@@ -139,7 +139,7 @@ public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO,
        List<Map<String,Object>> maps = jdbcTemplate.queryForList(sql);
        Integer isSort=0;
        if (maps!=null&&maps.size()!=0){
            isSort = Integer.parseInt(maps.get(0).get("total").toString());
            isSort = Integer.parseInt(maps.get(0).get("total").toString())+1;
        }else {
            isSort=isSort+1;
        }