Browse Source

改代码

hxm 3 years ago
parent
commit
91dd36a138

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

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

+ 5 - 1
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 + "%' ";