|
@@ -95,7 +95,7 @@ public class CommonServices {
|
|
|
if (p.getPharmacyId() == ConstantDef.GK_PHARMACY_ID && p.getPaymentStatus() == PaymentStatusEnum.Success.getValue()) {
|
|
|
return "待取药";
|
|
|
}
|
|
|
- if(CheckerPharmacyUtil.checkAdverPresPharmacyId(p.getPharmacyId()) && p.getPaymentStatus() == PaymentStatusEnum.Success.getValue()){
|
|
|
+ if(CheckerPharmacyUtil.checkAdverPresPharmacyId(p.getPharmacyId()) && p.getPaymentStatus() == PaymentStatusEnum.Success.getValue() && p.getStatus() == PrescriptionInfoStatusEnum.Dispatching.getValue()){
|
|
|
return "待取药";
|
|
|
}
|
|
|
return statusStr;
|