feature：处方列表下载

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

@@ -125,15 +125,15 @@ public class PrescriptionServices {
                 paramList.add(date);
             } else if (statusInt == 2) {
                 // 查找只是配送中/待取药 （不包含不通过的）
-                whereSql += " and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
+                whereSql += " and refund_status is null and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoStatusEnum.Dispatching.getValue());
             } else if (statusInt == 3) {
                 // 查找只是已完成的，只有广三的有已完成的状态
-                whereSql += " and ( status = ? and pharmacy_id = ? ) ";
+                whereSql += " and ( status = ? ) ";
                 paramList.add(PrescriptionInfoStatusEnum.Finished.getValue());
-                paramList.add(ConstantDef.GUANGSAN_PHARMACY_ID);
+
             } else if (statusInt == 5) {
                 // 查找只是不通过的，退费的不找出来，已评价的也不找出来
                 whereSql += " and ( (ext_status & ?) = ? and ext_status < ? and status != ? ) ";
@@ -659,15 +659,15 @@ public class PrescriptionServices {
                 paramList.add(date);
             } else if (statusInt == 2) {
                 // 查找只是配送中/待取药 （不包含不通过的）
-                whereSql += " and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
+                whereSql += " and refund_status is null and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoStatusEnum.Dispatching.getValue());
             } else if (statusInt == 3) {
                 // 查找只是已完成的，只有广三的有已完成的状态
-                whereSql += " and ( status = ? and pharmacy_id = ? ) ";
+                whereSql += " and ( status = ?  ) ";
                 paramList.add(PrescriptionInfoStatusEnum.Finished.getValue());
-                paramList.add(ConstantDef.GUANGSAN_PHARMACY_ID);
+
             } else if (statusInt == 5) {
                 // 查找只是不通过的，退费的不找出来，已评价的也不找出来
                 whereSql += " and ( (ext_status & ?) = ? and ext_status < ? and status != ? ) ";
@@ -1219,15 +1219,15 @@ public class PrescriptionServices {
                 paramList.add(date);
             } else if (statusInt == 2) {
                 // 查找只是配送中/待取药 （不包含不通过的）
-                whereSql += " and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
+                whereSql += " and refund_status is null and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoStatusEnum.Dispatching.getValue());
             } else if (statusInt == 3) {
                 // 查找只是已完成的，只有广三的有已完成的状态
-                whereSql += " and ( status = ? and pharmacy_id = ? ) ";
+                whereSql += " and ( status = ?  ) ";
                 paramList.add(PrescriptionInfoStatusEnum.Finished.getValue());
-                paramList.add(ConstantDef.GUANGSAN_PHARMACY_ID);
+
             } else if (statusInt == 5) {
                 // 查找只是不通过的，退费的不找出来，已评价的也不找出来
                 whereSql += " and ( (ext_status & ?) = ? and ext_status < ? and status != ? ) ";
@@ -1564,15 +1564,15 @@ public class PrescriptionServices {
                 paramList.add(date);
             } else if (statusInt == 2) {
                 // 查找只是配送中/待取药 （不包含不通过的）
-                whereSql += " and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
+                whereSql += " and refund_status is null and ( ((ext_status & ?) != ? or ext_status is null) && status = ?  ) ";
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoExtStatusEnum.PresNoPass.getValue());
                 paramList.add(PrescriptionInfoStatusEnum.Dispatching.getValue());
             } else if (statusInt == 3) {
                 // 查找只是已完成的，只有广三的有已完成的状态
-                whereSql += " and ( status = ? and pharmacy_id = ? ) ";
+                whereSql += " and ( status = ? ) ";
                 paramList.add(PrescriptionInfoStatusEnum.Finished.getValue());
-                paramList.add(ConstantDef.GUANGSAN_PHARMACY_ID);
+
             } else if (statusInt == 5) {
                 // 查找只是不通过的，退费的不找出来，已评价的也不找出来
                 whereSql += " and ( (ext_status & ?) = ? and ext_status < ? and status != ? ) ";