commit

src/main/java/cn/hnthyy/thmz/controller/mz/MzPharmacyController.java

@@ -302,7 +302,7 @@ public class MzPharmacyController {
         User tokenUser = TokenUtil.getUser(httpServletRequest);
         Map<String, Object> resultMap = new HashMap<>();
         try {
-            if (mzRefundMedicineVos == null || mzRefundMedicineVos.size() < 1) {
+            if (mzRefundMedicineVos == null && mzRefundMedicineVos.size() < 1) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "退药处理失败,参数为空");
                 return resultMap;

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzPharmacyServiceImpl.java

@@ -125,32 +125,26 @@ public class MzPharmacyServiceImpl implements MzPharmacyService {
             if (StringUtils.isBlank(mzRefundMedicineVo.getPatientId())) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "病人ID不能为空");
-                return resultMap;
             }
             if (mzRefundMedicineVo.getTimes() == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "门诊就诊次数不能为空");
-                return resultMap;
             }
             if (mzRefundMedicineVo.getOrderNo() == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "处方号不能为空");
-                return resultMap;
             }
             if (mzRefundMedicineVo.getReceiptNo() == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "门诊缴费次数不能为空");
-                return resultMap;
             }
             if (StringUtils.isBlank(mzRefundMedicineVo.getGroupNo())) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "药房编码不能为空");
-                return resultMap;
             }
             if (mzRefundMedicineVo.getRealNo() == null) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "流水号不能为空");
-                return resultMap;
             }
             mzRefundMedicineVo.setConfirmFlag(3);
             mzRefundMedicineVo.setConfirmTime(date);