Explorar el Código

feature:处方列表状态

wuyongyi hace 2 años
padre
commit
0f35c37b42
Se han modificado 1 ficheros con 1 adiciones y 1 borrados
  1. 1 1
      src/main/java/com/ywt/mg/services/CommonServices.java

+ 1 - 1
src/main/java/com/ywt/mg/services/CommonServices.java

@@ -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;