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

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -2103,36 +2103,26 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
            }
        }
        if (StringUtils.isNoneBlank(orderNo)){
            sql+=" and t.order_no ='"+orderNo+"'";
            sql+=" and t.order_no like '%"+orderNo+"%'";
        }
        if (StringUtils.isNoneBlank(yktOrderNo)){
            sql+=" and t.yk_order_no ='"+yktOrderNo+"'";
            sql+=" and t.yk_order_no like '%"+yktOrderNo+"%'";
        }
        if (StringUtils.isNoneBlank(patientName)){
            sql+=" and t.patient_name  like '%"+patientName+"%'";
        }
        if (StringUtils.isNoneBlank(idCard)){
            sql+=" and b.idcard ='"+idCard+"'";
        }
        if (StringUtils.isNoneBlank(medicard)){
            sql+=" and t.relation_code ='"+medicard+"'";
            sql+=" and b.idcard like '%"+idCard+"%'";
        }
        if (status!=null){
            sql+=" and t.status ="+status+"";
        }
        if (StringUtils.isNoneBlank(orderType)){
            sql+=" and t.order_type ="+orderType+"";
        }
        if (StringUtils.isNoneBlank(yktOrderNo)){
            sql+=" and t.yk_order_no =" + yktOrderNo + "";
        }
        if (StringUtils.isNoneBlank(medicard)){
            sql+=" and t.relation_code =" + medicard + "";
        }
        if (StringUtils.isNoneBlank(idCard)){
            sql+=" and b.idcard =" + idCard + "";
            sql+=" and t.order_type like %"+orderType+"%";
        }
        if (StringUtils.isNoneBlank(orderCategory)){
            if (orderCategory.equalsIgnoreCase("2")){
                sql+=" and t.order_category IN ('2','3') ";

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

@@ -4527,7 +4527,11 @@ public class ImService {
            pushSql += " AND a. STATUS in(" + status + ") ";
        }
        if (org.apache.commons.lang3.StringUtils.isNotBlank(type)) {
            pushSql += " AND a.type = " + type +" ";
            if (type.equals("0")) {
            }else {
                pushSql += " AND a.type = " + type +" ";
            }
        }
        if (org.apache.commons.lang3.StringUtils.isNotBlank(doctor)) {
            pushSql += " AND a.doctor_name like '%" + doctor + "%' ";

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/message/BaseServiceNewsService.java

@@ -198,7 +198,7 @@ public class BaseServiceNewsService {
            String relationCode = tmp.getRelationCode();
            if (StringUtils.isNotBlank(relationCode)){
                if ("1".equals(tmp.getType())){//上门
                   String sql = " select group_concat(Distinct fee.name SEPARATOR '、') from base_door_coach_fee_detail where  order_id ='"+relationCode+"' and status =1 ";
                   String sql = " select group_concat(Distinct name SEPARATOR '、') from base_door_coach_fee_detail where  order_id ='"+relationCode+"' and status =1 ";
                   List<String> serviceItems = jdbcTemplate.queryForList(sql,String.class);
                   if (serviceItems.size()>0){
                       tmp.setServeItems(serviceItems.get(0));

svr/svr-statistics-es/doc/es/命令建索引.txt

@@ -18,3 +18,6 @@ PUT  http://172.26.0.112:9200/wlyy_quota_test/_settings
    "max_result_window": 500000
  }
}
curl -XGET 'http://10.18.43.40:9200/hlw_quota_prod'