Merge branch 'dev' of huangwenjie/wlyy2.0 into dev

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

@@ -2033,11 +2033,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }
    
        if(StringUtils.isNotBlank(jobTitleNameKey)){
            sql+=" AND d.job_title_name AS = '"+jobTitleNameKey+"' ";
            sql+=" AND d.job_title_name  = '"+jobTitleNameKey+"' ";
        }
    
        if(StringUtils.isNotBlank(outpatientType)){
            sql+=" AND d.outpatient_type AS = '"+outpatientType+"' ";
            sql+=" AND d.outpatient_type = '"+outpatientType+"' ";
        }
    
        if(StringUtils.isNotBlank(keyName)){