Selaa lähdekoodia

feature:优化处方列表下载

wuyongyi 2 vuotta sitten
vanhempi
commit
f6e6a140f7

+ 21 - 0
src/main/java/com/ywt/mg/core/utils/CheckerPharmacyUtil.java

@@ -0,0 +1,21 @@
+package com.ywt.mg.core.utils;
+
+import com.ywt.mg.domain.models.ConstantDef;
+import com.ywt.mg.domain.models.enums.PrescriptionInfoSourceEnum;
+
+public class CheckerPharmacyUtil {
+
+    //4.6.5 判断是否来自太和或者白云his
+    public static boolean checkAdverPresSource(int source){
+
+       return (source == PrescriptionInfoSourceEnum.TaiHeHIS.getValue() || source == PrescriptionInfoSourceEnum.BaiYunHIS.getValue());
+
+    }
+
+//   判断是否来自国控黄石,太和便民,白云便民药房
+    public static boolean checkAdverPresPharmacyId(int pharmacyId){
+
+        return (pharmacyId == ConstantDef.BAIYUN_TAIHE_FATHER_PHARMACY || pharmacyId == ConstantDef.GUOKONG_PHARMACY|| pharmacyId == ConstantDef.TAIHE_PHARMACY || pharmacyId == ConstantDef.BAIYUN_PHARMACY);
+
+    }
+}

+ 24 - 0
src/main/java/com/ywt/mg/domain/models/ConstantDef.java

@@ -131,4 +131,28 @@ public class ConstantDef {
      * 对应ywt_drug库pharmacy表id=20的广三药房ID
      */
     public static final int GUANGSAN_ID = 20;
+
+
+    /**
+     * 白云太和父级药房
+     */
+    public static final int BAIYUN_TAIHE_FATHER_PHARMACY = 25;
+
+
+    /**
+     * 国药控股广州有限公司黄石大药房
+     */
+    public static final int GUOKONG_PHARMACY = 26;
+
+
+    /**
+     * 南方医院太和分院自费药取药便民处
+     */
+    public static final int TAIHE_PHARMACY = 27;
+
+
+    /**
+     * 南方医科大学南方医院白云分院自费药取药便民处
+     */
+    public static final int BAIYUN_PHARMACY = 28;
 }

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

@@ -1,6 +1,7 @@
 package com.ywt.mg.services;
 
 import com.ywt.mg.core.utils.Checker;
+import com.ywt.mg.core.utils.CheckerPharmacyUtil;
 import com.ywt.mg.core.utils.DateUtil;
 import com.ywt.mg.domain.models.ConstantDef;
 import com.ywt.mg.domain.models.enums.*;
@@ -94,6 +95,9 @@ 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()){
+            return "待取药";
+        }
         return statusStr;
     }