feature：处方列表下载

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

@@ -131,7 +131,7 @@ public class PrescriptionServices {
                 paramList.add(PrescriptionInfoStatusEnum.Dispatching.getValue());
             } else if (statusInt == 3) {
                 // 查找只是已完成的，只有广三的有已完成的状态
-                whereSql += " and ( status = ? ) and refund_status is null ";
+                whereSql += " and ( status = ? ) and (refund_status is null or refund_status = 2) and pres_type = 1 ";
                 paramList.add(PrescriptionInfoStatusEnum.Finished.getValue());
 
             } else if (statusInt == 5) {
@@ -665,7 +665,7 @@ public class PrescriptionServices {
                 paramList.add(PrescriptionInfoStatusEnum.Dispatching.getValue());
             } else if (statusInt == 3) {
                 // 查找只是已完成的，只有广三的有已完成的状态
-                whereSql += " and ( status = ?  ) and refund_status is null ";
+                whereSql += " and ( status = ? ) and (refund_status is null or refund_status = 2) and pres_type = 1 ";
                 paramList.add(PrescriptionInfoStatusEnum.Finished.getValue());
 
             } else if (statusInt == 5) {
@@ -1225,7 +1225,7 @@ public class PrescriptionServices {
                 paramList.add(PrescriptionInfoStatusEnum.Dispatching.getValue());
             } else if (statusInt == 3) {
                 // 查找只是已完成的，只有广三的有已完成的状态
-                whereSql += " and ( status = ?  ) and refund_status is null ";
+                whereSql += " and ( status = ? ) and (refund_status is null or refund_status = 2) and pres_type = 1 ";
                 paramList.add(PrescriptionInfoStatusEnum.Finished.getValue());
 
             } else if (statusInt == 5) {
@@ -1570,7 +1570,7 @@ public class PrescriptionServices {
                 paramList.add(PrescriptionInfoStatusEnum.Dispatching.getValue());
             } else if (statusInt == 3) {
                 // 查找只是已完成的，只有广三的有已完成的状态
-                whereSql += " and ( status = ? ) and refund_status is null ";
+                whereSql += " and ( status = ? ) and (refund_status is null or refund_status = 2) and pres_type = 1 ";
                 paramList.add(PrescriptionInfoStatusEnum.Finished.getValue());
 
             } else if (statusInt == 5) {