Merge branch 'dev' of liuwenbin/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionDispensaryCodeService.java

@@ -74,7 +74,8 @@ public class PrescriptionDispensaryCodeService extends BaseService {
            precriptionSql += " and p1.status = ? ";
            params.add(status);
        }else {
            precriptionSql += " and p1.status in (?,?,?,?,?)" ;
            precriptionSql += " and p1.status in (?,?,?,?,?,?)" ;
            params.add(PrescriptionLog.PrescriptionLogStatus.pay_success.getValue());
            params.add(PrescriptionLog.PrescriptionLogStatus.wait_expressage.getValue());
            params.add(PrescriptionLog.PrescriptionLogStatus.expressageing_error.getValue());
            params.add(PrescriptionLog.PrescriptionLogStatus.expressageJGS.getValue());