|
@ -73,13 +73,13 @@ public class PrescriptionDispensaryCodeService extends BaseService {
|
|
precriptionSql += " and p1.status = ? ";
|
|
precriptionSql += " and p1.status = ? ";
|
|
params.add(status);
|
|
params.add(status);
|
|
}else {
|
|
}else {
|
|
precriptionSql += " and p1.status in (?,?,?,?,?,?)" ;
|
|
|
|
|
|
precriptionSql += " and p1.status in (?,?,?,?,?)" ;
|
|
params.add(PrescriptionLog.PrescriptionLogStatus.wait_expressage.getValue());
|
|
params.add(PrescriptionLog.PrescriptionLogStatus.wait_expressage.getValue());
|
|
params.add(PrescriptionLog.PrescriptionLogStatus.expressageing_error.getValue());
|
|
params.add(PrescriptionLog.PrescriptionLogStatus.expressageing_error.getValue());
|
|
params.add(PrescriptionLog.PrescriptionLogStatus.expressageJGS.getValue());
|
|
params.add(PrescriptionLog.PrescriptionLogStatus.expressageJGS.getValue());
|
|
params.add(PrescriptionLog.PrescriptionLogStatus.expressageing.getValue());
|
|
params.add(PrescriptionLog.PrescriptionLogStatus.expressageing.getValue());
|
|
params.add(PrescriptionLog.PrescriptionLogStatus.expressage2hospital.getValue());
|
|
params.add(PrescriptionLog.PrescriptionLogStatus.expressage2hospital.getValue());
|
|
params.add(PrescriptionLog.PrescriptionLogStatus.finish.getValue());
|
|
|
|
|
|
// params.add(PrescriptionLog.PrescriptionLogStatus.finish.getValue());
|
|
}
|
|
}
|
|
if(timeType!=null){
|
|
if(timeType!=null){
|
|
precriptionSql += "AND TIMESTAMPDIFF(SECOND, p2.create_Time, CURRENT_TIME) < ? ";
|
|
precriptionSql += "AND TIMESTAMPDIFF(SECOND, p2.create_Time, CURRENT_TIME) < ? ";
|