feature：处方列表下载

src/main/java/com/ywt/mg/services/PrescriptionServices.java

@@ -125,7 +125,7 @@ public class PrescriptionServices {
                 paramList.add(date);
             } else if (statusInt == 2) {
                 // 查找只是配送中/待取药 （不包含不通过的）
-                whereSql += " and refund_status is null and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
+                whereSql += " and (refund_status is null or refund_status = 2) and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoStatusEnum.Dispatching.getValue());
@@ -659,7 +659,7 @@ public class PrescriptionServices {
                 paramList.add(date);
             } else if (statusInt == 2) {
                 // 查找只是配送中/待取药 （不包含不通过的）
-                whereSql += " and refund_status is null and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
+                whereSql += " and (refund_status is null or refund_status = 2) and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoStatusEnum.Dispatching.getValue());
@@ -1219,7 +1219,7 @@ public class PrescriptionServices {
                 paramList.add(date);
             } else if (statusInt == 2) {
                 // 查找只是配送中/待取药 （不包含不通过的）
-                whereSql += " and refund_status is null and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
+                whereSql += " and (refund_status is null or refund_status = 2) and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoStatusEnum.Dispatching.getValue());
@@ -1564,7 +1564,7 @@ public class PrescriptionServices {
                 paramList.add(date);
             } else if (statusInt == 2) {
                 // 查找只是配送中/待取药 （不包含不通过的）
-                whereSql += " and refund_status is null and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
+                whereSql += " and (refund_status is null or refund_status = 2) and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoStatusEnum.Dispatching.getValue());