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,26 +125,32 @@ 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);

src/main/resources/static/js/mz/west_pharmacy_send.js

@@ -1807,6 +1807,21 @@ function saveRefundMedicine() {
     var i = 0;
     data.forEach(function (item, index, arr) {
         if (item.dec_amount != 0) {
+            // 调试日志
+            console.log('=== 退药参数调试 ===');
+            console.log('item.patient_id:', item.patient_id);
+            console.log('item.times:', item.times);
+            console.log('item.receipt_no:', item.receipt_no);
+            console.log('item.order_no:', item.order_no);
+            console.log('item.real_no:', item.real_no);
+            console.log('item.dec_amount:', item.dec_amount);
+            console.log('item.unit_price:', item.unit_price);
+            console.log('item.charge_item_code:', item.charge_item_code);
+            console.log('item.serial:', item.serial);
+            console.log('item.group_no:', item.group_no);
+            console.log('item.item_no:', item.item_no);
+            console.log('item.serial_no:', item.serial_no);
+            
             var tem = {
                 "patientId": item.patient_id,
                 "times": item.times,
@@ -3150,6 +3165,11 @@ function callYbSaleGoodsItem(realNo, orderNo, receiptNo, times, patientId, name,
             }
         }
         
+        // 如果没有追溯码，添加空数组（保持数据结构一致）
+        if (ybData.drugtracinfo.length === 0) {
+            ybData.drugtracinfo = [];
+        }
+        
         console.log('调用医保接口，药品:', item.drugname, '参数:', ybData);
         
         // 调用医保接口